summaryrefslogtreecommitdiffstats
path: root/extra/kde350
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:03:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:03:49 -0600
commit387a27b62f25387e42a850739ced151d64a2e760 (patch)
treebbba39b506feb102175f10aa296b201a5a4557f5 /extra/kde350
parent3d1fa8562bf693237a1a76918b4487cca3e2e356 (diff)
downloadpytde-387a27b62f25387e42a850739ced151d64a2e760.tar.gz
pytde-387a27b62f25387e42a850739ced151d64a2e760.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'extra/kde350')
-rw-r--r--extra/kde350/konsole_part.h8
-rw-r--r--extra/kde350/ktoolbarbutton.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/extra/kde350/konsole_part.h b/extra/kde350/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde350/konsole_part.h
+++ b/extra/kde350/konsole_part.h
@@ -32,7 +32,7 @@
//#include "schema.h"
//#include "session.h"
-class KInstance;
+class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
@@ -57,11 +57,11 @@ public:
const char* classname = "KParts::Part",
const TQStringList &args = TQStringList());
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_aboutData;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_aboutData;
};
//////////////////////////////////////////////////////////////////////
diff --git a/extra/kde350/ktoolbarbutton.h b/extra/kde350/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde350/ktoolbarbutton.h
+++ b/extra/kde350/ktoolbarbutton.h
@@ -31,7 +31,7 @@
class KToolBar;
class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
@@ -60,7 +60,7 @@ public:
*/
KToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
- KInstance *_instance = KGlobal::instance());
+ TDEInstance *_instance = KGlobal::instance());
/**
* Construct a button with an existing pixmap. It is not