summaryrefslogtreecommitdiffstats
path: root/kmrml/kmrml/mrml_part.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:18:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:18:35 -0600
commitf71394031a5e1c3b315081a98000f242b461ca8c (patch)
tree54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kmrml/kmrml/mrml_part.h
parente5ce3b4175f2e72788b49b9ed46c722784218dad (diff)
downloadtdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz
tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmrml/kmrml/mrml_part.h')
-rw-r--r--kmrml/kmrml/mrml_part.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index a382d22a..7efa4e95 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -34,7 +34,7 @@ class TQCheckBox;
class TQHGroupBox;
class TQPushButton;
-class KAboutData;
+class TDEAboutData;
class KComboBox;
class KIntNumInput;
@@ -69,7 +69,7 @@ public:
void saveState( TQDataStream& stream );
void restoreState( TQDataStream& stream );
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
public slots:
virtual bool openURL( const KURL& );
@@ -157,7 +157,7 @@ public:
PartFactory();
~PartFactory();
- static KInstance * instance();
+ static TDEInstance * instance();
protected:
virtual KParts::Part * createPartObject( TQWidget *parentWidget = 0,
@@ -168,7 +168,7 @@ protected:
const TQStringList& args = TQStringList() );
private:
- static KInstance * s_instance;
+ static TDEInstance * s_instance;
};