diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:15:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:15:40 -0600 |
| commit | 08396682f3324c6c1266be6a084793b261ada6a4 (patch) | |
| tree | 2b20125911d9adc6d1a213563267b97827b3cdff /src/common | |
| parent | 6f617c4181afa90f3eba14139d4f92eb98834899 (diff) | |
| download | piklab-08396682f3324c6c1266be6a084793b261ada6a4.tar.gz piklab-08396682f3324c6c1266be6a084793b261ada6a4.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/gui/dialog.h | 2 | ||||
| -rw-r--r-- | src/common/gui/editlistbox.h | 2 | ||||
| -rw-r--r-- | src/common/gui/list_container.h | 4 | ||||
| -rw-r--r-- | src/common/gui/list_view.h | 2 | ||||
| -rw-r--r-- | src/common/gui/misc_gui.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/common/gui/dialog.h b/src/common/gui/dialog.h index 555e857..d675314 100644 --- a/src/common/gui/dialog.h +++ b/src/common/gui/dialog.h @@ -11,7 +11,7 @@ #include <tqlayout.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> //----------------------------------------------------------------------------- class Dialog : public KDialogBase diff --git a/src/common/gui/editlistbox.h b/src/common/gui/editlistbox.h index 553ac16..8bcee74 100644 --- a/src/common/gui/editlistbox.h +++ b/src/common/gui/editlistbox.h @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <klineedit.h> #include <kpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include "common/common/qflags.h" diff --git a/src/common/gui/list_container.h b/src/common/gui/list_container.h index b52f9e2..ebeb6de 100644 --- a/src/common/gui/list_container.h +++ b/src/common/gui/list_container.h @@ -9,8 +9,8 @@ #ifndef LIST_CONTAINER_H #define LIST_CONTAINER_H -#include <kpopupmenu.h> -#include <klistview.h> +#include <tdepopupmenu.h> +#include <tdelistview.h> //---------------------------------------------------------------------------- class ListContainer diff --git a/src/common/gui/list_view.h b/src/common/gui/list_view.h index 90e9595..41920bd 100644 --- a/src/common/gui/list_view.h +++ b/src/common/gui/list_view.h @@ -13,7 +13,7 @@ #include <tqvaluevector.h> #define private public #define protected public -#include <klistview.h> +#include <tdelistview.h> #undef private #undef protected diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp index 2400070..607156e 100644 --- a/src/common/gui/misc_gui.cpp +++ b/src/common/gui/misc_gui.cpp @@ -22,7 +22,7 @@ #include <kcursor.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kaction.h> +#include <tdeaction.h> #include <ktabbar.h> #include "dialog.h" |