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 /kdcop | |
| 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 'kdcop')
| -rw-r--r-- | kdcop/kdcoplistview.h | 2 | ||||
| -rw-r--r-- | kdcop/kdcopview.ui | 4 | ||||
| -rw-r--r-- | kdcop/kdcopwindow.cpp | 8 | ||||
| -rw-r--r-- | kdcop/kdcopwindow.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/kdcop/kdcoplistview.h b/kdcop/kdcoplistview.h index 1851d9569..8b537a152 100644 --- a/kdcop/kdcoplistview.h +++ b/kdcop/kdcoplistview.h @@ -8,7 +8,7 @@ #define __KDCOPLISTVIEW_H__ -#include <klistview.h> +#include <tdelistview.h> class TQDragObject; class KDCOPListView : public TDEListView diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui index 60092917a..3b67fa242 100644 --- a/kdcop/kdcopview.ui +++ b/kdcop/kdcopview.ui @@ -142,8 +142,8 @@ <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>klistviewsearchline.h</includehint> + <includehint>tdelistviewsearchline.h</includehint> <includehint>kdcoplistview.h</includehint> - <includehint>klistbox.h</includehint> + <includehint>tdelistbox.h</includehint> </includehints> </UI> diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index d9e6baaa9..9ffc0cc22 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -12,7 +12,7 @@ #include <klocale.h> #include <kdatastream.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <kmessagebox.h> #include <kdialog.h> @@ -20,11 +20,11 @@ #include <kiconloader.h> #include <klineedit.h> #include <keditlistbox.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kdialogbase.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kcolorbutton.h> -#include <klistviewsearchline.h> +#include <tdelistviewsearchline.h> #include <tqtimer.h> #include <tqwidgetstack.h> diff --git a/kdcop/kdcopwindow.h b/kdcop/kdcopwindow.h index ce8d94a4a..bf0fe532e 100644 --- a/kdcop/kdcopwindow.h +++ b/kdcop/kdcopwindow.h @@ -15,7 +15,7 @@ class TQWidgetStack; class TQLabel; class KDCOPListView; -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kdcoplistview.h" #include "kdcopview.h" |