Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 9b5da17ebdf66f607c44de5e5f1f807d42a59028)

3 files changed, 31 insertions, 31 deletions

diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp
index 4d9903f..1f27a20 100644
--- a/libkipi/libkipi/imagecollectionselector.cpp
+++ b/libkipi/libkipi/imagecollectionselector.cpp
@@ -95,8 +95,8 @@ ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* in
     d->_list->addColumn("");
     d->_list->header()->hide();
 
-    connect(d->_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-            TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+    connect(d->_list, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+            TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
     
     TQHBoxLayout* mainLayout=new TQHBoxLayout(this, 0, KDialog::spacingHint());
     mainLayout->addWidget(d->_list);
@@ -110,12 +110,12 @@ ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* in
     TQPushButton* selectNone=box->addButton(i18n("Select None"));
     box->layout();
 
-    connect(selectAll, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotSelectAll()) );
-    connect(invertSelection, TQT_SIGNAL(clicked()),
-            this, TQT_SLOT(slotInvertSelection()) );
-    connect(selectNone, TQT_SIGNAL(clicked()), 
-            this, TQT_SLOT(slotSelectNone()) );
+    connect(selectAll, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotSelectAll()) );
+    connect(invertSelection, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(slotInvertSelection()) );
+    connect(selectNone, TQ_SIGNAL(clicked()), 
+            this, TQ_SLOT(slotSelectNone()) );
 
     rightLayout->addItem(new TQSpacerItem(10,20,TQSizePolicy::Fixed,
                                          TQSizePolicy::Expanding));
@@ -138,7 +138,7 @@ ImageCollectionSelector::ImageCollectionSelector(TQWidget* parent, Interface* in
     d->_textLabel = new TQLabel(rightBox);
     
     fillList();
-    TQTimer::singleShot(0, this, TQT_SLOT(slotInitialShow()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotInitialShow()));
 }
 
 
@@ -266,8 +266,8 @@ void ImageCollectionSelector::slotSelectionChanged(TQListViewItem* listItem)
         if (!images.isEmpty())
         {
             TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(images.first(), 128);
-            connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
-                     TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
+            connect( thumbJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
+                     TQ_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
         }
     }
     
diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp
index 1fb25a6..fd7c63a 100644
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@@ -136,7 +136,7 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
     TQPushButton *helpButton = actionButton( Help );
     KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
     helpMenu->menu()->removeItemAt(0);
-    helpMenu->menu()->insertItem(i18n("Kipi Plugins Handbooks"), this, TQT_SLOT(slotHelp()), 0, -1, 0);
+    helpMenu->menu()->insertItem(i18n("Kipi Plugins Handbooks"), this, TQ_SLOT(slotHelp()), 0, -1, 0);
     helpButton->setPopup( helpMenu->menu() );
 
     //---------------------------------------------
@@ -168,17 +168,17 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
     for(; it!=d->_albums.end(); ++it) {
         new AlbumLVI(d->_albumList, *it);
     }
-    TQTimer::singleShot(0, this, TQT_SLOT(slotInitialShow()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotInitialShow()));
 
-    connect(d->_albumList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-            this, TQT_SLOT(fillImageList(TQListViewItem*)) );
+    connect(d->_albumList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+            this, TQ_SLOT(fillImageList(TQListViewItem*)) );
 
     if (singleSelection)
-        connect(d->_imageList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-                this, TQT_SLOT(slotImageSelected(TQListViewItem*)) );
+        connect(d->_imageList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+                this, TQ_SLOT(slotImageSelected(TQListViewItem*)) );
     else
-        connect(d->_imageList, TQT_SIGNAL(selectionChanged()),
-                this, TQT_SLOT(slotImagesSelected()));
+        connect(d->_imageList, TQ_SIGNAL(selectionChanged()),
+                this, TQ_SLOT(slotImagesSelected()));
 
     enableButtonOK(false);
 }
@@ -246,8 +246,8 @@ void ImageDialog::slotImageSelected(TQListViewItem* item) {
     d->_preview->clear();
 
     TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(d->_url, PREVIEW_SIZE);
-    connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
-             TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
+    connect( thumbJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
+             TQ_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
 }
 
 void ImageDialog::slotImagesSelected()
@@ -284,8 +284,8 @@ void ImageDialog::slotImagesSelected()
         d->_url = d->_urls.first();
 
         TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(d->_url, PREVIEW_SIZE);
-        connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
-                 TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
+        connect( thumbJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
+                 TQ_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
     }
     else
     {
diff --git a/libkipi/libkipi/uploadwidget.cpp b/libkipi/libkipi/uploadwidget.cpp
index 93f49ec..43106f0 100644
--- a/libkipi/libkipi/uploadwidget.cpp
+++ b/libkipi/libkipi/uploadwidget.cpp
@@ -105,14 +105,14 @@ KIPI::UploadWidget::UploadWidget( KIPI::Interface* interface, TQWidget* parent,
         
         d->m_pendingPath = TQStringList::split( "/", uploadPath, false );
         
-        connect( d->m_branch, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ),
-                 this, TQT_SLOT( slotPopulateFinished(KFileTreeViewItem *) ) );
+        connect( d->m_branch, TQ_SIGNAL( populateFinished(KFileTreeViewItem *) ),
+                 this, TQ_SLOT( slotPopulateFinished(KFileTreeViewItem *) ) );
 
         d->m_branch->setOpen(true);
     }
     
-    connect( d->m_treeView, TQT_SIGNAL( executed(TQListViewItem *) ),
-             this, TQT_SLOT( slotFolderSelected(TQListViewItem *) ) );
+    connect( d->m_treeView, TQ_SIGNAL( executed(TQListViewItem *) ),
+             this, TQ_SLOT( slotFolderSelected(TQListViewItem *) ) );
 }
 
 KIPI::UploadWidget::~UploadWidget()
@@ -134,8 +134,8 @@ void KIPI::UploadWidget::slotPopulateFinished( KFileTreeViewItem * parentItem )
 {
     if ( d->m_pendingPath.isEmpty() ) 
     {
-        disconnect( d->m_branch, TQT_SIGNAL( populateFinished(KFileTreeViewItem *) ), 
-                    this, TQT_SLOT( slotPopulateFinished(KFileTreeViewItem *) ) );
+        disconnect( d->m_branch, TQ_SIGNAL( populateFinished(KFileTreeViewItem *) ), 
+                    this, TQ_SLOT( slotPopulateFinished(KFileTreeViewItem *) ) );
         return;
     }
 
@@ -189,8 +189,8 @@ void KIPI::UploadWidget::mkdir()
 
     TDEIO::SimpleJob* job = TDEIO::mkdir(url);
     
-    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), 
-            this, TQT_SLOT(slotAlbumCreated(TDEIO::Job*)));
+    connect(job, TQ_SIGNAL(result(TDEIO::Job*)), 
+            this, TQ_SLOT(slotAlbumCreated(TDEIO::Job*)));
 }
 
 void KIPI::UploadWidget::slotAlbumCreated(TDEIO::Job* job)