Cleanup output clutter.

11 files changed, 35 insertions, 35 deletions

diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection.cpp
index 4852198..4f5b9db 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection.cpp
@@ -171,7 +171,7 @@ Connection::isValid() const
 void
 Connection::slotSecretsNeeded(const TQString& setting_name, const TQStringList& hints, bool request_new)
 {
-	printf("Connection::slotSecretsNeeded %s, new: %s\n\r", setting_name.ascii(), (request_new ? "yes" : "no"));
+	printf("Connection::slotSecretsNeeded %s, new: %s\n", setting_name.ascii(), (request_new ? "yes" : "no"));
 	kdDebug() << "Connection::slotSecretsNeeded " << setting_name.ascii() << ", new: " << (request_new ? "yes" : "no") << endl;
 	ConnectionSetting* setting = getSetting(setting_name);
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
index c415fe8..ad30054 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
@@ -201,7 +201,7 @@ ConnectionSecretsDBus::SendGetSecretsReply(ConnectionSettings::ConnectionSetting
 void
 ConnectionSecretsDBus::GetSecretsAsync(int id, const TQString& setting_name, const TQStringList& hints, bool request_new)
 {
-	printf("Connection::GetSecretsAsync for setting %s, %s\n\r", setting_name.ascii(), id);
+	printf("Connection::GetSecretsAsync for setting %s, %s\n", setting_name.ascii(), id);
 	kdDebug() << "Connection::GetSecretsAsync for setting " << setting_name.ascii() << ", " << id << endl;
 	d->currentRequest = id;
 	emit SecretsNeeded(setting_name, hints, request_new);
diff --git a/knetworkmanager-0.8/src/knetworkmanager-devicestore.cpp b/knetworkmanager-0.8/src/knetworkmanager-devicestore.cpp
index 6f217c1..c9bc54c 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-devicestore.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-devicestore.cpp
@@ -105,7 +105,7 @@ Device* DeviceStore::createDevice(const TQT_DBusObjectPath &obj_path)
 		dev->setConnection(TQT_DBusConnection::systemBus());
 		TQ_UINT32 type = dev->getDeviceType(err);
 
-		//printf("Device obj_path: %s\n\r", obj_path->data());
+		//printf("Device obj_path: %s\n", obj_path->data());
 
 		// FIXME: This should not be hardcoded, it would be better if wireless, wired etc. modules register their device type
 		// select the right device type and create the appropriate objects
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
index 6ffecb3..9ee78b6 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
@@ -93,7 +93,7 @@ void NetworkMenuItem::slotActivate()
 		if (nm)
 		{
 			kdDebug() << "Activate Connection " << d->conn->getObjectPath().data() << " on Device " << d->dev->getObjectPath().ascii() << endl;
-			printf("Activate Connection %s on Device %s\n\r", d->conn->getObjectPath().data(), d->dev->getObjectPath().ascii());
+			printf("Activate Connection %s on Device %s\n", d->conn->getObjectPath().data(), d->dev->getObjectPath().ascii());
 
 #if NM_CHECK_VERSION(0,8,992)
 			if (nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", d->conn->getObjectPath(), TQT_DBusObjectPath(QCString(d->dev->getObjectPath())), d->conn->getObjectPath(), err))
@@ -110,7 +110,7 @@ void NetworkMenuItem::slotActivate()
 	else if (d->conn)
 	{
 		// no device given, just take the default device
-		printf("Activate Connection %s on default device\n\r", d->conn->getObjectPath().data());
+		printf("Activate Connection %s on default device\n", d->conn->getObjectPath().data());
 		TQT_DBusObjectPath act_conn = nm->getDefaultActiveConnection();
 		TQT_DBusObjectPath device   = nm->getDeviceForActiveConnection(act_conn);
 		vpn_attempt_this_conn = d->conn->getObjectPath();
diff --git a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
index 7044237..dac6141 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
@@ -336,7 +336,7 @@ Storage::saveConnections()
 {
 	kdDebug() << k_funcinfo << endl;
 	kdDebug() << "Storage::saveConnections" << endl;
-	printf("Storage::saveConnections\n\r");
+	printf("Storage::saveConnections\n");
 	// write all connections we get from the connection-store to disk
 	ConnectionStore* store = ConnectionStore::getInstance();
 	TQValueList<ConnectionSettings::Connection*> connections = store->getConnections();
@@ -471,7 +471,7 @@ Storage::saveConnectionSecrets(Connection* conn, ConnectionSetting* setting, TQS
 			}
 		}
 	}
-	printf("Secrets storage requested: %d\n\r", storage_requested);
+	printf("Secrets storage requested: %d\n", storage_requested);
 
 	// get a group for this setting
 	setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type);
@@ -577,7 +577,7 @@ Storage::restoreVPNSecrets(Connection* connection, ConnectionSetting* setting)
 	TQString id = connection->getID();
 	TQString type = setting->getType();
 
-	printf("Storage::restoreVPNSecrets\n\r");
+	printf("Storage::restoreVPNSecrets\n");
 	kdDebug() << "Storage::restoreVPNSecrets" << endl;
 	// ID is necessary
 	if (id.isEmpty())
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
index f10582a..b88e5d9 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
@@ -229,7 +229,7 @@ void Tray::slotOnlineMode()
 
 void Tray::slotNewVPNConnection()
 {
-	printf("Creating new VPN connection\n\r");
+	printf("Creating new VPN connection\n");
 	// create a new VPN connection
 	Connection* conn = new VPNConnection();
 
@@ -410,7 +410,7 @@ Tray::slotStateChanged(TQ_UINT32 state)
 			setPixmap (loadIcon ("knetworkmanager"));
 			break;
 	}
-	printf("NM state: %d\n\r", nm_state);
+	printf("NM state: %d\n", nm_state);
 }
 
 void
@@ -443,7 +443,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 	Storage* storage = Storage::getInstance();
 	bool hasSecretsStored = storage->hasSecretsStored(connection, setting);
 
-	printf("Tray::slotVPNSecretsNeeded\n\r");
+	printf("Tray::slotVPNSecretsNeeded\n");
 	kdDebug() << "Tray::slotVPNSecretsNeeded" << endl;
 
 	// default secrets handling for all other connection types
@@ -454,7 +454,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 	//if (hasSecretsStored && (!request_new))
  	if (hasSecretsStored)
  	{
- 		printf("Tray::slotVPNSecretsNeeded: Restoring saved secrets\n\r");
+ 		printf("Tray::slotVPNSecretsNeeded: Restoring saved secrets\n");
  		// We have secrets stored, restore them
 //  		if (storage->restoreVPNSecrets(connection, setting))
 //  		{
@@ -463,17 +463,17 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 			TQString id = connection->getID();
 			TQString type = setting->getType();
 		
-			printf("restoreVPNSecrets\n\r");
+			printf("restoreVPNSecrets\n");
 			// ID is necessary
 			if (id.isEmpty()) {
-				printf("VPN connection ID is empty!\n\r");
+				printf("VPN connection ID is empty!\n");
 			}
 			else {
 				// Get a group for this setting
 				TQString setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type);
 			
 				// Restore the settings
-				printf("Restoring VPN secret: %s\n\r", setting_grp.ascii());
+				printf("Restoring VPN secret: %s\n", setting_grp.ascii());
 			
 				TDEConfigGroup secrets_grp(TDEGlobal::config(), setting_grp);
 				TQMap<TQString, TQString> config_map = TDEGlobal::config()->entryMap(setting_grp);
@@ -483,7 +483,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 	// 			ConnectionSetting* setting = conn->getSetting(typetwo);
 	// 			if (!setting)
 	// 			{
-	// 				printf("Secrets cannot be restored!\n\r");
+	// 				printf("Secrets cannot be restored!\n");
 	// 			}
 			
 				// Read the SettingsMap from tdeconfig
@@ -502,12 +502,12 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 					// Remove the annoying XML <string> stuff
 					xmldata.replace("<string>", "");
 					xmldata.replace("</string>", "");
-					//printf("Got %s with value %s\n\r", key.ascii(), xmldata.ascii());
+					//printf("Got %s with value %s\n", key.ascii(), xmldata.ascii());
 					map.insert(key, xmldata);
 					number_of_secrets_found++;
 				}
 				if (number_of_secrets_found > 0) {
-					printf("Got secrets from file, continuing...\n\r");
+					printf("Got secrets from file, continuing...\n");
 					
 					// Good, we have new secrets now, update the settings
 					//map = _vpnAuthWidget->getPasswords();
@@ -527,7 +527,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 						conn->slotSecretsProvided(prop);
 					}
 					else {
-						printf("Tray::slotVPNSecretsNeeded: New secrets requested\n\r");
+						printf("Tray::slotVPNSecretsNeeded: New secrets requested\n");
 						// OK, NM requests new secrets...do something!
 						ConnectionSettings::VPNConnection* conn = dynamic_cast<ConnectionSettings::VPNConnection*>(connection);
 						VPNAuthenticationDialog* auth = new VPNAuthenticationDialog(conn, this, "vpnauth");
@@ -540,7 +540,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 							passdata.remove("\r");
 							passdata.remove("\n");
 							passdata.remove("\t");
-							//printf("Trying to set %s to value %s\n\r", it.key().ascii(), passdata.ascii());
+							//printf("Trying to set %s to value %s\n", it.key().ascii(), passdata.ascii());
 							auth->setPasswords(it.key(), passdata);
 						}
 						auth->show();
@@ -549,7 +549,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
 					//connection->slotSecretsProvided(setting);
 				}
 				else {
-					printf("Tray::slotVPNSecretsNeeded: New secrets needed\n\r");
+					printf("Tray::slotVPNSecretsNeeded: New secrets needed\n");
 					// OK, NM needs new secrets...do something!
 					ConnectionSettings::VPNConnection* conn = dynamic_cast<ConnectionSettings::VPNConnection*>(connection);
 					VPNAuthenticationDialog* auth = new VPNAuthenticationDialog(conn, this, "vpnauth");
@@ -560,7 +560,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
  	}
  	else
  	{
-		printf("Tray::slotVPNSecretsNeeded: New secrets needed\n\r");
+		printf("Tray::slotVPNSecretsNeeded: New secrets needed\n");
 		// OK, NM needs new secrets...do something!
 		ConnectionSettings::VPNConnection* conn = dynamic_cast<ConnectionSettings::VPNConnection*>(connection);
 		VPNAuthenticationDialog* auth = new VPNAuthenticationDialog(conn, this, "vpnauth");
@@ -578,7 +578,7 @@ Tray::slotSecretsNeeded(ConnectionSettings::Connection* connection, ConnectionSe
 	if (connection->getType() == NM_SETTING_VPN_SETTING_NAME)
 	{
 		if (vpn_new_credentials_needed == 1) {
-			printf("VPN connection failed with bad credentials\n\r");
+			printf("VPN connection failed with bad credentials\n");
 			vpn_new_credentials_needed = 0;
 			request_new = 1;
 		}
@@ -897,7 +897,7 @@ void Tray::updateTrayIcon(NMDeviceState state)
 	}
 
 // 	if (found_any_active_connection == 1) {
-// 		printf("Active connection found\n\r");
+// 		printf("Active connection found\n");
 // 	}
 
 	if ((current_vpn_state == NM_VPN_CONNECTION_STATE_FAILED) || (current_vpn_state == NM_VPN_CONNECTION_STATE_DISCONNECTED)) {
@@ -940,8 +940,8 @@ void Tray::updateTrayIcon(NMDeviceState state)
 		}
 	}
 	else {
-		printf("VPN state: %d\n\r", current_vpn_state);
-		//printf("Activated is: %d\n\r", NM_VPN_CONNECTION_STATE_ACTIVATED);
+		printf("VPN state: %d\n", current_vpn_state);
+		//printf("Activated is: %d\n", NM_VPN_CONNECTION_STATE_ACTIVATED);
 		// stop the old movie to avoid unnecessary wakups
 		DeviceTrayComponent * dtc = d->foregroundTrayComponent;
 	
@@ -976,7 +976,7 @@ void Tray::updateTrayIcon(NMDeviceState state)
 	}
 
 	nm_device_state_global = state;
-	//printf("Device state: %d\n\r", nm_device_state_global);
+	//printf("Device state: %d\n", nm_device_state_global);
 }
 
 void Tray::updateActiveConnection(NMDeviceState state)
@@ -1010,7 +1010,7 @@ void Tray::slotDeviceRemovedNotify(Device* dev)
 
 void Tray::slotVPNBannerShow(const TQString& vpnbanner)
 {
-	printf("VPN banner: %s\n\r", vpnbanner.ascii());
+	printf("VPN banner: %s\n", vpnbanner.ascii());
 	KNotifyClient::event(winId(), "knm-nm-vpn-banner", vpnbanner);
 }
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpn_plugin.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpn_plugin.cpp
index f56b221..e419386 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpn_plugin.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpn_plugin.cpp
@@ -88,11 +88,11 @@ void VPNDBUSPlugin::slotLoginBanner(const TQString& banner)
 
 void VPNDBUSPlugin::slotFailure(TQ_UINT32 failure_reason)
 {
-	printf("VPN failure code %d\n\r", failure_reason);
+	printf("VPN failure code %d\n", failure_reason);
 
 	if ((failure_reason == 0) || (failure_reason == 1) || (failure_reason == 2)) {
 		// Try to connect again using cached information; request new login though
-		printf("Reactivate VPN connection on default device\n\r");
+		printf("Reactivate VPN connection on default device\n");
 		vpn_new_credentials_needed = 1;
 		int id;
 		TQT_DBusError err;
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
index ac61067..c18e8f2 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
@@ -167,7 +167,7 @@ void VPNAuthenticationDialog::cancel()
 	emit done (true, x, false, false);
 	TQDialog::done(1);*/
 
-	printf("Attempting to deactivate VPN connection...\n\r");
+	printf("Attempting to deactivate VPN connection...\n");
 
 	// Disconnect the attempted connection
 	_conn->slotSecretsError();
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
index 3a29b75..0885a89 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
@@ -141,7 +141,7 @@ WirelessConnection* WirelessDeviceTray::findMatchingConnection(const WirelessNet
 
 void WirelessDeviceTray::addWirelessNetworks(TDEPopupMenu* menu)
 {
-	printf("Updating wireless network list\n\r");
+	printf("Updating wireless network list\n");
 
 	// get all wireless networks
 	TQValueList<WirelessNetwork> nets = WirelessManager::getWirelessNetworks(d->dev);
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
index 836e11a..36dd802 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
@@ -67,7 +67,7 @@ void WirelessNetworkItem::slotActivate()
 	NMProxy* nm = NMProxy::getInstance();
 	int id;
 	TQT_DBusError err;
-	printf("slotActivate\n\r");
+	printf("slotActivate\n");
 	if (_dev && nm)
 	{
 		if ( _conn )
@@ -84,7 +84,7 @@ void WirelessNetworkItem::slotActivate()
 		else
 		{
 			// TODO: create new connection based upon the network and show the dialog
-			printf("New network support not implemented yet\n\r");
+			printf("New network support not implemented yet\n");
 		}
 	}
 }
diff --git a/knetworkmanager-0.8/src/vpn_tray_component.cpp b/knetworkmanager-0.8/src/vpn_tray_component.cpp
index b02412f..b067ba8 100644
--- a/knetworkmanager-0.8/src/vpn_tray_component.cpp
+++ b/knetworkmanager-0.8/src/vpn_tray_component.cpp
@@ -102,7 +102,7 @@ void VPNTrayComponent::addMenuItems(TDEPopupMenu* menu)
 					}
 
 					if (vpn_found == 1) {
-						printf("Active VPN connection found\n\r");
+						printf("Active VPN connection found\n");
 					}
 					else {
 						int id = popup->insertItem(SmallIcon ("encrypted",  TQIconSet::Automatic), title, item, TQT_SLOT(slotActivate()));