diff --git a/libltdl b/libltdl index 6d6796c29..3d846e4e8 160000 --- a/libltdl +++ b/libltdl @@ -1 +1 @@ -Subproject commit 6d6796c294ca6e9b7f83c295217817c4bf486031 +Subproject commit 3d846e4e86785d2ec53a7248fa2dd24d8c11994e diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index d747b61ae..b56111c61 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -28,10 +28,10 @@ // #define DEBUG_NETWORK_MANAGER_COMMUNICATIONS -#define PRINT_ERROR(x) printf("[TDE NM Backend ERROR] [%s:%d] %s\n\r", __FILE__, __LINE__, x.ascii()); +#define PRINT_ERROR(x) printf("[TDE NM Backend ERROR] [%s:%d] %s\n", __FILE__, __LINE__, x.ascii()); #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS -#define PRINT_WARNING(x) printf("[TDE NM Backend WARNING] [%s:%d] %s\n\r", __FILE__, __LINE__, x.ascii()); +#define PRINT_WARNING(x) printf("[TDE NM Backend WARNING] [%s:%d] %s\n", __FILE__, __LINE__, x.ascii()); #else #define PRINT_WARNING(x) #endif @@ -77,34 +77,34 @@ void printDBUSObjectStructure(TQT_DBusData object, int level=0, TQString mapKey= TQCString signature = object.buildDBusSignature(); if (object.type() == TQT_DBusData::String) { - printf("%s%s\t%s%s'%s'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toString().ascii()); fflush(stdout); + printf("%s%s\t%s%s'%s'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toString().ascii()); fflush(stdout); } else if (object.type() == TQT_DBusData::Bool) { - printf("%s%s\t%s%s'%s'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", (object.toBool())?"true":"false"); fflush(stdout); + printf("%s%s\t%s%s'%s'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", (object.toBool())?"true":"false"); fflush(stdout); } else if (object.type() == TQT_DBusData::Byte) { - printf("%s%s\t%s%s'%d'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toByte()); fflush(stdout); + printf("%s%s\t%s%s'%d'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toByte()); fflush(stdout); } else if (object.type() == TQT_DBusData::Int16) { - printf("%s%s\t%s%s'%d'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toInt16()); fflush(stdout); + printf("%s%s\t%s%s'%d'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toInt16()); fflush(stdout); } else if (object.type() == TQT_DBusData::UInt16) { - printf("%s%s\t%s%s'%d'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toUInt16()); fflush(stdout); + printf("%s%s\t%s%s'%d'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toUInt16()); fflush(stdout); } else if (object.type() == TQT_DBusData::Int32) { - printf("%s%s\t%s%s'%d'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toInt32()); fflush(stdout); + printf("%s%s\t%s%s'%d'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toInt32()); fflush(stdout); } else if (object.type() == TQT_DBusData::UInt32) { - printf("%s%s\t%s%s'%d'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toUInt32()); fflush(stdout); + printf("%s%s\t%s%s'%d'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toUInt32()); fflush(stdout); } else if (object.type() == TQT_DBusData::Int64) { - printf("%s%s\t%s%s'%lld'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toInt64()); fflush(stdout); + printf("%s%s\t%s%s'%lld'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toInt64()); fflush(stdout); } else if (object.type() == TQT_DBusData::UInt64) { - printf("%s%s\t%s%s'%lld'\n\r", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toUInt64()); fflush(stdout); + printf("%s%s\t%s%s'%lld'\n", levelIndent.ascii(), signature.data(), (mapKey.isNull())?"":mapKey.ascii(), (mapKey.isNull())?"":" = ", object.toUInt64()); fflush(stdout); } else { - printf("%s%s\n\r", levelIndent.ascii(), signature.data()); fflush(stdout); + printf("%s%s\n", levelIndent.ascii(), signature.data()); fflush(stdout); } if (object.type() == TQT_DBusData::Map) { @@ -1332,7 +1332,7 @@ void TDENetworkConnectionManager_BackendNM_DBusSignalReceiver::dbusSignal(const TQString member = message.member(); TQString path = message.path(); -// printf("[DEBUG] In dbusSignal: sender: %s, member: %s, interface: %s, path: %s, parent path: %s\n\r", sender.ascii(), member.ascii(), interface.ascii(), path.ascii(), m_parent->m_dbusDeviceString.ascii()); fflush(stdout); +// printf("[DEBUG] In dbusSignal: sender: %s, member: %s, interface: %s, path: %s, parent path: %s\n", sender.ascii(), member.ascii(), interface.ascii(), path.ascii(), m_parent->m_dbusDeviceString.ascii()); fflush(stdout); if (interface == NM_VPN_DBUS_CONNECTION_SERVICE) { if (member == "VpnStateChanged") { @@ -1824,7 +1824,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { } #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] %s\n\r", (*it).data()); fflush(stdout); + printf("[network-manager comm debug] %s\n", (*it).data()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS #ifndef USE_ASYNC_DBUS_CALLS @@ -1867,7 +1867,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { #endif // USE_ASYNC_DBUS_CALLS #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] received DBUS object structure map follows:\n\r"); fflush(stdout); + printf("[network-manager comm debug] received DBUS object structure map follows:\n"); fflush(stdout); printDBUSObjectStructure(TQT_DBusData::fromStringKeyMap(connectionSettingsMap)); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS @@ -1877,7 +1877,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { TQString outerKeyValue = it2.key(); TQT_DBusData dataValue = it2.data(); #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] [%s]\n\r", outerKeyValue.ascii()); fflush(stdout); + printf("[network-manager comm debug] [%s]\n", outerKeyValue.ascii()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS TQT_DBusTQStringDataMap nestedConnectionSettingsMap = dataValue.toStringKeyMap(); TQT_DBusTQStringDataMap::const_iterator it3; @@ -1886,7 +1886,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { TQT_DBusData dataValue = it3.data(); if (dataValue.type() != TQT_DBusData::Variant) { #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] %s = %s (type %d(%s))\n\r", keyValue.ascii(), dataValue.toString().ascii(), dataValue.type(), dataValue.typeName()); fflush(stdout); + printf("[network-manager comm debug] %s = %s (type %d(%s))\n", keyValue.ascii(), dataValue.toString().ascii(), dataValue.type(), dataValue.typeName()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // No NM settings are known which use this style } @@ -1895,7 +1895,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { TQT_DBusData dataValue2 = dataValueVariant.value; if (dataValue2.type() != TQT_DBusData::Variant) { #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] %s = %s (type %d(%s), signature %s)\n\r", keyValue.ascii(), dataValue2.toString().ascii(), dataValue2.type(), dataValue2.typeName(), dataValueVariant.signature.ascii()); fflush(stdout); + printf("[network-manager comm debug] %s = %s (type %d(%s), signature %s)\n", keyValue.ascii(), dataValue2.toString().ascii(), dataValue2.type(), dataValue2.typeName(), dataValueVariant.signature.ascii()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Most NM settings use this style if (outerKeyValue.lower() == "connection") { @@ -2999,7 +2999,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri #endif // USE_ASYNC_DBUS_CALLS #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] received DBUS object structure map follows:\n\r"); fflush(stdout); + printf("[network-manager comm debug] received DBUS object structure map follows:\n"); fflush(stdout); printDBUSObjectStructure(TQT_DBusData::fromStringKeyMap(connectionSecretsMap)); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS @@ -3009,7 +3009,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri TQString outerKeyValue = it2.key(); TQT_DBusData dataValue = it2.data(); #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] [%s]\n\r", outerKeyValue.ascii()); fflush(stdout); + printf("[network-manager comm debug] [%s]\n", outerKeyValue.ascii()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS TQT_DBusTQStringDataMap nestedConnectionSettingsMap = dataValue.toStringKeyMap(); TQT_DBusTQStringDataMap::const_iterator it3; @@ -3018,7 +3018,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri TQT_DBusData dataValue = it3.data(); if (dataValue.type() != TQT_DBusData::Variant) { #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] %s = %s (type %d(%s))\n\r", keyValue.ascii(), dataValue.toString().ascii(), dataValue.type(), dataValue.typeName()); fflush(stdout); + printf("[network-manager comm debug] %s = %s (type %d(%s))\n", keyValue.ascii(), dataValue.toString().ascii(), dataValue.type(), dataValue.typeName()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // No NM settings are known which use this style } @@ -3027,7 +3027,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri TQT_DBusData dataValue2 = dataValueVariant.value; if (dataValue2.type() != TQT_DBusData::Variant) { #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] %s = %s (type %d(%s), signature %s)\n\r", keyValue.ascii(), dataValue2.toString().ascii(), dataValue2.type(), dataValue2.typeName(), dataValueVariant.signature.ascii()); fflush(stdout); + printf("[network-manager comm debug] %s = %s (type %d(%s), signature %s)\n", keyValue.ascii(), dataValue2.toString().ascii(), dataValue2.type(), dataValue2.typeName(), dataValueVariant.signature.ascii()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Most NM settings use this style if (outerKeyValue.lower() == "802-1x") { @@ -4385,13 +4385,13 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* // To create new: Use 'd->m_networkManagerSettings' and call 'virtual bool AddConnectionAsync(int& asyncCallId, const TQT_DBusDataMap& connection, TQT_DBusError& error);' #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] uploaded DBUS object structure map follows:\n\r"); fflush(stdout); + printf("[network-manager comm debug] uploaded DBUS object structure map follows:\n"); fflush(stdout); printDBUSObjectStructure(TQT_DBusData::fromStringKeyMap(connectionSettingsMap)); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS if (existing) { #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] Updating existing connection\n\r"); fflush(stdout); + printf("[network-manager comm debug] Updating existing connection\n"); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Save connection settings to the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); @@ -4427,7 +4427,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* } else { #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] Creating new connection\n\r"); fflush(stdout); + printf("[network-manager comm debug] Creating new connection\n"); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Create new connection connect(d->m_networkManagerSettings, SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp index 42ca8557c..89499b902 100644 --- a/tdecore/svgicons/ksvgiconengine.cpp +++ b/tdecore/svgicons/ksvgiconengine.cpp @@ -203,7 +203,7 @@ public: TQWMatrix *current = m_engine->painter()->worldMatrix(); #ifdef USE_QT4 -printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n\r"); +printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n"); #else // USE_QT4 *current = matrix * *current; #endif // USE_QT4 diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp index 1b7a2c8ac..e42d1b882 100644 --- a/tdecore/tdehardwaredevices.cpp +++ b/tdecore/tdehardwaredevices.cpp @@ -475,7 +475,7 @@ bool ejectDriveUDisks(TDEStorageDevice* sdevice) { TQT_DBusMessage reply = driveControl.sendWithReply("DriveEject", params, &error); if (error.isValid()) { // Error! - printf("[ERROR] %s\n\r", error.name().ascii()); fflush(stdout); + printf("[ERROR] %s\n", error.name().ascii()); fflush(stdout); return FALSE; } else { @@ -510,7 +510,7 @@ bool ejectDriveUDisks2(TDEStorageDevice* sdevice) { TQT_DBusMessage reply = hardwareControl.sendWithReply("Get", params, &error); if (error.isValid()) { // Error! - printf("[ERROR] %s\n\r", error.name().ascii()); fflush(stdout); + printf("[ERROR] %s\n", error.name().ascii()); fflush(stdout); return FALSE; } else { @@ -528,7 +528,7 @@ bool ejectDriveUDisks2(TDEStorageDevice* sdevice) { TQT_DBusMessage reply = driveInformation.sendWithReply("Get", params, &error); if (error.isValid()) { // Error! - printf("[ERROR] %s\n\r", error.name().ascii()); fflush(stdout); + printf("[ERROR] %s\n", error.name().ascii()); fflush(stdout); return FALSE; } if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { @@ -545,7 +545,7 @@ bool ejectDriveUDisks2(TDEStorageDevice* sdevice) { TQT_DBusMessage reply = driveControl.sendWithReply("Eject", params, &error); if (error.isValid()) { // Error! - printf("[ERROR] %s\n\r", error.name().ascii()); fflush(stdout); + printf("[ERROR] %s\n", error.name().ascii()); fflush(stdout); return FALSE; } else { @@ -579,14 +579,14 @@ bool TDEStorageDevice::ejectDrive() { } else { #ifdef WITH_UDISKS2 - printf("[tdehwlib] Failed to eject drive '%s' via udisks2, falling back to alternate mechanism\n\r", deviceNode().ascii()); + printf("[tdehwlib] Failed to eject drive '%s' via udisks2, falling back to alternate mechanism\n", deviceNode().ascii()); #endif // WITH_UDISKS2 if (ejectDriveUDisks(this)) { return TRUE; } else { #ifdef WITH_UDISKS - printf("[tdehwlib] Failed to eject drive '%s' via udisks, falling back to alternate mechanism\n\r", deviceNode().ascii()); + printf("[tdehwlib] Failed to eject drive '%s' via udisks, falling back to alternate mechanism\n", deviceNode().ascii()); #endif // WITH_UDISKS TQString command = TQString("eject -v '%1' 2>&1").arg(deviceNode()); @@ -600,12 +600,12 @@ bool TDEStorageDevice::ejectDrive() { return TRUE; } else { - printf("[tdehwlib] Failed to eject drive '%s' via 'eject' command\n\r", deviceNode().ascii()); + printf("[tdehwlib] Failed to eject drive '%s' via 'eject' command\n", deviceNode().ascii()); return FALSE; } } else { - printf("[tdehwlib] Failed to eject drive '%s' via 'eject' command\n\r", deviceNode().ascii()); + printf("[tdehwlib] Failed to eject drive '%s' via 'eject' command\n", deviceNode().ascii()); return FALSE; } } @@ -2268,7 +2268,7 @@ TDEHardwareDevices::TDEHardwareDevices() { // Initialize udev interface m_udevStruct = udev_new(); if (!m_udevStruct) { - printf("Unable to create udev interface\n\r"); + printf("Unable to create udev interface\n"); } if (m_udevStruct) { @@ -3415,7 +3415,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_ desiredSubdeviceType = readDiskDeviceSubtypeFromString(*paramit, desiredSubdeviceType); } if (desiredSubdeviceType != sdevice->diskType()) { - printf("[tdehardwaredevices] Rules file %s used to set device subtype for device at path %s\n\r", device->m_externalRulesFile.ascii(), device->systemPath().ascii()); fflush(stdout); + printf("[tdehardwaredevices] Rules file %s used to set device subtype for device at path %s\n", device->m_externalRulesFile.ascii(), device->systemPath().ascii()); fflush(stdout); sdevice->internalSetDiskType(desiredSubdeviceType); } } @@ -3492,7 +3492,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDeviceByExternalRules(udev_ // Handle main type if (desiredDeviceType != device->type()) { - printf("[tdehardwaredevices] Rules file %s used to set device type for device at path %s\n\r", fi->absFilePath().ascii(), device->systemPath().ascii()); fflush(stdout); + printf("[tdehardwaredevices] Rules file %s used to set device type for device at path %s\n", fi->absFilePath().ascii(), device->systemPath().ascii()); fflush(stdout); if (m_deviceList.contains(device)) { m_deviceList.remove(device); } @@ -4087,7 +4087,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD if (device == 0) { // Unhandled if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Other); - printf("[FIXME] UNCLASSIFIED DEVICE name: %s type: %s subsystem: %s driver: %s [Node Path: %s] [Syspath: %s] [%s:%s]\n\r", devicename.ascii(), devicetype.ascii(), devicesubsystem.ascii(), devicedriver.ascii(), devicenode.ascii(), udev_device_get_syspath(dev), devicevendorid.ascii(), devicemodelid.ascii()); fflush(stdout); + printf("[FIXME] UNCLASSIFIED DEVICE name: %s type: %s subsystem: %s driver: %s [Node Path: %s] [Syspath: %s] [%s:%s]\n", devicename.ascii(), devicetype.ascii(), devicesubsystem.ascii(), devicedriver.ascii(), devicenode.ascii(), udev_device_get_syspath(dev), devicevendorid.ascii(), devicemodelid.ascii()); fflush(stdout); } // Root devices are special @@ -5300,7 +5300,7 @@ TQString TDEHardwareDevices::findPCIDeviceName(TQString vendorid, TQString model database_filename = "/usr/share/misc/pci.ids"; } if (!TQFile::exists(database_filename)) { - printf("[tdehardwaredevices] Unable to locate PCI information database pci.ids\n\r"); fflush(stdout); + printf("[tdehardwaredevices] Unable to locate PCI information database pci.ids\n"); fflush(stdout); return i18n("Unknown PCI Device"); } @@ -5361,7 +5361,7 @@ TQString TDEHardwareDevices::findPCIDeviceName(TQString vendorid, TQString model database.close(); } else { - printf("[tdehardwaredevices] Unable to open PCI information database %s\n\r", database_filename.ascii()); fflush(stdout); + printf("[tdehardwaredevices] Unable to open PCI information database %s\n", database_filename.ascii()); fflush(stdout); } } @@ -5410,7 +5410,7 @@ TQString TDEHardwareDevices::findUSBDeviceName(TQString vendorid, TQString model database_filename = "/usr/share/misc/usb.ids"; } if (!TQFile::exists(database_filename)) { - printf("[tdehardwaredevices] Unable to locate USB information database usb.ids\n\r"); fflush(stdout); + printf("[tdehardwaredevices] Unable to locate USB information database usb.ids\n"); fflush(stdout); return i18n("Unknown USB Device"); } @@ -5471,7 +5471,7 @@ TQString TDEHardwareDevices::findUSBDeviceName(TQString vendorid, TQString model database.close(); } else { - printf("[tdehardwaredevices] Unable to open USB information database %s\n\r", database_filename.ascii()); fflush(stdout); + printf("[tdehardwaredevices] Unable to open USB information database %s\n", database_filename.ascii()); fflush(stdout); } } @@ -5531,7 +5531,7 @@ TQString TDEHardwareDevices::findPNPDeviceName(TQString pnpid) { } if (!TQFile::exists(database_filename)) { - printf("[tdehardwaredevices] Unable to locate PNP information database pnp.ids\n\r"); fflush(stdout); + printf("[tdehardwaredevices] Unable to locate PNP information database pnp.ids\n"); fflush(stdout); return i18n("Unknown PNP Device"); } @@ -5561,7 +5561,7 @@ TQString TDEHardwareDevices::findPNPDeviceName(TQString pnpid) { database.close(); } else { - printf("[tdehardwaredevices] Unable to open PNP information database %s\n\r", database_filename.ascii()); fflush(stdout); + printf("[tdehardwaredevices] Unable to open PNP information database %s\n", database_filename.ascii()); fflush(stdout); } } @@ -5601,7 +5601,7 @@ TQString TDEHardwareDevices::findMonitorManufacturerName(TQString dpyid) { } if (!TQFile::exists(database_filename)) { - printf("[tdehardwaredevices] Unable to locate monitor information database dpy.ids\n\r"); fflush(stdout); + printf("[tdehardwaredevices] Unable to locate monitor information database dpy.ids\n"); fflush(stdout); return i18n("Unknown Monitor Device"); } @@ -5631,7 +5631,7 @@ TQString TDEHardwareDevices::findMonitorManufacturerName(TQString dpyid) { database.close(); } else { - printf("[tdehardwaredevices] Unable to open monitor information database %s\n\r", database_filename.ascii()); fflush(stdout); + printf("[tdehardwaredevices] Unable to open monitor information database %s\n", database_filename.ascii()); fflush(stdout); } } diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp index 1db2a3d8b..d982bea5d 100644 --- a/tdelfeditor/tdelfeditor.cpp +++ b/tdelfeditor/tdelfeditor.cpp @@ -429,7 +429,7 @@ int main_console(int argc, char **argv) { access = LIBR_READ_WRITE; } - printf("opening executable file %s...\n\r", argv[PARAM_ELF_FILE]); fflush(stdout); + printf("opening executable file %s...\n", argv[PARAM_ELF_FILE]); fflush(stdout); if((handle = libr_open(argv[PARAM_ELF_FILE], access)) == NULL) { errorf(_("failed to open file \"%s\": %s"), argv[PARAM_ELF_FILE], libr_errmsg()); @@ -535,7 +535,7 @@ int main_console(int argc, char **argv) } break; case MODE_TDE_AUTOADD_ICON: { - printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]); + printf("Searching for standard icon for name %s in the following directories:\n", argv[PARAM_ICON_NAME]); TDEApplication::disableAutoDcopRegistration(); TDEAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1"); TDECmdLineArgs::init(&aboutd); @@ -543,18 +543,18 @@ int main_console(int argc, char **argv) TQStringList rds = TDEGlobal::dirs()->resourceDirs("icon"); for ( TQStringList::Iterator it = rds.begin(); it != rds.end(); ++it ) { - printf(" * %s\n\r", (*it).ascii()); fflush(stdout); + printf(" * %s\n", (*it).ascii()); fflush(stdout); } TQString systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true); if (systemIcon.isNull()) { systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false); - printf("NOT FOUND, refusing to add unknown icon (this message is harmless)\n\r"); + printf("NOT FOUND, refusing to add unknown icon (this message is harmless)\n"); section = ICON_SECTION; clear_resource(handle, section); goto fail; } else { - printf("found %s\n\r", systemIcon.ascii()); + printf("found %s\n", systemIcon.ascii()); } libr_icon *icon = NULL; @@ -567,7 +567,7 @@ int main_console(int argc, char **argv) } TQFileInfo ifi(systemIcon); TQString iconBaseName = ifi.baseName(); - printf("using %s as icon name\n\r", iconBaseName.ascii()); + printf("using %s as icon name\n", iconBaseName.ascii()); if(!libr_icon_write(handle, icon, const_cast(iconBaseName.ascii()), LIBR_OVERWRITE)) { libr_icon_close(icon); diff --git a/tderandr/libtderandr.cc b/tderandr/libtderandr.cc index fe9461715..a22bd08b8 100644 --- a/tderandr/libtderandr.cc +++ b/tderandr/libtderandr.cc @@ -179,7 +179,7 @@ TQString KRandrSimpleAPI::applyIccFile(TQString screenName, TQString fileName) { icc_command = TQString("xcalib \"%1\"").arg(fileName); if ((pipe_xcalib = popen(icc_command.ascii(), "r")) == NULL) { - printf("Xcalib pipe error\n\r [xcalib apply]"); + printf("Xcalib pipe error\n [xcalib apply]"); } else { if (fgets(xcalib_result, 2048, pipe_xcalib)) { @@ -248,7 +248,7 @@ TQString KRandrSimpleAPI::applyIccFile(TQString screenName, TQString fileName) { icc_command = TQString("xcalib -c"); if ((pipe_xcalib = popen(icc_command.ascii(), "r")) == NULL) { - printf("Xcalib pipe error\n\r [xcalib clear]"); + printf("Xcalib pipe error\n [xcalib clear]"); } else { if (fgets(xcalib_result, 2048, pipe_xcalib)) { @@ -403,7 +403,7 @@ TQString KRandrSimpleAPI::applySystemWideIccConfiguration(TQString kde_confdir) icc_command = TQString("xcalib \"%1\"").arg(getIccFileName(NULL, "Default", kde_confdir)); if ((pipe_xcalib = popen(icc_command.ascii(), "r")) == NULL) { - printf("Xcalib pipe error [xcalib apply]\n\r"); + printf("Xcalib pipe error [xcalib apply]\n"); } else { if (fgets(xcalib_result, 2048, pipe_xcalib)) { @@ -697,7 +697,7 @@ bool KRandrSimpleAPI::applyDisplayConfiguration(TQPtrList scre } } else { - printf("[WARNING] Unable to find configuration for monitor %d; settings may not be correctly applied...\n\r", i); fflush(stdout); + printf("[WARNING] Unable to find configuration for monitor %d; settings may not be correctly applied...\n", i); fflush(stdout); } } freeScreenInfoStructure(randr_screen_info); @@ -1505,7 +1505,7 @@ TQString KRandrSimpleAPI::clearIccConfiguration() { icc_command = TQString("xcalib -c"); if ((pipe_xcalib = popen(icc_command.ascii(), "r")) == NULL) { - printf("Xcalib pipe error [xcalib clear]\n\r"); + printf("Xcalib pipe error [xcalib clear]\n"); } else { if (fgets(xcalib_result, 2048, pipe_xcalib)) { diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index b62f45ead..6ba25fff7 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -447,7 +447,7 @@ static int qxembed_x11_event_filter( XEvent* e) extra->embedded = 1; #ifdef USE_QT4 // [FIXME] - printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n\r"); + printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n"); #else // USE_QT4 extra->parentWinId = e->xclient.data.l[3]; #endif // USE_QT4 @@ -1320,7 +1320,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) ((QXEmbed*)client)->topData()->embedded = true; #ifdef USE_QT4 // [FIXME] - printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n\r"); + printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n"); #else // USE_QT4 ((QXEmbed*)client)->topData()->parentWinId = window; #endif // USE_QT4 diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index a3ced3a19..ad28c50f3 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -1445,7 +1445,7 @@ void TDEToolBar::resizeEvent( TQResizeEvent *e ) } } // else { -// printf("[WARNING] In TDEToolBar::resizeEvent, but this code block should not be executing. Preventing toolbar lockup. [Code 0045]\n\r"); +// printf("[WARNING] In TDEToolBar::resizeEvent, but this code block should not be executing. Preventing toolbar lockup. [Code 0045]\n"); // setUpdatesEnabled( true ); // } }