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 /tdewallet | |
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 'tdewallet')
-rw-r--r-- | tdewallet/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tdewallet/allyourbase.cpp | 2 | ||||
-rw-r--r-- | tdewallet/konfigurator/konfigurator.cpp | 2 | ||||
-rw-r--r-- | tdewallet/konfigurator/tdewallet_config.desktop | 2 | ||||
-rw-r--r-- | tdewallet/konfigurator/tdewalletconfig.desktop | 2 | ||||
-rw-r--r-- | tdewallet/tdewalleteditor.cpp | 4 | ||||
-rw-r--r-- | tdewallet/tdewalletmanager.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/tdewallet/CMakeLists.txt b/tdewallet/CMakeLists.txt index e4cedbe..7a4817e 100644 --- a/tdewallet/CMakeLists.txt +++ b/tdewallet/CMakeLists.txt @@ -32,7 +32,7 @@ tde_add_executable( tdewalletmanager AUTOMOC tdewalletmanager.skel main.cpp tdewalletpopup.cpp tdewalleteditor.cpp kwmapeditor.cpp allyourbase.cpp kbetterthankdialogbase.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp index 97b55d8..221c9b4 100644 --- a/tdewallet/allyourbase.cpp +++ b/tdewallet/allyourbase.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kglobal.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp index 230b4c9..04639fa 100644 --- a/tdewallet/konfigurator/konfigurator.cpp +++ b/tdewallet/konfigurator/konfigurator.cpp @@ -23,7 +23,7 @@ #include <dcopref.h> #include <kaboutdata.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <kgenericfactory.h> #include <kinputdialog.h> diff --git a/tdewallet/konfigurator/tdewallet_config.desktop b/tdewallet/konfigurator/tdewallet_config.desktop index a30297b..4ae0785 100644 --- a/tdewallet/konfigurator/tdewallet_config.desktop +++ b/tdewallet/konfigurator/tdewallet_config.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Exec=kcmshell --caption %c tdewalletconfig +Exec=tdecmshell --caption %c tdewalletconfig Icon=tdewalletmanager DocPath=tdewallet/index.html Name=TDE Wallet diff --git a/tdewallet/konfigurator/tdewalletconfig.desktop b/tdewallet/konfigurator/tdewalletconfig.desktop index ccae543..3b25017 100644 --- a/tdewallet/konfigurator/tdewalletconfig.desktop +++ b/tdewallet/konfigurator/tdewalletconfig.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=tdewalletmanager Type=Application -Exec=kcmshell tdewalletconfig +Exec=tdecmshell tdewalletconfig DocPath=tdewallet/index.html X-TDE-ModuleType=Library X-TDE-Library=tdewallet diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp index f85294f..ee07ccf 100644 --- a/tdewallet/tdewalleteditor.cpp +++ b/tdewallet/tdewalleteditor.cpp @@ -30,10 +30,10 @@ #include <kapplication.h> #include <kdebug.h> #include <kdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconview.h> #include <kinputdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klistviewsearchline.h> #include <klocale.h> #include <kmdcodec.h> diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp index 9e16b74..9b1a7df 100644 --- a/tdewallet/tdewalletmanager.cpp +++ b/tdewallet/tdewalletmanager.cpp @@ -27,7 +27,7 @@ #include <dcopref.h> #include <kaction.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> #include <kiconview.h> |