diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:51:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:51:08 -0600 |
| commit | b0699f7c1623811cff1fe3794521546d30e84ee1 (patch) | |
| tree | 9d95a691cc5086f0d348984b1fc86d433cdfad53 /src/common/nokde | |
| parent | f037da190037979080d407f3c6f0a88026b6bb91 (diff) | |
| download | piklab-b0699f7c1623811cff1fe3794521546d30e84ee1.tar.gz piklab-b0699f7c1623811cff1fe3794521546d30e84ee1.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/common/nokde')
| -rw-r--r-- | src/common/nokde/nokde.pro | 4 | ||||
| -rw-r--r-- | src/common/nokde/nokde_klocale.cpp | 2 | ||||
| -rw-r--r-- | src/common/nokde/nokde_tdeaboutdata.h | 2 | ||||
| -rw-r--r-- | src/common/nokde/nokde_tdecmdlineargs.cpp | 4 | ||||
| -rw-r--r-- | src/common/nokde/nokde_tdecmdlineargs.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/common/nokde/nokde.pro b/src/common/nokde/nokde.pro index ab37fbd..14dac2f 100644 --- a/src/common/nokde/nokde.pro +++ b/src/common/nokde/nokde.pro @@ -2,7 +2,7 @@ STOPDIR = ../../.. include($${STOPDIR}/lib.pro) TARGET = nokde -HEADERS += nokde_klocale.h nokde_tdeaboutdata.h nokde_tdecmdlineargs.h nokde_kprocess.h -SOURCES += nokde_klocale.cpp nokde_tdeaboutdata.cpp nokde_tdecmdlineargs.cpp nokde_kprocess.cpp +HEADERS += nokde_tdelocale.h nokde_tdeaboutdata.h nokde_tdecmdlineargs.h nokde_kprocess.h +SOURCES += nokde_tdelocale.cpp nokde_tdeaboutdata.cpp nokde_tdecmdlineargs.cpp nokde_kprocess.cpp win32:HEADERS += win32_utils.h win32:SOURCES += win32_utils.c
\ No newline at end of file diff --git a/src/common/nokde/nokde_klocale.cpp b/src/common/nokde/nokde_klocale.cpp index aa6cb26..327851b 100644 --- a/src/common/nokde/nokde_klocale.cpp +++ b/src/common/nokde/nokde_klocale.cpp @@ -1,4 +1,4 @@ -#include "nokde_klocale.h" +#include "nokde_tdelocale.h" TQString i18n(const TQString &, const TQString &text) { return text; } TQString locate(const TQString &, const TQString &) { return TQString(); } diff --git a/src/common/nokde/nokde_tdeaboutdata.h b/src/common/nokde/nokde_tdeaboutdata.h index 93a7768..7c49444 100644 --- a/src/common/nokde/nokde_tdeaboutdata.h +++ b/src/common/nokde/nokde_tdeaboutdata.h @@ -32,7 +32,7 @@ #include <tqstring.h> //#include <tqimage.h> -#include "nokde_klocale.h" +#include "nokde_tdelocale.h" #ifndef _KABOUTDATA_H_ #define _KABOUTDATA_H_ diff --git a/src/common/nokde/nokde_tdecmdlineargs.cpp b/src/common/nokde/nokde_tdecmdlineargs.cpp index 4480077..613a118 100644 --- a/src/common/nokde/nokde_tdecmdlineargs.cpp +++ b/src/common/nokde/nokde_tdecmdlineargs.cpp @@ -54,9 +54,9 @@ #include "nokde_tdecmdlineargs.h" #include "nokde_tdeaboutdata.h" -#include "nokde_klocale.h" +#include "nokde_tdelocale.h" //#include <tdeapplication.h> -//#include <kglobal.h> +//#include <tdeglobal.h> //#include <kstringhandler.h> //#include <kstaticdeleter.h> diff --git a/src/common/nokde/nokde_tdecmdlineargs.h b/src/common/nokde/nokde_tdecmdlineargs.h index 58931a6..fde841d 100644 --- a/src/common/nokde/nokde_tdecmdlineargs.h +++ b/src/common/nokde/nokde_tdecmdlineargs.h @@ -21,7 +21,7 @@ #ifndef _KCMDLINEARGS_H_ #define _KCMDLINEARGS_H_ -#include "nokde_klocale.h" +#include "nokde_tdelocale.h" #include "nokde_kurl.h" # if [[[TQT_VERSION IS DEPRECATED]]]<0x040000 |