summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 19:53:21 -0600
committerTimothy Pearson <[email protected]>2013-01-22 19:53:21 -0600
commit8cd2c9398a5402112d19aae3b24f75b6772f5e26 (patch)
tree6ce44bca8dba76a3fb3c98d21627c3c94a1056b1 /doc
parent3b22097ebecc1d10c4cc1d89c99aefc2abae0d63 (diff)
downloadkmyfirewall-8cd2c9398a5402112d19aae3b24f75b6772f5e26.tar.gz
kmyfirewall-8cd2c9398a5402112d19aae3b24f75b6772f5e26.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'doc')
-rw-r--r--doc/kmyfirewall/index.docbook8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/kmyfirewall/index.docbook b/doc/kmyfirewall/index.docbook
index 1c8df51..bd50735 100644
--- a/doc/kmyfirewall/index.docbook
+++ b/doc/kmyfirewall/index.docbook
@@ -1022,7 +1022,7 @@ private:
};
-class KInstance;
+class TDEInstance;
class KMFRuleOptionEditMACFactory : public KLibFactory {
Q_OBJECT
@@ -1138,12 +1138,12 @@ QWidget* KMFRuleOptionEditMAC::editWidget() {
}
// 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 &lt;kaboutdata.h&gt;
#include &lt;klocale.h&gt;
-// KInstance* KMFRuleOptionEditMACFactory::s_instance = 0L;
-// KAboutData* KMFRuleOptionEditMACFactory::s_about = 0L;
+// TDEInstance* KMFRuleOptionEditMACFactory::s_instance = 0L;
+// TDEAboutData* KMFRuleOptionEditMACFactory::s_about = 0L;
KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( QObject* parent, const char* name )
: KLibFactory( parent, name ) {