From 4e6c7c0e4e0383ffb067942f79aea0ebd07d98cf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 6 Sep 2012 13:01:10 -0500 Subject: [PATCH] Rearrange files again --- tdenetworkmanager/src/CMakeLists.txt | 4 ++-- .../connection_setting_cdma.ui | 0 .../connection_setting_gsm.ui | 0 .../connection_setting_info.ui | 0 .../connection_setting_ipv4.ui | 0 .../connection_setting_ppp.ui | 0 .../connection_setting_serial.ui | 0 .../connection_setting_vpn.ui | 0 .../connection_setting_wireless.ui | 0 .../connection_setting_wireless_security.ui | 0 .../connection_setting_wireless_security_auth.ui | 0 .../connection_setting_wireless_security_eap.ui | 0 .../connection_setting_wireless_security_phase2.ui | 0 .../connection_setting_wireless_security_wep.ui | 0 ...tion_setting_wireless_security_wepencryption.ui | 0 ...nnection_setting_wireless_security_wpacipher.ui | 0 .../connection_setting_wireless_security_wpapsk.ui | 0 ...nection_setting_wireless_security_wpaversion.ui | 0 .../connection_settings.ui | 0 ...tworkmanager-connection_setting_cdma_widget.cpp | 8 +++----- ...networkmanager-connection_setting_cdma_widget.h | 14 +++++++------- 21 files changed, 12 insertions(+), 14 deletions(-) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_cdma.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_gsm.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_info.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_ipv4.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_ppp.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_serial.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_vpn.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security_auth.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security_eap.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security_phase2.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security_wep.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security_wepencryption.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security_wpacipher.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security_wpapsk.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_setting_wireless_security_wpaversion.ui (100%) rename tdenetworkmanager/src/{settings => configwidgets}/connection_settings.ui (100%) 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_cdma.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_gsm.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_info.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_ipv4.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_ppp.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_serial.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_vpn.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security_auth.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security_eap.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security_phase2.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security_wep.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security_wepencryption.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security_wpacipher.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security_wpapsk.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_setting_wireless_security_wpaversion.ui rename to 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 similarity index 100% rename from tdenetworkmanager/src/settings/connection_settings.ui rename to 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 // 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 (conn->getSetting(NM_SETTING_CDMA_SETTING_NAME)); + _cdmasetting = dynamic_cast (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 #include +// tde headers +#include +#include + // 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; };