Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 78 insertions, 78 deletions

diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 2616f8e2d..3549a314d 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -225,10 +225,10 @@ void
 Core::initCore()
 {
   m_pluginManager = new PluginManager( this );
-  connect( m_pluginManager, TQT_SIGNAL(pluginLoaded(Plugin*)),
-           TQT_SLOT(slotPluginLoaded(Plugin*)) );
-  connect( m_pluginManager, TQT_SIGNAL(allPluginsLoaded()),
-           TQT_SLOT(slotAllPluginsLoaded()) );
+  connect( m_pluginManager, TQ_SIGNAL(pluginLoaded(Plugin*)),
+           TQ_SLOT(slotPluginLoaded(Plugin*)) );
+  connect( m_pluginManager, TQ_SIGNAL(allPluginsLoaded()),
+           TQ_SLOT(slotAllPluginsLoaded()) );
 
 
   m_pluginManager->loadAllPlugins();
@@ -238,39 +238,39 @@ Core::initCore()
 void
 Core::initConnections()
 {
-  connect( kapp, TQT_SIGNAL(shutDown()),
-           TQT_SLOT(slotQuit()) );
+  connect( kapp, TQ_SIGNAL(shutDown()),
+           TQ_SLOT(slotQuit()) );
 }
 
 void
 Core::createActions()
 {
-  KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() );
+  KStdAction::close( this, TQ_SLOT(slotClose()), actionCollection() );
 
   (void) new TDEAction( i18n( "&Send" ), "mail-send", CTRL+Key_Return,
-                      this, TQT_SLOT(slotSendNow()), actionCollection(),
+                      this, TQ_SLOT(slotSendNow()), actionCollection(),
                       "send_default" );
 
   (void) new TDEAction( i18n( "&Queue" ), "queue", 0,
-                      this, TQT_SLOT(slotSendLater()),
+                      this, TQ_SLOT(slotSendLater()),
                       actionCollection(), "send_alternative" );
 
   (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "document-save", 0,
-                      this, TQT_SLOT(slotSaveDraft()),
+                      this, TQ_SLOT(slotSaveDraft()),
                       actionCollection(), "save_in_drafts" );
   (void) new TDEAction( i18n( "&Insert File..." ), "document-open", 0,
-                      this,  TQT_SLOT(slotInsertFile()),
+                      this,  TQ_SLOT(slotInsertFile()),
                       actionCollection(), "insert_file" );
   (void) new TDEAction( i18n( "&Address Book" ), "contents",0,
-                      this, TQT_SLOT(slotAddrBook()),
+                      this, TQ_SLOT(slotAddrBook()),
                       actionCollection(), "addressbook" );
   (void) new TDEAction( i18n( "&New Composer" ), "mail-message-new",
                       TDEStdAccel::shortcut( TDEStdAccel::New ),
-                      this, TQT_SLOT(slotNewComposer()),
+                      this, TQ_SLOT(slotNewComposer()),
                       actionCollection(), "new_composer" );
 
   (void) new TDEAction( i18n( "&Attach File..." ), "attach",
-                      0, this, TQT_SLOT(slotAttachFile()),
+                      0, this, TQ_SLOT(slotAttachFile()),
                       actionCollection(), "attach_file" );
 }
 
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 9a33b9904..8c4e025d8 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -78,7 +78,7 @@ PluginManager::PluginManager( TQObject *parent )
   d->shutdownMode = Private::StartingUp;
 
   KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(),
-                                                   this, TQT_SLOT( loadAllPlugins() ) );
+                                                   this, TQ_SLOT( loadAllPlugins() ) );
 
   d->plugins = KPluginInfo::fromServices(
     TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
@@ -168,7 +168,7 @@ PluginManager::shutdown()
     }
   }
 
-  TQTimer::singleShot( 3000, this, TQT_SLOT(slotShutdownTimeout()) );
+  TQTimer::singleShot( 3000, this, TQ_SLOT(slotShutdownTimeout()) );
 }
 
 void
