From 9f2c757e1a1694373c11427a00502c2ff4c2d403 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:32:27 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kturtle/TODO | 2 +- kturtle/src/kturtle.cpp | 14 +++++++------- kturtle/src/kturtle.h | 2 +- kturtle/src/kturtle.kcfg | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'kturtle') diff --git a/kturtle/TODO b/kturtle/TODO index 8f280acd..0cab39f0 100644 --- a/kturtle/TODO +++ b/kturtle/TODO @@ -221,7 +221,7 @@ cies: That is a good plan! I have tux allready in my sprites dir (I'm a fan too - About the language: when user is set to fr (not fr_FR but fr like me being in Canada), the parsing does not work because Settings::LogoLanguage() is set to fr and NOT to fr_FR. Syntax highlighting does not work for fr DONE annma -- Default does not work in Language ComboBox -> I am not sure your use of KConfig XT is optimum here, Cies +- Default does not work in Language ComboBox -> I am not sure your use of TDEConfig XT is optimum here, Cies and other bug: output: kturtle: desktopLanguage: fr:en_US kturtle: defaultLanguage: en_US Why is not default Language fr_FR? DONE annma 02/04/2004 diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 02ecddb8..06f72c53 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -103,7 +103,7 @@ MainWindow::MainWindow(KTextEditor::Document *document) : editor(0) // init with more usefull size, stolen from kwite (they stole it from konq) if ( !initialGeometrySet() && !kapp->config()->hasGroup("MainWindow Settings") ) resize(640, 480); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); readConfig(config); } @@ -490,7 +490,7 @@ bool MainWindow::queryClose() } } } - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General Options"); m_recentFiles->saveEntries(config, "Recent Files"); config->sync(); @@ -865,10 +865,10 @@ void MainWindow::slotRestartFullScreen() void MainWindow::slotSettings() { // Check if there is already a dialog, if so bring it to the foreground. - if ( KConfigDialog::showDialog("settings") ) return; + if ( TDEConfigDialog::showDialog("settings") ) return; // Create a new dialog with the same name as the above checking code. - KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self() ); + TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self() ); // connect the help connect( dialog, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotSettingsHelp() ) ); @@ -965,7 +965,7 @@ void MainWindow::slotUpdateSettings() slotSetHighlightstyle( selectedLogoLanguage ); // set the statusbar to display the language as just updated // TODO maybe this language name can be more pretty by not using ".left(2)", ie "American English" would than be possible... [if this is possible this should be fixed at more places.] - KConfig entry(locate("locale", "all_languages")); + TDEConfig entry(locate("locale", "all_languages")); entry.setGroup(Settings::logoLanguage().left(2)); slotStatusBar(i18n("Command language: %1").arg( entry.readEntry("Name") ), IDS_LANG); @@ -973,11 +973,11 @@ void MainWindow::slotUpdateSettings() translate = new Translate(); } -void MainWindow::readConfig(KConfig *config) +void MainWindow::readConfig(TDEConfig *config) { config->setGroup("General Options"); m_recentFiles->loadEntries(config, "Recent Files"); - KConfig entry(locate("locale", "all_languages")); + TDEConfig entry(locate("locale", "all_languages")); entry.setGroup(Settings::logoLanguage().left(2)); slotStatusBar(i18n("Command language: %1").arg( entry.readEntry("Name") ), IDS_LANG); } diff --git a/kturtle/src/kturtle.h b/kturtle/src/kturtle.h index 6c3a3099..1cd77f55 100644 --- a/kturtle/src/kturtle.h +++ b/kturtle/src/kturtle.h @@ -128,7 +128,7 @@ class MainWindow : public KParts::MainWindow bool queryClose(); void finishExecution(); - void readConfig(KConfig *config); + void readConfig(TDEConfig *config); void updateFullScreen(); virtual bool event(TQEvent* e); diff --git a/kturtle/src/kturtle.kcfg b/kturtle/src/kturtle.kcfg index f3fec672..192d6986 100644 --- a/kturtle/src/kturtle.kcfg +++ b/kturtle/src/kturtle.kcfg @@ -52,7 +52,7 @@ // The KconfigXT framework makes shure the value that is saved in the kturtlerc file will be used in stead of the defaultLanguage that we find here. // Get the desktops language - KConfigBase *globalConf = TDEGlobal::config(); + TDEConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); TQString desktopLanguage = globalConf->readEntry("Language"); kdDebug(0) << "desktopLanguage: "<< desktopLanguage <<endl; -- cgit v1.2.1