summaryrefslogtreecommitdiffstats
path: root/languages/kjssupport
diff options
context:
space:
mode:
Diffstat (limited to 'languages/kjssupport')
-rw-r--r--languages/kjssupport/jscodecompletion.cpp12
-rw-r--r--languages/kjssupport/jscodecompletion.h2
-rw-r--r--languages/kjssupport/kjsproblems.h2
-rw-r--r--languages/kjssupport/kjssupport_part.cpp42
-rw-r--r--languages/kjssupport/kjssupport_part.h2
-rw-r--r--languages/kjssupport/subclassingdlg.cpp12
-rw-r--r--languages/kjssupport/subclassingdlg.h4
-rw-r--r--languages/kjssupport/subclassingdlgbase.ui4
8 files changed, 40 insertions, 40 deletions
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index 436e0a95..8a204c7a 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -21,7 +21,7 @@
#include <kiconloader.h>
#include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kdebug.h>
#include <tdeaction.h>
#include <tdeparts/part.h>
@@ -82,11 +82,11 @@ void JSCodeCompletion::setActiveEditorPart( KParts::Part * part )
}
disconnect(part->widget(), 0, this, 0 ); // to make sure that it is't connected twice
- connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()),
- this, TQT_SLOT(cursorPositionChanged()));
- connect(part->widget(), TQT_SIGNAL(argHintHidden()), this, TQT_SLOT(argHintHidden()));
- connect(part->widget(), TQT_SIGNAL(completionAborted()), this, TQT_SLOT(completionBoxAbort()));
- connect(part->widget(), TQT_SIGNAL(completionDone()), this, TQT_SLOT(completionBoxHidden()));
+ connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()),
+ this, TQ_SLOT(cursorPositionChanged()));
+ connect(part->widget(), TQ_SIGNAL(argHintHidden()), this, TQ_SLOT(argHintHidden()));
+ connect(part->widget(), TQ_SIGNAL(completionAborted()), this, TQ_SLOT(completionBoxAbort()));
+ connect(part->widget(), TQ_SIGNAL(completionDone()), this, TQ_SLOT(completionBoxHidden()));
}
TQValueList< KTextEditor::CompletionEntry > JSCodeCompletion::getVars( const TQString & startText )
diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h
index f1d18a70..3afb4846 100644
--- a/languages/kjssupport/jscodecompletion.h
+++ b/languages/kjssupport/jscodecompletion.h
@@ -28,7 +28,7 @@ The code completion engine for Javascript.
*/
class JSCodeCompletion : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
JSCodeCompletion(TQObject *parent = 0, const char *name = 0);
diff --git a/languages/kjssupport/kjsproblems.h b/languages/kjssupport/kjsproblems.h
index ff1a0ce1..1f08f60e 100644
--- a/languages/kjssupport/kjsproblems.h
+++ b/languages/kjssupport/kjsproblems.h
@@ -27,7 +27,7 @@ class kjsSupportPart;
*/
class KJSProblems : public TDEListView
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 5a00e9c6..a2e6b989 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -50,8 +50,8 @@
#include "subclassingdlg.h"
typedef KDevGenericFactory<kjsSupportPart> kjsSupportFactory;
-static const KDevPluginInfo data("kdevkjssupport");
-K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) );
+static const KDevPluginInfo pluginData("kdevkjssupport");
+K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( pluginData ) );
class typeProperty
@@ -63,26 +63,26 @@ class typeProperty
};
kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& )
-: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" )
+: KDevLanguageSupport(&pluginData, parent, name ? name : "kjsSupportPart" )
{
setInstance(kjsSupportFactory::instance());
setXMLFile("kdevkjssupport.rc");
- m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+ m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQ_SLOT(slotRun()),actionCollection(), "build_execute" );
m_build->setStatusText( i18n("Test the active script.") );
kdDebug() << "Creating kjssupport Part" << endl;
- connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)),
- this, TQT_SLOT(projectConfigWidget(KDialogBase*)) );
- connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
- connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
- connect( partController(), TQT_SIGNAL(savedFile(const TQString&)), this, TQT_SLOT(savedFile(const TQString&)) );
- connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
- this, TQT_SLOT(slotActivePartChanged(KParts::Part *)));
- connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
- this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)));
+ connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)),
+ this, TQ_SLOT(projectConfigWidget(KDialogBase*)) );
+ connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) );
+ connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) );
+ connect( partController(), TQ_SIGNAL(savedFile(const TQString&)), this, TQ_SLOT(savedFile(const TQString&)) );
+ connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)),
+ this, TQ_SLOT(slotActivePartChanged(KParts::Part *)));
+ connect(core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+ this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)));
// Building kjs interpreter.
@@ -140,14 +140,14 @@ void kjsSupportPart::projectOpened()
{
kdDebug(9014) << "projectOpened()" << endl;
- connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList &)),
- this, TQT_SLOT(addedFilesToProject(const TQStringList &)) );
- connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList &)),
- this, TQT_SLOT(removedFilesFromProject(const TQStringList &)) );
+ connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList &)),
+ this, TQ_SLOT(addedFilesToProject(const TQStringList &)) );
+ connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList &)),
+ this, TQ_SLOT(removedFilesFromProject(const TQStringList &)) );
// We want to parse only after all components have been
// properly initialized
- TQTimer::singleShot(0, this, TQT_SLOT(parse()));
+ TQTimer::singleShot(0, this, TQ_SLOT(parse()));
}
void kjsSupportPart::projectClosed()
{
@@ -202,7 +202,7 @@ void kjsSupportPart::parse()
if (project())
{
- kapp->setOverrideCursor(waitCursor);
+ tdeApp->setOverrideCursor(waitCursor);
TQStringList files = project()->allFiles();
m_problemReporter->clear();
@@ -214,7 +214,7 @@ void kjsSupportPart::parse()
}
emit updatedSourceInfo();
- kapp->restoreOverrideCursor();
+ tdeApp->restoreOverrideCursor();
} else {
kdDebug(9014) << "No project" << endl;
}
@@ -427,7 +427,7 @@ void kjsSupportPart::contextMenu(TQPopupMenu * popupMenu, const Context *context
m_selectedUI = fcontext->fileName();
if (m_selectedUI.right(3).lower() == ".ui")
int id = popupMenu->insertItem(i18n("Implement Slots"),
- this, TQT_SLOT(implementSlots()));
+ this, TQ_SLOT(implementSlots()));
else
m_selectedUI = TQString();
}
diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h
index 4572b9a2..eebe081e 100644
--- a/languages/kjssupport/kjssupport_part.h
+++ b/languages/kjssupport/kjssupport_part.h
@@ -45,7 +45,7 @@ class typeProperty;
class kjsSupportPart : public KDevLanguageSupport
{
- Q_OBJECT
+ TQ_OBJECT
public:
kjsSupportPart(TQObject *parent, const char *name, const TQStringList &);
diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp
index 513e0180..8c634bda 100644
--- a/languages/kjssupport/subclassingdlg.cpp
+++ b/languages/kjssupport/subclassingdlg.cpp
@@ -30,7 +30,7 @@
#include <tqpushbutton.h>
#include <domutil.h>
#include <tqdom.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kdebug.h>
#include <tdelocale.h>
#include <tqfile.h>
@@ -188,13 +188,13 @@ void SubclassingDlg::readUiFile()
// Special widget specific slots
SlotItem *newSlot;
- m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class",TQDIALOG_OBJECT_NAME_STRING);
+ m_qtBaseClassName = DomUtil::elementByPathExt(doc,"widget").attribute("class","TQDialog");
- if ( (m_qtBaseClassName==TQMAINWINDOW_OBJECT_NAME_STRING) || (m_qtBaseClassName==TQWIDGET_OBJECT_NAME_STRING) )
+ if ( (m_qtBaseClassName=="TQMainWindow") || (m_qtBaseClassName=="TQWidget") )
m_canBeModal = false;
else
m_canBeModal = true;
- if (m_qtBaseClassName != TQWIDGET_OBJECT_NAME_STRING)
+ if (m_qtBaseClassName != "TQWidget")
{
newSlot = new SLOT_ACCEPT;
newSlot->setOn(false);
@@ -211,7 +211,7 @@ void SubclassingDlg::readUiFile()
m_slots << newSlot;
}
- if (m_qtBaseClassName == TQWIZARD_OBJECT_NAME_STRING)
+ if (m_qtBaseClassName == "TQWizard")
{
newSlot = new SLOT_NEXT;
m_slotView->insertItem(newSlot);
@@ -332,7 +332,7 @@ bool SubclassingDlg::replaceKeywords(TQString &buffer,bool canBeModal)
replace(buffer,"$NEWFILENAMELC$",m_edFileName->text().lower());
if (canBeModal)
{
- replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = FALSE");
+ replace(buffer,"$CAN_BE_MODAL_H$",", bool modal = false");
replace(buffer,"$CAN_BE_MODAL_CPP1$",", bool modal");
replace(buffer,"$CAN_BE_MODAL_CPP2$",", modal");
}
diff --git a/languages/kjssupport/subclassingdlg.h b/languages/kjssupport/subclassingdlg.h
index 651120b0..43c4ba6d 100644
--- a/languages/kjssupport/subclassingdlg.h
+++ b/languages/kjssupport/subclassingdlg.h
@@ -43,10 +43,10 @@ class SubclassingDlg : public SubclassingDlgBase
public:
SubclassingDlg(kjsSupportPart* kjsSupport, const TQString &formFile,TQStringList &newFileNames,
TQWidget* parent = 0, const char* name = 0,
- bool modal = FALSE, WFlags fl = 0 );
+ bool modal = false, WFlags fl = 0 );
/* SubclassingDlg(CppSupportPart* kjsSupport, const TQString &formFile,const TQString &filename,TQStringList &dummy,
TQWidget* parent = 0, const char* name = 0,
- bool modal = FALSE, WFlags fl = 0 );*/
+ bool modal = false, WFlags fl = 0 );*/
~SubclassingDlg();
private:
diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui
index 23ec7b34..250da264 100644
--- a/languages/kjssupport/subclassingdlgbase.ui
+++ b/languages/kjssupport/subclassingdlgbase.ui
@@ -245,9 +245,9 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>onChangedClassName()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>