diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /lib/koproperty | |
parent | c260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff) | |
download | koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/koproperty')
-rw-r--r-- | lib/koproperty/editor.h | 2 | ||||
-rw-r--r-- | lib/koproperty/editoritem.cpp | 4 | ||||
-rw-r--r-- | lib/koproperty/editoritem.h | 2 | ||||
-rw-r--r-- | lib/koproperty/editors/fontedit.cpp | 4 | ||||
-rw-r--r-- | lib/koproperty/editors/pixmapedit.cpp | 2 | ||||
-rw-r--r-- | lib/koproperty/test/test.cpp | 2 | ||||
-rw-r--r-- | lib/koproperty/test/test.h | 2 | ||||
-rw-r--r-- | lib/koproperty/widget.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h index 0fbcf45f..204bb615 100644 --- a/lib/koproperty/editor.h +++ b/lib/koproperty/editor.h @@ -25,7 +25,7 @@ #include <tqguardedptr.h> #include "koproperty_global.h" -#include <klistview.h> +#include <tdelistview.h> class TQSize; diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index a22bab55..9ff69035 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kstyle.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kapplication.h> #define BRANCHBOX_SIZE 9 @@ -89,7 +89,7 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T } //! @internal -//! Based on TDEPopupTitle, see kpopupmenu.cpp +//! Based on TDEPopupTitle, see tdepopupmenu.cpp class GroupWidgetBase : public TQWidget { public: diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h index a1300e5a..d3515073 100644 --- a/lib/koproperty/editoritem.h +++ b/lib/koproperty/editoritem.h @@ -23,7 +23,7 @@ #define KPROPERTY_PROPERTYEDITORITEM_H #include "koproperty_global.h" -#include <klistview.h> +#include <tdelistview.h> #define KPROPEDITOR_ITEM_MARGIN 2 #define KPROPEDITOR_ITEM_BORDER_COLOR TQColor(200,200,200) //! \todo custom color? diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 84c7c3d2..2de0468b 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -32,8 +32,8 @@ #include <tqtooltip.h> #include <tdeversion.h> -#include <kfontrequester.h> -#include <kaccelmanager.h> +#include <tdefontrequester.h> +#include <tdeaccelmanager.h> #include <klocale.h> //! @internal diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index f803d4c3..a01248f2 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -40,7 +40,7 @@ #ifdef TQ_WS_WIN #include <win32_utils.h> -#include <krecentdirs.h> +#include <tderecentdirs.h> #endif #ifndef PURE_QT diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index 77ceb415..06277aa4 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <klocale.h> #include <kdebug.h> #include <kcmdlineargs.h> diff --git a/lib/koproperty/test/test.h b/lib/koproperty/test/test.h index 51ee85f5..2866031a 100644 --- a/lib/koproperty/test/test.h +++ b/lib/koproperty/test/test.h @@ -24,7 +24,7 @@ #include <config.h> #endif -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <koproperty/set.h> diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp index 3d6153ae..2028e75c 100644 --- a/lib/koproperty/widget.cpp +++ b/lib/koproperty/widget.cpp @@ -26,7 +26,7 @@ #include <tqpainter.h> #include <tqvariant.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdebug.h> using namespace KoProperty; |