diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /konsole/konsole/konsole_part.cpp | |
parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konsole/konsole/konsole_part.cpp')
-rw-r--r-- | konsole/konsole/konsole_part.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index ac0b65bf9..930c951f0 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -30,7 +30,7 @@ #include <kaboutdata.h> #include <kcharsets.h> #include <kdebug.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kglobalsettings.h> #include <kiconloader.h> #include <kinputdialog.h> @@ -44,10 +44,10 @@ #include <tqcheckbox.h> #include <tqspinbox.h> #include <tqpushbutton.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krootpixmap.h> #include <tdeconfig.h> -#include <kaction.h> +#include <tdeaction.h> // We can't use the ARGB32 visual when embedded in another application bool argb_visual = false; |