summaryrefslogtreecommitdiffstats
path: root/tdeprint/slave
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /tdeprint/slave
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeprint/slave')
-rw-r--r--tdeprint/slave/kio_print.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index 74142c994..946092d15 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -135,7 +135,7 @@ TQString buildGroupTable(DrGroup *grp, bool showHeader = true)
int kdemain(int argc, char **argv)
{
- KInstance instance("kio_print");
+ TDEInstance instance("kio_print");
PRINT_DEBUG << "starting ioslave" << endl;
if (argc != 4)
@@ -145,8 +145,8 @@ int kdemain(int argc, char **argv)
}
/* create fake KApplicatiom object, needed for job stuffs */
- KAboutData about( "kio_print", "kio_print", "fake_version",
- "TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" );
+ TDEAboutData about( "kio_print", "kio_print", "fake_version",
+ "TDEPrint IO slave", TDEAboutData::License_GPL, "(c) 2003, Michael Goffioul" );
TDECmdLineArgs::init( &about );
TDEApplication app;