diff options
Diffstat (limited to 'src')
29 files changed, 229 insertions, 229 deletions
diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 67b3be1a..b15ccbaf 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -62,8 +62,8 @@ Example: app.processEvents(); - TQObject::connect(PluginController::getInstance(), SIGNAL(loadingPlugin(const TQString &)), - splash, SLOT(showMessage(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(showMessage(const TQString &))); splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); @@ -80,7 +80,7 @@ Example: delete splash; - kapp->dcopClient()->registerAs("myapp"); + tdeApp->dcopClient()->registerAs("myapp"); return app.exec(); } diff --git a/src/core.cpp b/src/core.cpp index ccdd0ace..0ee37fa1 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -7,7 +7,7 @@ #include <tdemainwindow.h> #include <tdeconfig.h> #include <tdeversion.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeactioncollection.h> @@ -71,7 +71,7 @@ Core::~Core() bool Core::queryClose() { // save the the project to open it automaticly on startup if needed - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General Options"); config->writePathEntry("Last Project",ProjectManager::getInstance()->projectFile().url()); diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index 73ff852b..f9ce2ab8 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -40,13 +40,13 @@ EditorProxy::EditorProxy() : TQObject() { m_delayedLineTimer = new TQTimer( this ); - connect( m_delayedLineTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(setLineNumberDelayed()) ); - TDEConfig *config = kapp->config(); + connect( m_delayedLineTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(setLineNumberDelayed()) ); + TDEConfig *config = tdeApp->config(); m_delayedViewCreationCompatibleUI = true; TDEAction *ac = new TDEAction( i18n("Show Context Menu"), 0, this, - TQT_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); + TQ_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); TDEShortcut cut ;/*= TDEStdAccel::shortcut(TDEStdAccel::PopupMenuContext);*/ cut.append(KKey(CTRL+Key_Return)); ac->setShortcut(cut); @@ -143,7 +143,7 @@ void EditorProxy::installPopup( KParts::Part * part ) iface->installPopup( popup ); - connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(popupAboutToShow())); + connect(popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(popupAboutToShow())); // ugly hack: mark the "original" items m_popupIds.resize(popup->count()); diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index 794ab8cd..8445f0e8 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -32,10 +32,10 @@ TQString makeRelativePath(const TQString& fromPath, const TQString& toPath); GeneralInfoWidget::GeneralInfoWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) : GeneralInfoWidgetBase(parent, name), m_projectDom(projectDom) { - connect(project_directory_edit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotProjectDirectoryChanged(const TQString&))); - connect(project_directory_combo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotProjectDirectoryComboChanged())); + connect(project_directory_edit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotProjectDirectoryChanged(const TQString&))); + connect(project_directory_combo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotProjectDirectoryComboChanged())); readConfig(); } @@ -117,7 +117,7 @@ void GeneralInfoWidget::configureinUpdateVersion( TQString configureinpath, TQSt // AC_DEFINE(VERSION, "5.6") TQRegExp ac_define("^AC_DEFINE\\s*\\("); TQRegExp version("(\\bversion\\b)"); - version.setCaseSensitive(FALSE); + version.setCaseSensitive(false); while ( !stream.eof() ) { TQString line = stream.readLine(); diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp index 7bfbf29f..e9e3d9ac 100644 --- a/src/kdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -53,7 +53,7 @@ void KDevIDEExtension::init() void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", TDEIcon::SizeMedium) ); gsw = new SettingsWidget(vbox, "general settings widget"); @@ -87,7 +87,7 @@ void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("General Options"); config->writeEntry("DesignerApp", gsw->designerButtonGroup->selectedId()); diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index 52dd0053..f07f9b4d 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -94,7 +94,7 @@ void LanguageSelectWidget::init() layout->addWidget( groupBox2 ); - connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( _pluginList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); readProjectConfig(); } diff --git a/src/main.cpp b/src/main.cpp index 65177e53..edd538ff 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <tdemainwindow.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <dcopclient.h> @@ -102,8 +102,8 @@ int main(int argc, char *argv[]) if (splash) splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); - TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)), - splash, TQT_SLOT(message(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(message(const TQString &))); if (splash) splash->show(); PluginController::getInstance()->loadInitialPlugins(); @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) } } - kapp->dcopClient()->registerAs("tdevelop"); + tdeApp->dcopClient()->registerAs("tdevelop"); int ret = app.exec(); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index 10b5fd56..480d2c9c 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -5,7 +5,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <tdemainwindow.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <dcopclient.h> @@ -94,8 +94,8 @@ int main(int argc, char *argv[]) app.processEvents(); - TQObject::connect(PluginController::getInstance(), TQT_SIGNAL(loadingPlugin(const TQString &)), - splash, TQT_SLOT(message(const TQString &))); + TQObject::connect(PluginController::getInstance(), TQ_SIGNAL(loadingPlugin(const TQString &)), + splash, TQ_SLOT(message(const TQString &))); if (splash) splash->message( i18n( "Loading Settings" ) ); TopLevel::getInstance()->loadSettings(); @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) if (splash) delete splash; - kapp->dcopClient()->registerAs("kdevassistant"); + tdeApp->dcopClient()->registerAs("kdevassistant"); return app.exec(); } diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index c0c63e2e..f67f2cd2 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -81,11 +81,11 @@ MainWindowShare::MainWindowShare(TQObject* pParent, const char* name) void MainWindowShare::init() { - connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(Core::getInstance(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect( m_pMainWnd->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( m_pMainWnd->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); } void MainWindowShare::slotActionStatusText( const TQString &text ) @@ -105,83 +105,83 @@ void MainWindowShare::createActions() { ProjectManager::getInstance()->createActions( m_pMainWnd->actionCollection() ); - KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); + KStdAction::quit(this->parent(), TQ_SLOT(close()), m_pMainWnd->actionCollection()); TDEAction* action; m_stopProcesses = new TDEToolBarPopupAction( i18n( "&Stop" ), "process-stop", - Key_Escape, this, TQT_SLOT(slotStopButtonPressed()), + Key_Escape, this, TQ_SLOT(slotStopButtonPressed()), m_pMainWnd->actionCollection(), "stop_processes" ); m_stopProcesses->setToolTip(i18n("Stop")); m_stopProcesses->setWhatsThis(i18n("<b>Stop</b><p>Stops all running processes (like building process, grep command, etc.). When placed onto a toolbar provides a popup menu to choose a process to stop.")); m_stopProcesses->setEnabled( false ); - connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotStopMenuAboutToShow())); - connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotStopPopupActivated(int))); + connect(m_stopProcesses->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotStopMenuAboutToShow())); + connect(m_stopProcesses->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotStopPopupActivated(int))); - connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), - this, TQT_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); + connect( Core::getInstance(), TQ_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), + this, TQ_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); action = KStdAction::showMenubar( - this, TQT_SLOT(slotShowMenuBar()), + this, TQ_SLOT(slotShowMenuBar()), m_pMainWnd->actionCollection(), "settings_show_menubar" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you switch the menubar on/off."))); action = KStdAction::keyBindings( - this, TQT_SLOT(slotKeyBindings()), + this, TQ_SLOT(slotKeyBindings()), m_pMainWnd->actionCollection(), "settings_configure_shortcuts" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure shortcut keys."))); action = KStdAction::configureToolbars( - this, TQT_SLOT(slotConfigureToolbars()), + this, TQ_SLOT(slotConfigureToolbars()), m_pMainWnd->actionCollection(), "settings_configure_toolbars" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure toolbars."))); action = KStdAction::configureNotifications( - this, TQT_SLOT(slotConfigureNotifications()), + this, TQ_SLOT(slotConfigureNotifications()), m_pMainWnd->actionCollection(), "settings_configure_notifications" ); action->setToolTip(beautifyToolTip(action->text())); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(action->text())).arg(i18n("Lets you configure system notifications."))); - action = KStdAction::preferences(this, TQT_SLOT(slotSettings()), + action = KStdAction::preferences(this, TQ_SLOT(slotSettings()), m_pMainWnd->actionCollection(), "settings_configure" ); action->setToolTip( i18n( "Configure TDevelop" ) ); action->setWhatsThis(TQString("<b>%1</b><p>%2").arg(i18n( "Configure TDevelop" )).arg(i18n("Lets you customize TDevelop."))); - m_toggleStatusbar = KStdAction::showToolbar(this, TQT_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); + m_toggleStatusbar = KStdAction::showToolbar(this, TQ_SLOT(slotToggleStatusbar()),m_pMainWnd->actionCollection(), "settings_statusbar"); m_toggleStatusbar->setText(i18n("Show &Statusbar")); m_toggleStatusbar->setToolTip( i18n("Show statusbar") ); m_toggleStatusbar->setWhatsThis(i18n("<b>Show statusbar</b><p>Hides or shows the statusbar.")); - action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); + action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQ_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); action->setToolTip( i18n("Next window") ); action->setWhatsThis(i18n("<b>Next window</b><p>Switches to the next window.")); - action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); + action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQ_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); action->setToolTip( i18n("Previous window") ); action->setWhatsThis(i18n("<b>Previous window</b><p>Switches to the previous window.")); - action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); + action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQ_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); action->setToolTip( i18n("Last accessed window") ); action->setWhatsThis(i18n("<b>Last accessed window</b><p>Switches to the last viewed window (Hold the Alt key pressed and walk on by repeating the Up key).")); - action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); + action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQ_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); action->setToolTip( i18n("First accessed window") ); action->setWhatsThis(i18n("<b>First accessed window</b><p>Switches to the first accessed window (Hold the Alt key pressed and walk on by repeating the Down key).")); - action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); + action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQ_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); - m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); + m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQ_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); m_configureEditorAction->setToolTip( i18n("Configure editor settings") ); m_configureEditorAction->setWhatsThis(i18n("<b>Configure editor</b><p>Opens editor configuration dialog.")); m_configureEditorAction->setEnabled( false ); KDevPartController * partController = API::getInstance()->partController(); - connect( partController, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* )) ); + connect( partController, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part* )) ); } void MainWindowShare::slotReportBug() @@ -302,7 +302,7 @@ void MainWindowShare::slotSettings() ShellExtension::getInstance()->createGlobalSettingsPage(&dlg); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); config->setGroup("Global Settings Dialog"); int height = config->readNumEntry( "Height", 600 ); @@ -367,15 +367,15 @@ void MainWindowShare::slotGUICreated( KParts::Part * part ) if ( TDEAction * action = part->action("file_save") ) { kdDebug(9000) << " *** found \"file_save\" action - disconnecting" << endl; - disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); - connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotSave()) ); + disconnect( action, TQ_SIGNAL(activated()), 0, 0 ); + connect( action, TQ_SIGNAL(activated()), PartController::getInstance(), TQ_SLOT(slotSave()) ); } if ( TDEAction * action = part->action("file_reload") ) { kdDebug(9000) << " *** found \"file_reload\" action - disconnecting" << endl; - disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); - connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotReload()) ); + disconnect( action, TQ_SIGNAL(activated()), 0, 0 ); + connect( action, TQ_SIGNAL(activated()), PartController::getInstance(), TQ_SLOT(slotReload()) ); } } @@ -429,7 +429,7 @@ void MainWindowShare::slotConfigureToolbars() { m_pMainWnd->saveMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); KEditToolbar dlg( m_pMainWnd->factory() ); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -438,7 +438,7 @@ void MainWindowShare::contextMenu(TQPopupMenu* popup, const Context *) if ( m_pMainWnd->menuBar()->isVisible() ) return; - int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQT_SLOT(show()) ); + int id = popup->insertItem( i18n("Show &Menubar"), m_pMainWnd->menuBar(), TQ_SLOT(show()) ); popup->TQMenuData::setWhatsThis(id, i18n("<b>Show menubar</b><p>Lets you switch the menubar on/off.")); } diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 5fbc1cc9..fe988c02 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -57,8 +57,8 @@ MultiBuffer::MultiBuffer( TQWidget *parent ) API::getInstance() ->languageSupport() ) { setOrientation( lang->splitOrientation() ); - connect( lang, TQT_SIGNAL( splitOrientationChanged( TQt::Orientation ) ), - this, TQT_SLOT( setOrientation( TQt::Orientation ) ) ); + connect( lang, TQ_SIGNAL( splitOrientationChanged( TQt::Orientation ) ), + this, TQ_SLOT( setOrientation( TQt::Orientation ) ) ); } else { @@ -221,8 +221,8 @@ void MultiBuffer::show() // We're managing the view deletion by being its parent, // don't let the part self-destruct - disconnect( view, TQT_SIGNAL( destroyed() ), - document, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( view, TQ_SIGNAL( destroyed() ), + document, TQ_SLOT( slotWidgetDestroyed() ) ); document->insertChildClient( view ); PartController::getInstance() ->integrateTextEditorPart( document ); diff --git a/src/newui/button.cpp b/src/newui/button.cpp index ea63ea51..3220533e 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -56,11 +56,11 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, TQToolTip::add(this, m_realText); m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(assignAccel()), this); m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, - TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(clearAccel()), this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) @@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, Button::~Button() { // m_buttonBar->removeButton(this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQRegExp r("^&([0-9])\\s.*"); diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 164ecae7..0cf3cbdc 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) break; } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); int mode = config->readNumEntry("MDIStyle", 3); Ideal::ButtonMode buttonMode = Ideal::Text; @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); - m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); - m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); + m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this ); + m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this ); + m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this ); setVisible(m_visible); @@ -103,7 +103,7 @@ DDockWindow::~DDockWindow() void DDockWindow::setVisible(bool v) { //write dock width to the config file - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); @@ -147,7 +147,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); @@ -192,14 +192,14 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc m_bar->addButton(button); m_widgetStack->addWidget(widget); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget())); - connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) ); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget())); + connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) ); if (!skipActivation) { //if the widget was selected last time the dock is deleted //we need to show it - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) @@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget() void DDockWindow::contextMenu(TQPopupMenu * menu) { - m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQObject*>( sender() )) ); + m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) ); menu->insertSeparator(); diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index bc50b6f4..b2488901 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) void DMainWindow::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true); m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false); @@ -208,10 +208,10 @@ DTabWidget *DMainWindow::createTab() DTabWidget *tab = new DTabWidget(m_central); m_tabs.append(tab); if (tab->closeButton()) - connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab())); - connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); - connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), - this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &))); + connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab())); + connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); + connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), + this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &))); return tab; } @@ -274,7 +274,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view, { toolWindow(position)->addWidget(title, view); m_docks[view] = position; - connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); + connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); } void DMainWindow::removeDockWidget(TQWidget *view) @@ -295,7 +295,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) void DMainWindow::widgetDestroyed() { - TQWidget *w = TQT_TQWIDGET(const_cast<TQObject*>(sender())); + TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender())); if (m_docks.contains(w)) { diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index becfb12c..e0a27982 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -49,13 +49,13 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) setTabReorderingEnabled(true); } - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*))); -// connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(setFocus(TQWidget*))); +// connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(updateHistory(TQWidget*))); } void DTabWidget::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); // m_tabBarShown = config->readBoolEntry("TabBarShown", true); m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index b34eb4f9..b5a5ef3b 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -92,9 +92,9 @@ struct ModificationData PartController::PartController(TQWidget *parent) : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) { - connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) ); - connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) ); - connect(this, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*))); + connect(this, TQ_SIGNAL(partRemoved(KParts::Part*)), this, TQ_SLOT(slotPartRemoved(KParts::Part* )) ); + connect(this, TQ_SIGNAL(partAdded(KParts::Part*)), this, TQ_SLOT(slotPartAdded(KParts::Part* )) ); + connect(this, TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(slotActivePartChanged(KParts::Part*))); setupActions(); @@ -126,56 +126,56 @@ void PartController::setupActions() { TDEActionCollection *ac = TopLevel::getInstance()->main()->actionCollection(); - TDEAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open"); + TDEAction* newAction = KStdAction::open(this, TQ_SLOT(slotOpenFile()), ac, "file_open"); newAction->setToolTip( i18n("Open file") ); newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") ); - m_openRecentAction = KStdAction::openRecent( this, TQT_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); + m_openRecentAction = KStdAction::openRecent( this, TQ_SLOT(slotOpenRecent(const KURL&) ), ac, "file_open_recent" ); m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); - m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->loadEntries( tdeApp->config(), "RecentFiles" ); - m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); + m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQ_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction->setToolTip( i18n("Save all modified files") ); m_saveAllFilesAction->setWhatsThis(i18n("<b>Save all</b><p>Saves all modified files.")); m_saveAllFilesAction->setEnabled(false); - m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); + m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQ_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); m_revertAllFilesAction->setToolTip(i18n("Revert all changes")); m_revertAllFilesAction->setWhatsThis(i18n("<b>Revert all</b><p>Reverts all changes in opened files. Prompts to save changes so the reversion can be canceled for each modified file.")); m_revertAllFilesAction->setEnabled(false); - m_closeWindowAction = KStdAction::close(this, TQT_SLOT(slotCloseWindow()), ac, "file_close"); + m_closeWindowAction = KStdAction::close(this, TQ_SLOT(slotCloseWindow()), ac, "file_close"); m_closeWindowAction->setToolTip( i18n("Close current file") ); m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); - m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); + m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQ_SLOT(slotCloseAllWindows()), ac, "file_close_all"); m_closeAllWindowsAction->setToolTip( i18n("Close all files") ); m_closeAllWindowsAction->setWhatsThis(i18n("<b>Close all</b><p>Close all opened files.")); m_closeAllWindowsAction->setEnabled(false); - m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); + m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQ_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); m_closeOtherWindowsAction->setToolTip( i18n("Close other files") ); m_closeOtherWindowsAction->setWhatsThis(i18n("<b>Close all others</b><p>Close all opened files except current.")); m_closeOtherWindowsAction->setEnabled(false); new TDEActionSeparator(ac, "dummy_separator"); - m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back"); + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQ_SLOT(slotBack()), ac, "history_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the navigation history.")); - connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotBackPopupActivated(int))); + connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotBackPopupActivated(int))); - m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward"); + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQ_SLOT(slotForward()), ac, "history_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the navigation history.")); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotForwardPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotForwardPopupActivated(int))); - m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "go-bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); + m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "go-bottom", 0, this, TQ_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); m_gotoLastEditPosAction->setEnabled( false ); m_gotoLastEditPosAction->setToolTip( i18n("Goto Last Edit Position") ); m_gotoLastEditPosAction->setWhatsThis( i18n("<b>Goto Last Edit Position</b><p>Open the last edited file and position cursor at the point of edit") ); @@ -382,7 +382,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, m_openNextAsText = true; } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); // we don't trust KDE with designer files, let's handle it ourselves @@ -419,7 +419,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, addHistoryEntry(); integratePart( kdevpart, url ); m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); return; } } @@ -476,7 +476,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, m_openNextAsText = false; m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); return; } @@ -521,7 +521,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, } m_openRecentAction->addURL( url ); - m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); + m_openRecentAction->saveEntries( tdeApp->config(), "RecentFiles" ); } } else @@ -540,7 +540,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, { if ( dlg.always_open_as_text->isChecked() ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); TQStringList texttypeslist = config->readListEntry( "TextTypes" ); texttypeslist << MimeType->name(); @@ -574,8 +574,8 @@ void PartController::showDocument(const KURL &url, bool newWin) { part = new HTMLDocumentationPart; integratePart(part,docUrl); - connect(part, TQT_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )), - this, TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart* ))); + connect(part, TQ_SIGNAL(fileNameChanged(KParts::ReadOnlyPart* )), + this, TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart* ))); } else { @@ -631,8 +631,8 @@ KTextEditor::Editor * PartController::createEditorPart( bool activate, static bool alwaysActivate = true; - kapp->config()->setGroup("Editor"); - TQString preferred = kapp->config()->readPathEntry("EmbeddedKTextEditor"); + tdeApp->config()->setGroup("Editor"); + TQString preferred = tdeApp->config()->readPathEntry("EmbeddedKTextEditor"); // If we are not using kyzis... // Don't create non-wrapped views for now, // avoid two paths (== two chances for bad bugs) @@ -678,14 +678,14 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, emit loadedFile( ro_part->url() ); - connect( part, TQT_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQT_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) ); + connect( part, TQ_SIGNAL(modifiedOnDisc(Kate::Document*, bool, unsigned char)), this, TQ_SLOT(slotDocumentDirty(Kate::Document*, bool, unsigned char)) ); // let's get notified when a document has been changed - connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotUploadFinished())); + connect(part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotUploadFinished())); // yes, we're cheating again. this signal exists for katepart's // Document object and our HTMLDocumentationPart -// connect(part, TQT_SIGNAL(fileNameChanged()), this, TQT_SLOT(slotFileNameChanged())); +// connect(part, TQ_SIGNAL(fileNameChanged()), this, TQ_SLOT(slotFileNameChanged())); // Connect to the document's views newStatus() signal in order to keep track of the // modified-status of the document. @@ -697,22 +697,22 @@ void PartController::integratePart(KParts::Part *part, const KURL &url, if (designerPart && API::getInstance()->languageSupport()) { kdDebug() << "integrating designer part with language support" << endl; - connect(designerPart, TQT_SIGNAL(addedFunction(DesignerType, const TQString&, Function )), + connect(designerPart, TQ_SIGNAL(addedFunction(DesignerType, const TQString&, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(addFunction(DesignerType, const TQString&, Function ))); - connect(designerPart, TQT_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(editFunction(DesignerType, const TQString&, Function, Function ))); - connect(designerPart, TQT_SIGNAL(removedFunction(DesignerType, const TQString&, Function )), + TQ_SLOT(addFunction(DesignerType, const TQString&, Function ))); + connect(designerPart, TQ_SIGNAL(editedFunction(DesignerType, const TQString&, Function, Function )), API::getInstance()->languageSupport(), + TQ_SLOT(editFunction(DesignerType, const TQString&, Function, Function ))); + connect(designerPart, TQ_SIGNAL(removedFunction(DesignerType, const TQString&, Function )), API::getInstance()->languageSupport(), - TQT_SLOT(removeFunction(DesignerType, const TQString&, Function ))); - connect(designerPart, TQT_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )), + TQ_SLOT(removeFunction(DesignerType, const TQString&, Function ))); + connect(designerPart, TQ_SIGNAL(editFunction(DesignerType, const TQString&, const TQString& )), API::getInstance()->languageSupport(), - TQT_SLOT(openFunction(DesignerType, const TQString&, const TQString& ))); - connect(designerPart, TQT_SIGNAL(editSource(DesignerType, const TQString& )), + TQ_SLOT(openFunction(DesignerType, const TQString&, const TQString& ))); + connect(designerPart, TQ_SIGNAL(editSource(DesignerType, const TQString& )), API::getInstance()->languageSupport(), - TQT_SLOT(openSource(DesignerType, const TQString& ))); - connect(designerPart, TQT_SIGNAL(newStatus(const TQString &, int)), - this, TQT_SLOT(slotNewDesignerStatus(const TQString &, int))); + TQ_SLOT(openSource(DesignerType, const TQString& ))); + connect(designerPart, TQ_SIGNAL(newStatus(const TQString &, int)), + this, TQ_SLOT(slotNewDesignerStatus(const TQString &, int))); } } @@ -733,14 +733,14 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) if ( !doc ) return; - connect( doc, TQT_SIGNAL(textChanged()), this, TQT_SLOT(textChanged()) ); - connect( doc, TQT_SIGNAL(fileNameChanged()), - this, TQT_SLOT(slotDocumentUrlChanged())); + connect( doc, TQ_SIGNAL(textChanged()), this, TQ_SLOT(textChanged()) ); + connect( doc, TQ_SIGNAL(fileNameChanged()), + this, TQ_SLOT(slotDocumentUrlChanged())); if( doc->widget() ) { - connect( doc->widget(), TQT_SIGNAL(dropEventPass(TQDropEvent *)), - TopLevel::getInstance()->main(), TQT_SLOT(slotDropEvent(TQDropEvent *)) ); + connect( doc->widget(), TQ_SIGNAL(dropEventPass(TQDropEvent *)), + TopLevel::getInstance()->main(), TQ_SLOT(slotDropEvent(TQDropEvent *)) ); } if ( KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( doc->widget() ) ) @@ -780,7 +780,7 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) TQPtrListIterator<KTextEditor::View> it( list ); while ( it.current() ) { - connect( it, TQT_SIGNAL( newStatus() ), this, TQT_SLOT( slotNewStatus() ) ); + connect( it, TQ_SIGNAL( newStatus() ), this, TQ_SLOT( slotNewStatus() ) ); ++it; } } @@ -1275,7 +1275,7 @@ void PartController::slotOpenFile() if ( DefaultEncoding.isEmpty() ) { // have a peek at katepart's settings: - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup("Kate Document Defaults"); DefaultEncoding = config->readEntry("Encoding", TQString() ); } @@ -1327,7 +1327,7 @@ void PartController::slotActivePartChanged( KParts::Part *part ) } updateMenuItems(); - TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotWaitForFactoryHack()) ); } void PartController::showPart( KParts::Part* part, const TQString& name, const TQString& shortDescription ) @@ -1379,7 +1379,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns p->doc = doc; p->isModified = isModified; p->reason = reason; - KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p ); + KDevJobTimer::singleShot( 0, this, TQ_SLOT(slotDocumentDirtyStepTwo(void*)), p ); } } @@ -1453,7 +1453,7 @@ bool PartController::isDirty( KURL const & url ) bool PartController::reactToDirty( KURL const & url, unsigned char reason ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Editor"); TQString dirtyAction = config->readEntry( "DirtyAction" ); @@ -1754,7 +1754,7 @@ void PartController::slotWaitForFactoryHack( ) { if ( !activePart()->factory() ) { - TQTimer::singleShot( 100, this, TQT_SLOT(slotWaitForFactoryHack()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotWaitForFactoryHack()) ); return; } else diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 30aa9171..901f6bc4 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -15,7 +15,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kiconloader.h> @@ -80,7 +80,7 @@ PluginController::PluginController() : KDevPluginController() { /* m_defaultProfile = TQString::fromLatin1( "FullIDE" ); - m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" + + m_defaultProfilePath = tdeApp->dirs()->localtdedir() + "/" + TDEStandardDirs::kde_default( "data" ) + TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/ @@ -244,8 +244,8 @@ void PluginController::integratePart(KXMLGUIClient *part) Core::setupShourtcutTips(part); TopLevel::getInstance()->main()->guiFactory()->addClient(part); - connect( part->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - TopLevel::getInstance()->main()->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ) ); + connect( part->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + TopLevel::getInstance()->main()->actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ) ); } void PluginController::integrateAndRememberPart(const TQString &name, KDevPlugin *part) diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index a626a0dd..1e73ff48 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -51,8 +51,8 @@ PluginSelectDialog::PluginSelectDialog(TQWidget* parent, const char* name, bool plugin_list->addColumn(""); plugin_list->header()->hide(); - connect( plugin_list, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); - connect( urllabel, TQT_SIGNAL( leftClickedURL( const TQString & ) ), this, TQT_SLOT( openURL( const TQString & ) ) ); + connect( plugin_list, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( urllabel, TQ_SIGNAL( leftClickedURL( const TQString & ) ), this, TQ_SLOT( openURL( const TQString & ) ) ); init(); } @@ -86,7 +86,7 @@ void PluginSelectDialog::saveAsDefault() void PluginSelectDialog::openURL( const TQString & url ) { - kapp->invokeBrowser( url ); + tdeApp->invokeBrowser( url ); } void PluginSelectDialog::itemSelected( TQListViewItem * item ) diff --git a/src/pluginselectdialog.h b/src/pluginselectdialog.h index fc00c5f7..4f0820c7 100644 --- a/src/pluginselectdialog.h +++ b/src/pluginselectdialog.h @@ -23,7 +23,7 @@ class PluginSelectDialog : public PluginSelectDialogBase public: - PluginSelectDialog( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + PluginSelectDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~PluginSelectDialog(); TQStringList unselectedPluginNames(); diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index 8f53d109..81795f29 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -169,9 +169,9 @@ <slot>saveAsDefault()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">saveAsDefault()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurllabel.h</include> diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 36acd44d..b9d17720 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -649,7 +649,7 @@ <tabstop>disabledList</tabstop> <tabstop>pluginsView</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>profileExecuted(TQListViewItem *item)</slot> <slot>propertyExecuted(TQListBoxItem *item)</slot> <slot>addProfile()</slot> @@ -660,7 +660,7 @@ <slot>delEnabled()</slot> <slot>addDisabled()</slot> <slot>delDisabled()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index c2449374..c2d0c316 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -22,7 +22,7 @@ #include <tqfileinfo.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeio/netaccess.h> diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index fd4d06fa..d68eab51 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -23,7 +23,7 @@ #include <kurl.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdevplugin.h> diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 19a88d78..385353c5 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -21,9 +21,9 @@ class TQDomDocument; #include <tdeaction.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/netaccess.h> #include <tdetempfile.h> #include <tdemenubar.h> @@ -94,29 +94,29 @@ void ProjectManager::createActions( TDEActionCollection* ac ) TDEAction *action; action = new TDEAction(i18n("&Open Project..."), "project_open", 0, - this, TQT_SLOT(slotOpenProject()), + this, TQ_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project.")); m_openRecentProjectAction = new TDERecentFilesAction(i18n("Open &Recent Project"), 0, - this, TQT_SLOT(loadProject(const KURL &)), + this, TQ_SLOT(loadProject(const KURL &)), ac, "project_open_recent"); m_openRecentProjectAction->setToolTip(i18n("Open recent project")); m_openRecentProjectAction->setWhatsThis(i18n("<b>Open recent project</b><p>Opens recently opened project.")); - m_openRecentProjectAction->loadEntries(kapp->config(), "RecentProjects"); + m_openRecentProjectAction->loadEntries(tdeApp->config(), "RecentProjects"); m_closeProjectAction = new TDEAction(i18n("C&lose Project"), "window-close",0, - this, TQT_SLOT(closeProject()), + this, TQ_SLOT(closeProject()), ac, "project_close"); m_closeProjectAction->setEnabled(false); m_closeProjectAction->setToolTip(i18n("Close project")); m_closeProjectAction->setWhatsThis(i18n("<b>Close project</b><p>Closes the current project.")); m_projectOptionsAction = new TDEAction(i18n("Project &Options"), "configure", 0, - this, TQT_SLOT(slotProjectOptions()), + this, TQ_SLOT(slotProjectOptions()), ac, "project_options" ); m_projectOptionsAction->setToolTip(i18n("Project options")); m_projectOptionsAction->setWhatsThis(i18n("<b>Project options</b><p>Lets you customize project options.")); @@ -125,7 +125,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) void ProjectManager::slotOpenProject() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); @@ -151,9 +151,9 @@ void ProjectManager::slotProjectOptions() TQVBox *box = dlg.addVBoxPage( i18n("General"), i18n("General"), BarIcon( "tdevelop", TDEIcon::SizeMedium ) ); GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget"); - connect (&dlg, TQT_SIGNAL(okClicked()), g, TQT_SLOT(accept())); + connect (&dlg, TQ_SIGNAL(okClicked()), g, TQ_SLOT(accept())); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Project Settings Dialog"); int height = config->readNumEntry( "Height", 600 ); int width = config->readNumEntry( "Width", 800 ); @@ -176,7 +176,7 @@ void ProjectManager::loadSettings() void ProjectManager::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); if (projectLoaded()) { @@ -189,7 +189,7 @@ void ProjectManager::saveSettings() void ProjectManager::loadDefaultProject() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); TQString project = config->readPathEntry("Last Project"); bool readProject = config->readBoolEntry("Read Last Project On Startup", true); @@ -226,20 +226,20 @@ bool ProjectManager::loadProject(const KURL &projectURL) } TopLevel::getInstance()->main()->menuBar()->setEnabled( false ); - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); if( projectLoaded() && !closeProject() ) { m_openRecentProjectAction->setCurrentItem( -1 ); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return false; } m_info = new ProjectInfo; m_info->m_projectURL = url; - TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadProject()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadProject()) ); // no one cares about this value return true; @@ -253,7 +253,7 @@ void ProjectManager::slotLoadProject( ) delete m_info; m_info = 0; saveSettings(); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -262,7 +262,7 @@ void ProjectManager::slotLoadProject( ) if( !loadLanguageSupport(m_info->m_language) ) { delete m_info; m_info = 0; TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -271,7 +271,7 @@ void ProjectManager::slotLoadProject( ) delete m_info; m_info = 0; API::getInstance()->setProjectDom( 0 ); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); return; } @@ -301,7 +301,7 @@ void ProjectManager::slotLoadProject( ) Core::getInstance()->doEmitProjectOpened(); TopLevel::getInstance()->main()->menuBar()->setEnabled( true ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); TopLevel::getInstance()->statusBar()->message( i18n("Project loaded."), 3000 ); diff --git a/src/projectsession.cpp b/src/projectsession.cpp index afdaf0b5..d4a011de 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdetexteditor/viewcursorinterface.h> #include <tdetexteditor/document.h> #include <tdetexteditor/encodinginterface.h> @@ -118,7 +118,7 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ ++it; } - TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(loadDocument()) ); return true; } @@ -444,7 +444,7 @@ void ProjectSession::loadDocument( ) _docDataList.pop_front(); loadDocument(); - //TQTimer::singleShot( 0, this, TQT_SLOT(loadDocument()) ); + //TQTimer::singleShot( 0, this, TQ_SLOT(loadDocument()) ); } } diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 65bf0792..eebc7ad1 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -61,11 +61,11 @@ SimpleMainWindow::SimpleMainWindow(TQWidget* parent, const char *name) :DMainWindow(parent, name) { resize(800, 600); // starts tdevelop at 800x600 the first time - m_mainWindowShare = new MainWindowShare(TQT_TQOBJECT(this)); + m_mainWindowShare = new MainWindowShare(this); - connect(m_bottomDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); - connect(m_leftDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); - connect(m_rightDock, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(raiseEditor())); + connect(m_bottomDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); + connect(m_leftDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); + connect(m_rightDock, TQ_SIGNAL(hidden()), this, TQ_SLOT(raiseEditor())); } SimpleMainWindow::~ SimpleMainWindow( ) @@ -97,7 +97,7 @@ void SimpleMainWindow::init() if (help_menu) { help_menu->insertItem(SmallIconSet("contents"), i18n("TDevelop &Programming Handbook"), - TQT_TQOBJECT(this), TQT_SLOT(slotProgrammingHandbook()), 0, -1, 1); + this, TQ_SLOT(slotProgrammingHandbook()), 0, -1, 1); } menuBar()->setEnabled( false ); @@ -116,19 +116,19 @@ void SimpleMainWindow::init() i18n("Could Not Find Plugins") ); } - connect(Core::getInstance(), TQT_SIGNAL(coreInitialized()), TQT_TQOBJECT(this), TQT_SLOT(slotCoreInitialized())); - connect(Core::getInstance(), TQT_SIGNAL(projectOpened()), TQT_TQOBJECT(this), TQT_SLOT(projectOpened())); - connect(Core::getInstance(), TQT_SIGNAL(projectClosed()), TQT_TQOBJECT(this), TQT_SLOT(projectClosed())); - connect(Core::getInstance(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu *, const Context *))); - connect(PartController::getInstance(), TQT_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), - TQT_TQOBJECT(this), TQT_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - TQT_TQOBJECT(this), TQT_SLOT(activePartChanged(KParts::Part*))); + connect(Core::getInstance(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(slotCoreInitialized())); + connect(Core::getInstance(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened())); + connect(Core::getInstance(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed())); + connect(Core::getInstance(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *))); + connect(PartController::getInstance(), TQ_SIGNAL(partURLChanged(KParts::ReadOnlyPart *)), + this, TQ_SLOT(slotPartURLChanged(KParts::ReadOnlyPart * ))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); connect(PartController::getInstance(), - TQT_SIGNAL(documentChangedState(const KURL &, DocumentState)), - TQT_TQOBJECT(this), TQT_SLOT(documentChangedState(const KURL&, DocumentState))); + TQ_SIGNAL(documentChangedState(const KURL &, DocumentState)), + this, TQ_SLOT(documentChangedState(const KURL&, DocumentState))); loadSettings(); } @@ -260,7 +260,7 @@ void SimpleMainWindow::embedView( DDockWindow::Position pos, TQWidget * view, co DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & name, DDockWindow::Position defaultPos ) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "DToolDockPosition" ); TQString position = config->readEntry( name ); @@ -279,7 +279,7 @@ DDockWindow::Position SimpleMainWindow::recallToolViewPosition( const TQString & void SimpleMainWindow::rememberToolViewPosition( const TQString & name, DDockWindow::Position pos ) { - TDEConfig * config = kapp->config(); + TDEConfig * config = tdeApp->config(); config->setGroup( "DToolDockPosition" ); TQString position = "unknown"; @@ -364,7 +364,7 @@ void SimpleMainWindow::lowerView(TQWidget * view) void SimpleMainWindow::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); ProjectManager::getInstance()->loadSettings(); applyMainWindowSettings(config, "SimpleMainWindow"); @@ -374,7 +374,7 @@ void SimpleMainWindow::loadSettings() void SimpleMainWindow::saveSettings( ) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); ProjectManager::getInstance()->saveSettings(); saveMainWindowSettings(config, "SimpleMainWindow"); @@ -413,65 +413,65 @@ void SimpleMainWindow::createFramework() { PartController::createInstance( this ); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - TQT_TQOBJECT(this), TQT_SLOT(createGUI(KParts::Part*))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(createGUI(KParts::Part*))); } void SimpleMainWindow::createActions() { m_raiseEditor = new TDEAction(i18n("Raise &Editor"), ALT+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor"); + this, TQ_SLOT(raiseEditor()), actionCollection(), "raise_editor"); m_raiseEditor->setToolTip(i18n("Raise editor")); m_raiseEditor->setWhatsThis(i18n("<b>Raise editor</b><p>Focuses the editor.")); m_lowerAllDocks = new TDEAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); + this, TQ_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); - new TDEAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this), - TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); + new TDEAction(i18n("Switch to next TabWidget"), 0, this, + TQ_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); m_splitHor = new TDEAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); + this, TQ_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); m_splitHor->setIcon("view_top_bottom"); m_splitVer = new TDEAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); + this, TQ_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); m_splitVer->setIcon("view_left_right"); m_splitHor1 = new TDEAction(i18n("Split &Horizontal"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); + this, TQ_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); m_splitHor1->setIcon("view_top_bottom"); m_splitVer1 = new TDEAction(i18n("Split &Vertical"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); + this, TQ_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); m_splitVer1->setIcon("view_left_right"); m_splitHor2 = new TDEAction(i18n("Split &Horizontal and Open"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); + this, TQ_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); m_splitHor2->setIcon("view_top_bottom"); m_splitVer2 = new TDEAction(i18n("Split &Vertical and Open"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); + this, TQ_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); m_splitVer2->setIcon("view_left_right"); m_raiseLeftDock = new TDEAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, - TQT_TQOBJECT(this), TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); + this, TQ_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); m_raiseRightDock = new TDEAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, - TQT_TQOBJECT(this), TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); + this, TQ_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); m_raiseBottomDock = new TDEAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); + this, TQ_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars()), actionCollection(), "set_configure_toolbars"); m_mainWindowShare->createActions(); - connect(m_mainWindowShare, TQT_SIGNAL(gotoNextWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoNextWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoPreviousWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoPreviousWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoFirstWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoFirstWindow())); - connect(m_mainWindowShare, TQT_SIGNAL(gotoLastWindow()), TQT_TQOBJECT(this), TQT_SLOT(gotoLastWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoNextWindow()), this, TQ_SLOT(gotoNextWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoPreviousWindow()), this, TQ_SLOT(gotoPreviousWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoFirstWindow()), this, TQ_SLOT(gotoFirstWindow())); + connect(m_mainWindowShare, TQ_SIGNAL(gotoLastWindow()), this, TQ_SLOT(gotoLastWindow())); } void SimpleMainWindow::raiseEditor() @@ -598,7 +598,7 @@ void SimpleMainWindow::closeTab() void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) { - DTabWidget *tabWidget = static_cast<DTabWidget*>(TQT_TQWIDGET(const_cast<TQObject*>(sender()))); + DTabWidget *tabWidget = static_cast<DTabWidget*>(const_cast<TQObject*>(sender())); if (!tabWidget) return; @@ -644,7 +644,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) ++it; } - connect(&tabMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(tabContextActivated(int))); + connect(&tabMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(tabContextActivated(int))); tabMenu.exec(p); } @@ -679,7 +679,7 @@ void SimpleMainWindow::configureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow"); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -704,7 +704,7 @@ bool SimpleMainWindow::queryExit() void SimpleMainWindow::setupWindowMenu() { // get the xmlgui created one instead - m_windowMenu = static_cast<TQPopupMenu*>(TQT_TQWIDGET(main()->child("window", "TDEPopupMenu"))); + m_windowMenu = static_cast<TQPopupMenu*>(main()->child("window", "TDEPopupMenu")); if (!m_windowMenu) { @@ -718,8 +718,8 @@ void SimpleMainWindow::setupWindowMenu() actionCollection()->action("file_close_all")->plug(m_windowMenu); actionCollection()->action("file_closeother")->plug(m_windowMenu); - TQObject::connect(m_windowMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(openURL(int))); - TQObject::connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu())); + TQObject::connect(m_windowMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openURL(int))); + TQObject::connect(m_windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillWindowMenu())); } void SimpleMainWindow::openURL(int w) @@ -1019,7 +1019,7 @@ void SimpleMainWindow::projectClosed() void SimpleMainWindow::slotProgrammingHandbook() { - kapp->invokeHelp(TQString::null, "tde_app_devel"); + tdeApp->invokeHelp(TQString::null, "tde_app_devel"); } #include "simplemainwindow.moc" diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index 205656bd..b2e0f13a 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -13,7 +13,7 @@ KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f) { TQTimer *timer = new TQTimer( this ); - TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); + TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animate())); timer->start(150); state = 0; diff --git a/src/statusbar.cpp b/src/statusbar.cpp index b4e11769..44cb4b70 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -39,8 +39,8 @@ KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) _status->setAlignment(TQWidget::AlignCenter); addWidget(_status, 0, true); - connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); + connect(PartController::getInstance(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); } @@ -60,14 +60,14 @@ void KDevStatusBar::activePartChanged(KParts::Part *part) { if ((_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { - connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), - this, TQT_SLOT( setStatus( const TQString & ) ) ); + connect( part->widget(), TQ_SIGNAL( viewStatusMsg( const TQString & ) ), + this, TQ_SLOT( setStatus( const TQString & ) ) ); _status->show(); } else if ((_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) { - connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(part->widget(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); _status->show(); cursorPositionChanged(); diff --git a/src/statusbar.h b/src/statusbar.h index 4a61a07e..82efa285 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -32,7 +32,7 @@ class KDevStatusBar : public KStatusBar public: KDevStatusBar( TQWidget *parent=0, const char *name=0 ); ~KDevStatusBar(); - void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = FALSE ); + void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = false ); private slots: void cursorPositionChanged(); diff --git a/src/toplevel.cpp b/src/toplevel.cpp index 129d869c..75b3b50b 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -22,7 +22,7 @@ KDevMainWindow *TopLevel::getInstance() SimpleMainWindow *mainWindow = new SimpleMainWindow(0, "SimpleMainWindow"); s_instance = mainWindow; mainWindow->init(); - kapp->setMainWidget(mainWindow); + tdeApp->setMainWidget(mainWindow); } return s_instance; |