diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:47:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:47:46 -0600 |
| commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
| tree | 493c1095950b7f0a82690cedac1b749666be1b47 /kaboodle | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kaboodle')
| -rw-r--r-- | kaboodle/conf.cpp | 4 | ||||
| -rw-r--r-- | kaboodle/userinterface.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp index 370946e4..cd524c2b 100644 --- a/kaboodle/conf.cpp +++ b/kaboodle/conf.cpp @@ -39,7 +39,7 @@ Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name) autoPlay = new TQCheckBox(i18n("Start playing automatically"), box); quitAfterPlaying = new TQCheckBox(i18n("Quit when finished playing"), box); - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("core"); autoPlay->setChecked(config.readBoolEntry("autoPlay", true)); quitAfterPlaying->setChecked(config.readBoolEntry("quitAfterPlaying", true)); @@ -47,7 +47,7 @@ Kaboodle::Conf::Conf(TQWidget *_parent, const char *_name) void Kaboodle::Conf::accept(void) { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("core"); config.writeEntry("autoPlay", autoPlay->isChecked()); config.writeEntry("quitAfterPlaying", quitAfterPlaying->isChecked()); diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp index 10f7e56e..aa82479b 100644 --- a/kaboodle/userinterface.cpp +++ b/kaboodle/userinterface.cpp @@ -78,7 +78,7 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile setIcon(SmallIcon("kaboodle")); resize(320, minimumHeight()); - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); menubarAction->setChecked(!menuBar()->isHidden()); applySettings(); @@ -104,7 +104,7 @@ void Kaboodle::UserInterface::slotConfigureKeys() Kaboodle::UserInterface::~UserInterface(void) { - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); } void Kaboodle::UserInterface::fileOpen(void) @@ -143,7 +143,7 @@ void Kaboodle::UserInterface::playerPreferences(void) void Kaboodle::UserInterface::applySettings(void) { View *view = static_cast<View *>(part->view()); - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup("core"); view->setAutoPlay(config.readBoolEntry("autoPlay", true)); view->setQuitAfterPlaying(config.readBoolEntry("quitAfterPlaying", true)); |