Skip to content

Commit

Permalink
Restore compilation of aur
Browse files Browse the repository at this point in the history 
Signed-off-by: Dario Freddi <drf@kde.org>
  • Loading branch information
@drf
drf committed Jan 23, 2010
1 parent c30ca7e commit 972ded9
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 33 deletions.
42 changes: 21 additions & 21 deletions libaqpmaur/AurBackend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Backend::Private

QNetworkRequest createNetworkRequest(const QString &type, const QString &arg) const;
QNetworkRequest createDownloadRequest(Package *package) const;
Package packageFromMap(const QVariantMap &map) const;
Package *packageFromMap(const QVariantMap &map) const;

// Private slots
void __k__replyFinished(QNetworkReply *reply);
Expand All @@ -72,10 +72,10 @@ QNetworkRequest Backend::Private::createNetworkRequest(const QString& type, cons
return request;
}

QNetworkRequest Backend::Private::createDownloadRequest(const Aqpm::Aur::Package& package) const
QNetworkRequest Backend::Private::createDownloadRequest(Aqpm::Aur::Package *package) const
{
QNetworkRequest request;
QUrl url(AQPM_AUR_BASE_URL + package.path);
QUrl url(AQPM_AUR_BASE_URL + package->path);
request.setUrl(url);
request.setRawHeader("User-Agent", ("Aqpm/" + QString(AQPM_VERSION)).toUtf8());
return request;
Expand Down Expand Up @@ -124,33 +124,33 @@ void Backend::Private::__k__replyFinished(QNetworkReply* reply)
} else if (reply->property("aqpm_AUR_Request_Type").toString() == "info") {
if (reply->property("aqpm_AUR_is_Download").toBool()) {
// We are not really looking for info, we actually need to download the package we got.
Package p = packageFromMap(result["results"].toMap());
Package *p = packageFromMap(result["results"].toMap());
QNetworkReply *nreply = manager->get(createDownloadRequest(p));
nreply->setProperty("aqpm_AUR_is_archive_Download", true);
nreply->setProperty("aqpm_AUR_extract_path", reply->property("aqpm_AUR_extract_path").toString());
nreply->setProperty("aqpm_AUR_ID", reply->property("aqpm_AUR_ID").toInt());
nreply->setProperty("aqpm_AUR_pkg_name", p.name);
nreply->setProperty("aqpm_AUR_pkg_name", p->name);
} else {
// A simple info request, just notify and pass by
emit q->infoCompleted(reply->property("aqpm_AUR_ID").toInt(), packageFromMap(result["results"].toMap()));
}
}
}

Package Backend::Private::packageFromMap(const QVariantMap& map) const
{
Package p;
p.category = map["CategoryID"].toInt();
p.description = map["Description"].toString();
p.id = map["ID"].toInt();
p.license = map["License"].toString();
p.location = map["LocationID"].toInt();
p.name = map["Name"].toString();
p.outOfDate = map["OutOfDate"].toInt() == 0 ? false : true;
p.path = map["URLPath"].toString();
p.url = map["URL"].toString();
p.version = map["Version"].toString();
p.votes = map["NumVotes"].toInt();
Package *Backend::Private::packageFromMap(const QVariantMap& map) const
{
Package *p;
p->category = map["CategoryID"].toInt();
p->description = map["Description"].toString();
p->id = map["ID"].toInt();
p->license = map["License"].toString();
p->location = map["LocationID"].toInt();
p->name = map["Name"].toString();
p->outOfDate = map["OutOfDate"].toInt() == 0 ? false : true;
p->path = map["URLPath"].toString();
p->url = map["URL"].toString();
p->version = map["Version"].toString();
p->votes = map["NumVotes"].toInt();

return p;
}
Expand Down Expand Up @@ -219,10 +219,10 @@ Package::List Backend::searchSync(const QString& subject) const
return e.packageList();
}

