summaryrefslogtreecommitdiffstats
path: root/kdevdesigner/designer
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
commit3a044decb0a5d7be822c888b2d5374573d7df96e (patch)
treeddf4681e0233c25203fc927596aa7b3bdb5f2efa /kdevdesigner/designer
parent5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff)
downloadtdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz
tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdevdesigner/designer')
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.cpp12
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.h10
-rw-r--r--kdevdesigner/designer/myiconloader.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 55e96244..798b8b6c 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -236,12 +236,12 @@ void KDevDesignerPart::setupToolsAction( KRadioAction * toggle, TQAction * actio
// It's usually safe to leave the factory code alone.. with the
-// notable exception of the KAboutData data
+// notable exception of the TDEAboutData data
#include <kaboutdata.h>
#include <klocale.h>
-KInstance* KDevDesignerPartFactory::s_instance = 0L;
-KAboutData* KDevDesignerPartFactory::s_about = 0L;
+TDEInstance* KDevDesignerPartFactory::s_instance = 0L;
+TDEAboutData* KDevDesignerPartFactory::s_about = 0L;
KDevDesignerPartFactory::KDevDesignerPartFactory()
: KParts::Factory()
@@ -270,14 +270,14 @@ KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget,
return obj;
}
-KInstance* KDevDesignerPartFactory::instance()
+TDEInstance* KDevDesignerPartFactory::instance()
{
if( !s_instance )
{
- s_about = new KAboutData("kdevdesignerpart", I18N_NOOP("KDevDesignerPart"), "0.1");
+ s_about = new TDEAboutData("kdevdesignerpart", I18N_NOOP("KDevDesignerPart"), "0.1");
s_about->addAuthor("Alexander Dymo", 0, "cloudtemple@mksat.net");
s_about->addAuthor("Trolltech AS", 0, "info@trolltech.com");
- s_instance = new KInstance(s_about);
+ s_instance = new TDEInstance(s_about);
}
return s_instance;
}
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index 3754dfd0..32537653 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -125,8 +125,8 @@ private:
KRadioAction* pointerAction;
};
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
class KDevDesignerPartFactory : public KParts::Factory
{
@@ -138,11 +138,11 @@ public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
- static KInstance* instance();
+ static TDEInstance* instance();
private:
- static KInstance* s_instance;
- static KAboutData* s_about;
+ static TDEInstance* s_instance;
+ static TDEAboutData* s_about;
};
#endif // _KDEVDESIGNERPART_H_
diff --git a/kdevdesigner/designer/myiconloader.h b/kdevdesigner/designer/myiconloader.h
index 4fcc5ed5..63a47eee 100644
--- a/kdevdesigner/designer/myiconloader.h
+++ b/kdevdesigner/designer/myiconloader.h
@@ -23,7 +23,7 @@
#include <tqpixmap.h>
#include <tqstring.h>
-class KInstance;
+class TDEInstance;
TQPixmap BarIcon2 (const TQString &name);
TQPixmap SmallIcon2 (const TQString &name);