diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /twin/workspace.cpp | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'twin/workspace.cpp')
| -rw-r--r-- | twin/workspace.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 1bc55d3dd..aeb7ce283 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -14,17 +14,17 @@ License. See the file "COPYING" for the exact licensing terms. #include "workspace.h" #include <tdeapplication.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <fixx11h.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> #include <tqpainter.h> #include <tqbitmap.h> #include <tqclipboard.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kprocess.h> #include <kglobalaccel.h> #include <dcopclient.h> |