diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:36:20 -0600 |
| commit | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch) | |
| tree | 78ccb5117063da3e08e3277e11054b912a9f2ae7 /kdict | |
| parent | c48e769eb275917717e2b55eb869f7e559293ac8 (diff) | |
| download | tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kdict')
| -rw-r--r-- | kdict/applet/kdictapplet.cpp | 4 | ||||
| -rw-r--r-- | kdict/options.cpp | 4 | ||||
| -rw-r--r-- | kdict/queryview.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index 51f02faf..db53f284 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -168,7 +168,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); // restore history and completion list - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); TQStringList list = c->readListEntry("Completion list"); @@ -187,7 +187,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid DictApplet::~DictApplet() { // save history and completion list - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); TQStringList list = completionObject->items(); diff --git a/kdict/options.cpp b/kdict/options.cpp index e7ff3339..a9037d97 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -44,7 +44,7 @@ void GlobalData::read() { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); // general... config->setGroup("General"); @@ -182,7 +182,7 @@ void GlobalData::read() void GlobalData::write() { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("General"); config->writeEntry("Lookup_Clipboard",defineClipboard); diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 0569e499..a17bfeaa 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -53,7 +53,7 @@ SaveHelper::~SaveHelper() } else if (tmpFile) { // network location, initiate transaction tmpFile->close(); - if (KIO::NetAccess::upload(tmpFile->name(),url, p_arent) == false) + if (TDEIO::NetAccess::upload(tmpFile->name(),url, p_arent) == false) KMessageBox::error(global->topLevel, i18n("Unable to save remote file.")); tmpFile->unlink(); // delete temp file delete tmpFile; |