diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:19:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:19:29 -0600 |
| commit | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (patch) | |
| tree | 36de2281c8b4cf238a5e27a76b5c6e07f40151ab /src/k3b.cpp | |
| parent | 2a3289ab87c52551fd2f5655492988ca02c17892 (diff) | |
| download | k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.tar.gz k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/k3b.cpp')
| -rw-r--r-- | src/k3b.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/k3b.cpp b/src/k3b.cpp index 962caa6..a2c7940 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -620,7 +620,7 @@ void K3bMainWindow::saveProperties( KConfig* c ) // 3. save the url of the project (might be something like "AudioCD1") in the config // 4. save the status of every project (modified/saved) - TQString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); + TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); // FIXME: for some reason the config entries are not properly stored when using the default // KMainWindow session config. Since I was not able to find the bug I use another config object @@ -675,7 +675,7 @@ void K3bMainWindow::readProperties( KConfig* c ) // 3. reset the saved urls and the modified state // 4. delete "~/.trinity/share/apps/k3b/sessions/" + KApp->sessionId() - TQString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); + TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true ); // FIXME: for some reason the config entries are not properly stored when using the default // KMainWindow session config. Since I was not able to find the bug I use another config object @@ -1290,9 +1290,9 @@ void K3bMainWindow::slotProjectAddFiles() void K3bMainWindow::slotK3bSetup() { - KProcess p; - p << "tdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language(); - if( !p.start( KProcess::DontCare ) ) + TDEProcess p; + p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); + if( !p.start( TDEProcess::DontCare ) ) KMessageBox::error( 0, i18n("Could not find tdesu to run K3bSetup with root privileges. " "Please run it manually as root.") ); } |