diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:05 -0600 |
| commit | d796716f1dc9dd0b198863d974a03bf356f636e6 (patch) | |
| tree | 1bab87345ab25163397b8033b7e1910360bd94fb /src/k3b.cpp | |
| parent | 6f156aae95c8ea00b34ffb59e237df2f00cf8256 (diff) | |
| download | k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.tar.gz k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.zip | |
Rename a number of libraries and executables 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 038586c..95695ed 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -38,10 +38,10 @@ // include files for KDE #include <kiconloader.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmenubar.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstdaction.h> #include <klineeditdlg.h> #include <kstandarddirs.h> @@ -58,8 +58,8 @@ #include <ktip.h> #include <kxmlguifactory.h> #include <kstdguiitem.h> -#include <kio/global.h> -#include <kio/netaccess.h> +#include <tdeio/global.h> +#include <tdeio/netaccess.h> #include <krecentdocument.h> #include <stdlib.h> @@ -1291,7 +1291,7 @@ void K3bMainWindow::slotProjectAddFiles() void K3bMainWindow::slotK3bSetup() { TDEProcess p; - p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); + p << "tdesu" << "tdecmshell 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.") ); |