From f9ced3b3f13f3136ef63c33ef163042010d6e80b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:39:24 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- quanta/parts/kafka/htmlenhancer.cpp | 2 +- quanta/parts/kafka/htmlenhancer.h | 4 ++-- quanta/parts/kafka/kafkasyncoptions.cpp | 2 +- quanta/parts/kafka/kafkasyncoptions.h | 6 +++--- quanta/parts/kafka/nodeenhancer.h | 4 ++-- quanta/parts/kafka/undoredo.cpp | 2 +- quanta/parts/kafka/wkafkapart.cpp | 2 +- quanta/parts/kafka/wkafkapart.h | 4 ++-- quanta/parts/preview/whtmlpart.cpp | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'quanta/parts') diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp index b2647423..8077a76b 100644 --- a/quanta/parts/kafka/htmlenhancer.cpp +++ b/quanta/parts/kafka/htmlenhancer.cpp @@ -385,7 +385,7 @@ void HTMLEnhancer::postUnenhanceNode(DOM::Node domNode) } } -void HTMLEnhancer::readConfig(KConfig *m_config) +void HTMLEnhancer::readConfig(TDEConfig *m_config) { m_config->setGroup("HTML Enhancer"); m_showIconForScripts = m_config->readBoolEntry("Show Scripts Icons", true); diff --git a/quanta/parts/kafka/htmlenhancer.h b/quanta/parts/kafka/htmlenhancer.h index ac3753c0..9fdc8658 100644 --- a/quanta/parts/kafka/htmlenhancer.h +++ b/quanta/parts/kafka/htmlenhancer.h @@ -22,7 +22,7 @@ #include "nodeenhancer.h" -class KConfig; +class TDEConfig; class Node; class KafkaDocument; class KStandardDirs; @@ -70,7 +70,7 @@ public: * Read the config. * @m_config The config to read. */ - void readConfig(KConfig *m_config); + void readConfig(TDEConfig *m_config); /** * Set the base URL of the current document to update src attrs. diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp index 26013c25..2c37f0cd 100644 --- a/quanta/parts/kafka/kafkasyncoptions.cpp +++ b/quanta/parts/kafka/kafkasyncoptions.cpp @@ -25,7 +25,7 @@ #include "kafkasyncoptions.h" #include "kafkasyncoptions.moc" -KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* parent, const char* name ) +KafkaSyncOptions::KafkaSyncOptions( TDEConfig *a_config, TQWidget* parent, const char* name ) : KafkaSyncOptionsUI( parent, name ) { config = a_config; diff --git a/quanta/parts/kafka/kafkasyncoptions.h b/quanta/parts/kafka/kafkasyncoptions.h index 9009f6b7..c924b34e 100644 --- a/quanta/parts/kafka/kafkasyncoptions.h +++ b/quanta/parts/kafka/kafkasyncoptions.h @@ -20,7 +20,7 @@ #include "kafkasyncoptionsui.h" -class KConfig; +class TDEConfig; class KafkaSyncOptions : public KafkaSyncOptionsUI { @@ -28,13 +28,13 @@ class KafkaSyncOptions : public KafkaSyncOptionsUI public: - KafkaSyncOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); + KafkaSyncOptions( TDEConfig *config, TQWidget* parent = 0, const char* name = 0); ~KafkaSyncOptions(); void updateConfig(); protected: - KConfig *config; + TDEConfig *config; }; #endif diff --git a/quanta/parts/kafka/nodeenhancer.h b/quanta/parts/kafka/nodeenhancer.h index 44fd2e59..4fca17e1 100644 --- a/quanta/parts/kafka/nodeenhancer.h +++ b/quanta/parts/kafka/nodeenhancer.h @@ -18,7 +18,7 @@ #ifndef NODEENHANCER_H #define NODEENHANCER_H -class KConfig; +class TDEConfig; class Node; namespace DOM { @@ -66,7 +66,7 @@ public: * Read the config. * @m_config The config to read. */ - virtual void readConfig(KConfig *m_config) = 0; + virtual void readConfig(TDEConfig *m_config) = 0; /** * This need to be strongly extended. diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index d21129cd..e788a5c7 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -190,7 +190,7 @@ void undoRedo::addNewModifsSet(NodeModifsSet *modifs, int modifLocation, NodeSel return; } - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Kate Document Defaults"); int indentationWidth = config->readNumEntry("Indentation Width", 4); diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 8880dd27..39cefc8f 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -1796,7 +1796,7 @@ DOM::Node KafkaDocument::getNextSiblingNSpecial(DOM::Node domNode) return DOM::Node(); } -void KafkaDocument::readConfig(KConfig *m_config) +void KafkaDocument::readConfig(TDEConfig *m_config) { #ifdef LIGHT_DEBUG kdDebug(25001)<< "KafkaDocument::readConfig()" << endl; diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h index 2d03477b..9c4f3529 100644 --- a/quanta/parts/kafka/wkafkapart.h +++ b/quanta/parts/kafka/wkafkapart.h @@ -18,7 +18,7 @@ #ifndef WKAFKAPART_H #define WKAFKAPART_H -class KConfig; +class TDEConfig; namespace DOM { class Node; @@ -349,7 +349,7 @@ public: * Read the config. * @param m_config The config to read. */ - void readConfig(KConfig *m_config); + void readConfig(TDEConfig *m_config); /** * Returns the default DTD of the current Document. diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 42af2d0c..e86a9203 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -40,7 +40,7 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << this << endl; hpos = 0; // get settings from konq. - KConfig konqConfig("konquerorrc"); + TDEConfig konqConfig("konquerorrc"); konqConfig.setGroup("HTML Settings"); -- cgit v1.2.1