diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:03:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:03:49 -0600 |
| commit | 387a27b62f25387e42a850739ced151d64a2e760 (patch) | |
| tree | bbba39b506feb102175f10aa296b201a5a4557f5 /extra/kde340 | |
| parent | 3d1fa8562bf693237a1a76918b4487cca3e2e356 (diff) | |
| download | pytde-387a27b62f25387e42a850739ced151d64a2e760.tar.gz pytde-387a27b62f25387e42a850739ced151d64a2e760.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'extra/kde340')
| -rw-r--r-- | extra/kde340/konsole_part.h | 8 | ||||
| -rw-r--r-- | extra/kde340/ktoolbarbutton.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extra/kde340/konsole_part.h b/extra/kde340/konsole_part.h index 51c49f5..ed18ad6 100644 --- a/extra/kde340/konsole_part.h +++ b/extra/kde340/konsole_part.h @@ -32,7 +32,7 @@ //#include "schema.h" //#include "session.h" -class KInstance; +class TDEInstance; class konsoleBrowserExtension; class TQPushButton; class TQSpinBox; @@ -56,11 +56,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/kde340/ktoolbarbutton.h b/extra/kde340/ktoolbarbutton.h index dcea85e..2febc9b 100644 --- a/extra/kde340/ktoolbarbutton.h +++ b/extra/kde340/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 |