1 files changed, 19 insertions, 19 deletions

diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index 8734eadc..94c3d2fa 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -34,13 +34,13 @@
 #define TOOLSSETTINGS 1
 #define EXTRATOOLSSETTINGS 2
 
-static const KDevPluginInfo data("kdevtools");
-K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) )
+static const KDevPluginInfo pluginData("kdevtools");
+K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( pluginData ) )
 
 TQMap<int, TQString> externalToolMenuEntries;
 
 ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
-	: KDevPlugin( &data, parent, name ? name : "ToolsPart")
+	: KDevPlugin( &pluginData, parent, name ? name : "ToolsPart")
 {
   setInstance(ToolsFactory::instance());
 
@@ -49,17 +49,17 @@ ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
 	m_configProxy = new ConfigWidgetProxy( core() );
 	m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() );
 	m_configProxy->createGlobalConfigPage( i18n("External Tools"), EXTRATOOLSSETTINGS, info()->icon() );
-	connect( m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
-		this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
+	connect( m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+		this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
 
-  connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(updateMenu()));
+  connect(core(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(updateMenu()));
 
-  connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
-           this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+  connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+           this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
 
   // Apparently action lists can only be plugged after the
   // xmlgui client has been registered
-  TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu()));
+  TQTimer::singleShot(0, this, TQ_SLOT(updateToolsMenu()));
 }
 
 
@@ -73,14 +73,14 @@ void ToolsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, un
 	if ( pagenumber == TOOLSSETTINGS )
 	{
 		ToolsConfig *w = new ToolsConfig( page, "tools config widget" );
-		connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
-		connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateMenu()));
+		connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
+		connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateMenu()));
 	}
 	else if ( pagenumber == EXTRATOOLSSETTINGS )
 	{
 		ToolsConfigWidget *w2 = new ToolsConfigWidget( page, "tools config widget" );
-		connect(dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept()));
-		connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateToolsMenu()));
+		connect(dlg, TQ_SIGNAL(okClicked()), w2, TQ_SLOT(accept()));
+		connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateToolsMenu()));
 	}
 }
 
@@ -103,7 +103,7 @@ void ToolsPart::updateMenu()
 		continue;
 
 	  TDEAction *action = new TDEAction(df.readName(), df.readIcon(), 0,
-                                        this, TQT_SLOT(slotToolActivated()), (TQObject*)0, name.latin1());
+                                        this, TQ_SLOT(slotToolActivated()), (TQObject*)0, name.latin1());
 	  actions.append(action);
 	}
 
@@ -113,7 +113,7 @@ void ToolsPart::updateMenu()
 
 void ToolsPart::slotToolActivated()
 {
-  TQString df = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+  TQString df = sender()->name();
   kapp->startServiceByDesktopPath(df);
 }
 
@@ -180,7 +180,7 @@ void ToolsPart::updateToolsMenu()
         config->setGroup("Tool Menu " + menutext);
         bool isdesktopfile = config->readBoolEntry("DesktopFile");
         TDEAction *action = new TDEAction(*it, 0,
-                                      this, TQT_SLOT(toolsMenuActivated()),
+                                      this, TQ_SLOT(toolsMenuActivated()),
                                       (TQObject*) 0, menutext.utf8());
         if (isdesktopfile) {
             KDesktopFile df(config->readPathEntry("CommandLine"));
@@ -212,19 +212,19 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context)
         TQStringList l = config->readListEntry("Dir Context");
         TQStringList::ConstIterator it;
         for (it = l.begin(); it != l.end(); ++it)
-            externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(dirContextActivated(int)) ), (*it) );
+            externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(dirContextActivated(int)) ), (*it) );
     } else {
         TQStringList l = config->readListEntry("File Context");
         TQStringList::ConstIterator it;
         for (it = l.begin(); it != l.end(); ++it)
-            externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(fileContextActivated(int))  ), (*it) );
+            externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(fileContextActivated(int))  ), (*it) );
     }
 }
 
 
 void ToolsPart::toolsMenuActivated()
 {
-    TQString menutext = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+    TQString menutext = sender()->name();
     TDEConfig *config = ToolsFactory::instance()->config();
     config->setGroup("Tool Menu " + menutext);
     TQString cmdline = config->readPathEntry("CommandLine");