diff options
Diffstat (limited to 'lib/interfaces')
27 files changed, 59 insertions, 50 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/KDevCoreIface.h b/lib/interfaces/KDevCoreIface.h index 612c8457..7a985931 100644 --- a/lib/interfaces/KDevCoreIface.h +++ b/lib/interfaces/KDevCoreIface.h @@ -29,7 +29,7 @@ class KDevCore; class KDevCoreIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP 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/KDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h index 8c3647ea..b37bf1df 100644 --- a/lib/interfaces/KDevPartControllerIface.h +++ b/lib/interfaces/KDevPartControllerIface.h @@ -27,7 +27,7 @@ class KDevPartController; class KDevPartControllerIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox index 3b493fde..175909c3 100644 --- a/lib/interfaces/extensions/Mainpage.dox +++ b/lib/interfaces/extensions/Mainpage.dox @@ -38,7 +38,7 @@ those should be loaded at a time. This can be accomplished by: @code class KDevMyExtension: public KDevPlugin { public: - KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name) + KDevMyExtension(const KDevPluginInfo *info, TQObject* parent, const char* name) :KDevPlugin(info, parent, name) {} virtual void doSomething() = 0; diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 49dd95a8..eddad758 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -26,7 +26,7 @@ namespace Extensions { class KDevCodeBrowserFrontend : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h index 76952f35..f175ee92 100644 --- a/lib/interfaces/extensions/kdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -56,7 +56,7 @@ if (apf) { */ class KDevAppFrontend : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h index 52afa3d3..ea869e30 100644 --- a/lib/interfaces/extensions/kdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -52,7 +52,7 @@ if (mf) { */ class KDevMakeFrontend : public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index a19c6275..ede2cf91 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -134,7 +134,7 @@ if (vcs) { */ class KDevVersionControl: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: @@ -184,7 +184,7 @@ Basic interface for providing info on file registered in a version control repos */ class KDevVCSFileInfoProvider: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor. diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox index 8c22ba73..7c97cf16 100644 --- a/lib/interfaces/external/Mainpage.dox +++ b/lib/interfaces/external/Mainpage.dox @@ -10,23 +10,23 @@ 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 QString &formName, Function function) - void removedFunction(DesignerType type, const QString &formName, Function function) - void editedFunction(DesignerType type, const QString &formName, Function oldFunction, Function function) - void editFunction(DesignerType type, const QString &formName, const QString &functionName) - void editSource(DesignerType type, const QString &formName); + void addedFunction(DesignerType type, const TQString &formName, Function function) + void removedFunction(DesignerType type, const TQString &formName, Function function) + void editedFunction(DesignerType type, const TQString &formName, Function oldFunction, Function function) + 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/external/designer.h b/lib/interfaces/external/designer.h index b84e2268..73420496 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -64,7 +64,7 @@ implements this interface and sets itself as a default handler for that mimetype then it becomes automatically integrated into TDevelop IDE. */ class Designer: public KParts::ReadWritePart{ - Q_OBJECT + TQ_OBJECT public: Designer(TQObject *parent, const char *name); diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h index 6544c5d0..c6719e27 100644 --- a/lib/interfaces/extras/kdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -71,7 +71,7 @@ if ( plugin ) */ class KDevCompilerOptions : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h index 793070b3..41faf993 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -63,7 +63,7 @@ VCS integrator takes care about setting up VCS for new and existing projects. It can, for example, perform checkout or import operations. */ class KDevVCSIntegrator: public TQObject { - Q_OBJECT + TQ_OBJECT public: KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h index 8bdbdf8f..edc6d0af 100644 --- a/lib/interfaces/katedocumentmanagerinterface.h +++ b/lib/interfaces/katedocumentmanagerinterface.h @@ -32,7 +32,7 @@ This is an emulated interface to provide compatibility with Kate scripts. */ class KateDocumentManagerInterface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/kdevapi.h index d1f4f5cc..ef756b69 100644 --- a/lib/interfaces/kdevapi.h +++ b/lib/interfaces/kdevapi.h @@ -46,7 +46,7 @@ class because @ref KDevPlugin already provides API convenience methods. */ class KDevApi: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor.*/ diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/kdevcoderepository.h index 4e1dd765..fca20f32 100644 --- a/lib/interfaces/kdevcoderepository.h +++ b/lib/interfaces/kdevcoderepository.h @@ -47,7 +47,7 @@ symbol store like @ref CodeModel. */ class KDevCodeRepository : public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor.*/ diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index fad2891a..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)) @@ -299,7 +299,7 @@ It defines: */ class KDevCore: public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h index 528926cb..d8658b48 100644 --- a/lib/interfaces/kdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -50,7 +50,7 @@ and reimplement slots defined in the form. */ class KDevDesignerIntegration : public TQObject { -Q_OBJECT +TQ_OBJECT public: /**Constructor. diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp index aa5b560c..a5609cf9 100644 --- a/lib/interfaces/kdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -68,9 +68,9 @@ bool KDevLanguageSupport::shouldSplitDocument(const KURL &url) return false; } -Qt::Orientation KDevLanguageSupport::splitOrientation() const +TQt::Orientation KDevLanguageSupport::splitOrientation() const { - return Qt::Vertical; + return TQt::Vertical; } void KDevLanguageSupport::addClass() diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index 42221868..59b160b2 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -60,7 +60,7 @@ formatted name). */ class KDevLanguageSupport: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: @@ -135,8 +135,8 @@ public: virtual bool shouldSplitDocument( const KURL &url ); /**Returns the language parts Split View orientation. - By default Qt::Vertical.*/ - virtual Qt::Orientation splitOrientation() const; + By default TQt::Vertical.*/ + virtual TQt::Orientation splitOrientation() const; /**Opens a "New class" dialog and adds the configured class to the sources. Define NewClass feature if you reimplement this method.*/ @@ -255,7 +255,7 @@ signals: void addedSourceInfo( const TQString& fileName ); /**Emitted when the language part changes the Split View orientation.*/ - void splitOrientationChanged( Qt::Orientation orientation ); + void splitOrientationChanged( TQt::Orientation orientation ); }; #endif diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index fd8e6830..0229c7e7 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -55,7 +55,7 @@ GUI designers, etc. */ class KDevPartController: public KParts::PartManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index 5bdcaaf6..e2058fa8 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -106,7 +106,7 @@ from shell applications. */ class KDevPlugin: public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: 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/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h index d72563d5..c21cf58a 100644 --- a/lib/interfaces/kdevplugincontroller.h +++ b/lib/interfaces/kdevplugincontroller.h @@ -38,7 +38,7 @@ Plugin controller is responsible for quering, loading and unloading available pl */ class KDevPluginController: public TQObject { - Q_OBJECT + TQ_OBJECT public: 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); } diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h index 256b0c0c..3fc6cf87 100644 --- a/lib/interfaces/kdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -47,7 +47,7 @@ as a way of providing support for a build system (like it is done in TDevelop ID */ class KDevProject: public KDevPlugin { - Q_OBJECT + TQ_OBJECT public: /**Constructs a project plugin. diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/kdevprojectiface.h index e30cd6cc..4908f9f2 100644 --- a/lib/interfaces/kdevprojectiface.h +++ b/lib/interfaces/kdevprojectiface.h @@ -33,7 +33,7 @@ DCOP Interface for the @ref KDevProject object. */ class KDevProjectIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: |