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

5 files changed, 15 insertions, 15 deletions

diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp
index b20646e..2a885b7 100644
--- a/src/importprofiledialog.cpp
+++ b/src/importprofiledialog.cpp
@@ -99,7 +99,7 @@ void ImportProfileDialog::canAccept()
 		return ;
 	}
 
-	KConfig config( filename, true, false );
+	TDEConfig config( filename, true, false );
 
 	TQStringList grouplist = config.groupList();
 	
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index afd1140..d00f945 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -983,14 +983,14 @@ bool KVpnc::queryClose()
 	}
 }
 
-void KVpnc::restore ( KConfig *config, int i )
+void KVpnc::restore ( TDEConfig *config, int i )
 {
 	readPropertiesInternal ( config,i );
 }
 
 void KVpnc::restore()
 {
-	KConfig *config = parent->sessionConfig();
+	TDEConfig *config = parent->sessionConfig();
 
 	if ( !config )
 		return;
@@ -998,7 +998,7 @@ void KVpnc::restore()
 	return;
 }
 
-void KVpnc::saveProperties ( KConfig* c )
+void KVpnc::saveProperties ( TDEConfig* c )
 {
 	TQString saveDir = TDEGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
 
@@ -1008,7 +1008,7 @@ void KVpnc::saveProperties ( KConfig* c )
 	delete c;
 }
 
-void KVpnc::readProperties ( KConfig* c )
+void KVpnc::readProperties ( TDEConfig* c )
 {
 	TQString saveDir = TDEGlobal::dirs()->saveLocation ( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
 	c = new KSimpleConfig ( saveDir + "list", true );
@@ -11370,7 +11370,7 @@ void KVpnc::vpnTypesInfoClicked()
 {
 	this->slotStatusMsg ( i18n ( "Calling KVpnc website..." ), ID_FLASH_MSG );
 	TQString donateurl = "http://home.gna.org/kvpnc/en/donate.html";
-	TQString browser = TQString ( KConfigGroup ( TDEGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
+	TQString browser = TQString ( TDEConfigGroup ( TDEGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
 
 	if ( browser.isEmpty() )
 		browser = "konqueror";
@@ -11407,7 +11407,7 @@ void KVpnc::vpnTypesInfoClicked()
 void KVpnc::reportBugClicked()
 {
 	TQString bugreporturl = "http://bugs.trinitydesktop.org";
-	TQString browser = TQString ( KConfigGroup ( TDEGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
+	TQString browser = TQString ( TDEConfigGroup ( TDEGlobal::config(), "General" ).readEntry ( "BrowserApplication" ) ).remove ( "!", "" );
 
 	if ( browser.isEmpty() )
 		browser = "konqueror";
diff --git a/src/kvpnc.h b/src/kvpnc.h
index 086f738..7f20740 100644
--- a/src/kvpnc.h
+++ b/src/kvpnc.h
@@ -123,11 +123,11 @@ protected:
 	*/
 	virtual bool queryExit();
 
-	void saveProperties( KConfig* );
-	void readProperties( KConfig* );
+	void saveProperties( TDEConfig* );
+	void readProperties( TDEConfig* );
 
 public:
-	void restore(KConfig *config, int i);
+	void restore(TDEConfig *config, int i);
 	void restore();
 
 	/**
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 702d876..523aae7 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -543,7 +543,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 										// 									        i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
 										// 									              "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("user password")),
 										// 									        i18n( "Unable to store secure %1" ).arg(i18n("user password")),
-										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
+										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
 										// 									{
 										// 										config->writeEntry( "User password", it->getUserPassword() );
 										// 									}
@@ -560,7 +560,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 										// 									        i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
 										// 									              "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("pre shared key")),
 										// 									        i18n( "Unable to store secure %1" ).arg(i18n("pre shared key")),
-										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
+										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
 										// 									{
 										// 										config->writeEntry( "Pre shared key", it->getPreSharedKey() );
 										// 									}
@@ -576,7 +576,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 										// 									        i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
 										// 									              "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")),
 										// 									        i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")),
-										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
+										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
 										// 									{
 										// 										config->writeEntry( "Pre shared key", it->getPreSharedKey() );
 										// 									}
@@ -591,7 +591,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
 										// 									        i18n( "KVpnc is unable to save %1 password securely in your wallet.<br>"
 										// 									              "Do you want to save the password in the <b>unsafe</b> configuration file instead?" ).arg(i18n("preshared key password")),
 										// 									        i18n( "Unable to store secure %1" ).arg(i18n("reshared key password")),
-										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) ) == KMessageBox::Continue )
+										// 									        KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ),TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) ) == KMessageBox::Continue )
 										// 									{
 										// 										config->writeEntry( "Pre shared key", it->getPreSharedKey() );
 										// 									}
diff --git a/src/kvpncconfig.h b/src/kvpncconfig.h
index 65c8e74..ad83b8b 100644
--- a/src/kvpncconfig.h
+++ b/src/kvpncconfig.h
@@ -198,7 +198,7 @@ public:
 	TQTextStream logFileStream;
 	TQTextEdit *LogOutput;
 	KWallet::Wallet *wallet;
-	KConfig* config; //< configuration data
+	TDEConfig* config; //< configuration data
 
 	TQPoint WindowPos;
 	TQSize WindowSize;