File fix_uuid.patch of Package knetworkmanager-kde3

Overview Repositories Revisions Requests Users Attributes Meta

File fix_uuid.patch of Package knetworkmanager-kde3

Index: knetworkmanager/src/knetworkmanager-connection.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection.h	(Revision 835773)
+++ knetworkmanager/src/knetworkmanager-connection.h	(Arbeitskopie)
@@ -58,8 +58,8 @@
 			Connection();
 			virtual ~Connection();
 
-			QString                        getID() const;
-			void                           setID(const QString& id);
+			virtual QString                        getID() const = 0;
+			virtual void                           setID(const QString& id) = 0;
 
 			// get a specific setting
 			ConnectionSetting*             getSetting(const QString&) const;
Index: knetworkmanager/src/knetworkmanager-generic_connection.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-generic_connection.cpp	(Revision 835773)
+++ knetworkmanager/src/knetworkmanager-generic_connection.cpp	(Arbeitskopie)
@@ -71,6 +71,18 @@
 		return QString::null;
 }
 
+QString
+GenericConnection::getID() const
+{
+	return getInfoSetting()->getUUID();
+}
+
+void
+GenericConnection::setID(const QString& id)
+{
+	getInfoSetting()->setUUID(id);
+}
+
 Info* GenericConnection::getInfoSetting() const
 {
 	return dynamic_cast<Info*>(getSetting("connection"));
Index: knetworkmanager/src/knetworkmanager-connection.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection.cpp	(Revision 835773)
+++ knetworkmanager/src/knetworkmanager-connection.cpp	(Arbeitskopie)
@@ -56,7 +56,6 @@
 {
 	public:
 		ConnectionPrivate(Connection* parent)
-      : id("")
     {
 			conn_dbus = new ConnectionDBus(parent);
 			conn_secrets_dbus = new ConnectionSecretsDBus(parent);
@@ -66,7 +65,6 @@
 		QDBusObjectPath        obj_path;
 		ConnectionDBus*        conn_dbus;
 		ConnectionSecretsDBus* conn_secrets_dbus;
-		QString                id;
 		QValueList<ConnectionSetting*> settings;
 		QString                specific_object;
 };
@@ -102,18 +100,6 @@
 	delete d;
 }
 
-QString
-Connection::getID() const
-{
-	return d->id;
-}
-
-void
-Connection::setID(const QString& id)
-{
-	d->id = id;
-}
-
 ConnectionSetting*
 Connection::getSetting(const QString& type) const
 {
Index: knetworkmanager/src/knetworkmanager-generic_connection.h
===================================================================
--- knetworkmanager/src/knetworkmanager-generic_connection.h	(Revision 835773)
+++ knetworkmanager/src/knetworkmanager-generic_connection.h	(Arbeitskopie)
@@ -48,6 +48,9 @@
 			GenericConnection(const QString&);
 			QString getType();
 
+			QString getID() const;
+			void    setID(const QString& id);
+
 			Info* getInfoSetting() const;
 	};
 }
Index: knetworkmanager/src/knetworkmanager-connection_setting_info.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_info.h	(Revision 864752)
+++ knetworkmanager/src/knetworkmanager-connection_setting_info.h	(Revision 864753)
@@ -62,13 +62,17 @@
 		QDateTime   getTimestamp() const;
 		void        setTimestamp(const QDateTime&);
 
+		QString     getUUID() const;
+		void        setUUID(const QString&);
+
 		bool        isValid() const;
 
-		private:
+	private:
 		QString    _name;
 		QString    _devtype;
 		bool       _autoconnect;
 		QDateTime  _timestamp;
+		QString    _uuid;
 };
 
 }
Index: knetworkmanager/src/knetworkmanager-connection_setting_info.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_info.cpp	(Revision 864752)
+++ knetworkmanager/src/knetworkmanager-connection_setting_info.cpp	(Revision 864753)
@@ -104,14 +104,26 @@
 	_timestamp = dt;
 }
 
+QString
+Info::getUUID() const
+{
+	return _uuid;
+}
+
+void
+Info::setUUID(const QString& uuid)
+{
+	_uuid = uuid;
+}
+
 SettingsMap
 Info::toMap() const
 {
 	SettingsMap map;
 	map.insert(NM_SETTING_CONNECTION_ID, QDBusData::fromString(_name));
 	map.insert(NM_SETTING_CONNECTION_TYPE, QDBusData::fromString(_devtype));
-
 	map.insert(NM_SETTING_CONNECTION_AUTOCONNECT, QDBusData::fromBool(_autoconnect));
+	map.insert(NM_SETTING_CONNECTION_UUID, QDBusData::fromString(_uuid));
 
 	if (!_timestamp.isNull())
 		map.insert(NM_SETTING_CONNECTION_TIMESTAMP, QDBusData::fromUInt32(_timestamp.toTime_t()));
@@ -135,6 +147,9 @@
 
 	if ((it = map.find(NM_SETTING_CONNECTION_TIMESTAMP)) != map.end())
 		_timestamp.setTime_t(it.data().toUInt32());
+
+	if ((it = map.find(NM_SETTING_CONNECTION_UUID)) != map.end())
+		_uuid = it.data().toString();
 }
 
 bool

Places

File fix_uuid.patch of Package knetworkmanager-kde3

Places