diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:11:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:11:27 -0600 |
| commit | 7065b83d5db5a97df7cfd9a55681f808512691e8 (patch) | |
| tree | 24093255a01169856dffd479565b81b886d5d6e5 | |
| parent | 50fd2fb357f83b24afbc163791fc665285aeea09 (diff) | |
| download | kima-7065b83d5db5a97df7cfd9a55681f808512691e8.tar.gz kima-7065b83d5db5a97df7cfd9a55681f808512691e8.zip | |
Rename many classes and header files to avoid conflicts with KDE4
| -rw-r--r-- | src/kima.cpp | 10 | ||||
| -rw-r--r-- | src/prefs.cpp | 2 | ||||
| -rw-r--r-- | src/prefs.ui | 2 | ||||
| -rw-r--r-- | src/sources/labelsource.cpp | 2 | ||||
| -rw-r--r-- | src/sources/labelsourcePrefs.cpp | 2 | ||||
| -rw-r--r-- | src/sources/labelsourcePrefs.ui | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/kima.cpp b/src/kima.cpp index 4d27899..fd872df 100644 --- a/src/kima.cpp +++ b/src/kima.cpp @@ -28,18 +28,18 @@ #include <tqtextedit.h> #include <tqtimer.h> #include <tqcursor.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqlistview.h> #include <tqwidgetstack.h> // KDE #include <kmessagebox.h> #include <kaboutapplication.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> -#include <kaction.h> -#include <kactioncollection.h> -#include <kactionclasses.h> +#include <tdeaction.h> +#include <tdeactioncollection.h> +#include <tdeactionclasses.h> #include <kapplication.h> #include <kdialogbase.h> #include <tdeconfig.h> diff --git a/src/prefs.cpp b/src/prefs.cpp index c79c492..13b0133 100644 --- a/src/prefs.cpp +++ b/src/prefs.cpp @@ -14,7 +14,7 @@ #include <tqvariant.h> #include <tqsplitter.h> #include <tqheader.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqwidgetstack.h> #include <tqlayout.h> #include <tqtooltip.h> diff --git a/src/prefs.ui b/src/prefs.ui index 6845d7f..b909061 100644 --- a/src/prefs.ui +++ b/src/prefs.ui @@ -67,6 +67,6 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/src/sources/labelsource.cpp b/src/sources/labelsource.cpp index 9e27985..2c93479 100644 --- a/src/sources/labelsource.cpp +++ b/src/sources/labelsource.cpp @@ -21,7 +21,7 @@ #include "labelsource.h" #include <tqlabel.h> #include <kcolorbutton.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <tqcombobox.h> #include <tqcheckbox.h> #include <klocale.h> diff --git a/src/sources/labelsourcePrefs.cpp b/src/sources/labelsourcePrefs.cpp index 1da8ace..1091847 100644 --- a/src/sources/labelsourcePrefs.cpp +++ b/src/sources/labelsourcePrefs.cpp @@ -16,7 +16,7 @@ #include <tqframe.h> #include <tqlabel.h> #include <kcolorbutton.h> -#include <kfontrequester.h> +#include <tdefontrequester.h> #include <tqcombobox.h> #include <tqlayout.h> #include <tqtooltip.h> diff --git a/src/sources/labelsourcePrefs.ui b/src/sources/labelsourcePrefs.ui index 14eb3d3..e873431 100644 --- a/src/sources/labelsourcePrefs.ui +++ b/src/sources/labelsourcePrefs.ui @@ -181,6 +181,6 @@ Taskbar visual settings</string> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> </includehints> </UI> |