[PC-BSD Commits] r4735 - in pcbsd/trunk/pcbsd-netmanager: . src src/NetworkManager src/NetworkManagerAdmin src/NetworkTray src/ethernetconfig src/wificonfig

svn at pcbsd.org svn at pcbsd.org
Thu Oct 22 13:18:03 PDT 2009


Author: kris
Date: 2009-10-22 13:18:02 -0700 (Thu, 22 Oct 2009)
New Revision: 4735

Added:
   pcbsd/trunk/pcbsd-netmanager/pcbsdnetmanager.pro
   pcbsd/trunk/pcbsd-netmanager/src/src.pro
Removed:
   pcbsd/trunk/pcbsd-netmanager/CMakeLists.txt
   pcbsd/trunk/pcbsd-netmanager/src/CMakeLists.txt
   pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/CMakeLists.txt
   pcbsd/trunk/pcbsd-netmanager/src/NetworkManagerAdmin/CMakeLists.txt
   pcbsd/trunk/pcbsd-netmanager/src/NetworkTray/CMakeLists.txt
   pcbsd/trunk/pcbsd-netmanager/src/ethernetconfig/CMakeLists.txt
   pcbsd/trunk/pcbsd-netmanager/src/wificonfig/CMakeLists.txt
Modified:
   pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/NetworkManager.pro
   pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/kcm.cpp
   pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/kcm.h
   pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/pcnetwork.desktop
   pcbsd/trunk/pcbsd-netmanager/src/NetworkManagerAdmin/NetworkManagerAdmin.pro
   pcbsd/trunk/pcbsd-netmanager/src/NetworkTray/NetworkTray.pro
   pcbsd/trunk/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.pro
   pcbsd/trunk/pcbsd-netmanager/src/wificonfig/wificonfig.pro
Log:

Update to the network manager, keeping us consistent, use qmake for everything, added .pro files
for loading individual components.



Modified: pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/NetworkManager.pro
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/NetworkManager.pro	2009-10-22 18:14:37 UTC (rev 4734)
+++ pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/NetworkManager.pro	2009-10-22 20:18:02 UTC (rev 4735)
@@ -1,20 +1,20 @@
 TEMPLATE	= lib
 LANGUAGE	= C++
 
-CONFIG	+= qt warn_on release
+CONFIG	+= qt warn_on debug release
 
-LIBS	+= -Ikdelibs -L/usr/local/kde4/lib -L/usr/local/lib -lkdecore -lkio -lkdeui -lpcbsd
+LIBS	+= -L/usr/local/kde4/lib -L/usr/local/lib -lkdecore -lkio -lkdeui -lpcbsd -Ikdelibs
 
 INCLUDEPATH	+= /usr/PCBSD/includes /usr/local/include /usr/local/kde4/include
 
-HEADERS	+= kcm.h networkman.cpp restartpopup.h 
+HEADERS	+= kcm.h networkman.h restartpopup.h 
 
 SOURCES	+= kcm.cpp networkman.cpp restartpopup.cpp
 
 FORMS	= networkman.ui \
-	  restartpopup.ui \
+	  restartpopup.ui
 
-RESOURCES = NetworkManager.qrc 
+RESOURCES += NetworkManager.qrc 
 
 TARGET  = kcm_pcbsdnetwork
 

Modified: pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/kcm.cpp
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/kcm.cpp	2009-10-22 18:14:37 UTC (rev 4734)
+++ pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/kcm.cpp	2009-10-22 20:18:02 UTC (rev 4735)
@@ -3,6 +3,7 @@
 #include <kglobal.h>
 #include <kgenericfactory.h>
 #include "networkman.h"
+#include "ui_networkman.h"
 #include <kcmodule.h>
 #include <kcm.h>
 #include <qtranslator.h>
@@ -27,8 +28,6 @@
   QString LANG="NetworkManager";
   KGlobal::locale()->insertCatalog(LANG);
 
-
-
   netproc = new NetworkMan();
   netproc->Init();
   if ( ! checkRoot() )

