Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 38 insertions, 38 deletions

diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index ea640bb9e..d8d1b6375 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -100,23 +100,23 @@ CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent )
 {
   mResourceView = new ResourceView( mCalendar, mCalendarView, parent );
 
-  TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ),
-                    mCalendarView, TQT_SLOT( resourcesChanged() ) );
-  TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ),
-                    mCalendarView, TQT_SLOT( updateCategories() ) );
+  TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ),
+                    mCalendarView, TQ_SLOT( resourcesChanged() ) );
+  TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ),
+                    mCalendarView, TQ_SLOT( updateCategories() ) );
 
   TQObject::connect( mCalendar,
-                    TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
+                    TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
                     mResourceView,
-                    TQT_SLOT( addResourceItem( ResourceCalendar * ) ) );
+                    TQ_SLOT( addResourceItem( ResourceCalendar * ) ) );
   TQObject::connect( mCalendar,
-                    TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
+                    TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
                     mResourceView,
-                    TQT_SLOT( updateResourceItem( ResourceCalendar * ) ) );
-  TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
-                    mCalendarView, TQT_SLOT( updateCategories() ) );
-  TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
-                    mCalendarView, TQT_SLOT( updateCategories() ) );
+                    TQ_SLOT( updateResourceItem( ResourceCalendar * ) ) );
+  TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ),
+                    mCalendarView, TQ_SLOT( updateCategories() ) );
+  TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ),
+                    mCalendarView, TQ_SLOT( updateCategories() ) );
 
   return mResourceView;
 }
@@ -322,17 +322,17 @@ ResourceView::ResourceView( CalendarResources *calendar,
   mListView->setResizeMode( TQListView::LastColumn );
   topLayout->addWidget( mListView );
 
-  connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-           TQT_SLOT( currentChanged( TQListViewItem * ) ) );
-  connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addResource() ) );
-  connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeResource() ) );
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editResource() ) );
-  connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &,
+  connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+           TQ_SLOT( currentChanged( TQListViewItem * ) ) );
+  connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addResource() ) );
+  connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeResource() ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editResource() ) );
+  connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &,
                                               int ) ),
-           TQT_SLOT( editResource() ) );
-  connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *,
+           TQ_SLOT( editResource() ) );
+  connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *,
                                                      const TQPoint &, int ) ),
-           TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
+           TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
                                        int ) ) );
 
   updateView();
@@ -449,21 +449,21 @@ void ResourceView::addResourceItem( ResourceCalendar *resource )
       item->update();
   }
 
-  connect( resource, TQT_SIGNAL( signalSubresourceAdded( ResourceCalendar *,
+  connect( resource, TQ_SIGNAL( signalSubresourceAdded( ResourceCalendar *,
                                                      const TQString &,
                                                      const TQString &,
                                                      const TQString & ) ),
-           TQT_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &,
+           TQ_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &,
                                        const TQString &, const TQString & ) ) );
 
-  connect( resource, TQT_SIGNAL( signalSubresourceRemoved( ResourceCalendar *,
+  connect( resource, TQ_SIGNAL( signalSubresourceRemoved( ResourceCalendar *,
                                                        const TQString &,
                                                        const TQString & ) ),
-           TQT_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &,
+           TQ_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &,
                                          const TQString & ) ) );
 
-  connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ),
-           TQT_SLOT( closeResource( ResourceCalendar * ) ) );
+  connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ),
+           TQ_SLOT( closeResource( ResourceCalendar * ) ) );
 
   updateResourceList();
   emit resourcesChanged();
@@ -686,44 +686,44 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint
   ResourceItem *item = static_cast<ResourceItem *>( lvitem );
 
   TQPopupMenu *menu = new TQPopupMenu( this );
-  connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) );
+  connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) );
   if ( item ) {
     int reloadId = menu->insertItem( i18n("Re&load"), this,
-                                     TQT_SLOT( reloadResource() ) );
+                                     TQ_SLOT( reloadResource() ) );
     menu->setItemEnabled( reloadId, item->resource()->isActive() );
     int saveId = menu->insertItem( i18n("&Save"), this,
-                                   TQT_SLOT( saveResource() ) );
+                                   TQ_SLOT( saveResource() ) );
     menu->setItemEnabled( saveId, item->resource()->isActive() );
     menu->insertSeparator();
 
-    menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) );
+    menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) );
     //FIXME: This is better on the resource dialog
     if ( KOPrefs::instance()->agendaViewColors() != KOPrefs::CategoryOnly ) {
       TQPopupMenu *assignMenu= new TQPopupMenu( menu );
-      assignMenu->insertItem( i18n( "&Assign Color" ), this, TQT_SLOT( assignColor() ) );
+      assignMenu->insertItem( i18n( "&Assign Color" ), this, TQ_SLOT( assignColor() ) );
       if ( item->resourceColor().isValid() )
-        assignMenu->insertItem( i18n( "&Disable Color" ), this, TQT_SLOT( disableColor() ) );
+        assignMenu->insertItem( i18n( "&Disable Color" ), this, TQ_SLOT( disableColor() ) );
       menu->insertItem( i18n( "Resources Colors" ), assignMenu );
     }
 
     if ( item->isSubresource() &&
          ( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) {
       if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) {
-        menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) );
+        menu->insertItem( i18n("&Rename..."), this, TQ_SLOT( editResource() ) );
       }
     } else {
-      menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( editResource() ) );
+      menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( editResource() ) );
     }
-    menu->insertItem( i18n("&Remove"), this, TQT_SLOT( removeResource() ) );
+    menu->insertItem( i18n("&Remove"), this, TQ_SLOT( removeResource() ) );
     if ( item->resource() != manager->standardResource() ) {
       menu->insertSeparator();
       menu->insertItem( i18n("Use as &Default Calendar"), this,
-                        TQT_SLOT( setStandard() ) );
+                        TQ_SLOT( setStandard() ) );
     }
 
     menu->insertSeparator();
  }
-  menu->insertItem( i18n("&Add..."), this, TQT_SLOT( addResource() ) );
+  menu->insertItem( i18n("&Add..."), this, TQ_SLOT( addResource() ) );
 
   menu->popup( pos );
 }