[PC-BSD Commits] r4757 - pcbsd/trunk/kcmPFManager
svn at pcbsd.org
svn at pcbsd.org
Mon Oct 26 08:07:23 PST 2009
Author: kris
Date: 2009-10-26 09:07:23 -0700 (Mon, 26 Oct 2009)
New Revision: 4757
Modified:
pcbsd/trunk/kcmPFManager/moc_kcm.cpp
pcbsd/trunk/kcmPFManager/moc_pfmanagerdlg.cpp
pcbsd/trunk/kcmPFManager/notroot.cpp
pcbsd/trunk/kcmPFManager/notroot.h
Log:
Fixed launching typo, kdesu needs ' ' around any weird variables like --lang
Modified: pcbsd/trunk/kcmPFManager/moc_kcm.cpp
===================================================================
--- pcbsd/trunk/kcmPFManager/moc_kcm.cpp 2009-10-26 15:25:56 UTC (rev 4756)
+++ pcbsd/trunk/kcmPFManager/moc_kcm.cpp 2009-10-26 16:07:23 UTC (rev 4757)
@@ -1,92 +1,75 @@
/****************************************************************************
-** PFManager meta object code from reading C++ file 'kcm.hpp'
+** Meta object code from reading C++ file 'kcm.hpp'
**
-** Created: Mon Jan 15 14:15:51 2007
-** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.6 edited Mar 8 17:43 $)
+** Created: Mon Oct 26 12:06:40 2009
+** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#undef QT_NO_COMPAT
#include "kcm.hpp"
-#include <qmetaobject.h>
-#include <qapplication.h>
-
-#include <private/qucomextra_p.h>
-#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
-#error "This file was generated using the moc from 3.3.6. It"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'kcm.hpp' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 61
+#error "This file was generated using the moc from 4.5.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
-const char *PFManager::className() const
-{
- return "PFManager";
-}
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_PFManager[] = {
-QMetaObject *PFManager::metaObj = 0;
-static QMetaObjectCleanUp cleanUp_PFManager( "PFManager", &PFManager::staticMetaObject );
+ // content:
+ 2, // revision
+ 0, // classname
+ 0, 0, // classinfo
+ 2, 12, // methods
+ 0, 0, // properties
+ 0, 0, // enums/sets
+ 0, 0, // constructors
-#ifndef QT_NO_TRANSLATION
-QString PFManager::tr( const char *s, const char *c )
-{
- if ( qApp )
- return qApp->translate( "PFManager", s, c, QApplication::DefaultCodec );
- else
- return QString::fromLatin1( s );
-}
-#ifndef QT_NO_TRANSLATION_UTF8
-QString PFManager::trUtf8( const char *s, const char *c )
-{
- if ( qApp )
- return qApp->translate( "PFManager", s, c, QApplication::UnicodeUTF8 );
- else
- return QString::fromUtf8( s );
-}
-#endif // QT_NO_TRANSLATION_UTF8
+ // slots: signature, parameters, type, tag, flags
+ 11, 10, 10, 10, 0x0a,
+ 18, 10, 10, 10, 0x0a,
-#endif // QT_NO_TRANSLATION
+ 0 // eod
+};
-QMetaObject* PFManager::staticMetaObject()
-{
- if ( metaObj )
- return metaObj;
- QMetaObject* parentObject = KCModule::staticMetaObject();
- metaObj = QMetaObject::new_metaobject(
- "PFManager", parentObject,
- 0, 0,
- 0, 0,
-#ifndef QT_NO_PROPERTIES
- 0, 0,
- 0, 0,
-#endif // QT_NO_PROPERTIES
- 0, 0 );
- cleanUp_PFManager.setMetaObject( metaObj );
- return metaObj;
-}
+static const char qt_meta_stringdata_PFManager[] = {
+ "PFManager\0\0load()\0save()\0"
+};
-void* PFManager::qt_cast( const char* clname )
-{
- if ( !qstrcmp( clname, "PFManager" ) )
- return this;
- return KCModule::qt_cast( clname );
-}
+const QMetaObject PFManager::staticMetaObject = {
+ { &KCModule::staticMetaObject, qt_meta_stringdata_PFManager,
+ qt_meta_data_PFManager, 0 }
+};
-bool PFManager::qt_invoke( int _id, QUObject* _o )
+const QMetaObject *PFManager::metaObject() const
{
- return KCModule::qt_invoke(_id,_o);
+ return &staticMetaObject;
}
-bool PFManager::qt_emit( int _id, QUObject* _o )
+void *PFManager::qt_metacast(const char *_clname)
{
- return KCModule::qt_emit(_id,_o);
+ if (!_clname) return 0;
+ if (!strcmp(_clname, qt_meta_stringdata_PFManager))
+ return static_cast<void*>(const_cast< PFManager*>(this));
+ return KCModule::qt_metacast(_clname);
}
-#ifndef QT_NO_PROPERTIES
-bool PFManager::qt_property( int id, int f, QVariant* v)
+int PFManager::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
- return KCModule::qt_property( id, f, v);
+ _id = KCModule::qt_metacall(_c, _id, _a);
+ if (_id < 0)
+ return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ switch (_id) {
+ case 0: load(); break;
+ case 1: save(); break;
+ default: ;
+ }
+ _id -= 2;
+ }
+ return _id;
}
-
-bool PFManager::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
-#endif // QT_NO_PROPERTIES
+QT_END_MOC_NAMESPACE
Modified: pcbsd/trunk/kcmPFManager/moc_pfmanagerdlg.cpp
===================================================================
--- pcbsd/trunk/kcmPFManager/moc_pfmanagerdlg.cpp 2009-10-26 15:25:56 UTC (rev 4756)
+++ pcbsd/trunk/kcmPFManager/moc_pfmanagerdlg.cpp 2009-10-26 16:07:23 UTC (rev 4757)
@@ -1,107 +1,100 @@
/****************************************************************************
-** PFManagerDlg meta object code from reading C++ file 'pfmanagerdlg.hpp'
+** Meta object code from reading C++ file 'pfmanagerdlg.hpp'
**
-** Created: Mon Jan 15 14:15:58 2007
-** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.6 edited Mar 8 17:43 $)
+** Created: Mon Oct 26 11:53:38 2009
+** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#undef QT_NO_COMPAT
#include "pfmanagerdlg.hpp"
-#include <qmetaobject.h>
-#include <qapplication.h>
-
-#include <private/qucomextra_p.h>
-#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
-#error "This file was generated using the moc from 3.3.6. It"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'pfmanagerdlg.hpp' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 61
+#error "This file was generated using the moc from 4.5.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
-const char *PFManagerDlg::className() const
-{
- return "PFManagerDlg";
-}
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_PFManagerDlg[] = {
-QMetaObject *PFManagerDlg::metaObj = 0;
-static QMetaObjectCleanUp cleanUp_PFManagerDlg( "PFManagerDlg", &PFManagerDlg::staticMetaObject );
+ // content:
+ 2, // revision
+ 0, // classname
+ 0, 0, // classinfo
+ 12, 12, // methods
+ 0, 0, // properties
+ 0, 0, // enums/sets
+ 0, 0, // constructors
-#ifndef QT_NO_TRANSLATION
-QString PFManagerDlg::tr( const char *s, const char *c )
-{
- if ( qApp )
- return qApp->translate( "PFManagerDlg", s, c, QApplication::DefaultCodec );
- else
- return QString::fromLatin1( s );
-}
-#ifndef QT_NO_TRANSLATION_UTF8
-QString PFManagerDlg::trUtf8( const char *s, const char *c )
-{
- if ( qApp )
- return qApp->translate( "PFManagerDlg", s, c, QApplication::UnicodeUTF8 );
- else
- return QString::fromUtf8( s );
-}
-#endif // QT_NO_TRANSLATION_UTF8
+ // slots: signature, parameters, type, tag, flags
+ 14, 13, 13, 13, 0x0a,
+ 30, 13, 13, 13, 0x0a,
+ 45, 13, 13, 13, 0x0a,
+ 59, 13, 13, 13, 0x0a,
+ 76, 13, 13, 13, 0x0a,
+ 89, 13, 13, 13, 0x0a,
+ 103, 13, 13, 13, 0x0a,
+ 119, 13, 13, 13, 0x0a,
+ 136, 13, 13, 13, 0x0a,
+ 143, 13, 13, 13, 0x0a,
+ 150, 13, 13, 13, 0x0a,
+ 164, 13, 13, 13, 0x0a,
-#endif // QT_NO_TRANSLATION
+ 0 // eod
+};
-QMetaObject* PFManagerDlg::staticMetaObject()
-{
- if ( metaObj )
- return metaObj;
- QMetaObject* parentObject = MainDialog::staticMetaObject();
- static const QUMethod slot_0 = {"enableClicked", 0, 0 };
- static const QUMethod slot_1 = {"save", 0, 0 };
- static const QUMethod slot_2 = {"load", 0, 0 };
- static const QMetaData slot_tbl[] = {
- { "enableClicked()", &slot_0, QMetaData::Public },
- { "save()", &slot_1, QMetaData::Public },
- { "load()", &slot_2, QMetaData::Public }
- };
- metaObj = QMetaObject::new_metaobject(
- "PFManagerDlg", parentObject,
- slot_tbl, 3,
- 0, 0,
-#ifndef QT_NO_PROPERTIES
- 0, 0,
- 0, 0,
-#endif // QT_NO_PROPERTIES
- 0, 0 );
- cleanUp_PFManagerDlg.setMetaObject( metaObj );
- return metaObj;
-}
+static const char qt_meta_stringdata_PFManagerDlg[] = {
+ "PFManagerDlg\0\0enableClicked()\0"
+ "startClicked()\0stopClicked()\0"
+ "restartClicked()\0addClicked()\0"
+ "editClicked()\0deleteClicked()\0"
+ "restoreClicked()\0save()\0load()\0"
+ "refreshList()\0refreshStatus()\0"
+};
-void* PFManagerDlg::qt_cast( const char* clname )
-{
- if ( !qstrcmp( clname, "PFManagerDlg" ) )
- return this;
- return MainDialog::qt_cast( clname );
-}
+const QMetaObject PFManagerDlg::staticMetaObject = {
+ { &QDialog::staticMetaObject, qt_meta_stringdata_PFManagerDlg,
+ qt_meta_data_PFManagerDlg, 0 }
+};
-bool PFManagerDlg::qt_invoke( int _id, QUObject* _o )
+const QMetaObject *PFManagerDlg::metaObject() const
{
- switch ( _id - staticMetaObject()->slotOffset() ) {
- case 0: enableClicked(); break;
- case 1: save(); break;
- case 2: load(); break;
- default:
- return MainDialog::qt_invoke( _id, _o );
- }
- return TRUE;
+ return &staticMetaObject;
}
-bool PFManagerDlg::qt_emit( int _id, QUObject* _o )
+void *PFManagerDlg::qt_metacast(const char *_clname)
{
- return MainDialog::qt_emit(_id,_o);
+ if (!_clname) return 0;
+ if (!strcmp(_clname, qt_meta_stringdata_PFManagerDlg))
+ return static_cast<void*>(const_cast< PFManagerDlg*>(this));
+ return QDialog::qt_metacast(_clname);
}
-#ifndef QT_NO_PROPERTIES
-bool PFManagerDlg::qt_property( int id, int f, QVariant* v)
+int PFManagerDlg::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
- return MainDialog::qt_property( id, f, v);
+ _id = QDialog::qt_metacall(_c, _id, _a);
+ if (_id < 0)
+ return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ switch (_id) {
+ case 0: enableClicked(); break;
+ case 1: startClicked(); break;
+ case 2: stopClicked(); break;
+ case 3: restartClicked(); break;
+ case 4: addClicked(); break;
+ case 5: editClicked(); break;
+ case 6: deleteClicked(); break;
+ case 7: restoreClicked(); break;
+ case 8: save(); break;
+ case 9: load(); break;
+ case 10: refreshList(); break;
+ case 11: refreshStatus(); break;
+ default: ;
+ }
+ _id -= 12;
+ }
+ return _id;
}
-
-bool PFManagerDlg::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; }
-#endif // QT_NO_PROPERTIES
+QT_END_MOC_NAMESPACE
Modified: pcbsd/trunk/kcmPFManager/notroot.cpp
===================================================================
--- pcbsd/trunk/kcmPFManager/notroot.cpp 2009-10-26 15:25:56 UTC (rev 4756)
+++ pcbsd/trunk/kcmPFManager/notroot.cpp 2009-10-26 16:07:23 UTC (rev 4757)
@@ -42,13 +42,8 @@
{
QString locale = KGlobal::locale()->language();
- // Launch the kcmshell4 process as root
- QString prog = "kdesu";
- QStringList args;
- args << "kcmshell4" << "--lang" << locale << "pfmanager";
-
- launchAdminProc = new QProcess( this );
- launchAdminProc->start(prog,args);
+ QString prog = "kdesu 'kcmshell4 --lang " + locale + " pfmanager' &";
+ system( prog.toLatin1() );
}
Modified: pcbsd/trunk/kcmPFManager/notroot.h
===================================================================
--- pcbsd/trunk/kcmPFManager/notroot.h 2009-10-26 15:25:56 UTC (rev 4756)
+++ pcbsd/trunk/kcmPFManager/notroot.h 2009-10-26 16:07:23 UTC (rev 4757)
@@ -25,7 +25,6 @@
void slotLaunchAdmin();
private:
- QProcess *launchAdminProc;
signals:
More information about the Commits
mailing list