[PC-BSD Commits] r2149 - pcbsd/trunk/kcmPBMsource

[svn at pcbsd.org]

Author: kris
Date: 2008-06-21 11:54:21 -0700 (Sat, 21 Jun 2008)
New Revision: 2149

Modified:
   pcbsd/trunk/kcmPBMsource/PBM.pro
   pcbsd/trunk/kcmPBMsource/kcm.cpp
   pcbsd/trunk/kcmPBMsource/kcm.h
Log:

Updated the kcmPBMsource to the latest from my development, should launch
properly via system-settings now



Modified: pcbsd/trunk/kcmPBMsource/PBM.pro
===================================================================
--- pcbsd/trunk/kcmPBMsource/PBM.pro	2008-06-20 21:02:07 UTC (rev 2148)
+++ pcbsd/trunk/kcmPBMsource/PBM.pro	2008-06-21 18:54:21 UTC (rev 2149)
@@ -19,7 +19,7 @@
 
 TARGET  = kcm_pcbsdpbm
 
-DESTDIR = /usr/local/kde4/lib/
+DESTDIR = /usr/local/kde4/lib/kde4
 
 TRANSLATIONS = PBM_en_US.ts 
 

Modified: pcbsd/trunk/kcmPBMsource/kcm.cpp
===================================================================
--- pcbsd/trunk/kcmPBMsource/kcm.cpp	2008-06-20 21:02:07 UTC (rev 2148)
+++ pcbsd/trunk/kcmPBMsource/kcm.cpp	2008-06-21 18:54:21 UTC (rev 2149)
@@ -10,11 +10,13 @@
 #include <kcm.h>
 #include <qtranslator.h>
 
-K_PLUGIN_FACTORY(PCBSDPBMFactory, registerPlugin<PCBSDPBM>();)
-K_EXPORT_PLUGIN(PCBSDPBMFactory("kcm_pcbsdpbm"))
+K_PLUGIN_FACTORY(PCBSDPBMFactory, 
+                 registerPlugin<PCBSDPBM>();
+                )
+K_EXPORT_PLUGIN(PCBSDPBMFactory("kcmpcbsdpbm"))
 
-PCBSDPBM::PCBSDPBM(QWidget *parent, const QVariantList &args)
-   :    KCModule(PCBSDPBMFactory::componentData(), parent, args)
+PCBSDPBM::PCBSDPBM(QWidget *parent, const QVariantList &lst)
+   :    KCModule(PCBSDPBMFactory::componentData(), parent, lst)
 {
   layout = new Q3GridLayout(this);
   layout->setAutoAdd(true);
@@ -23,14 +25,14 @@
   
   if ( checkRoot() )
   {
-   buttons();
-   setButtons(KCModule::Help);
-  QString LANG="PBMsource";
-  KGlobal::locale()->insertCatalog(LANG);
+     buttons();
+     setButtons(KCModule::Help);
+     QString LANG="PBMsource";
+     KGlobal::locale()->insertCatalog(LANG);
 
-  PBM *pbmproc = new PBM(parent);
-  pbmproc->reparent(this, QPoint());
-  pbmproc->ProgramInit();
+     PBM *pbmproc = new PBM(parent);
+     pbmproc->reparent(this, QPoint());
+     pbmproc->ProgramInit();
   } else  {
       setButtons(KCModule::Help);
       NotRoot *nroot = new NotRoot(parent);
@@ -43,20 +45,21 @@
 }
 
 
-bool    PCBSDPBM::checkRoot() {
+bool PCBSDPBM::checkRoot() {
     return (getuid() == 0);
 }
 
 
-void    PCBSDPBM::load() {
+void PCBSDPBM::load() {
     
 }
 
 
-void    PCBSDPBM::defaults() {
+void  PCBSDPBM::defaults() {
    load();
 }
 
 
-void    PCBSDPBM::save() {
+void  PCBSDPBM::save() {
+
 }

Modified: pcbsd/trunk/kcmPBMsource/kcm.h
===================================================================
--- pcbsd/trunk/kcmPBMsource/kcm.h	2008-06-20 21:02:07 UTC (rev 2148)
+++ pcbsd/trunk/kcmPBMsource/kcm.h	2008-06-21 18:54:21 UTC (rev 2149)
@@ -3,19 +3,20 @@
 #include <qdialog.h>
 #include <pbm.h>
 #include <kcmodule.h>
+class KConfigDialogManager;
 
-
-
-class  PCBSDPBM : public KCModule {
+class PCBSDPBM : public KCModule {
    Q_OBJECT
 
 public:
-   PCBSDPBM(QWidget *parent, const QVariantList &args);
+   PCBSDPBM(QWidget *parent=0, const QVariantList &args=QVariantList());
    ~PCBSDPBM();
+   bool checkRoot();
+   QLayout 	*layout;
    
+public slots:
    void load();
    void defaults();
    void save();
-   bool checkRoot();
-   QLayout 	*layout;
+
 };