diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kicker/proxy | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/proxy')
| -rw-r--r-- | kicker/proxy/appletproxy.cpp | 6 | ||||
| -rw-r--r-- | kicker/proxy/extensiondebugger.cpp | 4 | ||||
| -rw-r--r-- | kicker/proxy/extensionproxy.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index c55690577..ac2f969d8 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -29,13 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <qxembed.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpanelapplet.h> #include <tdeaboutdata.h> #include <tqfileinfo.h> diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 9003e2a78..c210e7b9e 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpushbutton.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index ac99d6287..13c40e67b 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -28,9 +28,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <qxembed.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> #include <kdebug.h> |