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/plugins/history | |
| parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
| download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/plugins/history')
| -rw-r--r-- | kopete/plugins/history/converter.cpp | 4 | ||||
| -rw-r--r-- | kopete/plugins/history/historydialog.cpp | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/historyguiclient.cpp | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/historyplugin.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index f3616ee4..ca3c2e74 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -22,9 +22,9 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <tdeapplication.h> #include <ksavefile.h> diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index 37ddb921..aedd3e8a 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -45,7 +45,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <kstandarddirs.h> #include <tdelistview.h> diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp index eeda505c..54cc3401 100644 --- a/kopete/plugins/history/historyguiclient.cpp +++ b/kopete/plugins/history/historyguiclient.cpp @@ -22,7 +22,7 @@ #include "kopeteview.h" #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> class HistoryPlugin; diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index bf53fee4..fb48e79f 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -18,7 +18,7 @@ #include <kgenericfactory.h> #include <tdeaboutdata.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> //#include <tdeconfig.h> #include <kplugininfo.h> #include <tdeversion.h> |