1 files changed, 25 insertions, 26 deletions

diff --git a/src/Qt/qportage.cpp b/src/Qt/qportage.cpp
index 97359eb..cd9743c 100644
--- a/src/Qt/qportage.cpp
+++ b/src/Qt/qportage.cpp
@@ -18,11 +18,10 @@
 */
 
 
-#include "helper.h"
 #include "qportage.h"
+#include "qlistconverter.h"
 
 extern "C" {
-#include <stringlist.h>
 #include <dataconnect.h>
 }
 
@@ -43,130 +42,130 @@ QString portage::bestVersion(QStringList )
 
 }
 
-QStringList portage::getAllNodes()
+QStringList portage::allNodes()
 {
     StringList *clist;
     QStringList strlist;
     
     clist = portageGetAllNodes();
-    strlist = CListToQStringList(clist);
+    strlist = QListConverter::StringListToQStringList(clist);
     stringListFree(clist);
     
     return strlist;
 }
 
-QString portage::getBestEbuild(const QString& )
+QString portage::bestEbuild(const QString& )
 {
 
 }
 
-QString portage::getDepEbuild(const QString& )
+QString portage::depEbuild(const QString& )
 {
 
 }
 
-int portage::getHardMasked(const QString& , QStringList& , QStringList& )
+int portage::hardMasked(const QString& , QStringList& , QStringList& )
 {
 
 }
 
-QStringList portage::getInstalledFiles(const QString &package)
+QStringList portage::installedFiles(const QString &package)
 {
     StringList *clist;
     QStringList strlist;
     
     clist = portageGetInstalledFiles(package.toUtf8().data());
-    strlist = CListToQStringList(clist);
+    strlist = QListConverter::StringListToQStringList(clist);
     stringListFree(clist);
     
     return strlist;
 }
 
-QStringList portage::getInstalledList()
+QStringList portage::installedList()
 {
     StringList *clist;
     QStringList strlist;
 
     clist = portageGetInstalledList();
-    strlist = CListToQStringList(clist);
+    strlist = QListConverter::StringListToQStringList(clist);
     stringListFree(clist);
     
     return strlist;
 }
 
-QString portage::getMaskingReason(const QString& )
+QString portage::maskingReason(const QString& )
 {
 
 }
 
-QStringList portage::getMaskingStatus(const QString& )
+QStringList portage::maskingStatus(const QString& )
 {
 
 }
 
-QString portage::getOverlay(const QString& )
+QString portage::overlay(const QString& )
 {
 
 }
 
-QString portage::getOverlayNameFromPath(const QString& )
+QString portage::overlayNameFromPath(const QString& )
 {
 
 }
 
-QString portage::getOverlayNameFromPkg(const QString& )
+QString portage::overlayNameFromPkg(const QString& )
 {
 
 }
 
-long int portage::getPackageSizeInt(const QString& )
+long int portage::packageSizeInt(const QString& )
 {
 
 }
 
-QString portage::getPackageSizeString(const QString& )
+QString portage::packageSizeString(const QString& )
 {
 
 }
 
-QString portage::getPath(const QString &package, int )
+QString portage::path(const QString &package, int )
 {
 
 }
 
-PackageProperties* portage::getProperties(const QString &package)
+PackageProperties* portage::properties(const QString &package)
 {
     return portageGetProperties(package.toUtf8().data());
 }
 
-QStringList portage::getResolvedPkgs()
+QStringList portage::resolvedPkgs()
 {
     StringList *clist;
     QStringList strlist;
     
     clist = portageGetResolvedPkgs();
-    strlist = CListToQStringList(clist);
+    strlist = QListConverter::StringListToQStringList(clist);
     stringListFree(clist);
     
     return strlist;
 }
 
-QStringList portage::getUnresolvedPkgs()
+QStringList portage::unresolvedPkgs()
 {
     StringList *clist;
     QStringList strlist;
     
     clist = portageGetUnresolvedPkgs();
-    strlist = CListToQStringList(clist);
+    strlist = QListConverter::StringListToQStringList(clist);
     stringListFree(clist);
     
     return strlist;
 }
 
-QStringList portage::getVersions(const QString &package, bool include_masked)
+QStringList portage::versions(const QString &package, bool include_masked)
 {
     StringList *clist = portageGetVersions(package.toUtf8().data(), include_masked);
-    QStringList strlist = CListToQStringList(clist);
+    QStringList strlist = QListConverter::StringListToQStringList(clist);
     stringListFree(clist);
     
     return strlist;