diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
commit | 0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch) | |
tree | 54cce3e6ae07c4fc8921244b1397c75cc21a2997 /ksirc/servercontroller.cpp | |
parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksirc/servercontroller.cpp')
-rw-r--r-- | ksirc/servercontroller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index fac84e6b..d47791e6 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -81,7 +81,7 @@ #include <tqlabel.h> #include <tqregexp.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <tdeconfig.h> #include <tdefontdialog.h> #include <kiconloader.h> @@ -108,7 +108,7 @@ #ifdef HAVE_PATHS_H #include <paths.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdepopupmenu.h> |