From da1522385e5367bae56b90fac55c4355e475905b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:38:54 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 languages/java/app_templates/kappjava/app.java | 4 ++--
 languages/java/configproblemreporter.ui.h      | 4 ++--
 languages/java/javasupportpart.cpp             | 8 ++++----
 languages/java/javasupportpart.h               | 2 +-
 languages/java/problemreporter.cpp             | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'languages/java')

diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java
index 5822f563..d6424f73 100644
--- a/languages/java/app_templates/kappjava/app.java
+++ b/languages/java/app_templates/kappjava/app.java
@@ -93,7 +93,7 @@ public void setupActions()
                                   actionCollection(), "custom_action");
 }
 
-protected void saveProperties(KConfig config)
+protected void saveProperties(TDEConfig config)
 {
     // the 'config' object points to the session managed
     // config file.  anything you write here will be available
@@ -103,7 +103,7 @@ protected void saveProperties(KConfig config)
         config.writeEntry("lastURL", m_view.currentURL());
 }
 
-protected void readProperties(KConfig config)
+protected void readProperties(TDEConfig config)
 {
     // the 'config' object points to the session managed
     // config file.  this function is automatically called whenever
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index 6d289931..9534cc2f 100644
--- a/languages/java/configproblemreporter.ui.h
+++ b/languages/java/configproblemreporter.ui.h
@@ -11,7 +11,7 @@
 
 void ConfigureProblemReporter::init()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     bgParserCheckbox->setChecked( config->readBoolEntry("EnableJavaBgParser", true) );
     delaySlider->setEnabled( bgParserCheckbox->isChecked() );
@@ -25,7 +25,7 @@ void ConfigureProblemReporter::destroy()
 
 void ConfigureProblemReporter::accept()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     config->writeEntry( "EnableJavaBgParser", bgParserCheckbox->isChecked() );
     if( bgParserCheckbox->isChecked() )
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 4d7025e8..c1e45273 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -754,15 +754,15 @@ KMimeType::List JavaSupportPart::mimeTypes( )
 
 int JavaSupportPart::pcsVersion()
 {
-    KConfig* config = JavaSupportFactory::instance()->config();
-    KConfigGroupSaver cgs( config, "PCS" );
+    TDEConfig* config = JavaSupportFactory::instance()->config();
+    TDEConfigGroupSaver cgs( config, "PCS" );
     return config->readNumEntry( "Version", 0 );
 }
 
 void JavaSupportPart::setPcsVersion( int version )
 {
-    KConfig* config = JavaSupportFactory::instance()->config();
-    KConfigGroupSaver cgs( config, "PCS" );
+    TDEConfig* config = JavaSupportFactory::instance()->config();
+    TDEConfigGroupSaver cgs( config, "PCS" );
     config->writeEntry( "Version", version );
     config->sync();
 }
diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h
index fb5e3ebb..54e1d57f 100644
--- a/languages/java/javasupportpart.h
+++ b/languages/java/javasupportpart.h
@@ -72,7 +72,7 @@ public:
 
     KTextEditor::Document* findDocument( const KURL& url );
 
-    static KConfig *config();
+    static TDEConfig *config();
 
     virtual TQString formatTag( const Tag& tag );
     virtual TQString formatModelItem( const CodeModelItem *item, bool shortDescription=false );
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index a3206595..43aefed0 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -227,7 +227,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p
 void ProblemReporter::configure()
 {
     kdDebug(9013) << "ProblemReporter::configure()" << endl;
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "General Options" );
     m_active = config->readBoolEntry( "EnableJavaBgParser", TRUE );
     m_delay = config->readNumEntry( "BgParserDelay", 500 );
-- 
cgit v1.2.1