diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /chalk/ui/kis_controlframe.cc | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/ui/kis_controlframe.cc')
| -rw-r--r-- | chalk/ui/kis_controlframe.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index f4af08a1..6c57a7e6 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -31,10 +31,10 @@ #include <tdetoolbar.h> #include <tdemainwindow.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <koFrameButton.h> #include <tdeactioncollection.h> |