Rearrange files again

21 files changed, 12 insertions, 14 deletions

diff --git a/tdenetworkmanager/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt
index a379be9..aa06061 100644
--- a/tdenetworkmanager/src/CMakeLists.txt
+++ b/tdenetworkmanager/src/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_definitions( -UQT_NO_ASCII_CAST )
 
 #add_subdirectory( settings )
-#add_subdirectory( configwidgets )
+add_subdirectory( configwidgets )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -63,6 +63,6 @@ tde_add_tdeinit_executable( knetworkmanager AUTOMOC
     #knetworkmanager-pluginmanager.cpp knetworkmanager-vpnservice.cpp knetworkmanager-vpnmanager.cpp
     #knetworkmanager-vpnauthenticationdialog.cpp
     #vpn_tray_component.cpp
-  EMBED tdenetwork-connection-configwidgets-static tdenetwork-connection-settings-static
+  EMBED tdenetwork-connection-configwidgets-static #tdenetwork-connection-settings-static
   LINK tdecore-shared tdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES}
 )
diff --git a/tdenetworkmanager/src/settings/connection_setting_cdma.ui b/tdenetworkmanager/src/configwidgets/connection_setting_cdma.ui
index 5674468..5674468 100644
--- a/tdenetworkmanager/src/settings/connection_setting_cdma.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_cdma.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_gsm.ui b/tdenetworkmanager/src/configwidgets/connection_setting_gsm.ui
index c89a749..c89a749 100644
--- a/tdenetworkmanager/src/settings/connection_setting_gsm.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_gsm.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_info.ui b/tdenetworkmanager/src/configwidgets/connection_setting_info.ui
index 72a6e87..72a6e87 100644
--- a/tdenetworkmanager/src/settings/connection_setting_info.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_info.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_ipv4.ui b/tdenetworkmanager/src/configwidgets/connection_setting_ipv4.ui
index 0f08a00..0f08a00 100644
--- a/tdenetworkmanager/src/settings/connection_setting_ipv4.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_ipv4.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_ppp.ui b/tdenetworkmanager/src/configwidgets/connection_setting_ppp.ui
index 7db6e5e..7db6e5e 100644
--- a/tdenetworkmanager/src/settings/connection_setting_ppp.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_ppp.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_serial.ui b/tdenetworkmanager/src/configwidgets/connection_setting_serial.ui
index 2a3b9ad..2a3b9ad 100644
--- a/tdenetworkmanager/src/settings/connection_setting_serial.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_serial.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_vpn.ui b/tdenetworkmanager/src/configwidgets/connection_setting_vpn.ui
index 976fc25..976fc25 100644
--- a/tdenetworkmanager/src/settings/connection_setting_vpn.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_vpn.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui
index 9415ce4..9415ce4 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security.ui
index 5fce58f..5fce58f 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security_auth.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_auth.ui
index ce88e51..ce88e51 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security_auth.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_auth.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security_eap.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_eap.ui
index a851a93..a851a93 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security_eap.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_eap.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security_phase2.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_phase2.ui
index b3237d4..b3237d4 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security_phase2.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_phase2.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wep.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wep.ui
index c07033e..c07033e 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wep.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wep.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wepencryption.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wepencryption.ui
index 50c149d..50c149d 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wepencryption.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wepencryption.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpacipher.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wpacipher.ui
index a402e66..a402e66 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpacipher.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wpacipher.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpapsk.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wpapsk.ui
index 4df8eea..4df8eea 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpapsk.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wpapsk.ui
diff --git a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpaversion.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wpaversion.ui
index 11b1655..11b1655 100644
--- a/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpaversion.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless_security_wpaversion.ui
diff --git a/tdenetworkmanager/src/settings/connection_settings.ui b/tdenetworkmanager/src/configwidgets/connection_settings.ui
index c7994de..c7994de 100644
--- a/tdenetworkmanager/src/settings/connection_settings.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_settings.ui
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.cpp
index b09fea9..c803b4a 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.cpp
@@ -34,19 +34,17 @@
 #include <kuser.h>
 
 // knm headers
-#include "knetworkmanager-connection.h"
-#include "knetworkmanager-connection_setting_cdma.h"
 #include "knetworkmanager-connection_setting_cdma_widget.h"
-#include "knetworkmanager-device.h"
 
+// ui headers
 #include "connection_setting_cdma.h"
 
 using namespace ConnectionSettings;
 
-CDMAWidgetImpl::CDMAWidgetImpl(Connection* conn, TQWidget* parent, const char* name, WFlags fl)
+CDMAWidgetImpl::CDMAWidgetImpl(TDENetworkConnection* conn, TQWidget* parent, const char* name, WFlags fl)
 	: WidgetInterface(parent, name, fl)
 {
-	_cdmasetting = dynamic_cast<ConnectionSettings::CDMA*> (conn->getSetting(NM_SETTING_CDMA_SETTING_NAME));
+	_cdmasetting = dynamic_cast<TDEModemConnection*> (conn);
 
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 1, 1);
 	_mainWid = new ConnectionSettingCdmaWidget(this);
diff --git a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.h
index 6ee8a37..0cbbfee 100644
--- a/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.h
+++ b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.h
@@ -26,14 +26,16 @@
 #define KNETWORKMANAGER_CONNECTION_SETTING_CDMA_WIDGET_H
 
 
-// qt headers
+// tqt headers
 #include <tqwidget.h>
 #include <tqlineedit.h>
 
+// tde headers
+#include <tdehardwaredevices.h>
+#include <tdenetworkconnections.h>
+
 // knm headers
-#include "knetworkmanager-connection_setting_cdma.h"
 #include "knetworkmanager-connection_setting_widget_interface.h"
-#include "knetworkmanager-device.h"
 
 //class VPNService;
 class ConnectionSettingCdmaWidget;
@@ -41,14 +43,12 @@ class ConnectionSettingCdmaWidget;
 namespace ConnectionSettings
 {
 
-class Connection;
-
 class CDMAWidgetImpl : public WidgetInterface
 {
 	Q_OBJECT
   
 	public:
-		CDMAWidgetImpl(Connection* conn, TQWidget* parent = NULL, const char* name = NULL, WFlags fl = 0);
+		CDMAWidgetImpl(TDENetworkConnection* conn, TQWidget* parent = NULL, const char* name = NULL, WFlags fl = 0);
 		void Activate();
 		void Deactivate();
 	public slots:
@@ -59,7 +59,7 @@ class CDMAWidgetImpl : public WidgetInterface
 		//VPNConfigWidget* getVPNConfigWidget(VPNService* service);
 
 
-		CDMA* _cdmasetting;
+		TDEModemConnection* _cdmasetting;
 		ConnectionSettingCdmaWidget* _mainWid;
 };