diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:01 -0600 |
| commit | 0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch) | |
| tree | 54cce3e6ae07c4fc8921244b1397c75cc21a2997 /kopete/libkopete/private | |
| parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
| download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/libkopete/private')
| -rw-r--r-- | kopete/libkopete/private/kopetecommand.cpp | 4 | ||||
| -rw-r--r-- | kopete/libkopete/private/kopeteutils_private.cpp | 2 | ||||
| -rw-r--r-- | kopete/libkopete/private/kopeteviewmanager.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index 1c7ff584..7a21c5ed 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -17,8 +17,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kopetechatsessionmanager.h" #include "kopeteview.h" diff --git a/kopete/libkopete/private/kopeteutils_private.cpp b/kopete/libkopete/private/kopeteutils_private.cpp index 933a5b11..21453baa 100644 --- a/kopete/libkopete/private/kopeteutils_private.cpp +++ b/kopete/libkopete/private/kopeteutils_private.cpp @@ -16,7 +16,7 @@ #include <tqmap.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index a3150403..91305a2b 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -18,12 +18,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqptrlist.h> #include <tqstylesheet.h> #include <kplugininfo.h> #include <knotification.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <twin.h> #include "kopeteprefs.h" |