diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:57 -0600 |
| commit | 0ea54195f4400f13a5cc109feee4b3779fbd2f0f (patch) | |
| tree | 14f5fe9a43c0a4bc41119c9d518713a3f91bd4c1 /kdf | |
| parent | 0ec14ccb8401eff2be20f861953a77431410955c (diff) | |
| download | tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.tar.gz tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdf')
| -rw-r--r-- | kdf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdf/disklist.h | 2 | ||||
| -rw-r--r-- | kdf/disks.h | 2 | ||||
| -rw-r--r-- | kdf/kcmdf.desktop | 2 | ||||
| -rw-r--r-- | kdf/kdfconfig.cpp | 2 | ||||
| -rw-r--r-- | kdf/mntconfig.cpp | 2 | ||||
| -rw-r--r-- | kdf/mntconfig.h | 2 | ||||
| -rw-r--r-- | kdf/stdoption.cpp | 2 | ||||
| -rw-r--r-- | kdf/tdeconftest.cpp (renamed from kdf/kconftest.cpp) | 4 |
9 files changed, 10 insertions, 10 deletions
diff --git a/kdf/CMakeLists.txt b/kdf/CMakeLists.txt index 00345df..43725af 100644 --- a/kdf/CMakeLists.txt +++ b/kdf/CMakeLists.txt @@ -30,7 +30,7 @@ tde_add_library( kdf_common STATIC_PIC AUTOMOC SOURCES kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cpp disks.cpp listview.cpp optiondialog.cpp stdoption.cpp - LINK tdeui-shared kio-shared + LINK tdeui-shared tdeio-shared ) diff --git a/kdf/disklist.h b/kdf/disklist.h index 9dba750..cee71b9 100644 --- a/kdf/disklist.h +++ b/kdf/disklist.h @@ -26,7 +26,7 @@ #define __DISKLIST_H__ #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> //#include <kcontrol.h> diff --git a/kdf/disks.h b/kdf/disks.h index b39a9db..83b0d5d 100644 --- a/kdf/disks.h +++ b/kdf/disks.h @@ -32,7 +32,7 @@ #include <tqprogressbar.h> #include <tqfile.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kprogress.h> #include <kprocess.h> #include <klocale.h> diff --git a/kdf/kcmdf.desktop b/kdf/kcmdf.desktop index 8bec44c..8fb2198 100644 --- a/kdf/kcmdf.desktop +++ b/kdf/kcmdf.desktop @@ -4,7 +4,7 @@ X-TDE-Library=kdf X-TDE-FactoryName=kdf X-TDE-ParentApp=kinfocenter X-TDE-LocalUser=false -Exec=kcmshell kcmdf +Exec=tdecmshell kcmdf Icon=kcmdf Type=Application Name=Storage Devices diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index 302c4b8..1b86925 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -36,7 +36,7 @@ #include <tqlineedit.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <klocale.h> #include <kiconloader.h> diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index bc4af51..27249aa 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -35,7 +35,7 @@ #undef Unsorted #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kicondialog.h> #include <kmessagebox.h> diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h index 5056507..f0b910a 100644 --- a/kdf/mntconfig.h +++ b/kdf/mntconfig.h @@ -26,7 +26,7 @@ #define __MNTCONFIG_H__ #include <tdecmodule.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include "disks.h" diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp index 9d7447e..ee004cd 100644 --- a/kdf/stdoption.cpp +++ b/kdf/stdoption.cpp @@ -27,7 +27,7 @@ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "stdoption.h" diff --git a/kdf/kconftest.cpp b/kdf/tdeconftest.cpp index 2c14a5c..63d904f 100644 --- a/kdf/kconftest.cpp +++ b/kdf/tdeconftest.cpp @@ -27,14 +27,14 @@ /* compile with -* gcc -I$TQTDIR/include -I$TDEDIR/include -L/opt/kde/lib -L/usr/X11R6/lib -lkfm -ltdeui -ltdecore -lqt -lX11 -lXext -fno-rtti kconftest.cpp +* gcc -I$TQTDIR/include -I$TDEDIR/include -L/opt/kde/lib -L/usr/X11R6/lib -lkfm -ltdeui -ltdecore -lqt -lX11 -lXext -fno-rtti tdeconftest.cpp */ #include <iostream> #include <tqstring.h> #include <tqdict.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kapplication.h> #include <klocale.h> |