@@ -256,7 +256,7 @@ PluginManager::loadAllPlugins()
   }
 
   // Schedule the plugins to load
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
 }
 
 void PluginManager::slotLoadNextPlugin()
@@ -278,7 +278,7 @@ void PluginManager::slotLoadNextPlugin()
   // allPluginsLoaded() signal's handling. This has the added benefit that
   // the signal is delayed one event loop, so the accounts are more likely
   // to be instantiated.
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
 }
 
 Plugin*
@@ -289,7 +289,7 @@ PluginManager::loadPlugin( const TQString &pluginId,
     return loadPluginInternal( pluginId );
   } else {
     d->pluginsToLoad.push( pluginId );
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
     return 0;
   }
 }
@@ -317,10 +317,10 @@ PluginManager::loadPluginInternal( const TQString &pluginId )
     d->loadedPlugins.insert( info, plugin );
     info->setPluginEnabled( true );
 
-    connect( plugin, TQT_SIGNAL(destroyed(TQObject*)),
-             this, TQT_SLOT(slotPluginDestroyed(TQObject*)) );
-    connect( plugin, TQT_SIGNAL(readyForUnload()),
-             this, TQT_SLOT(slotPluginReadyForUnload()) );
+    connect( plugin, TQ_SIGNAL(destroyed(TQObject*)),
+             this, TQ_SLOT(slotPluginDestroyed(TQObject*)) );
+    connect( plugin, TQ_SIGNAL(readyForUnload()),
+             this, TQ_SLOT(slotPluginReadyForUnload()) );
 
     kdDebug() << k_funcinfo << "Successfully loaded plugin '"
               << pluginId << "'" << endl;
@@ -396,7 +396,7 @@ PluginManager::slotPluginDestroyed( TQObject *plugin )
   {
     // Use a timer to make sure any pending deleteLater() calls have
     // been handled first
-    TQTimer::singleShot( 0, this, TQT_SLOT(slotShutdownDone()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(slotShutdownDone()) );
   }
 }
 
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index abacd0ebb..f8260c10a 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -81,8 +81,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference,
   m_editorsCombo = new KComboBox( m_box );
   boxLayout->addWidget( m_editorsCombo );
 
-  connect( m_editorsCombo, TQT_SIGNAL(activated(const�TQString&)),
-           TQT_SLOT(slotActivated(const TQString&)) );
+  connect( m_editorsCombo, TQ_SIGNAL(activated(const�TQString&)),
+           TQ_SLOT(slotActivated(const TQString&)) );
 }
 
 EditorSelection::~EditorSelection()
diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp
index a690c67c6..40fe5181e 100644
--- a/libtdepim/komposer/core/tests/testmanager.cpp
+++ b/libtdepim/komposer/core/tests/testmanager.cpp
@@ -15,10 +15,10 @@ TestManager::TestManager( TQObject *parent )
   : TQObject( parent )
 {
   m_manager = new PluginManager( this );
-  connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)),
-           TQT_SLOT(slotPluginLoaded(Plugin*)) );
-  connect( m_manager, TQT_SIGNAL(allPluginsLoaded()),
-           TQT_SLOT(slotAllPluginsLoaded()) );
+  connect( m_manager, TQ_SIGNAL(pluginLoaded(Plugin*)),
+           TQ_SLOT(slotPluginLoaded(Plugin*)) );
+  connect( m_manager, TQ_SIGNAL(allPluginsLoaded()),
+           TQ_SLOT(slotAllPluginsLoaded()) );
   m_manager->loadAllPlugins();
 
   TQValueList<KPluginInfo*> plugins = m_manager->availablePlugins();
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index fe059b9ed..1aba97051 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -98,71 +98,71 @@ DefaultEditor::createActions( TDEActionCollection *ac )
   //
   // File Actions
   //
