diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Mainpage.dox | 2 | ||||
-rw-r--r-- | src/core.cpp | 2 | ||||
-rw-r--r-- | src/editorproxy.cpp | 2 | ||||
-rw-r--r-- | src/kdevideextension.cpp | 4 | ||||
-rw-r--r-- | src/main.cpp | 2 | ||||
-rw-r--r-- | src/main_assistant.cpp | 2 | ||||
-rw-r--r-- | src/mainwindowshare.cpp | 2 | ||||
-rw-r--r-- | src/newui/button.cpp | 4 | ||||
-rw-r--r-- | src/newui/ddockwindow.cpp | 8 | ||||
-rw-r--r-- | src/newui/dmainwindow.cpp | 2 | ||||
-rw-r--r-- | src/newui/dtabwidget.cpp | 2 | ||||
-rw-r--r-- | src/partcontroller.cpp | 20 | ||||
-rw-r--r-- | src/plugincontroller.cpp | 2 | ||||
-rw-r--r-- | src/pluginselectdialog.cpp | 2 | ||||
-rw-r--r-- | src/projectmanager.cpp | 22 | ||||
-rw-r--r-- | src/simplemainwindow.cpp | 10 | ||||
-rw-r--r-- | src/toplevel.cpp | 2 |
17 files changed, 45 insertions, 45 deletions
diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 69e2e239..b15ccbaf 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -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..4f3d8cf5 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -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 75e0ba13..f9ce2ab8 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -41,7 +41,7 @@ EditorProxy::EditorProxy() { m_delayedLineTimer = new TQTimer( this ); connect( m_delayedLineTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(setLineNumberDelayed()) ); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); m_delayedViewCreationCompatibleUI = true; 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/main.cpp b/src/main.cpp index 7faf9b53..16a859dc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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 b548aa3b..41728b27 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -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 38414c00..f67f2cd2 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -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 ); diff --git a/src/newui/button.cpp b/src/newui/button.cpp index fc8bf826..3220533e 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -60,7 +60,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, 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 60292252..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; @@ -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); @@ -199,7 +199,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc { //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) diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index d3c70d4e..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); diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp index f96f3ca0..e0a27982 100644 --- a/src/newui/dtabwidget.cpp +++ b/src/newui/dtabwidget.cpp @@ -55,7 +55,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) 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 086d641e..b5a5ef3b 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -132,7 +132,7 @@ void PartController::setupActions() 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, TQ_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction->setToolTip( i18n("Save all modified files") ); @@ -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(); @@ -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) @@ -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() ); } @@ -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" ); diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 7166ab34..6a7eed9e 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -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");*/ diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index f7e92089..1e73ff48 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -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/projectmanager.cpp b/src/projectmanager.cpp index d94e5d71..b99dc436 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -105,7 +105,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) 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, @@ -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()+"/"); @@ -153,7 +153,7 @@ void ProjectManager::slotProjectOptions() GeneralInfoWidget *g = new GeneralInfoWidget(*API::getInstance()->projectDom(), box, "general informations widget"); 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,13 +226,13 @@ 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; } @@ -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/simplemainwindow.cpp b/src/simplemainwindow.cpp index b18f4cb5..eebc7ad1 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -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"); @@ -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/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; |