Package Backend::infoSync(int id) const
Package *Backend::infoSync(int id) const
{
PackageConditionalEventLoop e(id);
connect(this, SIGNAL(infoCompleted(int, Aqpm::Aur::Package)), &e, SLOT(requestQuit(int, Aqpm::Aur::Package)));
connect(this, SIGNAL(infoCompleted(int, Aqpm::Aur::Package*)), &e, SLOT(requestQuit(int, Aqpm::Aur::Package*)));
info(id);
e.exec();
return e.package();
Expand Down
6 changes: 3 additions & 3 deletions libaqpmaur/AurBackend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace Aur
class AQPM_EXPORT Package
{
public:
typedef QList<Package> List;
typedef QList<Package*> List;

int id;
QString name;
Expand Down Expand Up @@ -63,14 +63,14 @@ class AQPM_EXPORT Backend : public QObject
Package::List searchSync(const QString &subject) const;

void info(int id) const;
Package infoSync(int id) const;
Package *infoSync(int id) const;

void prepareBuildEnvironment(int id, const QString &envpath) const;
void prepareBuildEnvironmentSync(int id, const QString &envpath) const;

Q_SIGNALS:
void searchCompleted(const QString &searchSubject, const Aqpm::Aur::Package::List &results);
void infoCompleted(int id, const Aqpm::Aur::Package &result);
void infoCompleted(int id, Aqpm::Aur::Package *result);
void buildEnvironmentReady(int id, const QString &envpath);

private:
Expand Down
12 changes: 6 additions & 6 deletions libaqpmaur/example/main_aursearcher.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ void AurSearcher::process()
if (arguments.at(1) == "search") {
Aqpm::Aur::Package::List retlist = Aqpm::Aur::Backend::instance()->searchSync(arguments.at(2));

foreach(const Aqpm::Aur::Package &result, retlist) {
printf("%s - %s (ID: %i)\n", result.name.toAscii().data(), result.version.toAscii().data(), result.id);
foreach(Aqpm::Aur::Package *result, retlist) {
printf("%s - %s (ID: %i)\n", result->name.toAscii().data(), result->version.toAscii().data(), result->id);
}
} else if (arguments.at(1) == "info") {
Aqpm::Aur::Package package = Aqpm::Aur::Backend::instance()->infoSync(QCoreApplication::arguments().at(2).toInt());
Aqpm::Aur::Package *package = Aqpm::Aur::Backend::instance()->infoSync(QCoreApplication::arguments().at(2).toInt());

printf("Name: %s\nVersion: %s\nDescription: %s\nUrl: %s\nVotes: %i\n%s\n", package.name.toAscii().data(),
package.version.toAscii().data(), package.description.toAscii().data(), package.url.toAscii().data(),
package.votes, package.outOfDate ? "The package is out of date" : "");
printf("Name: %s\nVersion: %s\nDescription: %s\nUrl: %s\nVotes: %i\n%s\n", package->name.toAscii().data(),
package->version.toAscii().data(), package->description.toAscii().data(), package->url.toAscii().data(),
package->votes, package->outOfDate ? "The package is out of date" : "");
} else if (arguments.at(1) == "download") {
Aqpm::Aur::Backend::instance()->prepareBuildEnvironmentSync(arguments.at(2).toInt(), QDir::currentPath());
} else {
Expand Down
6 changes: 3 additions & 3 deletions misc/PackageLoops_p.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ class PackageConditionalEventLoop : public QEventLoop
~PackageConditionalEventLoop() {}

public Q_SLOTS:
void requestQuit(int id, const Aqpm::Aur::Package &p) {
void requestQuit(int id, Aqpm::Aur::Package *p) {
if (m_id == id) {
m_package = p;
quit();
}
}

inline Aqpm::Aur::Package package() const {
inline Aqpm::Aur::Package *package() const {
return m_package;
}

private:
int m_id;
Aqpm::Aur::Package m_package;
Aqpm::Aur::Package *m_package;
};

class IntConditionalEventLoop : public QEventLoop
Expand Down

0 comments on commit 972ded9

Please sign in to comment.