Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

9 files changed, 19 insertions, 19 deletions

diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index b28ae3c..3eb5c5e 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -903,7 +903,7 @@ void BatchWizard::loadData( const TQString & data )
     }
 
     // new config entry!!!
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup("FileFormat");
     int pos[3] = { config->readNumEntry("Data0", 0 ),
                    config->readNumEntry("Data1", 1 ),
diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp
index ca7c016..8fad98b 100644
--- a/kbarcode/configdialog.cpp
+++ b/kbarcode/configdialog.cpp
@@ -174,7 +174,7 @@ void ConfigDialog::setupTab3()
     TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
     grid->addItem( spacer, 5, 0 );    
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup("FileFormat");
     combo1->setCurrentItem( config->readNumEntry("Data0", 0 ) );
     combo2->setCurrentItem( config->readNumEntry("Data1", 1 ) );
@@ -301,7 +301,7 @@ void ConfigDialog::setupTab5()
 
 void ConfigDialog::accept()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup("FileFormat");
     config->writeEntry("Data0", combo1->currentItem() );
     config->writeEntry("Data1", combo2->currentItem() );
diff --git a/kbarcode/definition.cpp b/kbarcode/definition.cpp
index 283bbef..8fdcb4a 100644
--- a/kbarcode/definition.cpp
+++ b/kbarcode/definition.cpp
@@ -298,7 +298,7 @@ bool Definition::openFile()
 
     TQString f = locateLocal( "data", "kbarcode/labeldefinitions.sql" );
     if( !TQFile::exists( f ) ) {
-        KConfig* config = kapp->config();
+        TDEConfig* config = kapp->config();
         config->setGroup( "Definitions" );
 
         // copy file to new location
@@ -552,7 +552,7 @@ bool Definition::showFileError()
 
         TQString f = KFileDialog::getOpenFileName( TQString(), TQString(), 0 );
         if( !f.isEmpty() && TQFile::exists( f ) ) {
-            KConfig* config = kapp->config();
+            TDEConfig* config = kapp->config();
             config->setGroup( "Definitions" );
             config->writeEntry( "defpath", f );
             config->sync();
diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp
index 6005d45..7621f1f 100644
--- a/kbarcode/dsmainwindow.cpp
+++ b/kbarcode/dsmainwindow.cpp
@@ -126,7 +126,7 @@ void DSMainWindow::setupActions()
 
 void DSMainWindow::loadConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("Wizard");
     first = config->readBoolEntry("firststart2", true );
@@ -145,7 +145,7 @@ void DSMainWindow::loadConfig()
 
 void DSMainWindow::saveConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("Wizard");
     config->writeEntry("firststart2", false );
diff --git a/kbarcode/kbarcodesettings.cpp b/kbarcode/kbarcodesettings.cpp
index 91dc9ae..8c6e43f 100644
--- a/kbarcode/kbarcodesettings.cpp
+++ b/kbarcode/kbarcodesettings.cpp
@@ -56,7 +56,7 @@ KBarcodeSettings::~KBarcodeSettings()
 
 void KBarcodeSettings::saveConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("LabelEditor");
     config->writeEntry("grid", gridsize );
@@ -67,7 +67,7 @@ void KBarcodeSettings::saveConfig()
 
 void KBarcodeSettings::loadConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     TQColor tmpc( TQt::lightGray );
     config->setGroup("LabelEditor");
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index 5088890..b09b706 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -181,7 +181,7 @@ LabelEditor::~LabelEditor()
 
 void LabelEditor::loadConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     recentAct->loadEntries( config, "RecentFiles" );
 
     gridAct->setChecked( config->readBoolEntry("gridenabled", false ) );
@@ -190,7 +190,7 @@ void LabelEditor::loadConfig()
 
 void LabelEditor::saveConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     recentAct->saveEntries( config, "RecentFiles" );
 
@@ -204,7 +204,7 @@ void LabelEditor::saveConfig()
 
 void LabelEditor::createCommandHistory()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     if( undoAct && redoAct )
     {
diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp
index eb2a1ed..f607fc2 100644
--- a/kbarcode/previewdialog.cpp
+++ b/kbarcode/previewdialog.cpp
@@ -139,7 +139,7 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
     connect( customerName, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerNameChanged(int) ) );
     connect( customerId, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerIdChanged(int) ) );
 
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "PreviewDialog" );
     resize( config->readNumEntry( "width", width() ), config->readNumEntry( "height", height() ) );
     
@@ -149,7 +149,7 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
 
 PreviewDialog::~PreviewDialog()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup( "PreviewDialog" );
     config->writeEntry( "width", width() );
     config->writeEntry( "height", height() );
diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp
index 6f63b1a..da52475 100644
--- a/kbarcode/printersettings.cpp
+++ b/kbarcode/printersettings.cpp
@@ -93,7 +93,7 @@ PrinterSettings* PrinterSettings::getInstance()
 
 void PrinterSettings::loadConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("Printer");
     lpdata->articleEvent1 = (enum linebreak)config->readNumEntry("articleEvent1", NO_BREAK );
@@ -128,7 +128,7 @@ void PrinterSettings::loadConfig()
 
 void PrinterSettings::saveConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("Printer");
     config->writeEntry("articleEvent1", lpdata->articleEvent1 );
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index 1a72504..60ddacd 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -283,7 +283,7 @@ void SqlTables::importLabelDef()
 
     TQString f = locateLocal( "data", "kbarcode/labeldefinitions.sql" );
     if( !TQFile::exists( f ) ) {
-        KConfig* config = kapp->config();
+        TDEConfig* config = kapp->config();
         config->setGroup( "Definitions" );
         f = config->readEntry( "defpath", locate( "data", "kbarcode/labeldefinitions.sql" ) );
     }
@@ -342,7 +342,7 @@ void SqlTables::exec( TQSqlQuery* query, const TQString & text )
 
 void SqlTables::loadConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("SQL");
     sqldata.username = config->readEntry("username", "root");
@@ -355,7 +355,7 @@ void SqlTables::loadConfig()
 
 void SqlTables::saveConfig()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
 
     config->setGroup("SQL");
     config->writeEntry("username", sqldata.username );