diff options
Diffstat (limited to 'lib/kross')
-rw-r--r-- | lib/kross/api/eventsignal.cpp | 2 | ||||
-rw-r--r-- | lib/kross/api/eventslot.cpp | 4 | ||||
-rw-r--r-- | lib/kross/api/qtobject.h | 2 | ||||
-rw-r--r-- | lib/kross/main/scriptaction.cpp | 2 | ||||
-rw-r--r-- | lib/kross/main/scriptguiclient.cpp | 34 | ||||
-rw-r--r-- | lib/kross/main/wdgscriptsmanager.cpp | 36 | ||||
-rwxr-xr-x | lib/kross/python/scripts/gui.py | 4 | ||||
-rw-r--r-- | lib/kross/test/main.cpp | 4 | ||||
-rw-r--r-- | lib/kross/test/testaction.cpp | 4 | ||||
-rw-r--r-- | lib/kross/test/testgui.py | 8 | ||||
-rw-r--r-- | lib/kross/test/testobject.cpp | 14 | ||||
-rw-r--r-- | lib/kross/test/testwindow.cpp | 2 |
12 files changed, 58 insertions, 58 deletions
diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index 9e07eed1..32537a68 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -51,7 +51,7 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, TDESharedPtr<List> argum TQString n = m_signal; - if(n.startsWith("2")) // Remove prefix of SIGNAL-macros + if(n.startsWith("2")) // Remove prefix of TQ_SIGNAL-macros n.remove(0,1); int signalid = m_sender->metaObject()->findSignal(n.latin1(), false); diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index cffe5ae8..5e655cdb 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -51,7 +51,7 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) TQString n = m_slot; //TODO name; //Variant::toString(args->item(0)); - if(n.startsWith("1")) // Remove prefix of SLOT-macros + if(n.startsWith("1")) // Remove prefix of TQ_SLOT-macros n.remove(0,1); int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false); @@ -98,7 +98,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) krossdebug( TQString("signal=%1 slot=%2 slotid=%3 params=%4 mdname=%5") .arg(signal).arg(slot).arg(slotid).arg(params).arg(md->name) ); - return TQCString("1" + slot); // Emulate the TQT_SLOT(...) macro by adding as first char a "1". + return TQCString("1" + slot); // Emulate the TQ_SLOT(...) macro by adding as first char a "1". } bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const TQCString& signal, TQString function, const TQCString& slot) diff --git a/lib/kross/api/qtobject.h b/lib/kross/api/qtobject.h index 22829f02..25e0f153 100644 --- a/lib/kross/api/qtobject.h +++ b/lib/kross/api/qtobject.h @@ -39,7 +39,7 @@ namespace Kross { namespace Api { /** * Class to wrap \a TQObject or inherited instances. * - * This class publishs all SIGNAL's, SLOT's and TQ_PROPERTY's + * This class publishs all TQ_SIGNAL's, TQ_SLOT's and TQ_PROPERTY's * the TQObject has. */ class QtObject : public Kross::Api::Class<QtObject> diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp index 2e775fcb..e8cbd4a6 100644 --- a/lib/kross/main/scriptaction.cpp +++ b/lib/kross/main/scriptaction.cpp @@ -164,7 +164,7 @@ ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement& TDEAction::setIcon(icon); // connect signal - connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activate())); + connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(activate())); } ScriptAction::~ScriptAction() diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index e96c4a90..75e2c2b0 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -76,10 +76,10 @@ ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent) setInstance( ScriptGUIClient::instance() ); // action to execute a scriptfile. - new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQ_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); // acion to show the ScriptManagerGUI dialog. - new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQ_SLOT(showScriptManager()), actionCollection(), "configurescripts"); // The predefined ScriptActionCollection's this ScriptGUIClient provides. d->collections.replace("installedscripts", @@ -250,11 +250,11 @@ bool ScriptGUIClient::loadScriptConfigDocument(const TQString& scriptconfigfile, installedcollection->attach( action ); } - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); } emit collectionChanged(installedcollection); return true; @@ -329,11 +329,11 @@ bool ScriptGUIClient::loadScriptFile() ScriptActionCollection* loadedcollection = d->collections["loadedscripts"]; if(loadedcollection) { ScriptAction::Ptr action = new ScriptAction( url.path() ); - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); loadedcollection->detach(action); loadedcollection->attach(action); @@ -361,11 +361,11 @@ bool ScriptGUIClient::executeScriptFile(const TQString& file) bool ScriptGUIClient::executeScriptAction(ScriptAction::Ptr action) { - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); action->activate(); bool ok = action->hadException(); action->finalize(); // execution is done. diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 50a0101f..d04f8d9d 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -135,45 +135,45 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con slotFillScriptsList(); slotSelectionChanged(0); - connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(scriptsList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "application-x-executable", TDEIcon::MainToolbar, 16 )); - connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); + connect(btnExec, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExecuteScript())); btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "document-open", TDEIcon::MainToolbar, 16 )); - connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); + connect(btnLoad, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadScript())); btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 )); - connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); + connect(btnUnload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUnloadScript())); btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", TDEIcon::MainToolbar, 16 )); - connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); + connect(btnInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript())); btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 )); - connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); + connect(btnUninstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript())); #ifdef KROSS_SUPPORT_NEWSTUFF btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 )); - connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); + connect(btnNewStuff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript())); #endif /* toolBar->setIconText( TDEToolBar::IconTextRight ); toolBar->insertButton("application-x-executable", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute")); - toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExecuteScript())); toolBar->insertLineSeparator(); toolBar->insertButton("document-open", WdgScriptsManagerPrivate::LoadBtn, true, i18n("Load")); - toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadScript())); toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UnloadBtn, false, i18n("Unload")); - toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUnloadScript())); toolBar->insertLineSeparator(); toolBar->insertButton("fileimport", WdgScriptsManagerPrivate::InstallBtn, true, i18n("Install")); - toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript())); toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall")); - toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript())); #ifdef KROSS_SUPPORT_NEWSTUFF toolBar->insertLineSeparator(); toolBar->insertButton("knewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts")); - toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript())); #endif */ - connect(scr, TQT_SIGNAL( collectionChanged(ScriptActionCollection*) ), - this, TQT_SLOT( slotFillScriptsList() )); + connect(scr, TQ_SIGNAL( collectionChanged(ScriptActionCollection*) ), + this, TQ_SLOT( slotFillScriptsList() )); } WdgScriptsManager::~WdgScriptsManager() @@ -325,7 +325,7 @@ void WdgScriptsManager::slotGetNewScript() if(! d->newstuff) { d->newstuff = new ScriptNewStuff(d->m_scripguiclient, type); - connect(d->newstuff, TQT_SIGNAL(installFinished()), this, TQT_SLOT(slotResourceInstalled())); + connect(d->newstuff, TQ_SIGNAL(installFinished()), this, TQ_SLOT(slotResourceInstalled())); } KNS::Engine *engine = new KNS::Engine(d->newstuff, type, this); @@ -333,8 +333,8 @@ void WdgScriptsManager::slotGetNewScript() d->setType(type); KNS::ProviderLoader *p = new KNS::ProviderLoader(this); - TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)), - d, TQT_SLOT(slotProviders(Provider::List*))); + TQObject::connect(p, TQ_SIGNAL(providersLoaded(Provider::List*)), + d, TQ_SLOT(slotProviders(Provider::List*))); p->load(type, "https://www.trinitydesktop.org/ocs/providers.xml"); d->exec(); diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index aa4dc986..19a51ce4 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -224,7 +224,7 @@ class TQtDialog: tqt.TQPushButton.__init__(self, parent) self.commandmethod = commandmethod self.setText(caption) - tqt.TQObject.connect(self, tqt.SIGNAL("clicked()"), self.commandmethod) + tqt.TQObject.connect(self, tqt.TQ_SIGNAL("clicked()"), self.commandmethod) class CheckBox(tqt.TQCheckBox): @@ -268,7 +268,7 @@ class TQtDialog: label.setBuddy(self.edit) browsebutton = Button(dialog, self, "...", self.browseButtonClicked) - #tqt.TQObject.connect(browsebutton, tqt.SIGNAL("clicked()"), self.browseButtonClicked) + #tqt.TQObject.connect(browsebutton, tqt.TQ_SIGNAL("clicked()"), self.browseButtonClicked) def get(self): return self.edit.text() diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp index 90665a72..146e0c20 100644 --- a/lib/kross/test/main.cpp +++ b/lib/kross/test/main.cpp @@ -114,8 +114,8 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode) /* // Connect TQObject signal with scriptfunction. - scriptcontainer->connect(testobject, TQT_SIGNAL(testSignal()), "testobjectCallback"); - scriptcontainer->connect(testobject, TQT_SIGNAL(testSignalString(const TQString&)), "testobjectCallbackWithParams"); + scriptcontainer->connect(testobject, TQ_SIGNAL(testSignal()), "testobjectCallback"); + scriptcontainer->connect(testobject, TQ_SIGNAL(testSignalString(const TQString&)), "testobjectCallbackWithParams"); // Call the testSlot to emit the testSignal. testobject->testSlot(); */ diff --git a/lib/kross/test/testaction.cpp b/lib/kross/test/testaction.cpp index 42963904..8dd43647 100644 --- a/lib/kross/test/testaction.cpp +++ b/lib/kross/test/testaction.cpp @@ -24,11 +24,11 @@ TestAction::TestAction(Kross::Api::ScriptContainer::Ptr scriptcontainer) { m_actioncollection = new TDEActionCollection(this, this); - m_action1 = new TDEAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); + m_action1 = new TDEAction("Action1_Text", 0, this, TQ_SLOT(activatedAction1()), m_actioncollection, "Action1"); m_actionlist.append(m_action1); scriptcontainer->addTDEAction(m_action1); - m_action2 = new TDEAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); + m_action2 = new TDEAction("Action2_Text", 0, this, TQ_SLOT(activatedAction2()), m_actioncollection, "Action2"); m_actionlist.append(m_action2); scriptcontainer->addTDEAction(m_action2); } diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py index 9c2747e8..c42f4f75 100644 --- a/lib/kross/test/testgui.py +++ b/lib/kross/test/testgui.py @@ -67,7 +67,7 @@ class TQtTest: label.setBuddy(self.edit) browsebutton = Button("...", self) - tqt.TQObject.connect(browsebutton, tqt.SIGNAL("clicked()"), self.browseButtonClicked) + tqt.TQObject.connect(browsebutton, tqt.TQ_SIGNAL("clicked()"), self.browseButtonClicked) def file(self): return self.edit.text() @@ -112,11 +112,11 @@ class TQtTest: self.layout.addWidget(buttonbox) savebutton = Button("Save", buttonbox) - tqt.TQObject.connect(savebutton, tqt.SIGNAL("clicked()"), self, tqt.SLOT("accept()")) - #tqt.TQObject.connect(savebutton, tqt.SIGNAL("clicked()"), self.exportButtonClicked) + tqt.TQObject.connect(savebutton, tqt.TQ_SIGNAL("clicked()"), self, tqt.TQ_SLOT("accept()")) + #tqt.TQObject.connect(savebutton, tqt.TQ_SIGNAL("clicked()"), self.exportButtonClicked) cancelbutton = Button("Cancel", buttonbox) - tqt.TQObject.connect(cancelbutton, tqt.SIGNAL("clicked()"), self, tqt.SLOT("close()")) + tqt.TQObject.connect(cancelbutton, tqt.TQ_SIGNAL("clicked()"), self, tqt.TQ_SLOT("close()")) def accept(self): print("ACCEPTTTTTTTT !!!!!!!!!!!!!!!!!!!!!!!!!!!!") diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp index 884e7e37..30385edd 100644 --- a/lib/kross/test/testobject.cpp +++ b/lib/kross/test/testobject.cpp @@ -29,17 +29,17 @@ TestObject::TestObject() TestObject::TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer) : TQObject(parent, "TestObject") { - connect(this, TQT_SIGNAL(testSignal()), this, TQT_SLOT(testSignalSlot())); - connect(this, TQT_SIGNAL(stdoutSignal(const TQString&)), this, TQT_SLOT(stdoutSlot(const TQString&))); - connect(this, TQT_SIGNAL(stderrSignal(const TQString&)), this, TQT_SLOT(stderrSlot(const TQString&))); + connect(this, TQ_SIGNAL(testSignal()), this, TQ_SLOT(testSignalSlot())); + connect(this, TQ_SIGNAL(stdoutSignal(const TQString&)), this, TQ_SLOT(stdoutSlot(const TQString&))); + connect(this, TQ_SIGNAL(stderrSignal(const TQString&)), this, TQ_SLOT(stderrSlot(const TQString&))); scriptcontainer->addTQObject(this); -//scriptcontainer->addSignal("stdout", this, TQT_SIGNAL(stdoutSignal(const TQString&))); -//scriptcontainer->addSlot("stderr", this, TQT_SLOT(stderrSlot(const TQString&))); +//scriptcontainer->addSignal("stdout", this, TQ_SIGNAL(stdoutSignal(const TQString&))); +//scriptcontainer->addSlot("stderr", this, TQ_SLOT(stderrSlot(const TQString&))); - //scriptcontainer->addSignal("myTestSignal", this, TQT_SIGNAL(testSignal())); - //scriptcontainer->addSlot("myTestSlot", this, TQT_SLOT(testSlot())); + //scriptcontainer->addSignal("myTestSignal", this, TQ_SIGNAL(testSignal())); + //scriptcontainer->addSlot("myTestSlot", this, TQ_SLOT(testSlot())); } TestObject::~TestObject() diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index 4d9c90e3..9e6908f5 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -83,7 +83,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco TQHBox* btnbox = new TQHBox(mainbox); KPushButton* execbtn = new KPushButton("Execute", btnbox); - connect(execbtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(execute())); + connect(execbtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(execute())); setCentralWidget(mainbox); setMinimumSize(600,420); |