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 /twin | |
| 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 'twin')
| -rw-r--r-- | twin/client.h | 2 | ||||
| -rw-r--r-- | twin/kcmtwin/twindecoration/buttons.h | 2 | ||||
| -rw-r--r-- | twin/kcmtwin/twinrules/ruleslist.cpp | 2 | ||||
| -rw-r--r-- | twin/kcmtwin/twinrules/ruleswidget.h | 2 | ||||
| -rw-r--r-- | twin/kcmtwin/twinrules/ruleswidgetbase.ui | 2 | ||||
| -rw-r--r-- | twin/utils.h | 2 | ||||
| -rw-r--r-- | twin/workspace.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/twin/client.h b/twin/client.h index ffa328592..674251a5a 100644 --- a/twin/client.h +++ b/twin/client.h @@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <netwm.h> #include <kdebug.h> #include <assert.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <X11/X.h> #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h index d3a794569..e31c09d4a 100644 --- a/twin/kcmtwin/twindecoration/buttons.h +++ b/twin/kcmtwin/twindecoration/buttons.h @@ -36,7 +36,7 @@ #include <tqdragobject.h> #include <tqlistbox.h> -#include <klistview.h> +#include <tdelistview.h> class KDecorationFactory; diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp index 2f7c4582a..8961874ae 100644 --- a/twin/kcmtwin/twinrules/ruleslist.cpp +++ b/twin/kcmtwin/twinrules/ruleslist.cpp @@ -18,7 +18,7 @@ #include "ruleslist.h" -#include <klistbox.h> +#include <tdelistbox.h> #include <kpushbutton.h> #include <assert.h> #include <kdebug.h> diff --git a/twin/kcmtwin/twinrules/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h index f3f6f9881..4d22e1826 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.h +++ b/twin/kcmtwin/twinrules/ruleswidget.h @@ -22,7 +22,7 @@ #include <kdialogbase.h> #include <twin.h> -#include <kshortcutdialog.h> +#include <tdeshortcutdialog.h> #include "ruleswidgetbase.h" #include "editshortcutbase.h" diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui index d99b475b2..90a438840 100644 --- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui +++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui @@ -2547,7 +2547,7 @@ <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/twin/utils.h b/twin/utils.h index 94edb8b4d..e8bc09a46 100644 --- a/twin/utils.h +++ b/twin/utils.h @@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <tqwidget.h> #include <kmanagerselection.h> #include <netwm_def.h> -#include <kshortcutdialog.h> +#include <tdeshortcutdialog.h> namespace KWinInternal { diff --git a/twin/workspace.h b/twin/workspace.h index 74f898668..e88e68c85 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <tqtimer.h> #include <tqvaluevector.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tqcursor.h> #include <netwm.h> #include <kxmessages.h> |