diff options
Diffstat (limited to 'kipi-plugins/findimages')
-rw-r--r-- | kipi-plugins/findimages/Doxyfile | 2 | ||||
-rw-r--r-- | kipi-plugins/findimages/actions.cpp | 6 | ||||
-rw-r--r-- | kipi-plugins/findimages/actions.h | 12 | ||||
-rw-r--r-- | kipi-plugins/findimages/compareoperation.h | 2 | ||||
-rw-r--r-- | kipi-plugins/findimages/displaycompare.cpp | 258 | ||||
-rw-r--r-- | kipi-plugins/findimages/displaycompare.h | 55 | ||||
-rw-r--r-- | kipi-plugins/findimages/fastcompare.cpp | 76 | ||||
-rw-r--r-- | kipi-plugins/findimages/fastcompare.h | 18 | ||||
-rw-r--r-- | kipi-plugins/findimages/finddupplicatedialog.cpp | 112 | ||||
-rw-r--r-- | kipi-plugins/findimages/finddupplicatedialog.h | 29 | ||||
-rw-r--r-- | kipi-plugins/findimages/finddupplicateimages.cpp | 116 | ||||
-rw-r--r-- | kipi-plugins/findimages/finddupplicateimages.h | 49 | ||||
-rw-r--r-- | kipi-plugins/findimages/fuzzycompare.cpp | 94 | ||||
-rw-r--r-- | kipi-plugins/findimages/fuzzycompare.h | 28 | ||||
-rw-r--r-- | kipi-plugins/findimages/imagesimilaritydata.h | 2 | ||||
-rw-r--r-- | kipi-plugins/findimages/plugin_findimages.cpp | 52 | ||||
-rw-r--r-- | kipi-plugins/findimages/plugin_findimages.h | 9 |
17 files changed, 462 insertions, 458 deletions
diff --git a/kipi-plugins/findimages/Doxyfile b/kipi-plugins/findimages/Doxyfile index 339dc76..8af60b1 100644 --- a/kipi-plugins/findimages/Doxyfile +++ b/kipi-plugins/findimages/Doxyfile @@ -84,7 +84,7 @@ REPEAT_BRIEF = YES # used as the annotated text. Otherwise, the brief description is used as-is. # If left blank, the following values are used ("$name" is automatically # replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# "The $name file" "is" "provides" "specifies" "tqcontains" # "represents" "a" "an" "the" ABBREVIATE_BRIEF = diff --git a/kipi-plugins/findimages/actions.cpp b/kipi-plugins/findimages/actions.cpp index e578a92..87341bb 100644 --- a/kipi-plugins/findimages/actions.cpp +++ b/kipi-plugins/findimages/actions.cpp @@ -29,10 +29,10 @@ * * To overcome this problem, we will only send status messages at most every 50 msec. */ -void KIPIFindDupplicateImagesPlugin::sendMessage( QObject* receiver, const Action& action, const QString & fileName, +void KIPIFindDupplicateImagesPlugin::sendMessage( TQObject* receiver, const Action& action, const TQString & fileName, int total, bool starting, bool succes ) { - static QTime time; + static TQTime time; static int count = 0; if (starting) ++count; @@ -46,7 +46,7 @@ void KIPIFindDupplicateImagesPlugin::sendMessage( QObject* receiver, const Actio d->count = count; d->starting = starting; d->success = succes; - QApplication::postEvent( receiver, new QCustomEvent(QEvent::User, d)); + TQApplication::postEvent( receiver, new TQCustomEvent(TQEvent::User, d)); time.restart(); } } diff --git a/kipi-plugins/findimages/actions.h b/kipi-plugins/findimages/actions.h index e95b333..c90acc6 100644 --- a/kipi-plugins/findimages/actions.h +++ b/kipi-plugins/findimages/actions.h @@ -23,9 +23,9 @@ #ifndef ACTIONS_H #define ACTIONS_H -#include <qstring.h> -#include <qdatetime.h> -#include <qapplication.h> +#include <tqstring.h> +#include <tqdatetime.h> +#include <tqapplication.h> namespace KIPIFindDupplicateImagesPlugin { @@ -50,8 +50,8 @@ public: success = false; } - QString fileName; - QString errString; + TQString fileName; + TQString errString; int count; int total; bool starting; @@ -60,7 +60,7 @@ public: }; -void sendMessage( QObject* receiver, const Action& action, const QString & fileName, +void sendMessage( TQObject* receiver, const Action& action, const TQString & fileName, int total, bool starting, bool succes ); diff --git a/kipi-plugins/findimages/compareoperation.h b/kipi-plugins/findimages/compareoperation.h index b677714..8845bff 100644 --- a/kipi-plugins/findimages/compareoperation.h +++ b/kipi-plugins/findimages/compareoperation.h @@ -27,7 +27,7 @@ class CompareOperation { public: CompareOperation() :m_stopRequested( false ) {} - virtual QDict < QPtrVector < QFile > > compare( const QStringList& fileList ) = 0; + virtual TQDict < TQPtrVector < TQFile > > compare( const TQStringList& fileList ) = 0; void stopPlease() { m_stopRequested = true; } protected: diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp index 70196a4..bd4b5f3 100644 --- a/kipi-plugins/findimages/displaycompare.cpp +++ b/kipi-plugins/findimages/displaycompare.cpp @@ -21,24 +21,24 @@ // ////////////////////////////////////////////////////////////////////////////// -// Include files for Qt - -#include <qptrvector.h> -#include <qdict.h> -#include <qfile.h> -#include <qlistbox.h> -#include <qlabel.h> -#include <qgroupbox.h> -#include <qlistview.h> -#include <qcheckbox.h> -#include <qheader.h> -#include <qlayout.h> -#include <qfileinfo.h> -#include <qimage.h> -#include <qpixmap.h> -#include <qwhatsthis.h> -#include <qpushbutton.h> -#include <qframe.h> +// Include files for TQt + +#include <tqptrvector.h> +#include <tqdict.h> +#include <tqfile.h> +#include <tqlistbox.h> +#include <tqlabel.h> +#include <tqgroupbox.h> +#include <tqlistview.h> +#include <tqcheckbox.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqfileinfo.h> +#include <tqimage.h> +#include <tqpixmap.h> +#include <tqwhatsthis.h> +#include <tqpushbutton.h> +#include <tqframe.h> // Include files for KDE @@ -74,57 +74,57 @@ namespace KIPIFindDupplicateImagesPlugin ///////////////////////////////////////////////////////////////////////////////////////////// -class FindOriginalItem : public QCheckListItem +class FindOriginalItem : public TQCheckListItem { public: - FindOriginalItem(QListView * parent, QString const & name, QString const & fullpath, - QString const & album, QString const & comments) - : QCheckListItem( parent, name, QCheckListItem::CheckBox), _name(name), + FindOriginalItem(TQListView * tqparent, TQString const & name, TQString const & fullpath, + TQString const & album, TQString const & comments) + : TQCheckListItem( tqparent, name, TQCheckListItem::CheckBox), _name(name), _fullpath(fullpath), _album (album), _comments (comments) {} - QString name() { return _name; } - QString fullpath() { return _fullpath; } - QString album() { return _album; } - QString comments() { return _comments; } + TQString name() { return _name; } + TQString fullpath() { return _fullpath; } + TQString album() { return _album; } + TQString comments() { return _comments; } private: - QString _name; - QString _fullpath; - QString _album; - QString _comments; + TQString _name; + TQString _fullpath; + TQString _album; + TQString _comments; }; ///////////////////////////////////////////////////////////////////////////////////////////// -class FindDuplicateItem : public QCheckListItem +class FindDuplicateItem : public TQCheckListItem { public: - FindDuplicateItem(QListView * parent, QString const & name, QString const & fullpath, - QString const & album, QString const & comments) - : QCheckListItem( parent, name, QCheckListItem::CheckBox), _name(name), + FindDuplicateItem(TQListView * tqparent, TQString const & name, TQString const & fullpath, + TQString const & album, TQString const & comments) + : TQCheckListItem( tqparent, name, TQCheckListItem::CheckBox), _name(name), _fullpath(fullpath), _album (album), _comments (comments) {} - QString name() { return _name; } - QString fullpath() { return _fullpath; } - QString album() { return _album; } - QString comments() { return _comments; } + TQString name() { return _name; } + TQString fullpath() { return _fullpath; } + TQString album() { return _album; } + TQString comments() { return _comments; } private: - QString _name; - QString _fullpath; - QString _album; - QString _comments; + TQString _name; + TQString _fullpath; + TQString _album; + TQString _comments; }; //////////////////////////////////// CONSTRUCTOR //////////////////////////////////////////// -DisplayCompare::DisplayCompare(QWidget* parent, KIPI::Interface* interface, - const QDict < QPtrVector < QFile > >& cmp ) - : KDialogBase( parent, "DisplayCompare", true, 0, +DisplayCompare::DisplayCompare(TQWidget* tqparent, KIPI::Interface* interface, + const TQDict < TQPtrVector < TQFile > >& cmp ) + : KDialogBase( tqparent, "DisplayCompare", true, 0, Help|User1|Close, Close, false, i18n("Delete")), m_cmp(cmp), m_interface( interface ) { @@ -151,86 +151,86 @@ DisplayCompare::DisplayCompare(QWidget* parent, KIPI::Interface* interface, m_helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("Plugin Handbook"), this, SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("Plugin Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); m_helpButton->setPopup( helpMenu->menu() ); // ---------------------------------------------------- - QWidget* box = new QWidget( this ); + TQWidget* box = new TQWidget( this ); setMainWidget(box); - QVBoxLayout* ml = new QVBoxLayout( box, 10 ); - QHBoxLayout* h1 = new QHBoxLayout( ml ); - QVBoxLayout* v1 = new QVBoxLayout( h1 ); + TQVBoxLayout* ml = new TQVBoxLayout( box, 10 ); + TQHBoxLayout* h1 = new TQHBoxLayout( ml ); + TQVBoxLayout* v1 = new TQVBoxLayout( h1 ); h1->addSpacing( 5 ); - QGridLayout* g1 = new QGridLayout( v1, 1, 2 ); + TQGridLayout* g1 = new TQGridLayout( v1, 1, 2 ); //--------------------------------------------- - GroupBox1 = new QGroupBox( 1, Qt::Horizontal, i18n("Original Files"), box ); - GroupBox1->layout()->setSpacing( 6 ); - GroupBox1->layout()->setMargin( 11 ); + GroupBox1 = new TQGroupBox( 1, Qt::Horizontal, i18n("Original Files"), box ); + GroupBox1->tqlayout()->setSpacing( 6 ); + GroupBox1->tqlayout()->setMargin( 11 ); OriginalNameLabel = new KSqueezedTextLabel( GroupBox1, "OriginalNameLabel" ); - OriginalNameLabel->setFrameShape( QLabel::Box ); - OriginalNameLabel->setAlignment( int( QLabel::AlignCenter ) ); + OriginalNameLabel->setFrameShape( TQLabel::Box ); + OriginalNameLabel->tqsetAlignment( int( TQLabel::AlignCenter ) ); - preview1 = new QLabel( GroupBox1, "preview1" ); + preview1 = new TQLabel( GroupBox1, "preview1" ); preview1->setFixedHeight( 120 ); - preview1->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); - preview1->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); - QWhatsThis::add( preview1, i18n( "<p>The preview of files with duplicates." ) ); + preview1->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + preview1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + TQWhatsThis::add( preview1, i18n( "<p>The preview of files with duplicates." ) ); originalInfoLabel1 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel1" ); - originalInfoLabel1->setAlignment( int( QLabel::AlignCenter ) ); + originalInfoLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel2 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel2" ); - originalInfoLabel2->setAlignment( int( QLabel::AlignCenter ) ); + originalInfoLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel3 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel3" ); - originalInfoLabel3->setAlignment( int( QLabel::AlignCenter ) ); + originalInfoLabel3->tqsetAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel4 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel4" ); - originalInfoLabel4->setAlignment( int( QLabel::AlignCenter ) ); + originalInfoLabel4->tqsetAlignment( int( TQLabel::AlignCenter ) ); originalInfoLabel5 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel5" ); - originalInfoLabel5->setAlignment( int( QLabel::AlignCenter ) ); + originalInfoLabel5->tqsetAlignment( int( TQLabel::AlignCenter ) ); listName = new KListView( GroupBox1, "listName" ); listName->header()->setLabel( 0, i18n( "Files" ) ); - QWhatsThis::add( listName, i18n( "<p>This list contains all files with many duplicates." ) ); + TQWhatsThis::add( listName, i18n( "<p>This list contains all files with many duplicates." ) ); listName->addColumn( i18n( "Files" ) ); - listName->setResizeMode(QListView::AllColumns); + listName->setResizeMode(TQListView::AllColumns); g1->addWidget( GroupBox1 , 0, 0); //--------------------------------------------- - GroupBox2 = new QGroupBox( 1, Qt::Horizontal, i18n("Similar Files"), box ); - GroupBox2->layout()->setSpacing( 6 ); - GroupBox2->layout()->setMargin( 11 ); + GroupBox2 = new TQGroupBox( 1, Qt::Horizontal, i18n("Similar Files"), box ); + GroupBox2->tqlayout()->setSpacing( 6 ); + GroupBox2->tqlayout()->setMargin( 11 ); similarNameLabel = new KSqueezedTextLabel( GroupBox2, "similarNameLabel" ); - similarNameLabel->setFrameShape( QLabel::Box ); - similarNameLabel->setAlignment( int( QLabel::AlignCenter ) ); + similarNameLabel->setFrameShape( TQLabel::Box ); + similarNameLabel->tqsetAlignment( int( TQLabel::AlignCenter ) ); - preview2 = new QLabel( GroupBox2, "preview2" ); + preview2 = new TQLabel( GroupBox2, "preview2" ); preview2->setFixedHeight( 120 ); - preview2->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); - preview2->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); - QWhatsThis::add( preview2, i18n( "<p>The preview of duplicate files." ) ); + preview2->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter ); + preview2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + TQWhatsThis::add( preview2, i18n( "<p>The preview of duplicate files." ) ); similarInfoLabel1 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel1" ); - similarInfoLabel1->setAlignment( int( QLabel::AlignCenter ) ); + similarInfoLabel1->tqsetAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel2 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel2" ); - similarInfoLabel2->setAlignment( int( QLabel::AlignCenter ) ); + similarInfoLabel2->tqsetAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel3 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel3" ); - similarInfoLabel3->setAlignment( int( QLabel::AlignCenter ) ); + similarInfoLabel3->tqsetAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel4 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel4" ); - similarInfoLabel4->setAlignment( int( QLabel::AlignCenter ) ); + similarInfoLabel4->tqsetAlignment( int( TQLabel::AlignCenter ) ); similarInfoLabel5 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel5" ); - similarInfoLabel5->setAlignment( int( QLabel::AlignCenter ) ); + similarInfoLabel5->tqsetAlignment( int( TQLabel::AlignCenter ) ); listEq = new KListView( GroupBox2, "listEq" ); listEq->header()->setLabel( 0, i18n( "Files" ) ); - QWhatsThis::add( listEq, i18n( "<p>This list contains all duplicates files." ) ); + TQWhatsThis::add( listEq, i18n( "<p>This list contains all duplicates files." ) ); listEq->addColumn( i18n( "Identical To" ) ); - listEq->setResizeMode(QListView::AllColumns); + listEq->setResizeMode(TQListView::AllColumns); g1->addWidget( GroupBox2 , 0, 1); @@ -238,19 +238,19 @@ DisplayCompare::DisplayCompare(QWidget* parent, KIPI::Interface* interface, //--------------------------------------------- - QDictIterator < QPtrVector < QFile > >itres(m_cmp); // iterator for res + TQDictIterator < TQPtrVector < TQFile > >itres(m_cmp); // iterator for res int n_id = 0; while (itres.current ()) { - QFileInfo fi(itres.currentKey()); - QString Temp = fi.dirPath(); - QString albumName = Temp.section('/', -1); + TQFileInfo fi(itres.currentKey()); + TQString Temp = fi.dirPath(); + TQString albumName = Temp.section('/', -1); KURL url; url.setPath(fi.fileName()); KIPI::ImageInfo info = m_interface->info(url); - QString comments = info.description(); + TQString comments = info.description(); new FindOriginalItem( listName, fi.fileName(), itres.currentKey(), albumName, comments ); ++itres; @@ -262,14 +262,14 @@ DisplayCompare::DisplayCompare(QWidget* parent, KIPI::Interface* interface, // signals and slots connections - connect(this, SIGNAL(user1Clicked()), - this, SLOT(slotDelete())); + connect(this, TQT_SIGNAL(user1Clicked()), + this, TQT_SLOT(slotDelete())); - connect(listName, SIGNAL(selectionChanged ( QListViewItem * )), - this, SLOT(slotDisplayLeft(QListViewItem *))); + connect(listName, TQT_SIGNAL(selectionChanged ( TQListViewItem * )), + this, TQT_SLOT(slotDisplayLeft(TQListViewItem *))); - connect(listEq, SIGNAL(selectionChanged ( QListViewItem * )), - this, SLOT(slotDisplayRight(QListViewItem *))); + connect(listEq, TQT_SIGNAL(selectionChanged ( TQListViewItem * )), + this, TQT_SLOT(slotDisplayRight(TQListViewItem *))); resize( 700, 600 ); listName->setSelected(listName->firstChild(), true); @@ -308,7 +308,7 @@ void DisplayCompare::slotDelete( void ) KURL deleteImage(item->fullpath()); if ( KIO::NetAccess::del(deleteImage) == false ) - KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").arg(item->fullpath())); + KMessageBox::error(this, i18n("Cannot remove duplicate file:\n%1").tqarg(item->fullpath())); else m_interface->delImage( deleteImage ); @@ -329,7 +329,7 @@ void DisplayCompare::slotDelete( void ) KURL deleteImage(item->fullpath()); if ( KIO::NetAccess::del(deleteImage) == false ) - KMessageBox::error(this, i18n("Cannot remove original file:\n%1").arg(item->fullpath())); + KMessageBox::error(this, i18n("Cannot remove original file:\n%1").tqarg(item->fullpath())); item->setOn( false ); } @@ -339,57 +339,57 @@ void DisplayCompare::slotDelete( void ) ///////////////////////////////////////////////////////////////////////////////////////////// -void DisplayCompare::slotDisplayLeft(QListViewItem * item) +void DisplayCompare::slotDisplayLeft(TQListViewItem * item) { KApplication::setOverrideCursor( waitCursor ); listEq->clear(); FindOriginalItem *pitem = static_cast<FindOriginalItem*>( item ); - QPtrVector < QFile > *list = (QPtrVector < QFile > *)m_cmp.find(pitem->fullpath()); - QImage im(pitem->fullpath()); + TQPtrVector < TQFile > *list = (TQPtrVector < TQFile > *)m_cmp.tqfind(pitem->fullpath()); + TQImage im(pitem->fullpath()); if ( !im.isNull() ) { OriginalNameLabel->setText(pitem->name()); - originalInfoLabel1->setText(i18n("Image size: %1x%2 pixels").arg(im.width()).arg(im.height())); + originalInfoLabel1->setText(i18n("Image size: %1x%2 pixels").tqarg(im.width()).tqarg(im.height())); originalInfoLabel2->setText(i18n("File size: 1 byte", - "File size: %n bytes",QFileInfo(pitem->fullpath()).size())); - originalInfoLabel3->setText(i18n("Modified: %1").arg(KLocale(NULL) - .formatDateTime(QFileInfo(pitem->fullpath()) + "File size: %n bytes",TQFileInfo(pitem->fullpath()).size())); + originalInfoLabel3->setText(i18n("Modified: %1").tqarg(KLocale(NULL) + .formatDateTime(TQFileInfo(pitem->fullpath()) .lastModified()))); - originalInfoLabel4->setText(i18n("Album: %1").arg(pitem->album())); - originalInfoLabel5->setText(i18n("Comments: %1").arg(pitem->comments())); + originalInfoLabel4->setText(i18n("Album: %1").tqarg(pitem->album())); + originalInfoLabel5->setText(i18n("Comments: %1").tqarg(pitem->comments())); } preview1->clear(); - QString IdemIndexed = "file:" + pitem->fullpath(); + TQString IdemIndexed = "file:" + pitem->fullpath(); KURL url(IdemIndexed); KIO::PreviewJob* thumbJob1 = KIO::filePreview( url, preview1->height() ); - connect(thumbJob1, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), - SLOT(slotGotPreview1(const KFileItem*, const QPixmap&))); + connect(thumbJob1, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + TQT_SLOT(slotGotPreview1(const KFileItem*, const TQPixmap&))); FindDuplicateItem *last = NULL; - QFile *f = NULL; - QFileInfo *fi = new QFileInfo(); - QString fn; + TQFile *f = NULL; + TQFileInfo *fi = new TQFileInfo(); + TQString fn; for (unsigned int i = 0 ; i < list->size () ; ++i) { - f = (QFile*)list->at(i); + f = (TQFile*)list->at(i); fi->setFile(*f); fn = fi->absFilePath(); if (fi->exists ()) { - QString Temp = fi->dirPath(); - QString albumName = Temp.section('/', -1); + TQString Temp = fi->dirPath(); + TQString albumName = Temp.section('/', -1); KURL url; url.setPath(fi->fileName()); KIPI::ImageInfo info = m_interface->info(url); - QString comments = info.description(); + TQString comments = info.description(); FindDuplicateItem *item = new FindDuplicateItem( listEq, fi->fileName(), @@ -402,7 +402,7 @@ void DisplayCompare::slotDisplayLeft(QListViewItem * item) } } - preview2->setPixmap(QPixmap()); + preview2->setPixmap(TQPixmap()); listEq->setSelected(last, true); KApplication::restoreOverrideCursor(); } @@ -410,7 +410,7 @@ void DisplayCompare::slotDisplayLeft(QListViewItem * item) ///////////////////////////////////////////////////////////////////////////////////////////// -void DisplayCompare::slotGotPreview1(const KFileItem* /*url*/, const QPixmap &pixmap) +void DisplayCompare::slotGotPreview1(const KFileItem* /*url*/, const TQPixmap &pixmap) { preview1->setPixmap(pixmap); } @@ -418,34 +418,34 @@ void DisplayCompare::slotGotPreview1(const KFileItem* /*url*/, const QPixmap &pi ///////////////////////////////////////////////////////////////////////////////////////////// -void DisplayCompare::slotDisplayRight(QListViewItem * item) +void DisplayCompare::slotDisplayRight(TQListViewItem * item) { KApplication::setOverrideCursor( waitCursor ); FindDuplicateItem *pitem = static_cast<FindDuplicateItem*>( item ); - QImage im(pitem->fullpath()); + TQImage im(pitem->fullpath()); if ( !im.isNull() ) { similarNameLabel->setText(pitem->name()); - similarInfoLabel1->setText(i18n("Image size: %1x%2 pixels").arg(im.width()).arg(im.height())); + similarInfoLabel1->setText(i18n("Image size: %1x%2 pixels").tqarg(im.width()).tqarg(im.height())); similarInfoLabel2->setText(i18n("File size: 1 byte", - "File size: %n bytes", QFileInfo(pitem->fullpath()).size())); - similarInfoLabel3->setText(i18n("Modified: %1").arg(KLocale(NULL) - .formatDateTime(QFileInfo(pitem->fullpath()) + "File size: %n bytes", TQFileInfo(pitem->fullpath()).size())); + similarInfoLabel3->setText(i18n("Modified: %1").tqarg(KLocale(NULL) + .formatDateTime(TQFileInfo(pitem->fullpath()) .lastModified()))); - similarInfoLabel4->setText(i18n("Album: %1").arg(pitem->album())); - similarInfoLabel5->setText(i18n("Caption: %1").arg(pitem->comments())); + similarInfoLabel4->setText(i18n("Album: %1").tqarg(pitem->album())); + similarInfoLabel5->setText(i18n("Caption: %1").tqarg(pitem->comments())); } preview2->clear(); - QString IdemIndexed = "file:" + pitem->fullpath(); + TQString IdemIndexed = "file:" + pitem->fullpath(); KURL url(IdemIndexed); KIO::PreviewJob* thumbJob2 = KIO::filePreview( url, preview2->height() ); - connect(thumbJob2, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), - SLOT(slotGotPreview2(const KFileItem*, const QPixmap&))); + connect(thumbJob2, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + TQT_SLOT(slotGotPreview2(const KFileItem*, const TQPixmap&))); KApplication::restoreOverrideCursor(); } @@ -453,7 +453,7 @@ void DisplayCompare::slotDisplayRight(QListViewItem * item) ///////////////////////////////////////////////////////////////////////////////////////////// -void DisplayCompare::slotGotPreview2(const KFileItem* /*url*/, const QPixmap &pixmap) +void DisplayCompare::slotGotPreview2(const KFileItem* /*url*/, const TQPixmap &pixmap) { preview2->setPixmap(pixmap); } diff --git a/kipi-plugins/findimages/displaycompare.h b/kipi-plugins/findimages/displaycompare.h index 18e4681..8edcba8 100644 --- a/kipi-plugins/findimages/displaycompare.h +++ b/kipi-plugins/findimages/displaycompare.h @@ -24,11 +24,11 @@ #ifndef __DISPLAYCOMPARE_H__ #define __DISPLAYCOMPARE_H__ -// Include files for Qt +// Include files for TQt -#include <qptrvector.h> -#include <qdict.h> -#include <qguardedptr.h> +#include <tqptrvector.h> +#include <tqdict.h> +#include <tqguardedptr.h> // Include files for KDE @@ -42,16 +42,16 @@ #include "kpaboutdata.h" -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QGroupBox; -class QLabel; -class QListView; -class QListViewItem; -class QPushButton; -class QPrtList; -class QFile; +class TQVBoxLayout; +class TQHBoxLayout; +class TQGridLayout; +class TQGroupBox; +class TQLabel; +class TQListView; +class TQListViewItem; +class TQPushButton; +class TQPrtList; +class TQFile; class KSqueezedTextLabel; class KFileItem; @@ -62,27 +62,28 @@ namespace KIPIFindDupplicateImagesPlugin class DisplayCompare : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DisplayCompare(QWidget* parent, KIPI::Interface* interface, const QDict < QPtrVector < QFile > >& cmp); + DisplayCompare(TQWidget* tqparent, KIPI::Interface* interface, const TQDict < TQPtrVector < TQFile > >& cmp); ~DisplayCompare(); private slots : - void slotDisplayRight(QListViewItem *); - void slotDisplayLeft(QListViewItem *); + void slotDisplayRight(TQListViewItem *); + void slotDisplayLeft(TQListViewItem *); void slotHelp(); void slotDelete( void ); - void slotGotPreview1(const KFileItem* url, const QPixmap &pixmap); - void slotGotPreview2(const KFileItem* url, const QPixmap &pixmap); + void slotGotPreview1(const KFileItem* url, const TQPixmap &pixmap); + void slotGotPreview2(const KFileItem* url, const TQPixmap &pixmap); private: - const QDict < QPtrVector < QFile > > m_cmp; + const TQDict < TQPtrVector < TQFile > > m_cmp; - QGroupBox* GroupBox1; - QGroupBox* GroupBox2; + TQGroupBox* GroupBox1; + TQGroupBox* GroupBox2; KSqueezedTextLabel* OriginalNameLabel; KSqueezedTextLabel* originalInfoLabel1; @@ -98,13 +99,13 @@ private: KSqueezedTextLabel* similarInfoLabel4; KSqueezedTextLabel* similarInfoLabel5; - QLabel* preview1; - QLabel* preview2; + TQLabel* preview1; + TQLabel* preview2; - QListView* listName; - QListView* listEq; + TQListView* listName; + TQListView* listEq; - QPushButton *m_helpButton; + TQPushButton *m_helpButton; KIPI::Interface *m_interface; diff --git a/kipi-plugins/findimages/fastcompare.cpp b/kipi-plugins/findimages/fastcompare.cpp index 858a69c..0cd0b51 100644 --- a/kipi-plugins/findimages/fastcompare.cpp +++ b/kipi-plugins/findimages/fastcompare.cpp @@ -24,58 +24,58 @@ #include "fastcompare.h" #include "actions.h" -#include <qstringlist.h> -#include <qapplication.h> +#include <tqstringlist.h> +#include <tqapplication.h> #include <kdebug.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> -KIPIFindDupplicateImagesPlugin::FastCompare::FastCompare( QObject* parent ) - :m_parent( parent ) +KIPIFindDupplicateImagesPlugin::FastCompare::FastCompare( TQObject* tqparent ) + :m_parent( tqparent ) { } -QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FastCompare::compare( const QStringList& filesList ) +TQDict < TQPtrVector < TQFile > > KIPIFindDupplicateImagesPlugin::FastCompare::compare( const TQStringList& filesList ) { - QDict < QPtrVector < QFile > > res; - QDict < QPtrVector < QFile > >*dict = new QDict < QPtrVector < QFile > >; + TQDict < TQPtrVector < TQFile > > res; + TQDict < TQPtrVector < TQFile > >*dict = new TQDict < TQPtrVector < TQFile > >; dict->setAutoDelete(true); - QPtrVector < QFile > *list; + TQPtrVector < TQFile > *list; - QString size; - QFile *file; + TQString size; + TQFile *file; int nbrF = 0; - sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::Progress, QString::null, filesList.count()*2, true, false ); + sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::Progress, TQString(), filesList.count()*2, true, false ); kdDebug( 51000 ) << filesList.count() << " images to parse with Fast method..." << endl; - for ( QStringList::ConstIterator item = filesList.begin(); item != filesList.end(); ++item ) + for ( TQStringList::ConstIterator item = filesList.begin(); item != filesList.end(); ++item ) { if ( m_stopRequested ) - return QDict < QPtrVector < QFile > >(); + return TQDict < TQPtrVector < TQFile > >(); - QString itemName(*item); + TQString itemName(*item); nbrF++; sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::FastParsing, itemName, 0, true, false ); // Create a file - file = new QFile( itemName ); + file = new TQFile( itemName ); // Read the file size - size = QString::number(QFileInfo (*file).size ()); + size = TQString::number(TQFileInfo (*file).size ()); // if not in the table, we do it - if ( !dict->find (size) ) + if ( !dict->tqfind (size) ) { - list = new QPtrVector < QFile >; + list = new TQPtrVector < TQFile >; list->setAutoDelete(true); dict->insert (size, list); } // Read the list - list = (QPtrVector < QFile > *)dict->find (size); + list = (TQPtrVector < TQFile > *)dict->tqfind (size); //Add the file list->resize (list->size () + 1); @@ -86,11 +86,11 @@ QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FastCompare::comp // For counting the files comparaison tasks. int count = 0; - QDictIterator < QPtrVector < QFile > >itcount (*dict); // Iterator for dict. + TQDictIterator < TQPtrVector < TQFile > >itcount (*dict); // Iterator for dict. while (itcount.current ()) { - list = (QPtrVector < QFile > *)itcount.current (); + list = (TQPtrVector < TQFile > *)itcount.current (); if (list->size () != 1) for (unsigned int i = 0; i < list->size (); i++) @@ -100,45 +100,45 @@ QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FastCompare::comp } // Files comparison - QDictIterator < QPtrVector < QFile > >it (*dict); // Iterator for dict. + TQDictIterator < TQPtrVector < TQFile > >it (*dict); // Iterator for dict. while (it.current ()) { if ( m_stopRequested ) - return QDict < QPtrVector < QFile > >(); - QDict < QFile > *fait = new QDict < QFile >; - list = (QPtrVector < QFile > *)it.current (); + return TQDict < TQPtrVector < TQFile > >(); + TQDict < TQFile > *fait = new TQDict < TQFile >; + list = (TQPtrVector < TQFile > *)it.current (); if (list->size () != 1) { for (unsigned int i = 0; i < list->size (); i++) { - QFile *file1 = (QFile *) (list->at (i)); + TQFile *file1 = (TQFile *) (list->at (i)); sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::Exact,file1->name(),filesList.count() + count, true, false ); - if (!fait->find (file1->name())) + if (!fait->tqfind (file1->name())) { for (unsigned int j = i + 1; j < list->size (); j++) { - QFile *file2 = (QFile *) (list->at (j)); + TQFile *file2 = (TQFile *) (list->at (j)); // The files are equals ? if (equals (file1, file2)) { - QPtrVector < QFile > *vect; + TQPtrVector < TQFile > *vect; // Add the file. - if (!res.find (file1->name ())) + if (!res.tqfind (file1->name ())) { - vect = new QPtrVector < QFile >; + vect = new TQPtrVector < TQFile >; vect->setAutoDelete(true); res.insert (file1->name (), vect); } else - vect = (QPtrVector < QFile > *)res.find (file1->name ()); + vect = (TQPtrVector < TQFile > *)res.tqfind (file1->name ()); vect->resize (vect->size () + 1); vect->insert (vect->size () - 1, file2); @@ -164,18 +164,18 @@ QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FastCompare::comp ///////////////////////////////////////////////////////////////////////////////////////////// // Nota: original source code from ShowImg ! -bool KIPIFindDupplicateImagesPlugin::FastCompare::equals(QFile * f1, QFile * f2) +bool KIPIFindDupplicateImagesPlugin::FastCompare::equals(TQFile * f1, TQFile * f2) { - if ( QFileInfo (*f1).size () != QFileInfo (*f2).size () ) + if ( TQFileInfo (*f1).size () != TQFileInfo (*f2).size () ) return false; f1->open (IO_ReadOnly); f2->open (IO_ReadOnly); - QDataStream s1 (f1); - QDataStream s2 (f2); + TQDataStream s1 (f1); + TQDataStream s2 (f2); - Q_INT8 b1, b2; + TQ_INT8 b1, b2; bool eq = true; while ( !s1.atEnd () && eq ) diff --git a/kipi-plugins/findimages/fastcompare.h b/kipi-plugins/findimages/fastcompare.h index 0222880..f939799 100644 --- a/kipi-plugins/findimages/fastcompare.h +++ b/kipi-plugins/findimages/fastcompare.h @@ -25,11 +25,11 @@ #ifndef FASTCOMPARE_H #define FASTCOMPARE_H -class QStringList; -class QObject; -#include <qdict.h> -#include <qptrvector.h> -#include <qfile.h> +class TQStringList; +class TQObject; +#include <tqdict.h> +#include <tqptrvector.h> +#include <tqfile.h> #include "actions.h" #include "compareoperation.h" @@ -39,14 +39,14 @@ namespace KIPIFindDupplicateImagesPlugin class FastCompare :public CompareOperation { public: - FastCompare( QObject* parent ); - virtual QDict < QPtrVector < QFile > > compare( const QStringList& filesList ); + FastCompare( TQObject* tqparent ); + virtual TQDict < TQPtrVector < TQFile > > compare( const TQStringList& filesList ); protected: - bool equals(QFile*, QFile*); // Return true if the 2 files are the sames. + bool equals(TQFile*, TQFile*); // Return true if the 2 files are the sames. private: - QObject* m_parent; + TQObject* m_parent; }; } diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp index cd6cfe5..0ff548e 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.cpp +++ b/kipi-plugins/findimages/finddupplicatedialog.cpp @@ -20,21 +20,21 @@ // ////////////////////////////////////////////////////////////////////////////// -// Include files for Qt - -#include <qlabel.h> -#include <qvbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qspinbox.h> -#include <qlistview.h> -#include <qheader.h> -#include <qpushbutton.h> -#include <qfileinfo.h> +// Include files for TQt + +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqlistview.h> +#include <tqheader.h> +#include <tqpushbutton.h> +#include <tqfileinfo.h> // Include files for KDE @@ -73,9 +73,9 @@ namespace KIPIFindDupplicateImagesPlugin { -FindDuplicateDialog::FindDuplicateDialog( KIPI::Interface* interface, QWidget *parent) +FindDuplicateDialog::FindDuplicateDialog( KIPI::Interface* interface, TQWidget *tqparent) : KDialogBase( IconList, i18n("Configure"), Help|Ok|Cancel, - Ok, parent, "FindDuplicateDialog", true, false ), + Ok, tqparent, "FindDuplicateDialog", true, false ), m_interface( interface ) { setCaption(i18n("Find Duplicate Images")); @@ -105,7 +105,7 @@ FindDuplicateDialog::FindDuplicateDialog( KIPI::Interface* interface, QWidget *p m_helpButton = actionButton( Help ); KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false); helpMenu->menu()->removeItemAt(0); - helpMenu->menu()->insertItem(i18n("Plugin Handbook"), this, SLOT(slotHelp()), 0, -1, 0); + helpMenu->menu()->insertItem(i18n("Plugin Handbook"), this, TQT_SLOT(slotHelp()), 0, -1, 0); m_helpButton->setPopup( helpMenu->menu() ); } @@ -126,9 +126,9 @@ void FindDuplicateDialog::setupSelection(void) i18n("Album's Selection"), BarIcon("folder_image", KIcon::SizeMedium)); - QVBoxLayout *layout = new QVBoxLayout(page_setupSelection, 0, spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); - layout->addWidget(m_imageCollectionSelector); + tqlayout->addWidget(m_imageCollectionSelector); } @@ -136,24 +136,24 @@ void FindDuplicateDialog::setupSelection(void) void FindDuplicateDialog::setupPageMethod(void) { - QString whatsThis; + TQString whatsThis; page_setupMethod = addPage( i18n("Method & Cache"), i18n("Find-Duplicates Method & Cache Configuration"), BarIcon("run", KIcon::SizeMedium ) ); - QVBoxLayout *vlay = new QVBoxLayout( page_setupMethod, 0, spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( page_setupMethod, 0, spacingHint() ); //--------------------------------------------- - QGroupBox * groupBox1 = new QGroupBox( 2, Qt::Horizontal, i18n("Method"), page_setupMethod ); - groupBox1->layout()->setSpacing( 6 ); - groupBox1->layout()->setMargin( 11 ); + TQGroupBox * groupBox1 = new TQGroupBox( 2, Qt::Horizontal, i18n("Method"), page_setupMethod ); + groupBox1->tqlayout()->setSpacing( 6 ); + groupBox1->tqlayout()->setMargin( 11 ); - QLabel *m_labelsearchMethod = new QLabel( i18n("Search method:"), groupBox1 ); - m_findMethod = new QComboBox(false, groupBox1); + TQLabel *m_labelsearchMethod = new TQLabel( i18n("Search method:"), groupBox1 ); + m_findMethod = new TQComboBox(false, groupBox1); m_findMethod->insertItem(i18n("Almost"), MethodAlmost); m_findMethod->insertItem(i18n("Fast"), MethodFast); m_findMethod->setCurrentItem ( MethodAlmost ); - QWhatsThis::add( m_findMethod, i18n("<p>Select here the search method used to find duplicate " + TQWhatsThis::add( m_findMethod, i18n("<p>Select here the search method used to find duplicate " "images in the Albums database.<p>" "<b>Almost</b>: the algorithm calculates an approximate difference between images. " "This method is slower but robust. You can affine the thresholding using the " @@ -162,48 +162,48 @@ void FindDuplicateDialog::setupPageMethod(void) "This method is faster but is not as robust.")); m_labelsearchMethod->setBuddy( m_findMethod ); - (void) new QLabel (i18n("Approximate threshold:"), groupBox1); + (void) new TQLabel (i18n("Approximate threshold:"), groupBox1); m_approximateThreshold = new KIntNumInput(88, groupBox1); m_approximateThreshold->setRange(60, 100, 1, true ); - QWhatsThis::add( m_approximateThreshold, i18n("<p>Select here the approximate threshold " - "value, as a percentage, for the 'Almost' find-duplicates method. " + TQWhatsThis::add( m_approximateThreshold, i18n("<p>Select here the approximate threshold " + "value, as a percentage, for the 'Almost' tqfind-duplicates method. " "This value is used by the algorithm to distinguish two " "similar images. The default value is 88.") ); vlay->addWidget( groupBox1 ); //--------------------------------------------- - QGroupBox * groupBox2 = new QGroupBox( 1, Qt::Horizontal, i18n("Cache Maintenance"), page_setupMethod ); - new QLabel(i18n("The find-duplicate-images process uses a cache folder for images' fingerprints\n" + TQGroupBox * groupBox2 = new TQGroupBox( 1, Qt::Horizontal, i18n("Cache Maintenance"), page_setupMethod ); + new TQLabel(i18n("The tqfind-duplicate-images process uses a cache folder for images' fingerprints\n" "to speed up the analysis of items from Albums."), groupBox2); - QPushButton* updateCache = new QPushButton( groupBox2, "UpdateCache" ); + TQPushButton* updateCache = new TQPushButton( groupBox2, "UpdateCache" ); updateCache->setText(i18n( "&Update Cache" )); - QWhatsThis::add( updateCache, i18n("<p>Update the cache data for the selected Albums.") ); - QPushButton* purgeCache = new QPushButton( groupBox2, "PurgeCacheAlbumsSelected" ); + TQWhatsThis::add( updateCache, i18n("<p>Update the cache data for the selected Albums.") ); + TQPushButton* purgeCache = new TQPushButton( groupBox2, "PurgeCacheAlbumsSelected" ); purgeCache->setText(i18n( "&Purge Cache (Albums Selected)" )); - QWhatsThis::add( purgeCache, i18n("<p>Purge the cache data for the selected Albums.") ); - QPushButton* purgeAllCache = new QPushButton( groupBox2, "PurgeAllCache" ); + TQWhatsThis::add( purgeCache, i18n("<p>Purge the cache data for the selected Albums.") ); + TQPushButton* purgeAllCache = new TQPushButton( groupBox2, "PurgeAllCache" ); purgeAllCache->setText(i18n( "&Purge All Caches" )); - QWhatsThis::add( purgeAllCache, i18n("<p>Purge the cache data for all Albums.") ); + TQWhatsThis::add( purgeAllCache, i18n("<p>Purge the cache data for all Albums.") ); vlay->addWidget( groupBox2 ); vlay->addStretch(1); //--------------------------------------------- - connect(m_findMethod, SIGNAL(activated(int)), - this, SLOT(slotfindMethodChanged(int))); + connect(m_findMethod, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotfindMethodChanged(int))); - connect(updateCache, SIGNAL(clicked()), - this, SLOT(slotUpdateCache())); + connect(updateCache, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotUpdateCache())); - connect(purgeCache, SIGNAL(clicked()), - this, SLOT(slotPurgeCache())); + connect(purgeCache, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotPurgeCache())); - connect(purgeAllCache, SIGNAL(clicked()), - this, SLOT(slotPurgeAllCache())); + connect(purgeAllCache, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotPurgeAllCache())); slotfindMethodChanged(m_findMethod->currentItem()); } @@ -233,13 +233,13 @@ void FindDuplicateDialog::slotfindMethodChanged(int index) void FindDuplicateDialog::slotUpdateCache(void) { - QValueList<KIPI::ImageCollection> albumsList = getSelectedAlbums(); - QStringList albumsListPath; + TQValueList<KIPI::ImageCollection> albumsList = getSelectedAlbums(); + TQStringList albumsListPath; - for( QValueList<KIPI::ImageCollection>::ConstIterator album = albumsList.begin() ; + for( TQValueList<KIPI::ImageCollection>::ConstIterator album = albumsList.begin() ; album != albumsList.end() ; ++album ) { - if ( !albumsListPath.contains( (*album).path().path() ) ) + if ( !albumsListPath.tqcontains( (*album).path().path() ) ) albumsListPath.append( (*album).path().path() ); } @@ -254,14 +254,14 @@ void FindDuplicateDialog::slotUpdateCache(void) void FindDuplicateDialog::slotPurgeCache(void) { - QValueList<KIPI::ImageCollection> albumsList = getSelectedAlbums(); + TQValueList<KIPI::ImageCollection> albumsList = getSelectedAlbums(); - QStringList albumsListPath; + TQStringList albumsListPath; - for( QValueList<KIPI::ImageCollection>::ConstIterator album = albumsList.begin() ; + for( TQValueList<KIPI::ImageCollection>::ConstIterator album = albumsList.begin() ; album != albumsList.end() ; ++album ) { - if ( !albumsListPath.contains( (*album).path().path() ) ) + if ( !albumsListPath.tqcontains( (*album).path().path() ) ) albumsListPath.append( (*album).path().path() ); } @@ -296,7 +296,7 @@ void FindDuplicateDialog::slotOk() ///////////////////////////////////////////////////////////////////////////////////////////// -QValueList<KIPI::ImageCollection> FindDuplicateDialog::getSelectedAlbums() const +TQValueList<KIPI::ImageCollection> FindDuplicateDialog::getSelectedAlbums() const { return m_imageCollectionSelector->selectedImageCollections(); } diff --git a/kipi-plugins/findimages/finddupplicatedialog.h b/kipi-plugins/findimages/finddupplicatedialog.h index c66e661..64c5422 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.h +++ b/kipi-plugins/findimages/finddupplicatedialog.h @@ -23,10 +23,10 @@ #ifndef FINDDUPPLICATEDIALOG_H #define FINDDUPPLICATEDIALOG_H -// Include files for Qt +// Include files for TQt -#include <qstring.h> -#include <qguardedptr.h> +#include <tqstring.h> +#include <tqguardedptr.h> // Include files for KDE @@ -40,9 +40,9 @@ #include "kpaboutdata.h" -class QComboBox; -class QFrame; -class QPushButton; +class TQComboBox; +class TQFrame; +class TQPushButton; class KFileItem; class KIntNumInput; @@ -59,10 +59,11 @@ namespace KIPIFindDupplicateImagesPlugin class FindDuplicateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FindDuplicateDialog( KIPI::Interface* interface, QWidget *parent=0); + FindDuplicateDialog( KIPI::Interface* interface, TQWidget *tqparent=0); ~FindDuplicateDialog(); int getFindMethod() const; @@ -71,7 +72,7 @@ class FindDuplicateDialog : public KDialogBase const int getApproximateThreeshold() const; void setApproximateThreeshold(int Value); - QValueList<KIPI::ImageCollection> getSelectedAlbums() const; + TQValueList<KIPI::ImageCollection> getSelectedAlbums() const; enum FindDuplicateMethod { MethodAlmost = 0, @@ -80,8 +81,8 @@ class FindDuplicateDialog : public KDialogBase signals: - void updateCache(QStringList fromDir); - void clearCache(QStringList fromDir); + void updateCache(TQStringList fromDir); + void clearCache(TQStringList fromDir); void clearAllCache(void); protected slots: @@ -95,12 +96,12 @@ class FindDuplicateDialog : public KDialogBase private: - QComboBox *m_findMethod; + TQComboBox *m_findMethod; - QFrame *page_setupSelection; - QFrame *page_setupMethod; + TQFrame *page_setupSelection; + TQFrame *page_setupMethod; - QPushButton *m_helpButton; + TQPushButton *m_helpButton; KIntNumInput *m_approximateThreshold; diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp index bbe7b5f..d8bcee3 100644 --- a/kipi-plugins/findimages/finddupplicateimages.cpp +++ b/kipi-plugins/findimages/finddupplicateimages.cpp @@ -30,14 +30,14 @@ extern "C" #include <math.h> } -// Include files for Qt +// Include files for TQt -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qimage.h> -#include <qprogressdialog.h> -#include <qmutex.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqimage.h> +#include <tqprogressdialog.h> +#include <tqmutex.h> // Include files for KDE @@ -63,7 +63,7 @@ extern "C" #include "finddupplicatedialog.h" #include "displaycompare.h" #include "actions.h" -#include <qcursor.h> +#include <tqcursor.h> #include "imagesimilaritydata.h" #include "fuzzycompare.h" #include "fastcompare.h" @@ -74,13 +74,13 @@ namespace KIPIFindDupplicateImagesPlugin //////////////////////////////////// CONSTRUCTOR //////////////////////////////////////////// -FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, QObject *parent) - : QObject(parent), QThread(), m_interface( interface ), +FindDuplicateImages::FindDuplicateImages( KIPI::Interface* interface, TQObject *tqparent) + : TQObject(tqparent), TQThread(), m_interface( interface ), m_cacheDir(KGlobal::dirs()->saveLocation("cache", "kipi-findduplicate/")), m_compareOp( 0 ) { KImageIO::registerFormats(); - parent_ = parent; + tqparent_ = tqparent; } @@ -134,22 +134,22 @@ void FindDuplicateImages::readSettings(void) bool FindDuplicateImages::execDialog() { - qApp->setOverrideCursor( QCursor(Qt::WaitCursor) ); - m_findDuplicateDialog = new FindDuplicateDialog( m_interface, kapp->activeWindow() ); - qApp->restoreOverrideCursor(); + tqApp->setOverrideCursor( TQCursor(TQt::WaitCursor) ); + m_findDuplicateDialog = new FindDuplicateDialog( m_interface, TQT_TQWIDGET(kapp->activeWindow()) ); + tqApp->restoreOverrideCursor(); readSettings(); - connect( m_findDuplicateDialog, SIGNAL(updateCache(QStringList)), - this, SLOT(slotUpdateCache(QStringList)) ); + connect( m_findDuplicateDialog, TQT_SIGNAL(updateCache(TQStringList)), + this, TQT_SLOT(slotUpdateCache(TQStringList)) ); - connect( m_findDuplicateDialog, SIGNAL(clearCache(QStringList)), - this, SLOT(slotClearCache(QStringList)) ); + connect( m_findDuplicateDialog, TQT_SIGNAL(clearCache(TQStringList)), + this, TQT_SLOT(slotClearCache(TQStringList)) ); - connect( m_findDuplicateDialog, SIGNAL(clearAllCache()), - this, SLOT(slotClearAllCache()) ); + connect( m_findDuplicateDialog, TQT_SIGNAL(clearAllCache()), + this, TQT_SLOT(slotClearAllCache()) ); - if ( m_findDuplicateDialog->exec() == QDialog::Accepted ) + if ( m_findDuplicateDialog->exec() == TQDialog::Accepted ) { // This is the value for approximate comparison level between 2 images. m_approximateLevel = (float) m_findDuplicateDialog->getApproximateThreeshold() / (float)100; @@ -167,9 +167,9 @@ bool FindDuplicateImages::execDialog() void FindDuplicateImages::showResult() { if( !m_res.isEmpty() ) - DisplayCompare((QWidget *)(kapp->activeWindow()), m_interface, m_res).exec(); + DisplayCompare((TQWidget *)(TQT_TQWIDGET(kapp->activeWindow())), m_interface, m_res).exec(); else - KMessageBox::information(kapp->activeWindow(), i18n("No identical files found")); + KMessageBox::information(TQT_TQWIDGET(kapp->activeWindow()), i18n("No identical files found")); } @@ -177,22 +177,22 @@ void FindDuplicateImages::showResult() void FindDuplicateImages::compareAlbums(void) { - qApp->setOverrideCursor( QCursor(Qt::WaitCursor) ); + tqApp->setOverrideCursor( TQCursor(TQt::WaitCursor) ); writeSettings(); // Prepare the data for the threaded operations. - QValueList<KIPI::ImageCollection> ListAlbums(m_findDuplicateDialog->getSelectedAlbums()); + TQValueList<KIPI::ImageCollection> ListAlbums(m_findDuplicateDialog->getSelectedAlbums()); filesList.clear(); - for( QValueList<KIPI::ImageCollection>::Iterator it = ListAlbums.begin(); it != ListAlbums.end(); ++it ) + for( TQValueList<KIPI::ImageCollection>::Iterator it = ListAlbums.begin(); it != ListAlbums.end(); ++it ) { KURL::List Files = (*it).images(); for( KURL::List::Iterator it2 = Files.begin(); it2 != Files.end(); ++it2 ) { - if ( !filesList.contains( (*it2).path() ) ) + if ( !filesList.tqcontains( (*it2).path() ) ) { filesList.append( (*it2).path() ); // PENDING(blackie) handle remote URLS } @@ -203,16 +203,16 @@ void FindDuplicateImages::compareAlbums(void) if ( m_findDuplicateDialog->getFindMethod() == FindDuplicateDialog::MethodAlmost ) { - FuzzyCompare *op = new FuzzyCompare( parent_, m_cacheDir ); + FuzzyCompare *op = new FuzzyCompare( tqparent_, m_cacheDir ); op->setApproximateThreeshold( m_approximateLevel ); m_compareOp = op; } else - m_compareOp = new FastCompare( parent_ ); + m_compareOp = new FastCompare( tqparent_ ); start(); // Starting the thread. - qApp->restoreOverrideCursor(); + tqApp->restoreOverrideCursor(); } @@ -222,20 +222,20 @@ void FindDuplicateImages::compareAlbums(void) void FindDuplicateImages::run() { m_res = m_compareOp->compare(filesList ); - sendMessage( parent_, KIPIFindDupplicateImagesPlugin::Progress, QString::null, 0, false, true ); + sendMessage( tqparent_, KIPIFindDupplicateImagesPlugin::Progress, TQString(), 0, false, true ); } ///////////////////////////////////////////////////////////////////////////////////////////// // Nota: original source code from ShowImg ! -void FindDuplicateImages::slotClearCache(QStringList fromDirs) +void FindDuplicateImages::slotClearCache(TQStringList fromDirs) { bool delOk = true; - for ( QStringList::Iterator it = fromDirs.begin(); it != fromDirs.end(); ++it ) + for ( TQStringList::Iterator it = fromDirs.begin(); it != fromDirs.end(); ++it ) { - QString deleteImage = m_cacheDir + *it ; + TQString deleteImage = m_cacheDir + *it ; if ( DeleteDir(deleteImage) == false ) delOk = false; @@ -264,15 +264,15 @@ void FindDuplicateImages::slotClearAllCache(void) ///////////////////////////////////////////////////////////////////////////////////////////// // Nota: original source code from ShowImg ! -void FindDuplicateImages::slotUpdateCache(QStringList fromDirs) +void FindDuplicateImages::slotUpdateCache(TQStringList fromDirs) { - pdCache = new QProgressDialog (m_findDuplicateDialog, "tmppb", true); + pdCache = new TQProgressDialog (m_findDuplicateDialog, "tmppb", true); pdCache->setLabelText(i18n("Updating in progress...")); pdCache->setTotalSteps(2); pdCache->show(); pdCache->setProgress(2); - for ( QStringList::Iterator it = fromDirs.begin(); it != fromDirs.end(); ++it ) + for ( TQStringList::Iterator it = fromDirs.begin(); it != fromDirs.end(); ++it ) updateCache(*it); pdCache->close(); @@ -284,35 +284,35 @@ void FindDuplicateImages::slotUpdateCache(QStringList fromDirs) ///////////////////////////////////////////////////////////////////////////////////////////// // Nota: original source code from ShowImg ! -void FindDuplicateImages::updateCache(QString fromDir) +void FindDuplicateImages::updateCache(TQString fromDir) { // PENDING(blackie) this method doesn't seem to work. kdDebug( 51000 ) << fromDir.ascii() << endl; pdCache->setLabelText(i18n("Updating in progress for:\n") + fromDir); - QDir d(m_cacheDir + fromDir); + TQDir d(m_cacheDir + fromDir); int len = m_cacheDir.length()-1; // Remove trailing / bool delDir = false; kdDebug( 51000 ) << m_cacheDir + fromDir.latin1() << endl; - if ( !QFileInfo(fromDir).exists() ) + if ( !TQFileInfo(fromDir).exists() ) delDir = true; // If the source folder have been removed, remove also the cache... - d.setFilter( QDir::All | QDir::Hidden | QDir::NoSymLinks ); - const QFileInfoList *list = d.entryInfoList(); + d.setFilter( TQDir::All | TQDir::Hidden | TQDir::NoSymLinks ); + const TQFileInfoList *list = d.entryInfoList(); if ( !list ) return; - QFileInfoListIterator it( *list ); - QFileInfo *fi; + TQFileInfoListIterator it( *list ); + TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { kapp->processEvents(); - QString fCache=fi->absFilePath(); - QString orgFile=fCache.right(fCache.length()-len); + TQString fCache=fi->absFilePath(); + TQString orgFile=fCache.right(fCache.length()-len); if ( fi->isDir() && !fromDir.startsWith(orgFile) ) { @@ -320,17 +320,17 @@ void FindDuplicateImages::updateCache(QString fromDir) } else { - if ( !QFileInfo(orgFile).exists() && QFileInfo(orgFile).extension(false) != "dat" ) + if ( !TQFileInfo(orgFile).exists() && TQFileInfo(orgFile).extension(false) != "dat" ) { - QDir().remove(fCache); - QDir().remove(fCache + ".dat"); + TQDir().remove(fCache); + TQDir().remove(fCache + ".dat"); } } ++it; } if (delDir) - QDir().rmdir(m_cacheDir + fromDir); + TQDir().rmdir(m_cacheDir + fromDir); } @@ -363,11 +363,11 @@ float FindDuplicateImages::image_sim_compare(ImageSimilarityData *a, ImageSimila ///////////////////////////////////////////////////////////////////////////////////////////////////// -bool FindDuplicateImages::DeleteDir(QString dirname) +bool FindDuplicateImages::DeleteDir(TQString dirname) { if ( !dirname.isEmpty() ) { - QDir dir; + TQDir dir; if (dir.exists ( dirname ) == true) { @@ -389,14 +389,14 @@ bool FindDuplicateImages::DeleteDir(QString dirname) ///////////////////////////////////////////////////////////////////////////////////////////////////// -bool FindDuplicateImages::deldir(QString dirname) +bool FindDuplicateImages::deldir(TQString dirname) { - QDir *dir = new QDir(dirname); - dir->setFilter ( QDir::Dirs | QDir::Files | QDir::NoSymLinks ); + TQDir *dir = new TQDir(dirname); + dir->setFilter ( TQDir::Dirs | TQDir::Files | TQDir::NoSymLinks ); - const QFileInfoList* fileinfolist = dir->entryInfoList(); - QFileInfoListIterator it(*fileinfolist); - QFileInfo* fi; + const TQFileInfoList* fileinfolist = dir->entryInfoList(); + TQFileInfoListIterator it(*fileinfolist); + TQFileInfo* fi; while( (fi = it.current() ) ) { diff --git a/kipi-plugins/findimages/finddupplicateimages.h b/kipi-plugins/findimages/finddupplicateimages.h index 04d35fb..8de237c 100644 --- a/kipi-plugins/findimages/finddupplicateimages.h +++ b/kipi-plugins/findimages/finddupplicateimages.h @@ -26,23 +26,23 @@ #ifndef FINDDUPPLICATEIMAGES_H #define FINDDUPPLICATEIMAGES_H -// Include files for Qt +// Include files for TQt -#include <qobject.h> -#include <qstring.h> -#include <qthread.h> -#include <qstringlist.h> -#include <qptrvector.h> -#include <qdict.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqthread.h> +#include <tqstringlist.h> +#include <tqptrvector.h> +#include <tqdict.h> // Includes file for libKIPI. #include <libkipi/interface.h> -class QProgressDialog; -class QFile; -class QCustomEvent; -class QMutex; +class TQProgressDialog; +class TQFile; +class TQCustomEvent; +class TQMutex; class KConfig; @@ -53,12 +53,13 @@ class ImageSimilarityData; class FindDuplicateDialog; class CompareOperation; -class FindDuplicateImages : public QObject, public QThread +class FindDuplicateImages : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: - FindDuplicateImages( KIPI::Interface* interface, QObject *parent=0); + FindDuplicateImages( KIPI::Interface* interface, TQObject *tqparent=0); ~FindDuplicateImages(); virtual void run(); @@ -69,29 +70,29 @@ public: void stopPlease(); public slots: - void slotUpdateCache(QStringList fromDirs); - void slotClearCache(QStringList fromDir); + void slotUpdateCache(TQStringList fromDirs); + void slotClearCache(TQStringList fromDir); void slotClearAllCache(void); protected: KConfig *config; - QString m_imagesFileFilter; - QProgressDialog *pdCache; + TQString m_imagesFileFilter; + TQProgressDialog *pdCache; FindDuplicateDialog *m_findDuplicateDialog; float m_approximateLevel; float image_sim_compare(ImageSimilarityData *a, ImageSimilarityData *b); void writeSettings(void); void readSettings(void); - void updateCache(QString fromDir); - bool DeleteDir(QString dirname); - bool deldir(QString dirname); + void updateCache(TQString fromDir); + bool DeleteDir(TQString dirname); + bool deldir(TQString dirname); - QStringList filesList; - QObject *parent_; - QDict < QPtrVector < QFile > > m_res; + TQStringList filesList; + TQObject *tqparent_; + TQDict < TQPtrVector < TQFile > > m_res; KIPI::Interface* m_interface; - QString m_cacheDir; + TQString m_cacheDir; private: CompareOperation* m_compareOp; diff --git a/kipi-plugins/findimages/fuzzycompare.cpp b/kipi-plugins/findimages/fuzzycompare.cpp index 50da23b..d588298 100644 --- a/kipi-plugins/findimages/fuzzycompare.cpp +++ b/kipi-plugins/findimages/fuzzycompare.cpp @@ -24,49 +24,49 @@ #include "fuzzycompare.h" #include "actions.h" -#include <qstringlist.h> -#include <qapplication.h> +#include <tqstringlist.h> +#include <tqapplication.h> #include <kdebug.h> #include "imagesimilaritydata.h" -#include <qdatetime.h> -#include <qfileinfo.h> +#include <tqdatetime.h> +#include <tqfileinfo.h> #include "finddupplicateimages.h" -#include <qimage.h> +#include <tqimage.h> #include <kimageio.h> #include <kimageeffect.h> #include <kstandarddirs.h> #include <math.h> -KIPIFindDupplicateImagesPlugin::FuzzyCompare::FuzzyCompare( QObject* parent, const QString& cacheDir ) - :m_parent( parent ), m_cacheDir( cacheDir ) +KIPIFindDupplicateImagesPlugin::FuzzyCompare::FuzzyCompare( TQObject* tqparent, const TQString& cacheDir ) + :m_parent( tqparent ), m_cacheDir( cacheDir ) { } -QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FuzzyCompare::compare( const QStringList& filesList ) +TQDict < TQPtrVector < TQFile > > KIPIFindDupplicateImagesPlugin::FuzzyCompare::compare( const TQStringList& filesList ) { - sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::Progress, QString::null, filesList.count()*2, true, false ); + sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::Progress, TQString(), filesList.count()*2, true, false ); kdDebug( 51000 ) << filesList.count() << " images to parse with Almost method..." << endl; - QDict < QPtrVector < QFile > > res; + TQDict < TQPtrVector < TQFile > > res; - QPtrVector < ImageSimilarityData > *listRatW = new QPtrVector < ImageSimilarityData >; - QPtrVector < ImageSimilarityData > *listRatH = new QPtrVector < ImageSimilarityData >; - QPtrVector < ImageSimilarityData > *list; + TQPtrVector < ImageSimilarityData > *listRatW = new TQPtrVector < ImageSimilarityData >; + TQPtrVector < ImageSimilarityData > *listRatH = new TQPtrVector < ImageSimilarityData >; + TQPtrVector < ImageSimilarityData > *list; listRatW->setAutoDelete(true); listRatH->setAutoDelete(true); - QTime debut=QTime::currentTime (); + TQTime debut=TQTime::currentTime (); ImageSimilarityData *is; - for ( QStringList::ConstIterator item = filesList.begin() ; item != filesList.end() ; ++item ) + for ( TQStringList::ConstIterator item = filesList.begin() ; item != filesList.end() ; ++item ) { if ( m_stopRequested ) - return QDict < QPtrVector < QFile > >(); + return TQDict < TQPtrVector < TQFile > >(); - QString itemName(*item); - QFileInfo fi(itemName); - QString Temp = fi.dirPath(); - QString albumName = Temp.section('/', -1); + TQString itemName(*item); + TQFileInfo fi(itemName); + TQString Temp = fi.dirPath(); + TQString albumName = Temp.section('/', -1); sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::Matrix, itemName, 0, true, false ); @@ -86,10 +86,10 @@ QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FuzzyCompare::co sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::Matrix, itemName, 0, false, false ); } - kdDebug( 51000 ) << "Matrix creation time:" << debut.msecsTo(QTime::currentTime()) << endl; - debut = QTime::currentTime (); + kdDebug( 51000 ) << "Matrix creation time:" << debut.msecsTo(TQTime::currentTime()) << endl; + debut = TQTime::currentTime (); - QDict < QFile > *fait = new QDict < QFile >; + TQDict < TQFile > *fait = new TQDict < TQFile >; list = listRatW; bool done = false; @@ -100,12 +100,12 @@ QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FuzzyCompare::co for (unsigned int i = 0; i < list->size (); i++) { if ( m_stopRequested ) - return QDict < QPtrVector < QFile > >(); + return TQDict < TQPtrVector < TQFile > >(); // Create the 'ImageSimilarityData' data for the first image. ImageSimilarityData *i1 = list->at(i); - if (i1 && !fait->find(i1->filename)) + if (i1 && !fait->tqfind(i1->filename)) { sendMessage( m_parent, KIPIFindDupplicateImagesPlugin::Similar, i1->filename, 0, true, false ); @@ -119,21 +119,21 @@ QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FuzzyCompare::co if (eq >= m_approximateLevel) // the files are the same ! { - QPtrVector < QFile > *vect; + TQPtrVector < TQFile > *vect; // Add file to the list. - if (!res.find (i1->filename)) + if (!res.tqfind (i1->filename)) { - vect = new QPtrVector < QFile >; + vect = new TQPtrVector < TQFile >; vect->setAutoDelete(true); res.insert (i1->filename, vect); } else - vect = (QPtrVector < QFile > *)res.find(i1->filename); + vect = (TQPtrVector < TQFile > *)res.tqfind(i1->filename); vect->resize (vect->size () + 1); - vect->insert (vect->size () - 1, new QFile(i2->filename)); - fait->insert(i2->filename, new QFile(i2->filename)); + vect->insert (vect->size () - 1, new TQFile(i2->filename)); + fait->insert(i2->filename, new TQFile(i2->filename)); } } } @@ -151,7 +151,7 @@ QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FuzzyCompare::co list = NULL; } - kdDebug( 51000 ) << "Comparison time: " << debut.msecsTo(QTime::currentTime()) << endl; + kdDebug( 51000 ) << "Comparison time: " << debut.msecsTo(TQTime::currentTime()) << endl; // End of comparison process. @@ -166,7 +166,7 @@ QDict < QPtrVector < QFile > > KIPIFindDupplicateImagesPlugin::FuzzyCompare::co ///////////////////////////////////////////////////////////////////////////////////////////// // Nota: original source code from ShowImg ! -KIPIFindDupplicateImagesPlugin::ImageSimilarityData* KIPIFindDupplicateImagesPlugin::FuzzyCompare::image_sim_fill_data(QString filename) +KIPIFindDupplicateImagesPlugin::ImageSimilarityData* KIPIFindDupplicateImagesPlugin::FuzzyCompare::image_sim_fill_data(TQString filename) { int w, h; uchar *pix; @@ -178,18 +178,18 @@ KIPIFindDupplicateImagesPlugin::ImageSimilarityData* KIPIFindDupplicateImagesPlu int xs, ys; const int INC=1; - QImage *pixbuf; + TQImage *pixbuf; ImageSimilarityData *sd = new ImageSimilarityData(); sd->filename=filename; - QFileInfo info(m_cacheDir + QFileInfo(filename).absFilePath()+".dat"); + TQFileInfo info(m_cacheDir + TQFileInfo(filename).absFilePath()+".dat"); if(info.exists()) { - QFile f(m_cacheDir+QFileInfo(filename).absFilePath()+".dat"); + TQFile f(m_cacheDir+TQFileInfo(filename).absFilePath()+".dat"); if ( f.open(IO_ReadOnly) ) { - QDataStream s( &f ); + TQDataStream s( &f ); s >> sd->ratio; for(int i=0 ; i<PAS*PAS ; i++) s >> sd->avg_r[i]; for(int i=0 ; i<PAS*PAS ; i++) s >> sd->avg_g[i]; @@ -201,7 +201,7 @@ KIPIFindDupplicateImagesPlugin::ImageSimilarityData* KIPIFindDupplicateImagesPlu return sd; } - pixbuf = new QImage(filename); + pixbuf = new TQImage(filename); if ( !sd || !pixbuf ) return 0L; @@ -261,12 +261,12 @@ KIPIFindDupplicateImagesPlugin::ImageSimilarityData* KIPIFindDupplicateImagesPlu // Saving the data. - QFile f(m_cacheDir+QFileInfo(filename).absFilePath()+".dat"); - KStandardDirs::makeDir(QFileInfo(f).dirPath(true)); + TQFile f(m_cacheDir+TQFileInfo(filename).absFilePath()+".dat"); + KStandardDirs::makeDir(TQFileInfo(f).dirPath(true)); if ( f.open(IO_WriteOnly) ) { - QDataStream s( &f ); + TQDataStream s( &f ); s << sd->ratio; for(int i=0 ; i<PAS*PAS ; i++) s << sd->avg_r[i]; for(int i=0 ; i<PAS*PAS ; i++) s << sd->avg_g[i]; @@ -318,27 +318,27 @@ float KIPIFindDupplicateImagesPlugin::FuzzyCompare::image_sim_compare_fast(Image ///////////////////////////////////////////////////////////////////////////////////////////// // Nota: original source code from ShowImg ! -char KIPIFindDupplicateImagesPlugin::FuzzyCompare::getRed(QImage* im, int x, int y) +char KIPIFindDupplicateImagesPlugin::FuzzyCompare::getRed(TQImage* im, int x, int y) { - return qRed(im->pixel(x, y)); + return tqRed(im->pixel(x, y)); } ///////////////////////////////////////////////////////////////////////////////////////////// // Nota: original source code from ShowImg ! -char KIPIFindDupplicateImagesPlugin::FuzzyCompare::getGreen(QImage* im, int x, int y) +char KIPIFindDupplicateImagesPlugin::FuzzyCompare::getGreen(TQImage* im, int x, int y) { - return qGreen(im->pixel(x, y)); + return tqGreen(im->pixel(x, y)); } ///////////////////////////////////////////////////////////////////////////////////////////// // Nota: original source code from ShowImg ! -char KIPIFindDupplicateImagesPlugin::FuzzyCompare::getBlue(QImage* im, int x, int y) +char KIPIFindDupplicateImagesPlugin::FuzzyCompare::getBlue(TQImage* im, int x, int y) { - return qBlue(im->pixel(x, y)); + return tqBlue(im->pixel(x, y)); } diff --git a/kipi-plugins/findimages/fuzzycompare.h b/kipi-plugins/findimages/fuzzycompare.h index 77a264a..104a1ac 100644 --- a/kipi-plugins/findimages/fuzzycompare.h +++ b/kipi-plugins/findimages/fuzzycompare.h @@ -25,12 +25,12 @@ #ifndef FUZZYCOMPARE_H #define FUZZYCOMPARE_H -class QImage; -class QObject; -class QStringList; -#include <qdict.h> -#include <qptrvector.h> -#include <qfile.h> +class TQImage; +class TQObject; +class TQStringList; +#include <tqdict.h> +#include <tqptrvector.h> +#include <tqfile.h> #include "compareoperation.h" namespace KIPIFindDupplicateImagesPlugin @@ -41,20 +41,20 @@ class ImageSimilarityData; class FuzzyCompare :public CompareOperation { public: - FuzzyCompare( QObject* parent, const QString& cacheDir ); + FuzzyCompare( TQObject* tqparent, const TQString& cacheDir ); void setApproximateThreeshold( float approximateLevel ) { m_approximateLevel = approximateLevel; } - QDict < QPtrVector < QFile > > compare(const QStringList& filesList ); + TQDict < TQPtrVector < TQFile > > compare(const TQStringList& filesList ); protected: - ImageSimilarityData* image_sim_fill_data(QString filename); + ImageSimilarityData* image_sim_fill_data(TQString filename); float image_sim_compare_fast(ImageSimilarityData *a, ImageSimilarityData *b, float min); - char getRed(QImage *im, int x, int y); - char getGreen(QImage *im, int x, int y); - char getBlue(QImage *im, int x, int y); + char getRed(TQImage *im, int x, int y); + char getGreen(TQImage *im, int x, int y); + char getBlue(TQImage *im, int x, int y); private: - QObject* m_parent; - const QString m_cacheDir; + TQObject* m_parent; + const TQString m_cacheDir; float m_approximateLevel; }; diff --git a/kipi-plugins/findimages/imagesimilaritydata.h b/kipi-plugins/findimages/imagesimilaritydata.h index 55c6712..2367a4f 100644 --- a/kipi-plugins/findimages/imagesimilaritydata.h +++ b/kipi-plugins/findimages/imagesimilaritydata.h @@ -57,7 +57,7 @@ public: free(avg_b); } - QString filename; + TQString filename; uchar *avg_r; uchar *avg_g; diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp index 6fba820..7141161 100644 --- a/kipi-plugins/findimages/plugin_findimages.cpp +++ b/kipi-plugins/findimages/plugin_findimages.cpp @@ -21,9 +21,9 @@ // ////////////////////////////////////////////////////////////////////////////// -// Qt includes. +// TQt includes. -#include <qfileinfo.h> +#include <tqfileinfo.h> // KDE includes. @@ -47,7 +47,7 @@ #include "finddupplicateimages.h" #include "actions.h" #include "plugin_findimages.h" -#include <qcursor.h> +#include <tqcursor.h> ///////////////////////////////////////////////////////////////////////////////////////////// @@ -56,13 +56,13 @@ typedef KGenericFactory<Plugin_FindImages> Factory; K_EXPORT_COMPONENT_FACTORY( kipiplugin_findimages, Factory("kipiplugin_findimages")) - Plugin_FindImages::Plugin_FindImages(QObject *parent, const char*, const QStringList&) - : KIPI::Plugin( Factory::instance(), parent, "FindImages") + Plugin_FindImages::Plugin_FindImages(TQObject *tqparent, const char*, const TQStringList&) + : KIPI::Plugin( Factory::instance(), tqparent, "FindImages") { kdDebug( 51001 ) << "Plugin_FindImages plugin loaded" << endl; } -void Plugin_FindImages::setup( QWidget* widget ) +void Plugin_FindImages::setup( TQWidget* widget ) { KIPI::Plugin::setup( widget ); @@ -70,7 +70,7 @@ void Plugin_FindImages::setup( QWidget* widget ) "finddupplicateimages", 0, this, - SLOT(slotFindDuplicateImages()), + TQT_SLOT(slotFindDuplicateImages()), actionCollection(), "findduplicateimages"); @@ -89,7 +89,7 @@ Plugin_FindImages::~Plugin_FindImages() void Plugin_FindImages::slotFindDuplicateImages() { - KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); + KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( tqparent() ); if ( !interface ) { @@ -101,10 +101,10 @@ void Plugin_FindImages::slotFindDuplicateImages() if (m_findDuplicateOperation->execDialog()) { - m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Find Duplicate Images")); + m_progressDlg = new KIPI::BatchProgressDialog(TQT_TQWIDGET(kapp->activeWindow()), i18n("Find Duplicate Images")); - connect(m_progressDlg, SIGNAL(cancelClicked()), - this, SLOT(slotCancel())); + connect(m_progressDlg, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(slotCancel())); m_progressDlg->show(); m_findDuplicateOperation->compareAlbums(); } @@ -127,7 +127,7 @@ void Plugin_FindImages::slotCancel() ///////////////////////////////////////////////////////////////////////////////////////////////////// -void Plugin_FindImages::customEvent(QCustomEvent *event) +void Plugin_FindImages::customEvent(TQCustomEvent *event) { if (!event) return; @@ -137,32 +137,32 @@ void Plugin_FindImages::customEvent(QCustomEvent *event) if (d->starting) { - QString text; + TQString text; switch (d->action) { case(KIPIFindDupplicateImagesPlugin::Similar): { - text = i18n("Similar comparison for '%1'").arg(QFileInfo(d->fileName).fileName() ); + text = i18n("Similar comparison for '%1'").tqarg(TQFileInfo(d->fileName).fileName() ); break; } case(KIPIFindDupplicateImagesPlugin::Exact): { m_total = d->total; // Needed because the total can change in this mode ! - text = i18n("Exact comparison for '%1'").arg(QFileInfo(d->fileName).fileName()); + text = i18n("Exact comparison for '%1'").tqarg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::Matrix): { - text = i18n("Creating fingerprint for '%1'").arg(QFileInfo(d->fileName).fileName()); + text = i18n("Creating fingerprint for '%1'").tqarg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::FastParsing): { - text = i18n("Fast parsing for '%1'").arg(QFileInfo(d->fileName).fileName()); + text = i18n("Fast parsing for '%1'").tqarg(TQFileInfo(d->fileName).fileName()); break; } @@ -185,14 +185,14 @@ void Plugin_FindImages::customEvent(QCustomEvent *event) { if (!d->success) { - QString text; + TQString text; switch (d->action) { case(KIPIFindDupplicateImagesPlugin::Matrix): { text = i18n("Failed to create fingerprint for '%1'") - .arg(QFileInfo(d->fileName).fileName()); + .tqarg(TQFileInfo(d->fileName).fileName()); break; } @@ -225,35 +225,35 @@ void Plugin_FindImages::customEvent(QCustomEvent *event) } else { - QString text; + TQString text; switch (d->action) { case(KIPIFindDupplicateImagesPlugin::Matrix): { text = i18n("Fingerprint created for '%1'") - .arg(QFileInfo(d->fileName).fileName()); + .tqarg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::FastParsing): { text = i18n("Fast parsing completed for '%1'") - .arg(QFileInfo(d->fileName).fileName()); + .tqarg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::Similar): { text = i18n("Finding similar images for '%1' completed.") - .arg(QFileInfo(d->fileName).fileName()); + .tqarg(TQFileInfo(d->fileName).fileName()); break; } case(KIPIFindDupplicateImagesPlugin::Exact): { text = i18n("Finding exact images for '%1' completed.") - .arg(QFileInfo(d->fileName).fileName()); + .tqarg(TQFileInfo(d->fileName).fileName()); break; } @@ -282,8 +282,8 @@ void Plugin_FindImages::customEvent(QCustomEvent *event) m_progressDlg->setButtonCancelText( i18n("&Close") ); #endif - disconnect(m_progressDlg, SIGNAL(cancelClicked()), - this, SLOT(slotCancel())); + disconnect(m_progressDlg, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(slotCancel())); m_progressDlg->addedAction(i18n("Displaying results..."), KIPI::StartingMessage); diff --git a/kipi-plugins/findimages/plugin_findimages.h b/kipi-plugins/findimages/plugin_findimages.h index 8bc0344..35f5fda 100644 --- a/kipi-plugins/findimages/plugin_findimages.h +++ b/kipi-plugins/findimages/plugin_findimages.h @@ -28,7 +28,7 @@ #include <libkipi/plugin.h> -class QCustomEvent; +class TQCustomEvent; class KActionMenu; class KAction; @@ -43,14 +43,15 @@ class FindDuplicateImages; class Plugin_FindImages : public KIPI::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin_FindImages(QObject *parent, const char* name, const QStringList &args); + Plugin_FindImages(TQObject *tqparent, const char* name, const TQStringList &args); ~Plugin_FindImages(); virtual KIPI::Category category( KAction* action ) const; - virtual void setup( QWidget* widget ); + virtual void setup( TQWidget* widget ); private: @@ -64,7 +65,7 @@ protected: int m_total; - void customEvent(QCustomEvent *event); + void customEvent(TQCustomEvent *event); private slots: |