The following commit has been merged in the master branch:
commit 51cc33618bcf4c0a13d6f3aa0a936085bcdb1c92
Author: Miriam Ruiz <[EMAIL PROTECTED]>
Date: Mon Nov 24 13:20:56 2008 +0100
Fixed compilation errors
diff --git a/gofind.cpp b/gofind.cpp
index fd84eb1..49b3cfe 100644
--- a/gofind.cpp
+++ b/gofind.cpp
@@ -90,7 +90,7 @@ int main(int argc, const char* argv[])
bindtextdomain ("gofind", NULL);
#endif
- GUIPlugIn gui_plugin( "./gui_lua.so" );
+ GUIPlugIn gui_plugin( "./gui_fltk.so" );
if( gui_plugin.LastError())
{
diff --git a/gui_cli.cpp b/gui_cli.cpp
index b63442e..d6c30f5 100644
--- a/gui_cli.cpp
+++ b/gui_cli.cpp
@@ -25,6 +25,7 @@
#include <typeinfo>
#include <iostream>
#include <string>
+#include <string.h>
#include <ept/apt/packagerecord.h>
#include <ept/textsearch/textsearch.h>
diff --git a/gui_fltk.cpp b/gui_fltk.cpp
index 19fd78b..ba02b92 100644
--- a/gui_fltk.cpp
+++ b/gui_fltk.cpp
@@ -35,6 +35,7 @@
#define gettext(a) (a)
#endif
+#include <vector>
#include <math.h>
#include <ept/apt/packagerecord.h>
@@ -109,7 +110,7 @@ static void UpdateUILists(GamesUI& ui)
ui.InterfaceSelection->value(newIdx);
const std::vector<Result> res = pkgdata.results();
- for (vector<Result>::const_iterator i = res.begin();
+ for (std::vector<Result>::const_iterator i = res.begin();
i != res.end(); ++i)
{
ept::apt::PackageRecord rec(pkgdata.apt().rawRecord(i->name));
@@ -139,11 +140,11 @@ static void UpdateUILists(GamesUI& ui)
char fmtstr[16];
snprintf(fmtstr, sizeof(fmtstr), "@[EMAIL PROTECTED]@.", bk,
fr);
- string desc = string(fmtstr) + rec.package() + "\t" +
- string(fmtstr) + rec.shortDescription();
+ std::string desc = std::string(fmtstr) + rec.package() + "\t" +
+ std::string(fmtstr) + rec.shortDescription();
if (pkgdata.popcon().hasData() && i->popcon)
{
- desc += "\t" + string(fmtstr);
+ desc += "\t" + std::string(fmtstr);
char stars[16];
snprintf(stars, sizeof(stars), "%%%d/8/1;",
(int)rintf(log(i->popcon) * 100 /
log(pkgdata.popconLocalMax())));
diff --git a/pkgdata.cpp b/pkgdata.cpp
index 491dfae..26e451d 100644
--- a/pkgdata.cpp
+++ b/pkgdata.cpp
@@ -32,6 +32,7 @@
#include <iostream>
#include <cmath>
+#include <vector>
#ifdef USE_GETTEXT
#include <libintl.h>
@@ -79,8 +80,8 @@ char *PackageData::PackageString(const std::string& name)
void PackageData::PrintResults()
{
- const vector<Result>& packages = results();
- for (vector<Result>::const_iterator i = packages.begin();
+ const std::vector<Result>& packages = results();
+ for (std::vector<Result>::const_iterator i = packages.begin();
i != packages.end(); ++i)
{
ept::apt::PackageRecord pkg = apt().rawRecord(i->name);
--
Development fot GoFind!
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