-  (void) KStdAction::open( this, TQT_SLOT(open()), ac );
-  (void) KStdAction::openRecent( this, TQT_SLOT(openURL(const KURL &)), ac );
-  (void) KStdAction::save( this, TQT_SLOT(save()), ac );
-  (void) KStdAction::saveAs( this, TQT_SLOT(saveAs()), ac );
+  (void) KStdAction::open( this, TQ_SLOT(open()), ac );
+  (void) KStdAction::openRecent( this, TQ_SLOT(openURL(const KURL &)), ac );
+  (void) KStdAction::save( this, TQ_SLOT(save()), ac );
+  (void) KStdAction::saveAs( this, TQ_SLOT(saveAs()), ac );
 
   //
   // Edit Actions
   //
-  TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac );
+  TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQ_SLOT(undo()), ac );
   actionUndo->setEnabled( false );
-  connect( m_textEdit, TQT_SIGNAL(undoAvailable(bool)),
-           actionUndo, TQT_SLOT(setEnabled(bool)) );
+  connect( m_textEdit, TQ_SIGNAL(undoAvailable(bool)),
+           actionUndo, TQ_SLOT(setEnabled(bool)) );
 
-  TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac );
+  TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQ_SLOT(redo()), ac );
   actionRedo->setEnabled( false );
-  connect( m_textEdit, TQT_SIGNAL(redoAvailable(bool)),
-           actionRedo, TQT_SLOT(setEnabled(bool)) );
+  connect( m_textEdit, TQ_SIGNAL(redoAvailable(bool)),
+           actionRedo, TQ_SLOT(setEnabled(bool)) );
 
-  TDEAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac );
+  TDEAction *action_cut = KStdAction::cut( m_textEdit, TQ_SLOT(cut()), ac );
   action_cut->setEnabled( false );
-  connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)),
-           action_cut, TQT_SLOT(setEnabled(bool)) );
+  connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)),
+           action_cut, TQ_SLOT(setEnabled(bool)) );
 
-  TDEAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac );
+  TDEAction *action_copy = KStdAction::copy( m_textEdit, TQ_SLOT(copy()), ac );
   action_copy->setEnabled( false );
-  connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)),
-           action_copy, TQT_SLOT(setEnabled(bool)) );
+  connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)),
+           action_copy, TQ_SLOT(setEnabled(bool)) );
 
-  (void) KStdAction::print( this, TQT_SLOT(print()), ac );
+  (void) KStdAction::print( this, TQ_SLOT(print()), ac );
 
-  (void) KStdAction::paste( m_textEdit, TQT_SLOT(paste()), ac );
+  (void) KStdAction::paste( m_textEdit, TQ_SLOT(paste()), ac );
   (void) new TDEAction( i18n( "C&lear" ), 0,
-                      m_textEdit, TQT_SLOT(removeSelectedText()),
+                      m_textEdit, TQ_SLOT(removeSelectedText()),
                       ac, "edit_clear" );
 
-  (void) KStdAction::selectAll( m_textEdit, TQT_SLOT(selectAll()), ac );
+  (void) KStdAction::selectAll( m_textEdit, TQ_SLOT(selectAll()), ac );
 
   //
   // View Actions
   //
-  (void) KStdAction::zoomIn( m_textEdit, TQT_SLOT(zoomIn()), ac );
-  (void) KStdAction::zoomOut( m_textEdit, TQT_SLOT(zoomOut()), ac );
+  (void) KStdAction::zoomIn( m_textEdit, TQ_SLOT(zoomIn()), ac );
+  (void) KStdAction::zoomOut( m_textEdit, TQ_SLOT(zoomOut()), ac );
 
   //
   // Character Formatting
   //
   m_actionBold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
                                     ac, "format_bold" );
-  connect( m_actionBold, TQT_SIGNAL(toggled(bool)),
-           m_textEdit, TQT_SLOT(setBold(bool)) );
+  connect( m_actionBold, TQ_SIGNAL(toggled(bool)),
+           m_textEdit, TQ_SLOT(setBold(bool)) );
 
   m_actionItalic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
                                       ac, "format_italic" );
 
-  connect( m_actionItalic, TQT_SIGNAL(toggled(bool)),
-           m_textEdit, TQT_SLOT(setItalic(bool) ));
+  connect( m_actionItalic, TQ_SIGNAL(toggled(bool)),
+           m_textEdit, TQ_SLOT(setItalic(bool) ));
 
   m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
                                          ac, "format_underline" );
 
