From e739706c965d98dd30ab05b73f12ec367d27ac4c Mon Sep 17 00:00:00 2001 From: Giorgos Tsiapaliwkas Date: Mon, 10 Oct 2011 10:41:25 +0300 Subject: init the terietor_interegation branch --- src/Qt/qlistconverter.cpp | 45 +++++++++++++++++++++++++++++ src/Qt/qlistconverter.h | 43 ++++++++++++++++++++++++++++ src/Qt/qpackageproperties.cpp | 66 +++++++++++++++++++++++++++++++++++++++++++ src/Qt/qpackageproperties.h | 35 +++++++++++++++++++++++ 4 files changed, 189 insertions(+) create mode 100644 src/Qt/qlistconverter.cpp create mode 100644 src/Qt/qlistconverter.h create mode 100644 src/Qt/qpackageproperties.cpp create mode 100644 src/Qt/qpackageproperties.h diff --git a/src/Qt/qlistconverter.cpp b/src/Qt/qlistconverter.cpp new file mode 100644 index 0000000..4f3855c --- /dev/null +++ b/src/Qt/qlistconverter.cpp @@ -0,0 +1,45 @@ +#include "qlistconverter.h" + +#include +#include + +namespace CppPortage{ + +QListConverter::QListConverter(StringList *stringList, QObject *parent) + :QObject(parent) +{ + m_stringlist = stringList; +} + +QListConverter::QListConverter(QStringList *stringList, QObject* parent) + : QObject(parent) +{ + m_qstringlist = stringList; +} + + + +QListConverter::~QListConverter() +{ +} + +StringList* QListConverter::QStringListToStringList() +{ + for (int i = 0; i <= m_qstringlist->size(); i++) { + char c = m_qstringlist->at(i).data()->toAscii(); + stringListInsertAt(m_stringlist, i, &c); + } + + return m_stringlist; +} + +QStringList QListConverter::StringListToQStringList() +{ + for (int i = 0; i <= m_stringlist->count(); i++) { + m_qstringlist->insert(i, stringListGetAt(m_stringlist, i)); + } + + return *m_qstringlist; +} + +} \ No newline at end of file diff --git a/src/Qt/qlistconverter.h b/src/Qt/qlistconverter.h new file mode 100644 index 0000000..44090bd --- /dev/null +++ b/src/Qt/qlistconverter.h @@ -0,0 +1,43 @@ +#ifndef QLISTCONVERTER_H +#define QLISTCONVERTER_H + +#include "../stringlist.h" + +#include + +struct StringList; + +class QString; +class QStringList; + +namespace CppPortage { + +class QListConverter : public QObject +{ + Q_OBJECT +public: + QListConverter(StringList *stringList, QObject *parent = 0); + QListConverter(QStringList *stringList, QObject* parent = 0); + virtual ~QListConverter(); + + /** + * Converts a StringList to a QStringList + **/ + QStringList StringListToQStringList(); + + /** + * Converts a QStringList to a StringList + **/ + StringList* QStringListToStringList(); + + /** + * This methed performs a check at the obj.If the object exists then it is dealloc. + * We need this method,because we don't want to check "manually" if the obj exists and + * if it exists to dealloc it with delete. + **/ +private: + StringList *m_stringlist; + QStringList *m_qstringlist; +}; +} +#endif \ No newline at end of file diff --git a/src/Qt/qpackageproperties.cpp b/src/Qt/qpackageproperties.cpp new file mode 100644 index 0000000..f42b54d --- /dev/null +++ b/src/Qt/qpackageproperties.cpp @@ -0,0 +1,66 @@ +#include "qpackageproperties.h" +#include "qlistconverter.h" + +#include +#include + +namespace CppPortage{ + +QPackageProperties::QPackageProperties(QString slot, QStringList keywords, + QStringList flags, QStringList homepages, QObject *parent) + :QObject(parent) +{ + m_listConverter = new QListConverter(&flags, this); + StringList *FLAGS = m_listConverter->QStringListToStringList(); + m_listConverter->checkList(); + + m_listConverter = new QListConverter(&homepages, this); + StringList *HOMEPAGES = m_listConverter->QStringListToStringList(); + m_listConverter->checkList(); + + m_listConverter = new QListConverter(&keywords, this); + StringList *KEYWORDS = m_listConverter->QStringListToStringList(); + m_listConverter->checkList(); + + packagePropertiesCreate(slot.toAscii().data(), KEYWORDS, FLAGS, HOMEPAGES); +} + + +QPackageProperties::~QPackageProperties() +{ + PackageProperties *p; + void Free(PackageProperties *p); +} + +const QString QPackageProperties::Slot() +{ + m_listConverter->checkList(); + PackageProperties *p; + return packagePropertiesGetSlot(p); +} + +const QStringList QPackageProperties::Flags() +{ + m_listConverter->checkList(); + PackageProperties *p; + m_listConverter = new QListConverter(packagePropertiesGetFlags(p), this); + return m_listConverter->StringListToQStringList(); +} + +const QStringList QPackageProperties::Keywords() +{ + m_listConverter->checkList(); + PackageProperties *p; + m_listConverter = new QListConverter(packagePropertiesGetKeywords(p), this); + return m_listConverter->StringListToQStringList(); +} + +const QStringList QPackageProperties::Homepages() +{ + m_listConverter->checkList(); + PackageProperties *p; + m_listConverter = new QListConverter(packagePropertiesGetHomepages(p), this); + + return m_listConverter->StringListToQStringList(); +} +} diff --git a/src/Qt/qpackageproperties.h b/src/Qt/qpackageproperties.h new file mode 100644 index 0000000..31db033 --- /dev/null +++ b/src/Qt/qpackageproperties.h @@ -0,0 +1,35 @@ +#ifndef QPACKAGEPROPERTIES_H +#define QPACKAGEPROPERTIES_H + + +#include +#include "../packageproperties.h" + + +class QString; +class QStringList; + +struct PackageProperties; +struct StringList; + +namespace CppPortage { + +class QListConverter; + +class QPackageProperties : public QObject +{ + Q_OBJECT +public: + QPackageProperties(QString slot, const QStringList keywords, const QStringList flags, + QStringList homepages,QObject *parent = 0); + virtual ~QPackageProperties(); + + const QString Slot(); + const QStringList Keywords(); + const QStringList Flags(); + const QStringList Homepages(); +private: + QListConverter *m_listConverter; +}; +} +#endif \ No newline at end of file -- cgit v1.2.3-18-g5258 From b93479e65f05e35320423969c25ad22e54239a68 Mon Sep 17 00:00:00 2001 From: Giorgos Tsiapaliwkas Date: Mon, 10 Oct 2011 10:42:26 +0300 Subject: add 2 new class,qlistconverter and qpackageproperties --- src/CMakeLists.txt | 2 +- src/Qt/CMakeLists.txt | 9 +++-- src/Qt/qlistconverter.cpp | 47 ++++++++++------------- src/Qt/qlistconverter.h | 19 ++------- src/Qt/qpackageproperties.cpp | 30 ++++----------- src/Qt/qpackageproperties.h | 2 - src/Qt/qportagesettings.cpp | 89 ++++++++++++++++++++++++++----------------- src/Qt/qportagesettings.h | 43 ++++++++++----------- 8 files changed, 112 insertions(+), 129 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 637e697..22e27c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,4 +18,4 @@ option(CppPortage "Enable c++ wrapper for c-portage (uses Qt4)") if (CppPortage) add_subdirectory(Qt) -endif(CppPortage) \ No newline at end of file +endif(CppPortage) diff --git a/src/Qt/CMakeLists.txt b/src/Qt/CMakeLists.txt index 2a19c3e..3159bfc 100644 --- a/src/Qt/CMakeLists.txt +++ b/src/Qt/CMakeLists.txt @@ -2,11 +2,14 @@ find_package(Qt4 REQUIRED) include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) remove_definitions(-std=c99) -set(cpp-portage_SRCS qportagesettings.cpp) -set(cpp-portage_HDRS qportagesettings.h) +set(cpp-portage_SRCS qportagesettings.cpp qpackageproperties.cpp) +set(cpp-portage_HDRS qportagesettings.h qpackageproperties.h) QT4_WRAP_CPP(cpp-portage_MOC_SRCS ${cpp-portage_HDRS}) add_library(cpp-portage qportagesettings.cpp ${cpp-portage_MOC_SRCS}) + install(TARGETS cpp-portage DESTINATION lib) -install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage) \ No newline at end of file +install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage) + +add_subdirectory(tests) \ No newline at end of file diff --git a/src/Qt/qlistconverter.cpp b/src/Qt/qlistconverter.cpp index 4f3855c..4ce0845 100644 --- a/src/Qt/qlistconverter.cpp +++ b/src/Qt/qlistconverter.cpp @@ -3,43 +3,38 @@ #include #include -namespace CppPortage{ - -QListConverter::QListConverter(StringList *stringList, QObject *parent) - :QObject(parent) +struct StringList { - m_stringlist = stringList; -} - -QListConverter::QListConverter(QStringList *stringList, QObject* parent) - : QObject(parent) -{ - m_qstringlist = stringList; -} + char **list; + unsigned int count; +}; +namespace CppPortage{ +QListConverter::QListConverter(QObject *parent) + :QObject(parent) +{} -QListConverter::~QListConverter() +StringList* QListConverter::QStringListToStringList(QStringList qstringList) { -} + StringList *stringList = stringListCreate(qstringList.size());//create a new StringList -StringList* QListConverter::QStringListToStringList() -{ - for (int i = 0; i <= m_qstringlist->size(); i++) { - char c = m_qstringlist->at(i).data()->toAscii(); - stringListInsertAt(m_stringlist, i, &c); + for (int i = 0; i <= qstringList.size(); i++) { + char c = *(qstringList.at(i).toUtf8().data()); + stringListInsertAt(stringList, i, &c); } - return m_stringlist; + return stringList; } -QStringList QListConverter::StringListToQStringList() +QStringList QListConverter::StringListToQStringList(StringList *stringList) { - for (int i = 0; i <= m_stringlist->count(); i++) { - m_qstringlist->insert(i, stringListGetAt(m_stringlist, i)); + QStringList qstringList; + + for (int i = 0; i <= stringList->count; i++) { + qstringList.insert(i, stringListGetAt(stringList, i)); } - return *m_qstringlist; + return qstringList; } - -} \ No newline at end of file +}//end namespace \ No newline at end of file diff --git a/src/Qt/qlistconverter.h b/src/Qt/qlistconverter.h index 44090bd..83f73fc 100644 --- a/src/Qt/qlistconverter.h +++ b/src/Qt/qlistconverter.h @@ -5,8 +5,6 @@ #include -struct StringList; - class QString; class QStringList; @@ -16,28 +14,17 @@ class QListConverter : public QObject { Q_OBJECT public: - QListConverter(StringList *stringList, QObject *parent = 0); - QListConverter(QStringList *stringList, QObject* parent = 0); - virtual ~QListConverter(); + QListConverter(QObject *parent = 0); /** * Converts a StringList to a QStringList **/ - QStringList StringListToQStringList(); + static QStringList StringListToQStringList(StringList *stringList); /** * Converts a QStringList to a StringList **/ - StringList* QStringListToStringList(); - - /** - * This methed performs a check at the obj.If the object exists then it is dealloc. - * We need this method,because we don't want to check "manually" if the obj exists and - * if it exists to dealloc it with delete. - **/ -private: - StringList *m_stringlist; - QStringList *m_qstringlist; + static StringList* QStringListToStringList(QStringList qstringList); }; } #endif \ No newline at end of file diff --git a/src/Qt/qpackageproperties.cpp b/src/Qt/qpackageproperties.cpp index f42b54d..8302122 100644 --- a/src/Qt/qpackageproperties.cpp +++ b/src/Qt/qpackageproperties.cpp @@ -10,19 +10,13 @@ QPackageProperties::QPackageProperties(QString slot, QStringList keywords, QStringList flags, QStringList homepages, QObject *parent) :QObject(parent) { - m_listConverter = new QListConverter(&flags, this); - StringList *FLAGS = m_listConverter->QStringListToStringList(); - m_listConverter->checkList(); + StringList *FLAGS = QListConverter::QStringListToStringList(flags); - m_listConverter = new QListConverter(&homepages, this); - StringList *HOMEPAGES = m_listConverter->QStringListToStringList(); - m_listConverter->checkList(); + StringList *HOMEPAGES = QListConverter::QStringListToStringList(homepages); - m_listConverter = new QListConverter(&keywords, this); - StringList *KEYWORDS = m_listConverter->QStringListToStringList(); - m_listConverter->checkList(); + StringList *KEYWORDS = QListConverter::QStringListToStringList(keywords); - packagePropertiesCreate(slot.toAscii().data(), KEYWORDS, FLAGS, HOMEPAGES); + packagePropertiesCreate(slot.toUtf8().data(), KEYWORDS, FLAGS, HOMEPAGES); } @@ -34,33 +28,25 @@ QPackageProperties::~QPackageProperties() const QString QPackageProperties::Slot() { - m_listConverter->checkList(); PackageProperties *p; return packagePropertiesGetSlot(p); } const QStringList QPackageProperties::Flags() { - m_listConverter->checkList(); PackageProperties *p; - m_listConverter = new QListConverter(packagePropertiesGetFlags(p), this); - return m_listConverter->StringListToQStringList(); + return QListConverter::StringListToQStringList(packagePropertiesGetFlags(p)); } const QStringList QPackageProperties::Keywords() { - m_listConverter->checkList(); PackageProperties *p; - m_listConverter = new QListConverter(packagePropertiesGetKeywords(p), this); - return m_listConverter->StringListToQStringList(); + return QListConverter::StringListToQStringList(packagePropertiesGetKeywords(p)); } const QStringList QPackageProperties::Homepages() { - m_listConverter->checkList(); - PackageProperties *p; - m_listConverter = new QListConverter(packagePropertiesGetHomepages(p), this); - - return m_listConverter->StringListToQStringList(); + PackageProperties *p; + return QListConverter::StringListToQStringList(packagePropertiesGetHomepages(p)); } } diff --git a/src/Qt/qpackageproperties.h b/src/Qt/qpackageproperties.h index 31db033..cfec142 100644 --- a/src/Qt/qpackageproperties.h +++ b/src/Qt/qpackageproperties.h @@ -28,8 +28,6 @@ public: const QStringList Keywords(); const QStringList Flags(); const QStringList Homepages(); -private: - QListConverter *m_listConverter; }; } #endif \ No newline at end of file diff --git a/src/Qt/qportagesettings.cpp b/src/Qt/qportagesettings.cpp index f69af6c..21dc7b2 100644 --- a/src/Qt/qportagesettings.cpp +++ b/src/Qt/qportagesettings.cpp @@ -5,77 +5,94 @@ namespace CppPortage{ -PortageSettings::PortageSettings(QObject *parent) +QPortageSettings::QPortageSettings(QObject *parent) :QObject(parent) { - } - -PortageSettings::~PortageSettings() +QPortageSettings::~QPortageSettings() { - + PortageSettings *ps; + portageSettingsFree(ps); } -int PortageSettings::ResetUseFlags() +const int QPortageSettings::resetUseFlags() { - + PortageSettings *ps; + return portageSettingsResetUseFlags(ps); } -int PortageSettings::Reset() -{ -} -int PortageSettings::ReloadConfig() +const int QPortageSettings::reset() { - + PortageSettings *ps; + return portageSettingsResetUseFlags(ps); } -int PortageSettings::ReloadWorld() -{ -} -QStringList PortageSettings::GetWorld() +const int QPortageSettings::reloadConfig() { - + PortageSettings *ps; + return portageSettingsReloadConfig(ps); } -QStringList PortageSettings::GetArchList() -{ -} -QStringList PortageSettings::GetVirtuals() +const int QPortageSettings::reloadWorld() { - + PortageSettings *ps; + return portageSettingsReloadWorld(ps); } - -const QString PortageSettings::AcceptKeywords() +const QStringList QPortageSettings::world() { - + PortageSettings *ps; + return QListConverter::StringListToQStringList(portageSettingsGetWorld(ps)); } -const QStringList PortageSettings::SystemUseFlags() -{ -} -const QString PortageSettings::Arch() +const QStringList QPortageSettings::archList() { + PortageSettings *ps; + return QListConverter::StringListToQStringList(portageSettingsGetArchList(ps)); } -const QString PortageSettings::Portdir() -{ -} -const QString PortageSettings::PortdirOverlay() +const QStringList QPortageSettings::virtuals() { + PortageSettings *ps; + return QListConverter::StringListToQStringList(portageSettingsGetVirtuals(ps)); +} +const QString QPortageSettings::acceptKeywords() +{ + PortageSettings *ps; + return portageSettingsAcceptKeywords(ps); } -const QString PortageSettings::UserConfigDir() + +const QStringList QPortageSettings::systemUseFlags() { + PortageSettings *ps; + return QListConverter::StringListToQStringList(portageSettingsSystemUseFlags(ps)); +} +const QString QPortageSettings::arch() +{ + PortageSettings *ps; + return portageSettingsArch(ps); } +const QString QPortageSettings::portdir() +{ + PortageSettings *ps; + return portageSettingsPortdir(ps); +} -void PortageSettings::Free() +const QString QPortageSettings::portdirOverlay() { + PortageSettings *ps; + return portageSettingsPortdirOverlay(ps); +} +const QString QPortageSettings::userConfigDir() +{ + PortageSettings *ps; + return portageSettingsUserConfigDir(ps); } -} \ No newline at end of file +}//end namespace diff --git a/src/Qt/qportagesettings.h b/src/Qt/qportagesettings.h index e72af42..652020c 100644 --- a/src/Qt/qportagesettings.h +++ b/src/Qt/qportagesettings.h @@ -4,38 +4,35 @@ #include #include "../portagesettings.h" +#include "qlistconverter.h" class QString; class QStringList; +struct PortageSettings; + namespace CppPortage { -class PortageSettings : public QObject +class QPortageSettings : public QObject { Q_OBJECT public: - PortageSettings(QObject *parent = 0); - virtual ~PortageSettings(); - - -int ResetUseFlags(); -int Reset(); -int ReloadConfig(); -int ReloadWorld(); -QStringList GetWorld(); -QStringList GetArchList(); -QStringList GetVirtuals(); - - -const QString AcceptKeywords(); -const QStringList SystemUseFlags(); -const QString Arch(); -const QString Portdir(); -const QString PortdirOverlay(); -const QString UserConfigDir(); - - -void Free(); + QPortageSettings(QObject *parent = 0); + virtual ~QPortageSettings(); + + const int resetUseFlags(); + const int reset(); + const int reloadConfig(); + const int reloadWorld(); + const QStringList world(); + const QStringList archList(); + const QStringList virtuals(); + const QString acceptKeywords(); + const QStringList systemUseFlags(); + const QString arch(); + const QString portdir(); + const QString portdirOverlay(); + const QString userConfigDir(); }; } #endif \ No newline at end of file -- cgit v1.2.3-18-g5258 From 96ee3243fc74eaff04fcd8b3c1bd96fe2ba9a238 Mon Sep 17 00:00:00 2001 From: Giorgos Tsiapaliwkas Date: Mon, 10 Oct 2011 10:46:55 +0300 Subject: add a readme and a TODO --- src/Qt/README | 3 +++ src/Qt/TODO | 2 ++ src/Qt/tests/CMakeLists.txt | 34 ++++++++++++++++++++++++++++ src/Qt/tests/qlistconverter_test.cpp | 16 ++++++++++++++ src/Qt/tests/qpackageproperties_test.cpp | 32 +++++++++++++++++++++++++++ src/Qt/tests/qportagesettings_test.cpp | 38 ++++++++++++++++++++++++++++++++ src/Qt/tests/test.cpp | 10 +++++++++ 7 files changed, 135 insertions(+) create mode 100644 src/Qt/README create mode 100644 src/Qt/TODO create mode 100644 src/Qt/tests/CMakeLists.txt create mode 100644 src/Qt/tests/qlistconverter_test.cpp create mode 100644 src/Qt/tests/qpackageproperties_test.cpp create mode 100644 src/Qt/tests/qportagesettings_test.cpp create mode 100644 src/Qt/tests/test.cpp diff --git a/src/Qt/README b/src/Qt/README new file mode 100644 index 0000000..3059917 --- /dev/null +++ b/src/Qt/README @@ -0,0 +1,3 @@ +Don't use this branch.It is only an interegation branch. +The code is very unstable.I created this branch in order to +avoid breaking the cmake_port branch. diff --git a/src/Qt/TODO b/src/Qt/TODO new file mode 100644 index 0000000..d11d08e --- /dev/null +++ b/src/Qt/TODO @@ -0,0 +1,2 @@ +I need some help with the CMakeLists.txt which is located at +c-portage/src/Qt/tests,in order to create some test files diff --git a/src/Qt/tests/CMakeLists.txt b/src/Qt/tests/CMakeLists.txt new file mode 100644 index 0000000..9c10387 --- /dev/null +++ b/src/Qt/tests/CMakeLists.txt @@ -0,0 +1,34 @@ +find_package(Qt4 REQUIRED) +include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}) +remove_definitions(-std=c99) + +set(cpp-portage-tests_SRCS qlistconverter_test.cpp qpackageproperties_test.cpp qportagesettings_test.cpp ) + +add_executable(QtWrapperTest test.cpp) +add_executable(QPackagepropertiesTest qpackageproperties_test.cpp) +add_executable(QPortagesettingsTest qportagesettings_test.cpp) + + +set(test_EXECS QtWrapperTest QPackagepropertiesTest QPortagesettingsTest) +target_link_libraries(QtWrapperTest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) +target_link_libraries(QPackagepropertiesTest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) +target_link_libraries(QPortagesettingsTest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) + +install(TARGETS QtWrapperTest QPackagepropertiesTest QPortagesettingsTest DESTINATION lib) + + + +#include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) +#remove_definitions(-std=c99) + +#set(cpp-portage_SRCS qportagesettings.cpp) +#set(cpp-portage_HDRS qportagesettings.h) + +#QT4_WRAP_CPP(cpp-portage_MOC_SRCS ${cpp-portage_HDRS}) + +#add_library(cpp-portage qportagesettings.cpp ${cpp-portage_MOC_SRCS}) + +#install(TARGETS cpp-portage DESTINATION lib) +#install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage) + +#add_subdirectory(tests) \ No newline at end of file diff --git a/src/Qt/tests/qlistconverter_test.cpp b/src/Qt/tests/qlistconverter_test.cpp new file mode 100644 index 0000000..622b84b --- /dev/null +++ b/src/Qt/tests/qlistconverter_test.cpp @@ -0,0 +1,16 @@ +#include +#include + +#include "../qportagesettings.h" + +void test() { + qDebug() << +} + +int main(int argc, char *argv[]) +{ + QApplication app; + + + return app.exec(); +} diff --git a/src/Qt/tests/qpackageproperties_test.cpp b/src/Qt/tests/qpackageproperties_test.cpp new file mode 100644 index 0000000..efde5e7 --- /dev/null +++ b/src/Qt/tests/qpackageproperties_test.cpp @@ -0,0 +1,32 @@ +#include +#include + +#include "../qpackageproperties.h" +#include "../qpackageproperties.cpp" +#include "../qlistconverter.h" +#include "../qlistconverter.cpp" +#include +namespace CppPortage { +class QPackageProperties; +} + +using namespace CppPortage; + +void test(); + +void test() { + + QPackageProperties packPro(QString("slot"),QStringList("keyw"),QStringList("home"),QStringList("flags")); + + qDebug() << "QString Slot()" << packPro.Slot(); + qDebug() << "QStringList Homepages()" << packPro.Homepages(); + qDebug() << "QStringList Flags()" << packPro.Flags(); + qDebug() << "QStringList Keywords" << packPro.Keywords(); +} + +int main(int argc, char *argv[]) +{ + test(); + QApplication app(argc, argv); + return app.exec(); +} \ No newline at end of file diff --git a/src/Qt/tests/qportagesettings_test.cpp b/src/Qt/tests/qportagesettings_test.cpp new file mode 100644 index 0000000..ba24df7 --- /dev/null +++ b/src/Qt/tests/qportagesettings_test.cpp @@ -0,0 +1,38 @@ +#include +#include +#include +#include "../qportagesettings.h" +#include "../qportagesettings.cpp" +#include "../qlistconverter.h" +#include "../qlistconverter.cpp" +namespace CppPortage { + class QPortageSettings; +} + +using namespace CppPortage; + +void test() { + QPortageSettings portSett; + + qDebug() << "int resetUseFlags()" << portSett.resetUseFlags(); + qDebug() << "int reset()" << portSett.reset(); + qDebug() << "int reloadConfig()" << portSett.reloadConfig(); + qDebug() << "int reloadWorld()" << portSett.reloadWorld(); + qDebug() << "QStringList world()" << portSett.world(); + qDebug() << "QStringList archList()" << portSett.archList(); + qDebug() << "QStringList virtuals()" << portSett.virtuals(); + qDebug() << "QString acceptKeywords()" << portSett.acceptKeywords(); + qDebug() << "QStringList systemUseFlags()" << portSett.systemUseFlags(); + qDebug() << "QString arch()" << portSett.arch(); + qDebug() << "QString portdir()" << portSett.portdir(); + qDebug() << "QString portdirOverlay()" << portSett.portdirOverlay(); + qDebug() << "QString userConfigDir()" << portSett.userConfigDir(); +} + +int main(int argc, char *argv[]) +{ + test(); + QApplication app(argc, argv); + + return app.exec(); +} diff --git a/src/Qt/tests/test.cpp b/src/Qt/tests/test.cpp new file mode 100644 index 0000000..c8329b1 --- /dev/null +++ b/src/Qt/tests/test.cpp @@ -0,0 +1,10 @@ +#include +#include + +int main(int argc, char *argv[]) +{ + QApplication app(argc,argv); + + + return app.exec(); +} -- cgit v1.2.3-18-g5258 From ae40b3bc70886a26f6ec26fba31c30f23270ca8c Mon Sep 17 00:00:00 2001 From: Theofilos Intzoglou Date: Tue, 11 Oct 2011 14:55:11 +0300 Subject: A couple of fixes on the CMakeLists and change the test programs to use QCoreApplication instead of QApplication as GUI isn't necessary for the tests --- src/CMakeLists.txt | 3 ++- src/Qt/CMakeLists.txt | 7 ++++--- src/Qt/qpackageproperties.h | 1 - src/Qt/tests/CMakeLists.txt | 34 +++----------------------------- src/Qt/tests/qpackageproperties_test.cpp | 11 +++-------- src/Qt/tests/qportagesettings_test.cpp | 10 +++------- 6 files changed, 15 insertions(+), 51 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 22e27c7..3fb5b8b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,8 +8,9 @@ set(c-portage_SRCS dataconnect.c dict.c flag.c interpreter.c packageproperties.c set(c-portage_HDRS dataconnect.h dict.h flag.h internal.h interpreter.h packageproperties.h stringlist.h) add_library(c-portage SHARED ${c-portage_SRCS}) +target_link_libraries(c-portage ${PYTHON_LIBRARY}) add_executable(tester tester.c) -target_link_libraries(tester c-portage ${PYTHON_LIBRARY}) +target_link_libraries(tester c-portage) install(TARGETS c-portage DESTINATION lib) install(FILES ${c-portage_HDRS} DESTINATION include/c-portage) diff --git a/src/Qt/CMakeLists.txt b/src/Qt/CMakeLists.txt index 3159bfc..b2849e8 100644 --- a/src/Qt/CMakeLists.txt +++ b/src/Qt/CMakeLists.txt @@ -2,12 +2,13 @@ find_package(Qt4 REQUIRED) include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) remove_definitions(-std=c99) -set(cpp-portage_SRCS qportagesettings.cpp qpackageproperties.cpp) -set(cpp-portage_HDRS qportagesettings.h qpackageproperties.h) +set(cpp-portage_SRCS qportagesettings.cpp qpackageproperties.cpp qlistconverter.cpp) +set(cpp-portage_HDRS qportagesettings.h qpackageproperties.h qlistconverter.h) QT4_WRAP_CPP(cpp-portage_MOC_SRCS ${cpp-portage_HDRS}) -add_library(cpp-portage qportagesettings.cpp ${cpp-portage_MOC_SRCS}) +add_library(cpp-portage SHARED qportagesettings.cpp ${cpp-portage_MOC_SRCS}) +target_link_libraries(cpp-portage c-portage ${QT_QTCORE_LIBRARY}) install(TARGETS cpp-portage DESTINATION lib) install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage) diff --git a/src/Qt/qpackageproperties.h b/src/Qt/qpackageproperties.h index cfec142..fcda875 100644 --- a/src/Qt/qpackageproperties.h +++ b/src/Qt/qpackageproperties.h @@ -1,7 +1,6 @@ #ifndef QPACKAGEPROPERTIES_H #define QPACKAGEPROPERTIES_H - #include #include "../packageproperties.h" diff --git a/src/Qt/tests/CMakeLists.txt b/src/Qt/tests/CMakeLists.txt index 9c10387..a2b1e28 100644 --- a/src/Qt/tests/CMakeLists.txt +++ b/src/Qt/tests/CMakeLists.txt @@ -1,34 +1,6 @@ -find_package(Qt4 REQUIRED) -include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}) -remove_definitions(-std=c99) - -set(cpp-portage-tests_SRCS qlistconverter_test.cpp qpackageproperties_test.cpp qportagesettings_test.cpp ) - add_executable(QtWrapperTest test.cpp) +target_link_libraries(QtWrapperTest cpp-portage) add_executable(QPackagepropertiesTest qpackageproperties_test.cpp) +target_link_libraries(QPackagepropertiesTest cpp-portage) add_executable(QPortagesettingsTest qportagesettings_test.cpp) - - -set(test_EXECS QtWrapperTest QPackagepropertiesTest QPortagesettingsTest) -target_link_libraries(QtWrapperTest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -target_link_libraries(QPackagepropertiesTest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -target_link_libraries(QPortagesettingsTest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) - -install(TARGETS QtWrapperTest QPackagepropertiesTest QPortagesettingsTest DESTINATION lib) - - - -#include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) -#remove_definitions(-std=c99) - -#set(cpp-portage_SRCS qportagesettings.cpp) -#set(cpp-portage_HDRS qportagesettings.h) - -#QT4_WRAP_CPP(cpp-portage_MOC_SRCS ${cpp-portage_HDRS}) - -#add_library(cpp-portage qportagesettings.cpp ${cpp-portage_MOC_SRCS}) - -#install(TARGETS cpp-portage DESTINATION lib) -#install(FILES ${cpp-portage_HDRS} DESTINATION include/cpp-portage) - -#add_subdirectory(tests) \ No newline at end of file +target_link_libraries(QPortagesettingsTest cpp-portage) diff --git a/src/Qt/tests/qpackageproperties_test.cpp b/src/Qt/tests/qpackageproperties_test.cpp index efde5e7..b7e99ac 100644 --- a/src/Qt/tests/qpackageproperties_test.cpp +++ b/src/Qt/tests/qpackageproperties_test.cpp @@ -1,14 +1,9 @@ -#include +#include #include +#include #include "../qpackageproperties.h" -#include "../qpackageproperties.cpp" #include "../qlistconverter.h" -#include "../qlistconverter.cpp" -#include -namespace CppPortage { -class QPackageProperties; -} using namespace CppPortage; @@ -27,6 +22,6 @@ void test() { int main(int argc, char *argv[]) { test(); - QApplication app(argc, argv); + QCoreApplication app(argc, argv); return app.exec(); } \ No newline at end of file diff --git a/src/Qt/tests/qportagesettings_test.cpp b/src/Qt/tests/qportagesettings_test.cpp index ba24df7..da02903 100644 --- a/src/Qt/tests/qportagesettings_test.cpp +++ b/src/Qt/tests/qportagesettings_test.cpp @@ -1,13 +1,9 @@ -#include +#include #include #include + #include "../qportagesettings.h" -#include "../qportagesettings.cpp" #include "../qlistconverter.h" -#include "../qlistconverter.cpp" -namespace CppPortage { - class QPortageSettings; -} using namespace CppPortage; @@ -32,7 +28,7 @@ void test() { int main(int argc, char *argv[]) { test(); - QApplication app(argc, argv); + QCoreApplication app(argc, argv); return app.exec(); } -- cgit v1.2.3-18-g5258