8 files changed, 30 insertions, 21 deletions
diff --git a/lib/interfaces/KDevCoreIface.cpp b/lib/interfaces/KDevCoreIface.cpp
index aa70e01b..c86e3562 100644
--- a/lib/interfaces/KDevCoreIface.cpp
+++ b/lib/interfaces/KDevCoreIface.cpp
@@ -29,8 +29,8 @@
 KDevCoreIface::KDevCoreIface(KDevCore *core)
     : TQObject(core), DCOPObject("KDevCore"), m_core(core)
 {
-    connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) );
-    connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) );
+    connect( m_core, TQ_SIGNAL(projectOpened()), this, TQ_SLOT(forwardProjectOpened()) );
+    connect( m_core, TQ_SIGNAL(projectClosed()), this, TQ_SLOT(forwardProjectClosed()) );
 }
 
 
diff --git a/lib/interfaces/KDevPartControllerIface.cpp b/lib/interfaces/KDevPartControllerIface.cpp
index 1b184453..60c9ef97 100644
--- a/lib/interfaces/KDevPartControllerIface.cpp
+++ b/lib/interfaces/KDevPartControllerIface.cpp
@@ -28,9 +28,9 @@
 KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc)
   : TQObject(pc), DCOPObject("KDevPartController"), m_controller(pc)
 {
-  connect(pc, TQT_SIGNAL(loadedFile(const KURL &)), this, TQT_SLOT(forwardLoadedFile(const KURL &)));
-  connect(pc, TQT_SIGNAL(savedFile(const KURL &)), this, TQT_SLOT(forwardSavedFile(const KURL &)));
-  connect(pc, TQT_SIGNAL(closedFile(const KURL &)), this, TQT_SLOT(forwardClosedFile(const KURL &)));  
+  connect(pc, TQ_SIGNAL(loadedFile(const KURL &)), this, TQ_SLOT(forwardLoadedFile(const KURL &)));
+  connect(pc, TQ_SIGNAL(savedFile(const KURL &)), this, TQ_SLOT(forwardSavedFile(const KURL &)));
+  connect(pc, TQ_SIGNAL(closedFile(const KURL &)), this, TQ_SLOT(forwardClosedFile(const KURL &)));  
 }
 
 