Modified: pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/kcm.h
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/kcm.h	2009-10-22 18:14:37 UTC (rev 4734)
+++ pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/kcm.h	2009-10-22 20:18:02 UTC (rev 4735)
@@ -4,6 +4,8 @@
 #include <networkman.h>
 #include <kcmodule.h>
 #include <stdlib.h>
+#include "ui_networkman.h"
+#include "networkman.h"
 
 class KConfigDialogManager;
 
@@ -26,7 +28,7 @@
    void configChanged();
 
 private: 
-   NetworkMan *netproc;
+  NetworkMan *netproc;
 
 };
 

Modified: pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/pcnetwork.desktop
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/pcnetwork.desktop	2009-10-22 18:14:37 UTC (rev 4734)
+++ pcbsd/trunk/pcbsd-netmanager/src/NetworkManager/pcnetwork.desktop	2009-10-22 20:18:02 UTC (rev 4735)
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell4 pcbsdnetwork
+Exec=kcmshell4 pcnetwork
 Icon=network-wired
 Type=Service
 ServiceTypes=KCModule
-X-KDE-Library=kcm_pcbsdnetwork
+X-KDE-Library=libkcm_pcbsdnetwork
 X-KDE-ParentApp=kcontrol
 X-KDE-System-Settings-Parent-Category=network-and-connectivity
 

Modified: pcbsd/trunk/pcbsd-netmanager/src/NetworkManagerAdmin/NetworkManagerAdmin.pro
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/src/NetworkManagerAdmin/NetworkManagerAdmin.pro	2009-10-22 18:14:37 UTC (rev 4734)
+++ pcbsd/trunk/pcbsd-netmanager/src/NetworkManagerAdmin/NetworkManagerAdmin.pro	2009-10-22 20:18:02 UTC (rev 4735)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -lkdecore -lkdeui -lkio -Ikdelibs
+LIBS	+= -lkdecore -lkdeui -lkio -Ikdelibs -lpcbsd
 
 HEADERS	+= netmanadmin.h
 

Modified: pcbsd/trunk/pcbsd-netmanager/src/NetworkTray/NetworkTray.pro
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/src/NetworkTray/NetworkTray.pro	2009-10-22 18:14:37 UTC (rev 4734)
+++ pcbsd/trunk/pcbsd-netmanager/src/NetworkTray/NetworkTray.pro	2009-10-22 20:18:02 UTC (rev 4735)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -lkdecore -lkdeui -lkio -Ikdelibs
+LIBS	+= -lkdecore -lkdeui -lkio -Ikdelibs -lpcbsd
 
 HEADERS	+= NetworkTray.h
 

Modified: pcbsd/trunk/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.pro
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.pro	2009-10-22 18:14:37 UTC (rev 4734)
+++ pcbsd/trunk/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.pro	2009-10-22 20:18:02 UTC (rev 4735)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -lkdecore -lkdeui -lkio -Ikdelibs
+LIBS	+= -lkdecore -lkdeui -lkio -Ikdelibs -lpcbsd
 
 HEADERS	+= ethernetconfig.h
 

Modified: pcbsd/trunk/pcbsd-netmanager/src/wificonfig/wificonfig.pro
===================================================================
--- pcbsd/trunk/pcbsd-netmanager/src/wificonfig/wificonfig.pro	2009-10-22 18:14:37 UTC (rev 4734)
+++ pcbsd/trunk/pcbsd-netmanager/src/wificonfig/wificonfig.pro	2009-10-22 20:18:02 UTC (rev 4735)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -lkdecore -lkdeui -lkio -Ikdelibs
+LIBS	+= -lkdecore -lkdeui -lkio -Ikdelibs -lpcbsd
 
 HEADERS	+= dialogwpaenterprise.h dialogwpapersonal.h wepconfig.h wificonfigwidgetbase.h wifiscanssid.h wifiselectiondialog.h
 



More information about the Commits mailing list