summaryrefslogtreecommitdiffstats
path: root/tdeprint/cups/cupsdconf2
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdeprint/cups/cupsdconf2
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint/cups/cupsdconf2')
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdconf.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddialog.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
index 971da38ff..a05e44d6f 100644
--- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line)
bool CupsdConf::loadAvailableResources()
{
- KConfig conf("tdeprintrc");
+ TDEConfig conf("tdeprintrc");
conf.setGroup("CUPS");
TQString host = conf.readEntry("Host",cupsServer());
int port = conf.readNumEntry("Port",ippPort());
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index 5e6d4659d..ada83d362 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -95,7 +95,7 @@ const char* getPassword(const char*)
TQString user(cupsUser());
TQString pass;
- if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted)
+ if (TDEIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted)
{
cupsSetUser(user.latin1());
pass_string = pass;