From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- tdeprint/management/kmwdrivertest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeprint/management/kmwdrivertest.cpp') diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 545d3b94d..d4652878f 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -133,7 +133,7 @@ void KMWDriverTest::slotTest() { if (!m_printer) return; - TQString name = "tmpprinter_"+KApplication::randomString(8); + TQString name = "tmpprinter_"+TDEApplication::randomString(8); // save printer name (can be non empty when modifying a printer) TQString oldname = m_printer->name(); -- cgit v1.2.1 From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- tdeprint/management/kmwdrivertest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeprint/management/kmwdrivertest.cpp') diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index d4652878f..0e0cd306b 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -105,7 +105,7 @@ void KMWDriverTest::initPrinter(KMPrinter *p) { m_driver = KMFactory::self()->manager()->loadFileDriver(drfile); /* remove the temp file if it has been downloaded */ - KIO::NetAccess::removeTempFile( drfile ); + TDEIO::NetAccess::removeTempFile( drfile ); } else if (p->dbEntry() != NULL) m_driver = KMFactory::self()->manager()->loadDbDriver(p->dbEntry()); -- cgit v1.2.1 From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:16 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- tdeprint/management/kmwdrivertest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeprint/management/kmwdrivertest.cpp') diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 0e0cd306b..4f57762aa 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) : KMWizardPage(parent,name) -- cgit v1.2.1 From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:17:18 -0600 Subject: Rename common header files for consistency with class renaming --- tdeprint/management/kmwdrivertest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeprint/management/kmwdrivertest.cpp') diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 4f57762aa..cb46a45a0 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- tdeprint/management/kmwdrivertest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdeprint/management/kmwdrivertest.cpp') diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index cb46a45a0..73871988a 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -28,9 +28,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include -- cgit v1.2.1