Small fixes to make the PortageSettings class compilable

2 files changed, 19 insertions, 23 deletions

diff --git a/src/Qt/qportagesettings.cpp b/src/Qt/qportagesettings.cpp
index 4fbccb0..f69af6c 100644
--- a/src/Qt/qportagesettings.cpp
+++ b/src/Qt/qportagesettings.cpp
@@ -78,7 +78,4 @@ void PortageSettings::Free()
 
 }
 
-}
-
-
-#include "qportagesettings.moc"
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Qt/qportagesettings.h b/src/Qt/qportagesettings.h
index 4034dd1..e72af42 100644
--- a/src/Qt/qportagesettings.h
+++ b/src/Qt/qportagesettings.h
@@ -3,15 +3,14 @@
 
 
 #include <QObject>
-#include <portagesettings.h>
+#include "../portagesettings.h"
 
+class QString;
+class QStringList;
 
 namespace CppPortage {
-    
-    class QString;
-    class QStringList;
 
-class PortageSettings : public Q_OBJECT
+class PortageSettings : public QObject
 {
     Q_OBJECT
 public:
@@ -19,24 +18,24 @@ public:
     virtual ~PortageSettings();
 
 
-int ResetUseFlags(PortageSettings*);
-int Reset(PortageSettings*);
-int ReloadConfig(PortageSettings*);
-int ReloadWorld(PortageSettings*);
-QStringList GetWorld(PortageSettings*);
-QStringList GetArchList(PortageSettings*);
-QStringList GetVirtuals(PortageSettings*);
+int ResetUseFlags();
+int Reset();
+int ReloadConfig();
+int ReloadWorld();
+QStringList GetWorld();
+QStringList GetArchList();
+QStringList GetVirtuals();
 
 
-const QString AcceptKeywords(PortageSettings*);
-const QStringList SystemUseFlags(PortageSettings*);
-const QString Arch(PortageSettings*);
-const QString Portdir(PortageSettings*);
-const QString PortdirOverlay(PortageSettings*);
-const QString UserConfigDir(PortageSettings*);
+const QString AcceptKeywords();
+const QStringList SystemUseFlags();
+const QString Arch();
+const QString Portdir();
+const QString PortdirOverlay();
+const QString UserConfigDir();
 
 
-void portageSettingsFree(PortageSettings*);
+void Free();
 };
 }
 #endif
\ No newline at end of file