diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:14 -0600 |
| commit | 77343a1b8c1a5cb91a57039c4e595de33853a2d9 (patch) | |
| tree | ec168097bf95daefb0add7e401d151cf6a0b5948 /src/common/global | |
| parent | a1d4239c832b3bb1c8289f27831ef43b0a2eb941 (diff) | |
| download | piklab-77343a1b8c1a5cb91a57039c4e595de33853a2d9.tar.gz piklab-77343a1b8c1a5cb91a57039c4e595de33853a2d9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/common/global')
| -rw-r--r-- | src/common/global/generic_config.cpp | 2 | ||||
| -rw-r--r-- | src/common/global/global.h | 2 | ||||
| -rw-r--r-- | src/common/global/purl.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp index 9d951aa..48c705b 100644 --- a/src/common/global/generic_config.cpp +++ b/src/common/global/generic_config.cpp @@ -20,7 +20,7 @@ public: }; #else # include <kapplication.h> -# include <kconfig.h> +# include <tdeconfig.h> class GenericConfigPrivate { public: diff --git a/src/common/global/global.h b/src/common/global/global.h index 9eb8979..0bc0b58 100644 --- a/src/common/global/global.h +++ b/src/common/global/global.h @@ -35,7 +35,7 @@ # include <kaboutdata.h> # include <kcmdlineargs.h> # include <ktempfile.h> -# include <kconfigbackend.h> +# include <tdeconfigbackend.h> #endif #if defined(Q_OS_WIN) diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp index 29da212..c47fa7b 100644 --- a/src/common/global/purl.cpp +++ b/src/common/global/purl.cpp @@ -19,9 +19,9 @@ #include "process.h" #if !defined(NO_KDE) -# include <kio/netaccess.h> -# include <kfileitem.h> -# include <kconfigbackend.h> +# include <tdeio/netaccess.h> +# include <tdefileitem.h> +# include <tdeconfigbackend.h> #endif //----------------------------------------------------------------------------- |