summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:08:00 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:08:00 -0600
commit5963d453b0636dc174121b6e852c769a8193824d (patch)
treeadf927cb05fe0e118a81f7db30cb7ac25fcbdf5f
parent19e4c89d109f0baa82f6f37637939c8a85422e5e (diff)
downloadtdeio-apt-5963d453b0636dc174121b6e852c769a8193824d.tar.gz
tdeio-apt-5963d453b0636dc174121b6e852c769a8193824d.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--src/apt.cpp2
-rw-r--r--src/apt.h2
-rw-r--r--src/parsers/parsers.cpp10
-rw-r--r--src/parsers/parsers.h8
4 files changed, 11 insertions, 11 deletions
diff --git a/src/apt.cpp b/src/apt.cpp
index 98b89f5..529a702 100644
--- a/src/apt.cpp
+++ b/src/apt.cpp
@@ -36,7 +36,7 @@
#include <config.h>
-using namespace KIO;
+using namespace TDEIO;
/*************************************************************************
* Common definitions of HTML fragments
diff --git a/src/apt.h b/src/apt.h
index ef848eb..78ef37d 100644
--- a/src/apt.h
+++ b/src/apt.h
@@ -21,7 +21,7 @@ namespace Parsers
class Parser;
}
-class AptProtocol : public TQObject, public KIO::SlaveBase {
+class AptProtocol : public TQObject, public TDEIO::SlaveBase {
Q_OBJECT
diff --git a/src/parsers/parsers.cpp b/src/parsers/parsers.cpp
index 808150b..8cc67da 100644
--- a/src/parsers/parsers.cpp
+++ b/src/parsers/parsers.cpp
@@ -20,18 +20,18 @@
namespace Parsers
{
- static void print_czstring(KIO::SlaveBase& slave, const char* data, int len)
+ static void print_czstring(TDEIO::SlaveBase& slave, const char* data, int len)
{
TQByteArray nonull;
nonull.setRawData(data, len);
slave.data(nonull);
nonull.resetRawData(data, len);
}
- void operator << (KIO::SlaveBase& slave, const TQCString& string)
+ void operator << (TDEIO::SlaveBase& slave, const TQCString& string)
{ print_czstring(slave, string.data(), string.size() - 1); }
- void operator << (KIO::SlaveBase& slave, const TQString& string)
+ void operator << (TDEIO::SlaveBase& slave, const TQString& string)
{ slave << string.utf8(); }
- void operator << (KIO::SlaveBase& slave, const char* string)
+ void operator << (TDEIO::SlaveBase& slave, const char* string)
{ print_czstring(slave, string, strlen(string)); }
@@ -51,7 +51,7 @@ namespace Parsers
void Parser::attribute_end(TQHtmlStream& stream)
{ stream << close() << endl << close(); }
-// void Parser::operator ( )( KIO::SlaveBase * /*slave*/,
+// void Parser::operator ( )( TDEIO::SlaveBase * /*slave*/,
// const TQString & /*tag*/, const TQString & /*value*/ )
// {}
diff --git a/src/parsers/parsers.h b/src/parsers/parsers.h
index 904ff00..ef02e76 100644
--- a/src/parsers/parsers.h
+++ b/src/parsers/parsers.h
@@ -13,7 +13,7 @@
#include <tqstring.h>
-namespace KIO
+namespace TDEIO
{
class SlaveBase;
}
@@ -81,9 +81,9 @@ namespace Parsers
void operator () (AptProtocol* slave, const TQString& tag, const TQString& value);
};
- void operator << (KIO::SlaveBase& slave, const TQCString& string);
- void operator << (KIO::SlaveBase& slave, const TQString& string);
- void operator << (KIO::SlaveBase& slave, const char* string);
+ void operator << (TDEIO::SlaveBase& slave, const TQCString& string);
+ void operator << (TDEIO::SlaveBase& slave, const TQString& string);
+ void operator << (TDEIO::SlaveBase& slave, const char* string);
TQString mangle_version(TQString version);
}