summaryrefslogtreecommitdiffstats
path: root/kioslave/man/kmanpart.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kioslave/man/kmanpart.h
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/man/kmanpart.h')
-rw-r--r--kioslave/man/kmanpart.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h
index f2d9e3891..2f39af11f 100644
--- a/kioslave/man/kmanpart.h
+++ b/kioslave/man/kmanpart.h
@@ -30,8 +30,8 @@
#include <tqcstring.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
/**
* Man Page Viewer
@@ -48,11 +48,11 @@ class KManPartFactory: public KParts::Factory
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;
};
@@ -70,7 +70,7 @@ class KManPart : public KHTMLPart
void jobDone( KIO::Job *);
protected:
virtual bool openFile();
- KInstance *m_instance;
+ TDEInstance *m_instance;
KParts::BrowserExtension * m_extension;
KIO::TransferJob *m_job;
};