lib creating mocs...

6 files changed, 59 insertions, 11 deletions

diff --git a/gui/AddRm/PkAddRm.cpp b/gui/AddRm/PkAddRm.cpp
index 9a40e60..31ae573 100755
--- a/gui/AddRm/PkAddRm.cpp
+++ b/gui/AddRm/PkAddRm.cpp
@@ -80,10 +80,10 @@ PkAddRm::PkAddRm( QWidget *parent )
 
     //initialize the groups
     QStringList groups = m_daemon->getGroups();
-    for (int i = 0; i < groups.size(); ++i) {
-	Groups::Value v = (Groups::Value)EnumFromString<Groups>( groups.at(i) );
-	groupsCB->addItem( PkStrings::GroupsIcon(v), PkStrings::Groups(v), v );
-    }
+//     for (int i = 0; i < groups.size(); ++i) {
+// 	Groups::Value v = (Groups::Value)EnumFromString<Groups>( groups.at(i) );
+// 	groupsCB->addItem( PkStrings::GroupsIcon(v), PkStrings::Groups(v), v );
+//     }
 
     // install the backend filters
     FilterMenu( m_daemon->getFilters() );
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 625d122..bbd075c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -15,11 +15,12 @@ include(FindPkgConfig)
 pkg_check_modules(POLICYKIT polkit-dbus)
 
 include_directories(
+${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
   ${QT_INCLUDES}
   ${POLICYKIT_INCLUDE_DIRS}
 )
 
-set( packagekit-qt_LIB_SRCS
+set( PK_LIB_SRCS
 	CentralProxy.cpp
 	Daemon.cpp
 	Package.cpp
@@ -27,8 +28,52 @@ set( packagekit-qt_LIB_SRCS
 	Transaction.cpp
 	TransactionProxy.cpp
 )
+# 	SignatureType.cpp
+# 	Status.cpp
+# 	Groups.cpp
+# )
 
-add_library(packagekit-qt SHARED ${packagekit-qt_LIB_SRCS})
+# qt4_automoc(${PK_LIB_SRCS})
+
+set( PK_SRCS
+	CentralProxy.h
+	Daemon.h
+	Package.h
+	PolkitClient.h
+	Transaction.h
+	TransactionProxy.h
+	Error.h
+	Exit.h
+	Actions.h
+	Provides.h
+	Restart.h
+	Role.h
+	SignatureType.h
+	Status.h
+	Groups.h
+)
+
+QT4_WRAP_CPP( Pk_MOC_SRCS ${PK_SRCS} )
+
+# set( packagekit-qt_MOC_SRCS
+# 	CentralProxy.moc
+# 	Daemon.moc
+# 	Package.moc
+# 	PolkitClient.moc
+# 	Transaction.moc
+# 	TransactionProxy.moc
+# 	Error.moc
+# 	Exit.moc
+# 	Actions.moc
+# 	Provides.moc
+# 	Restart.moc
+# 	Role.moc
+# 	SignatureType.moc
+# 	Status.moc
+# 	Groups.moc
+# )
+
+add_library(packagekit-qt SHARED ${Pk_MOC_SRCS} ${PK_LIB_SRCS})
 set_target_properties( packagekit-qt PROPERTIES VERSION 0.1 SOVERSION 0 )
 
 target_link_libraries(packagekit-qt
@@ -50,7 +95,6 @@ install(FILES
 	Exit.h
 	Actions.h
 	Error.h
-	Exit.h
 	Enum.h
 	Provides.h
 	Restart.h
diff --git a/lib/Daemon.cpp b/lib/Daemon.cpp
index f0a5a03..a224857 100644
--- a/lib/Daemon.cpp
+++ b/lib/Daemon.cpp
@@ -96,3 +96,4 @@ void Daemon::sendAuthRefused(const QString &message) {
 void Daemon::NetworkStateChanged_cb(const QString &status) {
 	emit NetworkStateChanged((status == "online"));
 }
+
diff --git a/lib/Package.cpp b/lib/Package.cpp
index 40e41c7..d064e61 100644
--- a/lib/Package.cpp
+++ b/lib/Package.cpp
@@ -63,3 +63,4 @@ const QString& Package::summary() {
 bool Package::operator==(const Package &other) const {
 	return const_cast<Package*>(this)->id() == const_cast<Package&>(other).id();
 }
+
diff --git a/lib/PolkitClient.cpp b/lib/PolkitClient.cpp
index 8717f26..480ec0a 100644
--- a/lib/PolkitClient.cpp
+++ b/lib/PolkitClient.cpp
@@ -17,3 +17,4 @@ bool PolkitClient::getAuth(const QString &action) {
     }
     return auth;
 }
+
diff --git a/lib/SignatureType.h b/lib/SignatureType.h
index 270d6fe..ff9ca7f 100644
--- a/lib/SignatureType.h
+++ b/lib/SignatureType.h
@@ -24,10 +24,11 @@ class SignatureType : public QObject {
 	Q_ENUMS(Value)
 
 public:
-	enum Value {
-		Gpg,
-		Unknown
-	};
+typedef enum {
+	Gpg,
+	Unknown
+} Value;
+
 };
 
 } // End namespace PackageKit