diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:46 -0600 |
| commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
| tree | 493c1095950b7f0a82690cedac1b749666be1b47 /juk/juk.cpp | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'juk/juk.cpp')
| -rw-r--r-- | juk/juk.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/juk/juk.cpp b/juk/juk.cpp index 5c2e6db5..60d69eae 100644 --- a/juk/juk.cpp +++ b/juk/juk.cpp @@ -224,7 +224,7 @@ void JuK::setupSystemTray() void JuK::setupGlobalAccels() { - m_accel = new KGlobalAccel(TQT_TQOBJECT(this)); + m_accel = new TDEGlobalAccel(TQT_TQOBJECT(this)); KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQT_SLOT(activate())); KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQT_SLOT(activate())); @@ -257,7 +257,7 @@ void JuK::slotProcessArgs() void JuK::createDirs() { - TQDir dir(KGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/')); + TQDir dir(TDEGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/')); if (!dir.exists("covers", false)) dir.mkdir("covers", false); dir.cd("covers"); @@ -278,7 +278,7 @@ void JuK::keyPressEvent(TQKeyEvent *e) void JuK::readSettings() { - KConfigGroup config(KGlobal::config(), "Settings"); + KConfigGroup config(TDEGlobal::config(), "Settings"); m_showSplash = config.readBoolEntry("ShowSplashScreen", true); m_startDocked = config.readBoolEntry("StartDocked", false); } @@ -287,7 +287,7 @@ void JuK::readConfig() { // player settings - KConfigGroup playerConfig(KGlobal::config(), "Player"); + KConfigGroup playerConfig(TDEGlobal::config(), "Player"); if(m_sliderAction->volumeSlider()) { int maxVolume = m_sliderAction->volumeSlider()->maxValue(); @@ -310,7 +310,7 @@ void JuK::readConfig() // general settings - KConfigGroup settingsConfig(KGlobal::config(), "Settings"); + KConfigGroup settingsConfig(TDEGlobal::config(), "Settings"); bool dockInSystemTray = settingsConfig.readBoolEntry("DockInSystemTray", true); m_toggleSystemTrayAction->setChecked(dockInSystemTray); @@ -331,7 +331,7 @@ void JuK::saveConfig() { // player settings - KConfigGroup playerConfig(KGlobal::config(), "Player"); + KConfigGroup playerConfig(TDEGlobal::config(), "Player"); if (m_sliderAction->volumeSlider()) { @@ -353,7 +353,7 @@ void JuK::saveConfig() // general settings - KConfigGroup settingsConfig(KGlobal::config(), "Settings"); + KConfigGroup settingsConfig(TDEGlobal::config(), "Settings"); settingsConfig.writeEntry("ShowSplashScreen", m_toggleSplashAction->isChecked()); settingsConfig.writeEntry("StartDocked", m_startDocked); settingsConfig.writeEntry("DockInSystemTray", m_toggleSystemTrayAction->isChecked()); @@ -362,7 +362,7 @@ void JuK::saveConfig() if(m_outputSelectAction) settingsConfig.writeEntry("MediaSystem", m_outputSelectAction->currentItem()); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); } bool JuK::queryExit() |