Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 19e4c89d10
commit 5963d453b0

@ -36,7 +36,7 @@
#include <config.h>
using namespace KIO;
using namespace TDEIO;
/*************************************************************************
* Common definitions of HTML fragments

@ -21,7 +21,7 @@ namespace Parsers
class Parser;
}
class AptProtocol : public TQObject, public KIO::SlaveBase {
class AptProtocol : public TQObject, public TDEIO::SlaveBase {
Q_OBJECT

@ -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*/ )
// {}

@ -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);
}

Loading…
Cancel
Save