summaryrefslogtreecommitdiffstats
path: root/ksirc/toplevel.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
commitf21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch)
tree78ccb5117063da3e08e3277e11054b912a9f2ae7 /ksirc/toplevel.cpp
parentc48e769eb275917717e2b55eb869f7e559293ac8 (diff)
downloadtdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz
tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'ksirc/toplevel.cpp')
-rw-r--r--ksirc/toplevel.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index 264eecf3..de75ee5f 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -289,7 +289,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
clearWindow();
if(isPrivateChat()){
- KConfig conf("ksirc/winlog/" + channelInfo.server() + "-" + channelInfo.channel(),
+ TDEConfig conf("ksirc/winlog/" + channelInfo.server() + "-" + channelInfo.channel(),
false, false, "data");
TQString group = "Message-History";
@@ -419,7 +419,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
*/
if(user_menu == 0)
- user_menu = UserControlMenu::parseKConfig();
+ user_menu = UserControlMenu::parseTDEConfig();
user_controls = new TQPopupMenu(this);
kmenu->insertItem(i18n("&Users"), user_controls);
@@ -562,7 +562,7 @@ KSircTopLevel::~KSircTopLevel()
}
- KConfig conf("ksirc/winlog/" + channelInfo().server() +
+ TDEConfig conf("ksirc/winlog/" + channelInfo().server() +
"-" + channelInfo().channel(),
false, false, "data");
TQString group = "Message-History";
@@ -1672,9 +1672,9 @@ void KSircTopLevel::saveCurrLog()
temp.close();
#if KDE_IS_VERSION(3,1,92)
- KIO::NetAccess::upload(temp.name(), url, this);
+ TDEIO::NetAccess::upload(temp.name(), url, this);
#else
- KIO::NetAccess::upload(temp.name(), url);
+ TDEIO::NetAccess::upload(temp.name(), url);
#endif
}