From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RDcrC-0006KQ-CY for garchives@archives.gentoo.org; Tue, 11 Oct 2011 13:58:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76AE921C08C; Tue, 11 Oct 2011 13:58:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3209E21C08C for ; Tue, 11 Oct 2011 13:58:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78F831B4029 for ; Tue, 11 Oct 2011 13:58:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D819480042 for ; Tue, 11 Oct 2011 13:58:48 +0000 (UTC) From: "Theofilos Intzoglou" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theofilos Intzoglou" Message-ID: <1996eddd2cb1444ccf57aff77ab17ec2cd18f1e2.parapente@gentoo> Subject: [gentoo-commits] proj/c-portage:cmake_port commit in: src/Qt/ X-VCS-Repository: proj/c-portage X-VCS-Files: src/Qt/CMakeLists.txt src/Qt/helper.cpp src/Qt/helper.h src/Qt/qportage.cpp src/Qt/qportage.h X-VCS-Directories: src/Qt/ X-VCS-Committer: parapente X-VCS-Committer-Name: Theofilos Intzoglou X-VCS-Revision: 1996eddd2cb1444ccf57aff77ab17ec2cd18f1e2 Date: Tue, 11 Oct 2011 13:58:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 46b49fff7e128e42291d680ffcba1c79 commit: 1996eddd2cb1444ccf57aff77ab17ec2cd18f1e2 Author: Theofilos Intzoglou gmail com> AuthorDate: Tue Oct 11 13:58:36 2011 +0000 Commit: Theofilos Intzoglou gmail com> CommitDate: Tue Oct 11 13:58:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/c-portage.git= ;a=3Dcommit;h=3D1996eddd Change naming scheme of QPortage and remove helper.{cpp,h} as they are no= longer needed --- src/Qt/CMakeLists.txt | 4 +- src/Qt/helper.cpp | 27 ------------------------- src/Qt/helper.h | 8 ------- src/Qt/qportage.cpp | 51 ++++++++++++++++++++++++-------------------= ------ src/Qt/qportage.h | 40 +++++++++++++++++++------------------- 5 files changed, 47 insertions(+), 83 deletions(-) diff --git a/src/Qt/CMakeLists.txt b/src/Qt/CMakeLists.txt index 1ffc149..ab672ba 100644 --- a/src/Qt/CMakeLists.txt +++ b/src/Qt/CMakeLists.txt @@ -2,8 +2,8 @@ find_package(Qt4 REQUIRED) include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ..) remove_definitions(-std=3Dc99) =20 -set(cpp-portage_SRCS helper.cpp qportage.cpp qportagesettings.cpp qpacka= geproperties.cpp qlistconverter.cpp) -set(cpp-portage_HDRS helper.h qportage.h qportagesettings.h qpackageprop= erties.h qlistconverter.h) +set(cpp-portage_SRCS qportage.cpp qportagesettings.cpp qpackagepropertie= s.cpp qlistconverter.cpp) +set(cpp-portage_HDRS qportage.h qportagesettings.h qpackageproperties.h = qlistconverter.h) =20 QT4_WRAP_CPP(cpp-portage_MOC_SRCS ${cpp-portage_HDRS}) =20 diff --git a/src/Qt/helper.cpp b/src/Qt/helper.cpp deleted file mode 100644 index c745eae..0000000 --- a/src/Qt/helper.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "helper.h" - -QStringList CListToQStringList(StringList *clist) -{ - QStringList list; - =20 - for (int i=3D0; i - -extern "C" { -#include -} - -QStringList CListToQStringList(StringList *); -StringList* QStringListToCList(const QStringList&); \ No newline at end of file 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 @@ */ =20 =20 -#include "helper.h" #include "qportage.h" +#include "qlistconverter.h" =20 extern "C" { -#include #include } =20 @@ -43,130 +42,130 @@ QString portage::bestVersion(QStringList ) =20 } =20 -QStringList portage::getAllNodes() +QStringList portage::allNodes() { StringList *clist; QStringList strlist; =20 clist =3D portageGetAllNodes(); - strlist =3D CListToQStringList(clist); + strlist =3D QListConverter::StringListToQStringList(clist); stringListFree(clist); =20 return strlist; } =20 -QString portage::getBestEbuild(const QString& ) +QString portage::bestEbuild(const QString& ) { =20 } =20 -QString portage::getDepEbuild(const QString& ) +QString portage::depEbuild(const QString& ) { =20 } =20 -int portage::getHardMasked(const QString& , QStringList& , QStringList& = ) +int portage::hardMasked(const QString& , QStringList& , QStringList& ) { =20 } =20 -QStringList portage::getInstalledFiles(const QString &package) +QStringList portage::installedFiles(const QString &package) { StringList *clist; QStringList strlist; =20 clist =3D portageGetInstalledFiles(package.toUtf8().data()); - strlist =3D CListToQStringList(clist); + strlist =3D QListConverter::StringListToQStringList(clist); stringListFree(clist); =20 return strlist; } =20 -QStringList portage::getInstalledList() +QStringList portage::installedList() { StringList *clist; QStringList strlist; =20 clist =3D portageGetInstalledList(); - strlist =3D CListToQStringList(clist); + strlist =3D QListConverter::StringListToQStringList(clist); stringListFree(clist); =20 return strlist; } =20 -QString portage::getMaskingReason(const QString& ) +QString portage::maskingReason(const QString& ) { =20 } =20 -QStringList portage::getMaskingStatus(const QString& ) +QStringList portage::maskingStatus(const QString& ) { =20 } =20 -QString portage::getOverlay(const QString& ) +QString portage::overlay(const QString& ) { =20 } =20 -QString portage::getOverlayNameFromPath(const QString& ) +QString portage::overlayNameFromPath(const QString& ) { =20 } =20 -QString portage::getOverlayNameFromPkg(const QString& ) +QString portage::overlayNameFromPkg(const QString& ) { =20 } =20 -long int portage::getPackageSizeInt(const QString& ) +long int portage::packageSizeInt(const QString& ) { =20 } =20 -QString portage::getPackageSizeString(const QString& ) +QString portage::packageSizeString(const QString& ) { =20 } =20 -QString portage::getPath(const QString &package, int ) +QString portage::path(const QString &package, int ) { =20 } =20 -PackageProperties* portage::getProperties(const QString &package) +PackageProperties* portage::properties(const QString &package) { return portageGetProperties(package.toUtf8().data()); } =20 -QStringList portage::getResolvedPkgs() +QStringList portage::resolvedPkgs() { StringList *clist; QStringList strlist; =20 clist =3D portageGetResolvedPkgs(); - strlist =3D CListToQStringList(clist); + strlist =3D QListConverter::StringListToQStringList(clist); stringListFree(clist); =20 return strlist; } =20 -QStringList portage::getUnresolvedPkgs() +QStringList portage::unresolvedPkgs() { StringList *clist; QStringList strlist; =20 clist =3D portageGetUnresolvedPkgs(); - strlist =3D CListToQStringList(clist); + strlist =3D QListConverter::StringListToQStringList(clist); stringListFree(clist); =20 return strlist; } =20 -QStringList portage::getVersions(const QString &package, bool include_ma= sked) +QStringList portage::versions(const QString &package, bool include_maske= d) { StringList *clist =3D portageGetVersions(package.toUtf8().data(), in= clude_masked); - QStringList strlist =3D CListToQStringList(clist); + QStringList strlist =3D QListConverter::StringListToQStringList(clis= t); stringListFree(clist); =20 return strlist; diff --git a/src/Qt/qportage.h b/src/Qt/qportage.h index 8cdd7b3..d67558b 100644 --- a/src/Qt/qportage.h +++ b/src/Qt/qportage.h @@ -35,30 +35,30 @@ class portage : public QObject explicit portage(QObject* parent =3D 0); virtual ~portage(); =20 - QStringList getVersions(const QString&, bool); - int getHardMasked(const QString&, QStringList&, = QStringList&); - QStringList getInstalledFiles(const QString&); + QStringList versions(const QString&, bool); + int hardMasked(const QString&, QStringList&, QSt= ringList&); + QStringList installedFiles(const QString&); =20 - QString bestVersion(QStringList); - QString getBestEbuild(const QString&); - QString getDepEbuild(const QString&); + QString bestVersion(QStringList); + QString bestEbuild(const QString&); + QString depEbuild(const QString&); =20 - QStringList getMaskingStatus(const QString&); - QString getMaskingReason(const QString&); + QStringList maskingStatus(const QString&); + QString maskingReason(const QString&); =20 - long int getPackageSizeInt(const QString&); - QString getPackageSizeString(const QString&); - PackageProperties* getProperties(const QString&); - bool isOverlay(const QString&); - QString getOverlay(const QString&); - QString getOverlayNameFromPath(const QString&); - QString getOverlayNameFromPkg(const QString&); - QString getPath(const QString&, int); + long int packageSizeInt(const QString&); + QString packageSizeString(const QString&); + PackageProperties* properties(const QString&); + bool isOverlay(const QString&); + QString overlay(const QString&); + QString overlayNameFromPath(const QString&); + QString overlayNameFromPkg(const QString&); + QString path(const QString&, int); =20 - QStringList getResolvedPkgs(); - QStringList getUnresolvedPkgs(); - QStringList getAllNodes(); - QStringList getInstalledList(); + QStringList resolvedPkgs(); + QStringList unresolvedPkgs(); + QStringList allNodes(); + QStringList installedList(); =20 }; // End of class =20