TDE
/
dbus-1-tqt
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename additional global TQt functions

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 33bcd26f99
commit 9382852ba7
12 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File

4
tools/dbusxml2qt3/classgen.cpp
Unescape View File

@ -556,7 +556,7 @@ static void writeMethodDeclarations(const Class& classData, Class::Role role,
switch (role)
{
case Class::Interface:
qWarning("Properties not yet supported for interfaces");
tqWarning("Properties not yet supported for interfaces");
skip = true;
pureVirtual = true;
break;
@ -959,7 +959,7 @@ bool ClassGenerator::finishStreams(const TQString& baseName,
bool ClassGenerator::extractClass(const TQDomElement& interfaceElement,
Class& classData)
{
qDebug("ClassGenerator: processing interface '%s'",
tqDebug("ClassGenerator: processing interface '%s'",
interfaceElement.attribute("name").latin1());
classData.dbusName = interfaceElement.attribute("name");

2
tools/dbusxml2qt3/main.cpp
Unescape View File

@ -277,7 +277,7 @@ int main(int argc, char** argv)
{
if (!hasIntrospectable)
{
qDebug("Generating org.freedesktop.DBus.Introspectable on demand");
tqDebug("Generating org.freedesktop.DBus.Introspectable on demand");
Class classData;
classData.name = "Introspectable";

2
tools/dbusxml2qt3/methodgen.cpp
Unescape View File

@ -835,7 +835,7 @@ void MethodGenerator::writeMethodCall(const Class& classData,
stream << " if (!error.isValid())" << endl;
stream << " {" << endl;
stream << " qWarning(\"Call to implementation of ";
stream << " tqWarning(\"Call to implementation of ";
TQStringList::const_iterator nsIt = classData.namespaces.begin();
TQStringList::const_iterator nsEndIt = classData.namespaces.end();

2
tqdbusconnection.h
Unescape View File

@ -601,7 +601,7 @@ public:
* // check if we are connected and which uniqueName we got
* if (con.isConnected())
* {
* qDebug("Connected to session bus. We got uniqueName %s",
* tqDebug("Connected to session bus. We got uniqueName %s",
* con.uniqueName().local8Bit().data());
* }
* @endcode

4
tqdbusdata.cpp
Unescape View File

@ -102,7 +102,7 @@ public:
break;
default:
qFatal("TQT_DBusData::Private: unhandled map key type %d(%s)",
tqFatal("TQT_DBusData::Private: unhandled map key type %d(%s)",
keyType, TQT_DBusData::typeName(keyType));
break;
}
@ -258,7 +258,7 @@ bool TQT_DBusData::operator==(const TQT_DBusData& other) const
break;
default:
qFatal("TQT_DBusData operator== unhandled map key type %d(%s)",
tqFatal("TQT_DBusData operator== unhandled map key type %d(%s)",
d->keyType, TQT_DBusData::typeName(d->keyType));
break;
}

4
tqdbusdatalist.cpp
Unescape View File

@ -450,7 +450,7 @@ TQT_DBusDataList& TQT_DBusDataList::operator<<(const TQT_DBusData& data)
}
else if (d->type != data.type())
{
qWarning("TQT_DBusDataList: trying to add data of type %s to list of type %s",
tqWarning("TQT_DBusDataList: trying to add data of type %s to list of type %s",
data.typeName(), TQT_DBusData::typeName(d->type));
}
else if (hasContainerItemType())
@ -460,7 +460,7 @@ TQT_DBusDataList& TQT_DBusDataList::operator<<(const TQT_DBusData& data)
if (ourSignature != dataSignature)
{
qWarning("TQT_DBusDataList: trying to add data with signature %s "
tqWarning("TQT_DBusDataList: trying to add data with signature %s "
"to list with item signature %s",
dataSignature.data(), ourSignature.data());
}

4
tqdbusdatamap.h
Unescape View File

@ -723,7 +723,7 @@ public:
}
else if (data.type() != m_valueType)
{
qWarning("TQT_DBusDataMap: trying to add data of type %s to map of type %s",
tqWarning("TQT_DBusDataMap: trying to add data of type %s to map of type %s",
data.typeName(), TQT_DBusData::typeName(m_valueType));
}
else if (hasContainerValueType())
@ -733,7 +733,7 @@ public:
if (ourSignature != dataSignature)
{
qWarning("TQT_DBusDataMap: trying to add data with signature %s "
tqWarning("TQT_DBusDataMap: trying to add data with signature %s "
"to map with value signature %s",
dataSignature.data(), ourSignature.data());
}

32
tqdbusintegrator.cpp
Unescape View File

@ -53,7 +53,7 @@ static dbus_bool_t qDBusAddTimeout(DBusTimeout *timeout, void *data)
Q_ASSERT(timeout);
Q_ASSERT(data);
// qDebug("addTimeout %d", dbus_timeout_get_interval(timeout));
// tqDebug("addTimeout %d", dbus_timeout_get_interval(timeout));
TQT_DBusConnectionPrivate *d = static_cast<TQT_DBusConnectionPrivate *>(data);
@ -77,7 +77,7 @@ static void qDBusRemoveTimeout(DBusTimeout *timeout, void *data)
Q_ASSERT(timeout);
Q_ASSERT(data);
// qDebug("removeTimeout");
// tqDebug("removeTimeout");
TQT_DBusConnectionPrivate *d = static_cast<TQT_DBusConnectionPrivate *>(data);
for (TQValueList<DBusTimeout*>::iterator it = d->pendingTimeouts.begin();
@ -107,7 +107,7 @@ static void qDBusToggleTimeout(DBusTimeout *timeout, void *data)
Q_ASSERT(timeout);
Q_ASSERT(data);
//qDebug("ToggleTimeout");
//tqDebug("ToggleTimeout");
qDBusRemoveTimeout(timeout, data);
qDBusAddTimeout(timeout, data);
@ -126,7 +126,7 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data)
TQT_DBusConnectionPrivate::Watcher watcher;
if (flags & DBUS_WATCH_READABLE) {
bool enabled = dbus_watch_get_enabled(watch);
//qDebug("addReadWatch %d %s", fd, (enabled ? "enabled" : "disabled"));
//tqDebug("addReadWatch %d %s", fd, (enabled ? "enabled" : "disabled"));
watcher.watch = watch;
if (tqApp) {
watcher.read = new TQSocketNotifier(fd, TQSocketNotifier::Read, d);
@ -136,7 +136,7 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data)
}
if (flags & DBUS_WATCH_WRITABLE) {
bool enabled = dbus_watch_get_enabled(watch);
//qDebug("addWriteWatch %d %s", fd, (enabled ? "enabled" : "disabled"));
//tqDebug("addWriteWatch %d %s", fd, (enabled ? "enabled" : "disabled"));
watcher.watch = watch;
if (tqApp) {
watcher.write = new TQSocketNotifier(fd, TQSocketNotifier::Write, d);
@ -160,7 +160,7 @@ static void qDBusRemoveWatch(DBusWatch *watch, void *data)
Q_ASSERT(watch);
Q_ASSERT(data);
//qDebug("remove watch");
//tqDebug("remove watch");
TQT_DBusConnectionPrivate *d = static_cast<TQT_DBusConnectionPrivate *>(data);
int fd = dbus_watch_get_unix_fd(watch);
@ -202,7 +202,7 @@ static void qDBusToggleWatch(DBusWatch *watch, void *data)
Q_ASSERT(watch);
Q_ASSERT(data);
//qDebug("toggle watch");
//tqDebug("toggle watch");
TQT_DBusConnectionPrivate *d = static_cast<TQT_DBusConnectionPrivate *>(data);
int fd = dbus_watch_get_unix_fd(watch);
@ -217,7 +217,7 @@ static void qDBusToggleWatch(DBusWatch *watch, void *data)
bool enabled = dbus_watch_get_enabled(watch);
int flags = dbus_watch_get_flags(watch);
// qDebug("toggle watch %d to %d (write: %d, read: %d)",
// tqDebug("toggle watch %d to %d (write: %d, read: %d)",
// dbus_watch_get_unix_fd(watch), enabled,
// flags & DBUS_WATCH_WRITABLE, flags & DBUS_WATCH_READABLE);
@ -235,7 +235,7 @@ static void qDBusNewConnection(DBusServer *server, DBusConnection *c, void *data
{
Q_ASSERT(data); Q_ASSERT(server); Q_ASSERT(c);
qDebug("SERVER: GOT A NEW CONNECTION"); // TODO
tqDebug("SERVER: GOT A NEW CONNECTION"); // TODO
}
static DBusHandlerResult qDBusSignalFilter(DBusConnection *connection,
@ -252,7 +252,7 @@ static DBusHandlerResult qDBusSignalFilter(DBusConnection *connection,
bool handled = false;
//TQT_DBusMessage amsg = TQT_DBusMessage::fromDBusMessage(message);
//qDebug() << "got message: " << dbus_message_get_type(message) << amsg;
//tqDebug() << "got message: " << dbus_message_get_type(message) << amsg;
if (msgType == DBUS_MESSAGE_TYPE_SIGNAL) {
handled = d->handleSignal(message);
@ -363,7 +363,7 @@ void TQT_DBusConnectionPrivate::socketRead(int fd)
for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) {
if ((*wit).read && (*wit).read->isEnabled()) {
if (!dbus_watch_handle((*wit).watch, DBUS_WATCH_READABLE))
qDebug("OUT OF MEM");
tqDebug("OUT OF MEM");
}
}
}
@ -380,7 +380,7 @@ void TQT_DBusConnectionPrivate::socketWrite(int fd)
for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) {
if ((*wit).write && (*wit).write->isEnabled()) {
if (!dbus_watch_handle((*wit).watch, DBUS_WATCH_WRITABLE))
qDebug("OUT OF MEM");
tqDebug("OUT OF MEM");
}
}
}
@ -388,7 +388,7 @@ void TQT_DBusConnectionPrivate::socketWrite(int fd)
void TQT_DBusConnectionPrivate::objectDestroyed(TQObject* object)
{
//qDebug("Object destroyed");
//tqDebug("Object destroyed");
for (PendingCallMap::iterator it = pendingCalls.begin(); it != pendingCalls.end();)
{
TQObject* receiver = (TQObject*) it.data()->receiver;
@ -547,17 +547,17 @@ void TQT_DBusConnectionPrivate::setConnection(DBusConnection *dbc)
return;
}
} else {
qWarning("TQT_DBusConnectionPrivate::SetConnection: Unable to get unique name");
tqWarning("TQT_DBusConnectionPrivate::SetConnection: Unable to get unique name");
}
dbus_connection_add_filter(connection, qDBusSignalFilter, this, 0);
//qDebug("unique name: %s", service);
//tqDebug("unique name: %s", service);
}
static void qDBusResultReceived(DBusPendingCall *pending, void *user_data)
{
//qDebug("Pending Call Result received");
//tqDebug("Pending Call Result received");
TQT_DBusConnectionPrivate* d = reinterpret_cast<TQT_DBusConnectionPrivate*>(user_data);
TQT_DBusConnectionPrivate::PendingCallMap::iterator it = d->pendingCalls.find(pending);

12
tqdbusmarshall.cpp
Unescape View File

@ -72,7 +72,7 @@ static TQT_DBusData::Type qSingleTypeForDBusSignature(char signature)
static TQValueList<TQT_DBusData> parseSignature(TQCString& signature)
{
// qDebug("parseSignature(%s)", signature.data());
// tqDebug("parseSignature(%s)", signature.data());
TQValueList<TQT_DBusData> result;
while (!signature.isEmpty())
@ -134,7 +134,7 @@ static TQValueList<TQT_DBusData> parseSignature(TQCString& signature)
TQT_DBusDataMap<TQT_DBusObjectPath>(valueType));
break;
default:
qWarning("TQT_DBusMarshall: unsupported map key type %s "
tqWarning("TQT_DBusMarshall: unsupported map key type %s "
"at de-marshalling",
TQT_DBusData::typeName(keyType));
break;
@ -187,7 +187,7 @@ static TQValueList<TQT_DBusData> parseSignature(TQCString& signature)
TQT_DBusDataMap<TQT_DBusObjectPath>(valueContainer[0]));
break;
default:
qWarning("TQT_DBusMarshall: unsupported map key type %s "
tqWarning("TQT_DBusMarshall: unsupported map key type %s "
"at de-marshalling",
TQT_DBusData::typeName(keyType));
break;
@ -535,7 +535,7 @@ static TQT_DBusData qFetchParameter(DBusMessageIter *it)
break;
#endif
default:
qWarning("TQT_DBusMarshall: Don't know how to de-marshall type %d '%c'",
tqWarning("TQT_DBusMarshall: Don't know how to de-marshall type %d '%c'",
dbus_message_iter_get_arg_type(it),
dbus_message_iter_get_arg_type(it));
return TQT_DBusData();
@ -1044,7 +1044,7 @@ static void qDBusDataToIterator(DBusMessageIter* it, const TQT_DBusData& var)
qDBusObjectPathKeyMapToIterator(it, var);
break;
default:
qWarning("TQT_DBusMarshall: unhandled map key type %s "
tqWarning("TQT_DBusMarshall: unhandled map key type %s "
"at marshalling",
TQT_DBusData::typeName(var.keyType()));
break;
@ -1092,7 +1092,7 @@ static void qDBusDataToIterator(DBusMessageIter* it, const TQT_DBusData& var)
}
#endif
default:
//qWarning("Don't know how to handle type %s", var.typeName());
//tqWarning("Don't know how to handle type %s", var.typeName());
break;
}
}

2
tqdbusmessage.cpp
Unescape View File

@ -90,7 +90,7 @@ TQT_DBusMessage TQT_DBusMessage::methodError(const TQT_DBusMessage &other, const
TQT_DBusMessage message;
if (!error.isValid())
{
qWarning("TQT_DBusMessage: error passed to methodError() is not valid!");
tqWarning("TQT_DBusMessage: error passed to methodError() is not valid!");
return message;
}

6
tqdbusobject.h
Unescape View File

@ -148,18 +148,18 @@
*
* TQT_DBusConnection connection = TQT_DBusConnection::sessionBus();
* if (!connection.isConnected())
* qFatal("Cannot connect to session bus");
* tqFatal("Cannot connect to session bus");
*
* // try to get a specific service name
* if (!connection.requestName("org.example.SortService"))
* {
* qWarning("Requesting name 'org.example.SortService' failed. "
* tqWarning("Requesting name 'org.example.SortService' failed. "
* "Will only be addressable through unique name '%s'",
* connection.uniqueName().local8Bit().data());
* }
* else
* {
* qDebug("Requesting name 'org.example.SortService' successfull");
* tqDebug("Requesting name 'org.example.SortService' successfull");
* }
*
* TestService service(connection);

10
tqdbusproxy.h
Unescape View File

@ -67,7 +67,7 @@
*
* TQT_DBusConnection connection = TQT_DBusConnection::sessionBus();
* if (!connection.isConnected())
* qFatal("Failed to connect to session bus");
* tqFatal("Failed to connect to session bus");
*
* // create a proxy object for method calls
*
@ -83,19 +83,19 @@
* TQT_DBusMessage reply = proxy.sendWithReply("ListNames", params);
*
* if (reply.type() != TQT_DBusMessage::ReplyMessage)
* qFatal("Call failed");
* tqFatal("Call failed");
*
* if (reply.count() != 1 || reply[0].type() != TQT_DBusData::List)
* qFatal("Unexpected reply");
* tqFatal("Unexpected reply");
*
* bool ok = false;
* TQStringList names = reply[0].toTQStringList(&ok);
*
* if (!ok) qFatal("Unexpected reply");
* if (!ok) tqFatal("Unexpected reply");
*
* for (TQStringList::iterator it = names.begin(); it != names.end(); ++it)
* {
* qDebug("%s", (*it).local8Bit().data());
* tqDebug("%s", (*it).local8Bit().data());
* }
*
* return 0;

Write Preview
Loading…
Cancel
Save