diff --git a/lib/interfaces/extensions/CMakeLists.txt b/lib/interfaces/extensions/CMakeLists.txt
index 6a07c77c..73708856 100644
--- a/lib/interfaces/extensions/CMakeLists.txt
+++ b/lib/interfaces/extensions/CMakeLists.txt
@@ -42,12 +42,12 @@ tde_create_translated_desktop(
 
 add_custom_command( OUTPUT codebrowserfrontend.moc.cpp
   COMMAND
-    ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp
+    ${TQMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h )
 
 add_custom_command( OUTPUT kdevversioncontrol.moc.cpp
   COMMAND
-    ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp
+    ${TQMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h )
 
 tde_add_library( kdevextensions STATIC_PIC AUTOMOC
diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox
index 0febd41d..7c97cf16 100644
--- a/lib/interfaces/external/Mainpage.dox
+++ b/lib/interfaces/external/Mainpage.dox
@@ -10,14 +10,14 @@ GUI Designer integration framework.
 
 \section designerintegration Overview of GUI designer integration process
 Each KPart that wants to act as a GUI Designer must implement @ref KInterfaceDesigner::Designer
-interface. It defines necessary Q_SIGNALS to communicate with an IDE and abstract virtual
+interface. It defines necessary signals to communicate with an IDE and abstract virtual
 functions to determine designer type.
 
 If a part which can "design" user interface files of a certain mimetype
 implements this interface and sets itself as a default handler for that 
 mimetype then it becomes automatically integrated into TDevelop IDE.
 
-When a part is embedded into TDevelop shell, its Q_SIGNALS (defined in @ref
+When a part is embedded into TDevelop shell, its signals (defined in @ref
 KInterfaceDesigner::Designer interface):
 @code
     void addedFunction(DesignerType type, const TQString &formName, Function function)
@@ -26,7 +26,7 @@ KInterfaceDesigner::Designer interface):
     void editFunction(DesignerType type, const TQString &formName, const TQString &functionName)
     void editSource(DesignerType type, const TQString &formName);
 @endcode
-are connected to corresponding Q_SLOTS of TDevelop designer integration engine which can be implemented in TDevelop language support plugin.
+are connected to corresponding slots of TDevelop designer integration engine which can be implemented in TDevelop language support plugin.
  
 Each language support which wants to use integrated designer, must reimplement 
 @code
diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp
index 0afbcc81..e190ed04 100644
--- a/lib/interfaces/katedocumentmanagerinterface.cpp
+++ b/lib/interfaces/katedocumentmanagerinterface.cpp
@@ -50,7 +50,7 @@ DCOPRef KateDocumentManagerInterface::document( uint n )
 DCOPRef KateDocumentManagerInterface::documentWithID( uint id )
 {
   TQString dcopobj = "KateDocument#" + TQString::number(id);
-  return DCOPRef(kapp->dcopClient()->appId(), dcopobj.latin1() );
+  return DCOPRef(tdeApp->dcopClient()->appId(), dcopobj.latin1() );
 }
 
 DCOPRef KateDocumentManagerInterface::openURL( const KURL &url, const TQString &encoding )
diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h
index 282906db..e496576f 100644
--- a/lib/interfaces/kdevcore.h
+++ b/lib/interfaces/kdevcore.h
@@ -78,15 +78,15 @@ to if you reimplement TQWidget::contextMenuEvent method.
 -# Connect KDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in
 the constructor of your plugin:\n 
 @code
-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 *)));
 @endcode
 -# Fill the menu in the slot you created, for example:\n
 @code
 if (context->hasType(Context::EditorContext))
 {
     const EditorContext *econtext = static_cast<const EditorContext*>(context);
-    int id = popup->insertItem(i18n("My Menu Item 1"), this, TQT_SLOT(myMenuAction1()));
+    int id = popup->insertItem(i18n("My Menu Item 1"), this, TQ_SLOT(myMenuAction1()));
     popup->setWhatsThis(id, i18n("What's this for my menu item 1"));
 }
 else if context->hasType(MyContext))
diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp
index 1cc6caa3..2a1b0770 100644
--- a/lib/interfaces/kdevplugincontroller.cpp
+++ b/lib/interfaces/kdevplugincontroller.cpp
@@ -27,8 +27,17 @@ KDevPluginController::KDevPluginController()
 TDETrader::OfferList KDevPluginController::query(const TQString &serviceType,
     const TQString &constraint)
 {
-    return TDETrader::self()->query(serviceType,
-        TQString("%1 and [X-TDevelop-Version] == %2").arg(constraint).arg(TDEVELOP_PLUGIN_VERSION));
+    TQString versionConstraint =
+        TQString::fromLatin1("[X-TDevelop-Version] == %1").arg(TDEVELOP_PLUGIN_VERSION);
+
+    TQString newConstraint;
+    if (!constraint.isEmpty()) {
+        newConstraint = TQString("( %1 ) and %2").arg(constraint).arg(versionConstraint);
+    } else {
+        newConstraint = versionConstraint;
+    }
+
+    return TDETrader::self()->query(serviceType, newConstraint);
 }
 
 TDETrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint)
diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp
index e8616df1..3a49a8c6 100644
--- a/lib/interfaces/kdevproject.cpp
+++ b/lib/interfaces/kdevproject.cpp
@@ -40,14 +40,14 @@ struct KDevProject::Private {
 KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name)
     : KDevPlugin(info, parent, name), d(new KDevProject::Private())
 {
-    connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) );
-    connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) );
+    connect( this, TQ_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQ_SLOT(buildFileMap()) );
+    connect( this, TQ_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQ_SLOT(buildFileMap()) );
 
-    connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(slotAddFilesToFileMap(const TQStringList& )) );
-    connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) );
+    connect( this, TQ_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQ_SLOT(slotAddFilesToFileMap(const TQStringList& )) );
+    connect( this, TQ_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQ_SLOT(slotRemoveFilesFromFileMap(const TQStringList& )) );
 
     d->m_timer = new TQTimer(this);
-    connect(d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBuildFileMap()));
+    connect(d->m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBuildFileMap()));
     d->m_iface = new KDevProjectIface(this);
 }