-  connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)),
-           m_textEdit, TQT_SLOT(setUnderline(bool)) );
+  connect( m_actionUnderline, TQ_SIGNAL(toggled(bool)),
+           m_textEdit, TQ_SLOT(setUnderline(bool)) );
 
   (void) new TDEAction( i18n("Text &Color..."), "colorpicker", 0,
-                      this, TQT_SLOT(formatColor()),
+                      this, TQ_SLOT(formatColor()),
                       ac, "format_color" );
 
   //
@@ -170,37 +170,37 @@ DefaultEditor::createActions( TDEActionCollection *ac )
   //
   m_actionFont = new TDEFontAction( i18n("&Font"), 0,
                                  ac, "format_font" );
-  connect( m_actionFont, TQT_SIGNAL(activated(const TQString &)),
-           m_textEdit, TQT_SLOT(setFamily(const TQString &)) );
+  connect( m_actionFont, TQ_SIGNAL(activated(const TQString &)),
+           m_textEdit, TQ_SLOT(setFamily(const TQString &)) );
 
 
   m_actionFontSize = new TDEFontSizeAction( i18n("Font &Size"), 0,
                                           ac, "format_font_size" );
-  connect( m_actionFontSize, TQT_SIGNAL(fontSizeChanged(int)),
-           m_textEdit, TQT_SLOT(setPointSize(int)) );
+  connect( m_actionFontSize, TQ_SIGNAL(fontSizeChanged(int)),
+           m_textEdit, TQ_SLOT(setPointSize(int)) );
 
   //
   // Alignment
   //
   m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0,
                                          ac, "format_align_left" );
-  connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)),
-           this, TQT_SLOT(setAlignLeft(bool)) );
+  connect( m_actionAlignLeft, TQ_SIGNAL(toggled(bool)),
+           this, TQ_SLOT(setAlignLeft(bool)) );
 
   m_actionAlignCenter = new TDEToggleAction( i18n("Align &Center"), "text_center", 0,
                                            ac, "format_align_center" );
-  connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)),
-           this, TQT_SLOT(setAlignCenter(bool)) );
+  connect( m_actionAlignCenter, TQ_SIGNAL(toggled(bool)),
+           this, TQ_SLOT(setAlignCenter(bool)) );
 
   m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0,
                                           ac, "format_align_right" );
-  connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)),
-           this, TQT_SLOT(setAlignRight(bool)) );
+  connect( m_actionAlignRight, TQ_SIGNAL(toggled(bool)),
+           this, TQ_SLOT(setAlignRight(bool)) );
 
   m_actionAlignJustify = new TDEToggleAction( i18n("&Justify"), "text_block", 0,
                                             ac, "format_align_justify" );
-  connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)),
-           this, TQT_SLOT(setAlignJustify(bool)) );
+  connect( m_actionAlignJustify, TQ_SIGNAL(toggled(bool)),
+           this, TQ_SLOT(setAlignJustify(bool)) );
 
   m_actionAlignLeft->setExclusiveGroup( "alignment" );
   m_actionAlignCenter->setExclusiveGroup( "alignment" );
@@ -210,19 +210,19 @@ DefaultEditor::createActions( TDEActionCollection *ac )
   //
   // Tools
   //
-  (void) KStdAction::spelling( this, TQT_SLOT(checkSpelling()), ac );
+  (void) KStdAction::spelling( this, TQ_SLOT(checkSpelling()), ac );
 
   //
   // Setup enable/disable
   //
   updateActions();
 
-  connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)),
-           this, TQT_SLOT( updateFont() ) );
-  connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)),
-           this, TQT_SLOT(updateCharFmt()) );
-  connect( m_textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)),
-           this, TQT_SLOT(updateAligment()) );
+  connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)),
+           this, TQ_SLOT( updateFont() ) );
+  connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)),
+           this, TQ_SLOT(updateCharFmt()) );
+  connect( m_textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)),
+           this, TQ_SLOT(updateAligment()) );
 }
 
 void