[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5770 - in gnunet-qt: . src/common src/core src/plugins/abo
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5770 - in gnunet-qt: . src/common src/core src/plugins/about src/plugins/fs src/plugins/general src/plugins/stats |
|
Date: |
Sun, 25 Nov 2007 06:10:33 -0700 (MST) |
Author: grothoff
Date: 2007-11-25 06:10:33 -0700 (Sun, 25 Nov 2007)
New Revision: 5770
Modified:
gnunet-qt/configure.ac
gnunet-qt/src/common/pluginLoader.cc
gnunet-qt/src/core/aboutDlg.cc
gnunet-qt/src/core/main.cc
gnunet-qt/src/plugins/about/about.cc
gnunet-qt/src/plugins/fs/downloadController.cc
gnunet-qt/src/plugins/fs/ecrsMetaData.cc
gnunet-qt/src/plugins/fs/ecrsuri.cc
gnunet-qt/src/plugins/fs/fs.cc
gnunet-qt/src/plugins/fs/searchController.cc
gnunet-qt/src/plugins/fs/searchSummaryController.cc
gnunet-qt/src/plugins/fs/searchSummaryModel.cc
gnunet-qt/src/plugins/fs/uploadController.cc
gnunet-qt/src/plugins/general/checkDaemonThread.cc
gnunet-qt/src/plugins/general/general.cc
gnunet-qt/src/plugins/general/startStopThread.cc
gnunet-qt/src/plugins/stats/statsPlugin.cc
gnunet-qt/src/plugins/stats/statsThread.cc
Log:
renaming APIs
Modified: gnunet-qt/configure.ac
===================================================================
--- gnunet-qt/configure.ac 2007-11-25 13:00:36 UTC (rev 5769)
+++ gnunet-qt/configure.ac 2007-11-25 13:10:33 UTC (rev 5770)
@@ -87,16 +87,16 @@
AC_MSG_ERROR([compiling gnunet-qt requires GNUnet core
headers]))
SAVELIBS=$LIBS
-AC_CHECK_LIB(gnunetutil,GE_LOG,,
+AC_CHECK_LIB(gnunetutil,GNUNET_GE_LOG,,
AC_MSG_ERROR([gnunet-qt requires GNUnet-Util]))
-AC_CHECK_LIB(gnunetecrs,ECRS_createMetaData,,
+AC_CHECK_LIB(gnunetecrs,GNUNET_ECRS_meta_data_create,,
AC_MSG_ERROR([gnunet-qt requires ECRS]))
-AC_CHECK_LIB(gnunetfsui,FSUI_start,,
+AC_CHECK_LIB(gnunetfsui,GNUNET_FSUI_start,,
AC_MSG_ERROR([gnunet-qt requires FSUI]))
LIBS="-lgnunetstats_api $LIBS"
# check for newer STATS functions
-AC_CHECK_FUNC(STATS_getStatistics, HAVE_STATS=1, HAVE_STATS=0)
+AC_CHECK_FUNC(GNUNET_STATS_get_statistics, HAVE_STATS=1, HAVE_STATS=0)
LIBS=$SAVELIBS
AC_DEFINE_UNQUOTED([HAVE_STATS], $HAVE_STATS, [We have the new stats library])
Modified: gnunet-qt/src/common/pluginLoader.cc
===================================================================
--- gnunet-qt/src/common/pluginLoader.cc 2007-11-25 13:00:36 UTC (rev
5769)
+++ gnunet-qt/src/common/pluginLoader.cc 2007-11-25 13:10:33 UTC (rev
5770)
@@ -33,7 +33,7 @@
}
GPlugin *GPluginLoader::load(const QString &strName,
- struct GC_Configuration *config, struct GE_Context *errorContext)
+ struct GNUNET_GC_Configuration *config, struct GNUNET_GE_Context
*errorContext)
{
InitPlugin init;
GPluginSpec spec;
@@ -50,7 +50,7 @@
if (init)
spec.wnd = init(config, errorContext);
else
- GE_LOG(errorContext, (GE_KIND) (GE_FATAL | GE_USER | GE_IMMEDIATE),
+ GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_FATAL |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
qPrintable(spec.lib->errorString()));
}
Modified: gnunet-qt/src/core/aboutDlg.cc
===================================================================
--- gnunet-qt/src/core/aboutDlg.cc 2007-11-25 13:00:36 UTC (rev 5769)
+++ gnunet-qt/src/core/aboutDlg.cc 2007-11-25 13:10:33 UTC (rev 5770)
@@ -36,7 +36,7 @@
labelHead->setFont(QFont("Verdana", 12, QFont::Bold));
labelHead->setForegroundRole(QPalette::Highlight);
- labelVer->setText(tr("Version ") + PACKAGE_VERSION);
+ labelVer->setText(tr("Version ") + PACKAGNUNET_GE_VERSION);
}
GAboutDlg::~GAboutDlg()
Modified: gnunet-qt/src/core/main.cc
===================================================================
--- gnunet-qt/src/core/main.cc 2007-11-25 13:00:36 UTC (rev 5769)
+++ gnunet-qt/src/core/main.cc 2007-11-25 13:10:33 UTC (rev 5770)
@@ -44,8 +44,8 @@
static GApplication *app;
static char *cfgFilename = GNUNET_DEFAULT_CLIENT_CONFIG_FILE;
-static struct GE_Context *ectx, *stdECtx;
-static struct GC_Configuration *cfg;
+static struct GNUNET_GE_Context *ectx, *stdECtx;
+static struct GNUNET_GC_Configuration *cfg;
#if defined(Q_OS_WIN)
static int debug_mode = GNUNET_NO;
@@ -155,23 +155,23 @@
GMainWindow *mainWnd;
} GLoggerClosure;
-static void logger(void *cls, GE_KIND kind, const char *date, const char *msg)
+static void logger(void *cls, GNUNET_GE_KIND kind, const char *date, const
char *msg)
{
Q_UNUSED(date)
QPixmap icon;
- if (kind & GE_DEBUG)
+ if (kind & GNUNET_GE_DEBUG)
icon.load(":/pixmaps/debug.png");
- else if (kind & GE_STATUS)
+ else if (kind & GNUNET_GE_STATUS)
icon.load(":/pixmaps/stats.png");
- else if (kind & GE_INFO)
+ else if (kind & GNUNET_GE_INFO)
icon.load(":/pixmaps/info.png");
- else if (kind & GE_WARNING)
+ else if (kind & GNUNET_GE_WARNING)
icon.load(":/pixmaps/warning.png");
- else if (kind & GE_ERROR)
+ else if (kind & GNUNET_GE_ERROR)
icon.load(":/pixmaps/error.png");
- else if (kind & GE_FATAL)
+ else if (kind & GNUNET_GE_FATAL)
icon.load(":/pixmaps/fatal.png");
((GLoggerClosure *) cls)->lock.lock();
@@ -180,7 +180,7 @@
}
GApplication::GApplication(int argc, char **argv,
- struct GC_Configuration *cfg) : QApplication(argc, argv)
+ struct GNUNET_GC_Configuration *cfg) : QApplication(argc, argv)
{
this->ectx = NULL;
this->cfg = cfg;
@@ -188,7 +188,7 @@
strCfgFile = cfgFilename;
}
-void GApplication::setErrorContext(struct GE_Context *ectx)
+void GApplication::setErrorContext(struct GNUNET_GE_Context *ectx)
{
this->ectx = ectx;
}
@@ -198,7 +198,7 @@
int count;
char *cfgPlugins;
- GC_get_configuration_value_string(cfg, "GNUNET-QT", "PLUGINS", "about
general fs stats", &cfgPlugins);
+ GNUNET_GC_get_configuration_value_string(cfg, "GNUNET-QT", "PLUGINS", "about
general fs stats", &cfgPlugins);
QStringList plugins = QString(cfgPlugins).split(QRegExp("\\s+"));
count = plugins.count();
@@ -242,9 +242,9 @@
logCls.mainWnd = app->getWindow();
// FIXME: make mask configurable
- ectx = GE_create_context_callback((GE_KIND) (GE_USER | GE_ADMIN | GE_ERROR |
- GE_WARNING | GE_FATAL | GE_IMMEDIATE), &logger, &logCls, NULL, NULL);
- GE_setDefaultContext(ectx);
+ ectx = GNUNET_GE_create_context_callback((GNUNET_GE_KIND) (GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
+ GNUNET_GE_WARNING | GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE), &logger,
&logCls, NULL, NULL);
+ GNUNET_GE_setDefaultContext(ectx);
strLocale = QLocale::system().name();
#if defined(Q_OS_WIN)
@@ -268,7 +268,7 @@
delete app;
- GE_free_context(ectx);
+ GNUNET_GE_free_context(ectx);
GNUNET_fini(stdECtx, cfg);
return ret;
Modified: gnunet-qt/src/plugins/about/about.cc
===================================================================
--- gnunet-qt/src/plugins/about/about.cc 2007-11-25 13:00:36 UTC (rev
5769)
+++ gnunet-qt/src/plugins/about/about.cc 2007-11-25 13:10:33 UTC (rev
5770)
@@ -84,7 +84,7 @@
"<body>" +
header() +
"<center>"
- "<font size=\"5\"><b>" + tr("Welcome to ") + PACKAGE_STRING
"</b></font>"
+ "<font size=\"5\"><b>" + tr("Welcome to ") + PACKAGNUNET_GE_STRING
"</b></font>"
"<br />"
"<br />"
"<table width=\"91%\">"
@@ -278,8 +278,8 @@
extern "C"
{
-GNUNETQT_API GPlugin *init_plugin(struct GC_Configuration *config,
- struct GE_Context *errorContext)
+GNUNETQT_API GPlugin *init_plugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext)
{
Q_UNUSED(config)
Q_UNUSED(errorContext)
Modified: gnunet-qt/src/plugins/fs/downloadController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/downloadController.cc 2007-11-25 13:00:36 UTC
(rev 5769)
+++ gnunet-qt/src/plugins/fs/downloadController.cc 2007-11-25 13:10:33 UTC
(rev 5770)
@@ -120,7 +120,7 @@
* @param recursive true for a recursive directory download
*/
void GFSDownloadController::start(QPersistentModelIndex &searchIdx,
- struct FSUI_SearchList *parentSearch, GFSEcrsUri &uri, GFSEcrsMetaData &meta,
+ struct GNUNET_FSUI_SearchList *parentSearch, GFSEcrsUri &uri,
GFSEcrsMetaData &meta,
QString gnPath, QString name, QString destPath, int anonymity, bool
recursive)
{
GString path;
@@ -162,21 +162,21 @@
{
char *dir;
- GC_get_configuration_value_filename(fs->config(), "FS", "INCOMINGDIR",
+ GNUNET_GC_get_configuration_value_filename(fs->config(), "FS",
"INCOMINGDIR",
"$HOME/gnunet-downloads/", &dir);
destPath = dir;
}
path = destPath + QDir::separator() + gnPath + QDir::separator() + name;
- FSUI_startDownload(fs->context(), anonymity, recursive, uri.uri(),
meta.meta(),
+ GNUNET_FSUI_download_start(fs->context(), anonymity, recursive, uri.uri(),
meta.meta(),
path.toCString(), parentSearch, NULL /* FIXME */);
downloadList.insert(uri, searchIdx);
}
-QPersistentModelIndex *GFSDownloadController::started(struct FSUI_DownloadList
*handle,
- QPersistentModelIndex *parent, const ECRS_FileInfo *fi, QString name,
unsigned long long total,
+QPersistentModelIndex *GFSDownloadController::started(struct
GNUNET_FSUI_DownloadList *handle,
+ QPersistentModelIndex *parent, const GNUNET_ECRS_FileInfo *fi, QString name,
unsigned long long total,
unsigned long long completed)
{
QModelIndex tmpIdx;
@@ -203,7 +203,7 @@
tmpIdx = downloadModel.index(item->index().row(), COL_DST_PATH);
downloadModel.setData(tmpIdx, QVariant(name), Qt::DisplayRole);
- size = ECRS_fileSize(fi->uri);
+ size = GNUNET_ECRS_uri_get_file_size(fi->uri);
tmpIdx = downloadModel.index(item->index().row(), COL_SIZE);
downloadModel.setData(tmpIdx, QVariant(GString::fromByteSize(size)),
Qt::DisplayRole);
@@ -211,7 +211,7 @@
idx = new QPersistentModelIndex(item->index());
setProgress(idx, completed, total, (GNUNET_CronTime) -1);
- state(idx, (total != completed) ? FSUI_download_started :
FSUI_download_completed);
+ state(idx, (total != completed) ? GNUNET_FSUI_download_started :
GNUNET_FSUI_download_completed);
return idx;
}
@@ -220,7 +220,7 @@
unsigned long long total, GNUNET_CronTime eta)
{
setProgress(idx, completed, total, eta);
- state(idx, FSUI_download_progress);
+ state(idx, GNUNET_FSUI_download_progress);
}
void GFSDownloadController::completed(QPersistentModelIndex *idx, GFSEcrsUri
uri, QString file)
@@ -230,19 +230,19 @@
it = downloadList.find(uri);
if (it != downloadList.end())
fs->searchController()->downloadCompleted(*it, file);
- state(idx, FSUI_download_completed);
+ state(idx, GNUNET_FSUI_download_completed);
}
-void GFSDownloadController::state(QPersistentModelIndex *idx, FSUI_EventType
type)
+void GFSDownloadController::state(QPersistentModelIndex *idx,
GNUNET_FSUI_EventType type)
{
QModelIndex index = downloadModel.index(idx->row(), COL_STATUS,
idx->parent());
downloadModel.setData(index, QVariant(fs->fsuiState(type)), Qt::DisplayRole);
- if (type == FSUI_download_stopped)
+ if (type == GNUNET_FSUI_download_stopped)
downloadModel.removeRow(idx->row());
else
downloadModel.setData(index,
- QVariant(type == FSUI_download_completed || type ==
FSUI_download_aborted),
+ QVariant(type == GNUNET_FSUI_download_completed || type ==
GNUNET_FSUI_download_aborted),
Qt::UserRole);
}
@@ -258,7 +258,7 @@
QStandardItem *item;
item = downloadModel.item(idx.row());
- FSUI_stopDownload(fs->context(), (struct FSUI_DownloadList *)
+ GNUNET_FSUI_download_stop(fs->context(), (struct
GNUNET_FSUI_DownloadList *)
item->data(Qt::UserRole).value<void *>());
}
else
@@ -266,10 +266,10 @@
}
}
-void GFSDownloadController::cancel(struct FSUI_DownloadList *handle)
+void GFSDownloadController::cancel(struct GNUNET_FSUI_DownloadList *handle)
{
- FSUI_abortDownload(fs->context(), handle);
- FSUI_stopDownload(fs->context(), handle);
+ GNUNET_FSUI_download_abort(fs->context(), handle);
+ GNUNET_FSUI_download_stop(fs->context(), handle);
}
QAbstractItemModel *GFSDownloadController::model()
Modified: gnunet-qt/src/plugins/fs/ecrsMetaData.cc
===================================================================
--- gnunet-qt/src/plugins/fs/ecrsMetaData.cc 2007-11-25 13:00:36 UTC (rev
5769)
+++ gnunet-qt/src/plugins/fs/ecrsMetaData.cc 2007-11-25 13:10:33 UTC (rev
5770)
@@ -20,7 +20,7 @@
/**
* @file src/plugins/fs/ecrsMetaData.cc
- * @brief Encapsulates ECRS_MetaData
+ * @brief Encapsulates GNUNET_ECRS_MetaData
* @author Nils Durner
*/
@@ -34,13 +34,13 @@
GFSEcrsMetaData::GFSEcrsMetaData(QByteArray serialized)
{
- metaData = ECRS_deserializeMetaData(NULL, serialized.data(),
serialized.size());
+ metaData = GNUNET_ECRS_meta_data_deserialize(NULL, serialized.data(),
serialized.size());
}
GFSEcrsMetaData::~GFSEcrsMetaData()
{
if (metaData)
- ECRS_freeMetaData(metaData);
+ GNUNET_ECRS_meta_data_destroy(metaData);
}
GFSEcrsMetaData::GFSEcrsMetaData(const GFSEcrsMetaData &src)
@@ -48,7 +48,7 @@
copyFrom(src);
}
-GFSEcrsMetaData::GFSEcrsMetaData(const struct ECRS_MetaData *src)
+GFSEcrsMetaData::GFSEcrsMetaData(const struct GNUNET_ECRS_MetaData *src)
{
copyFrom(src);
}
@@ -59,7 +59,7 @@
return *this;
}
-GFSEcrsMetaData &GFSEcrsMetaData::operator=(const struct ECRS_MetaData *src)
+GFSEcrsMetaData &GFSEcrsMetaData::operator=(const struct GNUNET_ECRS_MetaData
*src)
{
copyFrom(src);
return *this;
@@ -67,15 +67,15 @@
void GFSEcrsMetaData::copyFrom(const class GFSEcrsMetaData &src)
{
- metaData = ECRS_dupMetaData(src.metaData);
+ metaData = GNUNET_ECRS_meta_data_duplicate(src.metaData);
}
-void GFSEcrsMetaData::copyFrom(const struct ECRS_MetaData *src)
+void GFSEcrsMetaData::copyFrom(const struct GNUNET_ECRS_MetaData *src)
{
- metaData = ECRS_dupMetaData(src);
+ metaData = GNUNET_ECRS_meta_data_duplicate(src);
}
-struct ECRS_MetaData *GFSEcrsMetaData::meta()
+struct GNUNET_ECRS_MetaData *GFSEcrsMetaData::meta()
{
return metaData;
}
@@ -84,15 +84,15 @@
{
int size;
- size = ECRS_sizeofMetaData(metaData, ECRS_SERIALIZE_FULL);
+ size = GNUNET_ECRS_meta_data_get_serialized_size(metaData,
GNUNET_ECRS_SERIALIZE_FULL);
if (size != GNUNET_SYSERR)
{
QByteArray ret;
char *data;
data = new char[size];
- GNUNETQT_ASSERT(ECRS_serializeMetaData(NULL, metaData, data, size,
- ECRS_SERIALIZE_FULL) != GNUNET_SYSERR);
+ GNUNETQT_ASSERT(GNUNET_ECRS_meta_data_serialize(NULL, metaData, data, size,
+ GNUNET_ECRS_SERIALIZE_FULL) != GNUNET_SYSERR);
ret = QByteArray(data, size);
delete [] data;
Modified: gnunet-qt/src/plugins/fs/ecrsuri.cc
===================================================================
--- gnunet-qt/src/plugins/fs/ecrsuri.cc 2007-11-25 13:00:36 UTC (rev 5769)
+++ gnunet-qt/src/plugins/fs/ecrsuri.cc 2007-11-25 13:10:33 UTC (rev 5770)
@@ -20,7 +20,7 @@
/**
* @file src/plugins/fs/ecrsuri.h
- * @brief Wrapper for ECRS_URI
+ * @brief Wrapper for GNUNET_ECRS_URI
* @author Nils Durner
*/
@@ -34,13 +34,13 @@
GFSEcrsUri::GFSEcrsUri(QString serialized)
{
- ecrsUri = ECRS_stringToUri(NULL, qPrintable(serialized));
+ ecrsUri = GNUNET_ECRS_string_to_uri(NULL, qPrintable(serialized));
}
GFSEcrsUri::GFSEcrsUri(const GFSEcrsUri &src)
{
if (src.ecrsUri)
- ecrsUri = ECRS_dupUri(src.ecrsUri);
+ ecrsUri = GNUNET_ECRS_uri_duplicate(src.ecrsUri);
else
ecrsUri = NULL;
}
@@ -48,25 +48,25 @@
GFSEcrsUri::~GFSEcrsUri()
{
if (ecrsUri)
- ECRS_freeUri(ecrsUri);
+ GNUNET_ECRS_uri_destroy(ecrsUri);
}
-const ECRS_URI *GFSEcrsUri::uri()
+const GNUNET_ECRS_URI *GFSEcrsUri::uri()
{
return ecrsUri;
}
bool GFSEcrsUri::operator==(const GFSEcrsUri &rvalue)
{
- return ecrsUri && rvalue.ecrsUri && ECRS_equalsUri(ecrsUri, rvalue.ecrsUri);
+ return ecrsUri && rvalue.ecrsUri && GNUNET_ECRS_uri_test_equal(ecrsUri,
rvalue.ecrsUri);
}
GFSEcrsUri &GFSEcrsUri::operator=(const GFSEcrsUri &src)
{
if (ecrsUri)
- ECRS_freeUri(ecrsUri);
+ GNUNET_ECRS_uri_destroy(ecrsUri);
- ecrsUri = ECRS_dupUri(src.ecrsUri);
+ ecrsUri = GNUNET_ECRS_uri_duplicate(src.ecrsUri);
return *this;
}
@@ -76,8 +76,8 @@
char *s1, *s2;
bool ret;
- s1 = ECRS_uriToString(ecrsUri);
- s2 = ECRS_uriToString(rvalue.ecrsUri);
+ s1 = GNUNET_ECRS_uri_to_string(ecrsUri);
+ s2 = GNUNET_ECRS_uri_to_string(rvalue.ecrsUri);
ret = (strcmp(s1, s2) < 0);
@@ -95,19 +95,19 @@
if (!ecrsUri)
return QString();
- desc = ECRS_uriToString(ecrsUri);
+ desc = GNUNET_ECRS_uri_to_string(ecrsUri);
if (!desc)
return QString();
- GNUNETQT_ASSERT(strlen(desc) >= strlen(ECRS_URI_PREFIX));
+ GNUNETQT_ASSERT(strlen(desc) >= strlen(GNUNET_ECRS_URI_PREFIX));
- dhead = desc + strlen(ECRS_URI_PREFIX);
- if (strncmp(dhead, ECRS_SEARCH_INFIX, strlen(ECRS_SEARCH_INFIX)) == 0)
- strRet = dhead + strlen(ECRS_SEARCH_INFIX);
- else if (strncmp(dhead, ECRS_SUBSPACE_INFIX, strlen(ECRS_SUBSPACE_INFIX) ==
0))
- strRet = dhead + strlen(ECRS_SUBSPACE_INFIX);
- else if (strncmp(dhead, ECRS_FILE_INFIX, strlen(ECRS_FILE_INFIX) == 0))
- strRet = dhead + strlen(ECRS_FILE_INFIX);
+ dhead = desc + strlen(GNUNET_ECRS_URI_PREFIX);
+ if (strncmp(dhead, GNUNET_ECRS_SEARCH_INFIX,
strlen(GNUNET_ECRS_SEARCH_INFIX)) == 0)
+ strRet = dhead + strlen(GNUNET_ECRS_SEARCH_INFIX);
+ else if (strncmp(dhead, GNUNET_ECRS_SUBSPACE_INFIX,
strlen(GNUNET_ECRS_SUBSPACE_INFIX) == 0))
+ strRet = dhead + strlen(GNUNET_ECRS_SUBSPACE_INFIX);
+ else if (strncmp(dhead, GNUNET_ECRS_FILE_INFIX,
strlen(GNUNET_ECRS_FILE_INFIX) == 0))
+ strRet = dhead + strlen(GNUNET_ECRS_FILE_INFIX);
GNUNET_free(desc);
@@ -122,7 +122,7 @@
if (!ecrsUri)
return QString();
- str = ECRS_uriToString(ecrsUri);
+ str = GNUNET_ECRS_uri_to_string(ecrsUri);
if (str)
{
@@ -133,17 +133,17 @@
return ret;
}
-GFSEcrsUri::GFSEcrsUri(const ECRS_URI *uri)
+GFSEcrsUri::GFSEcrsUri(const GNUNET_ECRS_URI *uri)
{
- ecrsUri = ECRS_dupUri(uri);
+ ecrsUri = GNUNET_ECRS_uri_duplicate(uri);
}
-GFSEcrsUri &GFSEcrsUri::operator=(const ECRS_URI *uri)
+GFSEcrsUri &GFSEcrsUri::operator=(const GNUNET_ECRS_URI *uri)
{
if (ecrsUri)
- ECRS_freeUri(ecrsUri);
+ GNUNET_ECRS_uri_destroy(ecrsUri);
- ecrsUri = ECRS_dupUri(uri);
+ ecrsUri = GNUNET_ECRS_uri_duplicate(uri);
return *this;
}
Modified: gnunet-qt/src/plugins/fs/fs.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs.cc 2007-11-25 13:00:36 UTC (rev 5769)
+++ gnunet-qt/src/plugins/fs/fs.cc 2007-11-25 13:10:33 UTC (rev 5770)
@@ -43,100 +43,100 @@
#include "ecrsuri.h"
#include "searchController.h"
-static void *fsuiEventProcessor(void *cls, const FSUI_Event *event)
+static void *fsuiEventProcessor(void *cls, const GNUNET_FSUI_Event *event)
{
GFSSearchController *searchCntrl = ((GFSPlugin *) cls)->searchController();
GFSUploadController *uploadCntrl = ((GFSPlugin *) cls)->uploadController();
GFSDownloadController *downloadCntrl = ((GFSPlugin *)
cls)->downloadController();
- struct GE_Context *errorContext = ((GFSPlugin *) cls)->errorContext();
+ struct GNUNET_GE_Context *errorContext = ((GFSPlugin *) cls)->errorContext();
switch (event->type)
{
- case FSUI_search_started:
+ case GNUNET_FSUI_search_started:
return searchCntrl->started(event->data.SearchStarted.sc.pos,
event->data.SearchStarted.searchURI, 0, NULL);
- case FSUI_search_result:
+ case GNUNET_FSUI_search_result:
searchCntrl->result((GFSSearchInfo *) event->data.SearchResult.sc.cctx,
&event->data.SearchResult.fi);
break;
- case FSUI_search_error:
- GE_LOG(errorContext, (GE_KIND) (GE_ERROR | GE_USER | GE_IMMEDIATE),
+ case GNUNET_FSUI_search_error:
+ GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_ERROR |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
event->data.SearchError.message);
- case FSUI_search_aborted:
- case FSUI_search_completed:
- case FSUI_search_suspended:
+ case GNUNET_FSUI_search_aborted:
+ case GNUNET_FSUI_search_completed:
+ case GNUNET_FSUI_search_suspended:
searchCntrl->state((GFSSearchInfo *) event->data.SearchResult.sc.cctx,
event->type);
break;
- case FSUI_search_resumed:
+ case GNUNET_FSUI_search_resumed:
return searchCntrl->started(event->data.SearchResumed.sc.pos,
event->data.SearchResumed.searchURI,
event->data.SearchResumed.fisSize,
event->data.SearchResumed.fis);
- case FSUI_search_stopped:
+ case GNUNET_FSUI_search_stopped:
searchCntrl->stopped((GFSSearchInfo *)
event->data.SearchStopped.sc.cctx);
break;
- case FSUI_upload_started:
+ case GNUNET_FSUI_upload_started:
return uploadCntrl->started((QPersistentModelIndex *)
event->data.UploadStarted.uc.pcctx,
event->data.UploadStarted.filename, event->data.UploadStarted.total,
0);
- case FSUI_upload_resumed:
+ case GNUNET_FSUI_upload_resumed:
return uploadCntrl->started((QPersistentModelIndex *)
event->data.UploadResumed.uc.pcctx,
event->data.UploadResumed.filename, event->data.UploadResumed.total,
event->data.UploadResumed.completed);
- case FSUI_upload_progress:
+ case GNUNET_FSUI_upload_progress:
uploadCntrl->progress((QPersistentModelIndex *)
event->data.UploadProgress.uc.cctx,
event->data.UploadProgress.completed,
event->data.UploadProgress.total);
break;
- case FSUI_upload_error:
- GE_LOG(errorContext, (GE_KIND) (GE_ERROR | GE_USER | GE_IMMEDIATE),
+ case GNUNET_FSUI_upload_error:
+ GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_ERROR |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
event->data.UploadError.message);
- case FSUI_upload_stopped:
- case FSUI_upload_completed:
- case FSUI_upload_aborted:
- case FSUI_upload_suspended:
+ case GNUNET_FSUI_upload_stopped:
+ case GNUNET_FSUI_upload_completed:
+ case GNUNET_FSUI_upload_aborted:
+ case GNUNET_FSUI_upload_suspended:
uploadCntrl->state((QPersistentModelIndex *)
event->data.UploadStopped.uc.cctx,
event->type);
break;
- case FSUI_download_started:
+ case GNUNET_FSUI_download_started:
return downloadCntrl->started(event->data.DownloadStarted.dc.pos,
(QPersistentModelIndex *) event->data.DownloadStarted.dc.pcctx,
&event->data.DownloadStarted.fi,
event->data.DownloadStarted.filename,
event->data.DownloadStarted.total, 0);
- case FSUI_download_resumed:
+ case GNUNET_FSUI_download_resumed:
return downloadCntrl->started(event->data.DownloadResumed.dc.pos,
(QPersistentModelIndex *) event->data.DownloadResumed.dc.pcctx,
&event->data.DownloadResumed.fi,
event->data.DownloadResumed.filename,
event->data.DownloadResumed.total,
event->data.DownloadResumed.completed);
- case FSUI_download_progress:
+ case GNUNET_FSUI_download_progress:
downloadCntrl->progress((QPersistentModelIndex *)
event->data.DownloadProgress.dc.cctx,
event->data.DownloadProgress.completed,
event->data.DownloadProgress.total,
event->data.DownloadProgress.eta);
break;
- case FSUI_download_completed:
+ case GNUNET_FSUI_download_completed:
downloadCntrl->completed((QPersistentModelIndex *)
event->data.DownloadCompleted.dc.cctx,
event->data.DownloadCompleted.uri,
event->data.DownloadCompleted.filename);
break;
- case FSUI_download_error:
- GE_LOG(errorContext, (GE_KIND) (GE_ERROR | GE_USER | GE_IMMEDIATE),
+ case GNUNET_FSUI_download_error:
+ GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_ERROR |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
event->data.DownloadError.message);
- case FSUI_download_stopped:
- case FSUI_download_aborted:
- case FSUI_download_suspended:
+ case GNUNET_FSUI_download_stopped:
+ case GNUNET_FSUI_download_aborted:
+ case GNUNET_FSUI_download_suspended:
downloadCntrl->state((QPersistentModelIndex *)
event->data.DownloadStopped.dc.cctx,
event->type);
break;
default:
- GE_LOG(errorContext, (GE_KIND) (GE_ERROR | GE_USER | GE_IMMEDIATE),
+ GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_ERROR |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
qPrintable(QObject::tr("Internal error: received unhandled event from
FSUI.")));
}
return NULL;
}
-GFSPlugin::GFSPlugin(struct GC_Configuration *config,
- struct GE_Context *errorContext) : GPlugin()
+GFSPlugin::GFSPlugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext) : GPlugin()
{
setupUi(this);
@@ -190,13 +190,13 @@
treeUploads->setEditTriggers(QAbstractItemView::NoEditTriggers);
/* FIXME: allow user to configure download parallelism */
- fsuiContext = FSUI_start(errorContext, config, "gnunet_qt", 128, GNUNET_YES,
+ fsuiContext = GNUNET_FSUI_start(errorContext, config, "gnunet_qt", 128,
GNUNET_YES,
fsuiEventProcessor, this);
}
GFSPlugin::~GFSPlugin()
{
- FSUI_stop(fsuiContext);
+ GNUNET_FSUI_stop(fsuiContext);
delete searchCntrl;
delete searchItemDelegate;
delete uploadCntrl;
@@ -240,7 +240,7 @@
void GFSPlugin::searchClicked()
{
QString strSearch, strNS;
- ECRS_URI *uri;
+ GNUNET_ECRS_URI *uri;
strSearch = cmbSearchFor->lineEdit()->text();
if (strSearch == "")
@@ -261,27 +261,27 @@
QString strUri;
char *ustring;
- strUri = QString(ECRS_URI_PREFIX) + ECRS_SUBSPACE_INFIX + strNS + "/" +
+ strUri = QString(GNUNET_ECRS_URI_PREFIX) + GNUNET_ECRS_SUBSPACE_INFIX +
strNS + "/" +
strSearch;
ustring = strUri.toLocal8Bit().data();
- uri = ECRS_stringToUri(ectx, ustring);
+ uri = GNUNET_ECRS_string_to_uri(ectx, ustring);
if (!uri)
- GE_LOG(ectx, (GE_KIND) (GE_ERROR | GE_USER | GE_IMMEDIATE),
+ GNUNET_GE_LOG(ectx, (GNUNET_GE_KIND) (GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE),
tr("Failed to create namespace URI from `%s'.\n").toLocal8Bit().data(),
ustring);
}
else
- uri = ECRS_parseCharKeywordURI(ectx, strSearch.toLocal8Bit().data());
+ uri = GNUNET_ECRS_keyword_string_to_uri(ectx,
strSearch.toLocal8Bit().data());
if (uri == NULL)
return;
/* Start search */
// @TODO: FIXME: INT_MAX
- FSUI_startSearch(fsuiContext, spinSearchAnon->value(), INT_MAX, INT_MAX,
+ GNUNET_FSUI_search_start(fsuiContext, spinSearchAnon->value(), INT_MAX,
INT_MAX,
uri);
- ECRS_freeUri(uri);
+ GNUNET_ECRS_uri_destroy(uri);
}
GFSSearchController *GFSPlugin::searchController()
@@ -422,7 +422,7 @@
}
void GFSPlugin::download(QPersistentModelIndex &searchIdx,
- struct FSUI_SearchList *handle, GFSEcrsUri &uri, GFSEcrsMetaData &meta,
+ struct GNUNET_FSUI_SearchList *handle, GFSEcrsUri &uri, GFSEcrsMetaData
&meta,
QString gnPath, QString &file, int anonymity, bool recurse)
{
QPixmap icon;
@@ -441,7 +441,7 @@
void GFSPlugin::cancelDLClicked()
{
- typedef QList<struct FSUI_DownloadList *> GCancelList;
+ typedef QList<struct GNUNET_FSUI_DownloadList *> GCancelList;
QModelIndexList list;
QModelIndexList::iterator it;
@@ -454,7 +454,7 @@
// collect handles of downloads first because indexes shift as rows are
removed
for (it = list.begin(); it != list.end(); it++)
- cancelList.push_back((struct FSUI_DownloadList *) dataModel->data(*it,
Qt::UserRole).value<void *>());
+ cancelList.push_back((struct GNUNET_FSUI_DownloadList *)
dataModel->data(*it, Qt::UserRole).value<void *>());
// remove downloads
for (itCancel = cancelList.begin(); itCancel != cancelList.end(); itCancel++)
@@ -466,71 +466,71 @@
uploadCntrl->clear();
}
-struct GC_Configuration *GFSPlugin::config()
+struct GNUNET_GC_Configuration *GFSPlugin::config()
{
return cfg;
}
-struct GE_Context *GFSPlugin::errorContext()
+struct GNUNET_GE_Context *GFSPlugin::errorContext()
{
return ectx;
}
-struct FSUI_Context *GFSPlugin::context()
+struct GNUNET_FSUI_Context *GFSPlugin::context()
{
return fsuiContext;
}
-QString GFSPlugin::fsuiState(FSUI_EventType type)
+QString GFSPlugin::fsuiState(GNUNET_FSUI_EventType type)
{
switch(type)
{
- case FSUI_search_started:
- case FSUI_download_started:
- case FSUI_upload_started:
- case FSUI_unindex_started:
+ case GNUNET_FSUI_search_started:
+ case GNUNET_FSUI_download_started:
+ case GNUNET_FSUI_upload_started:
+ case GNUNET_FSUI_unindex_started:
return tr("started");
- case FSUI_search_result:
- case FSUI_download_progress:
- case FSUI_upload_progress:
- case FSUI_unindex_progress:
+ case GNUNET_FSUI_search_result:
+ case GNUNET_FSUI_download_progress:
+ case GNUNET_FSUI_upload_progress:
+ case GNUNET_FSUI_unindex_progress:
return tr("active");
- case FSUI_search_stopped:
- case FSUI_download_stopped:
- case FSUI_upload_stopped:
- case FSUI_unindex_stopped:
+ case GNUNET_FSUI_search_stopped:
+ case GNUNET_FSUI_download_stopped:
+ case GNUNET_FSUI_upload_stopped:
+ case GNUNET_FSUI_unindex_stopped:
return tr("stopped");
- case FSUI_search_completed:
- case FSUI_download_completed:
- case FSUI_upload_completed:
- case FSUI_unindex_completed:
+ case GNUNET_FSUI_search_completed:
+ case GNUNET_FSUI_download_completed:
+ case GNUNET_FSUI_upload_completed:
+ case GNUNET_FSUI_unindex_completed:
return tr("completed");
- case FSUI_search_aborted:
- case FSUI_download_aborted:
- case FSUI_upload_aborted:
- case FSUI_unindex_aborted:
+ case GNUNET_FSUI_search_aborted:
+ case GNUNET_FSUI_download_aborted:
+ case GNUNET_FSUI_upload_aborted:
+ case GNUNET_FSUI_unindex_aborted:
return tr("aborted");
- case FSUI_search_error:
- case FSUI_download_error:
- case FSUI_upload_error:
- case FSUI_unindex_error:
+ case GNUNET_FSUI_search_error:
+ case GNUNET_FSUI_download_error:
+ case GNUNET_FSUI_upload_error:
+ case GNUNET_FSUI_unindex_error:
return tr("error");
- case FSUI_search_suspended:
- case FSUI_download_suspended:
- case FSUI_upload_suspended:
- case FSUI_unindex_suspended:
+ case GNUNET_FSUI_search_suspended:
+ case GNUNET_FSUI_download_suspended:
+ case GNUNET_FSUI_upload_suspended:
+ case GNUNET_FSUI_unindex_suspended:
return tr("suspended");
- case FSUI_search_resumed:
- case FSUI_download_resumed:
- case FSUI_upload_resumed:
- case FSUI_unindex_resumed:
+ case GNUNET_FSUI_search_resumed:
+ case GNUNET_FSUI_download_resumed:
+ case GNUNET_FSUI_upload_resumed:
+ case GNUNET_FSUI_unindex_resumed:
return tr("resumed");
default:
@@ -540,8 +540,8 @@
extern "C"
{
- GNUNETQT_API GPlugin *init_plugin(struct GC_Configuration *config,
- struct GE_Context *errorContext)
+ GNUNETQT_API GPlugin *init_plugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext)
{
return new GFSPlugin(config, errorContext);
}
Modified: gnunet-qt/src/plugins/fs/searchController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.cc 2007-11-25 13:00:36 UTC
(rev 5769)
+++ gnunet-qt/src/plugins/fs/searchController.cc 2007-11-25 13:10:33 UTC
(rev 5770)
@@ -63,8 +63,8 @@
return GNUNET_OK;
}
-GFSSearchInfo *GFSSearchController::started(struct FSUI_SearchList *list,
- const struct ECRS_URI *uri, unsigned int resultCount, const ECRS_FileInfo
*results)
+GFSSearchInfo *GFSSearchController::started(struct GNUNET_FSUI_SearchList
*list,
+ const struct GNUNET_ECRS_URI *uri, unsigned int resultCount, const
GNUNET_ECRS_FileInfo *results)
{
GEvent *event;
GFSSearch *view = NULL;
@@ -106,7 +106,7 @@
}
void GFSSearchController::addSearchResult(QStandardItemModel *model,
- QModelIndex parent, const ECRS_FileInfo *info)
+ QModelIndex parent, const GNUNET_ECRS_FileInfo *info)
{
int row;
GFSEcrsUri ecrsUri;
@@ -128,10 +128,10 @@
childIdx = model->index(row, 0, parent);
// insert flat meta data
- ECRS_getMetaData(info->meta, &insertMetaData, &childIdx);
+ GNUNET_ECRS_meta_data_get_contents(info->meta, &insertMetaData, &childIdx);
// insert thumbnail data
- thumbSize = ECRS_getThumbnailFromMetaData(info->meta, &thumb);
+ thumbSize = GNUNET_ECRS_meta_data_get_thumbnail(info->meta, &thumb);
if (thumbSize)
{
QByteArray data((char *) thumb, thumbSize);
@@ -175,7 +175,7 @@
* @notice called by FSUI
*/
void GFSSearchController::result(GFSSearchInfo *searchInfo,
- const ECRS_FileInfo *info)
+ const GNUNET_ECRS_FileInfo *info)
{
result(searchInfo->model, searchInfo->handle, info);
}
@@ -188,7 +188,7 @@
* @notice called by started() if there are results from the last session
*/
void GFSSearchController::result(QStandardItemModel *model,
- const struct FSUI_SearchList *list, const ECRS_FileInfo *info)
+ const struct GNUNET_FSUI_SearchList *list, const GNUNET_ECRS_FileInfo *info)
{
addSearchResult(model, QModelIndex(), info);
@@ -214,17 +214,17 @@
delete info;
}
-void GFSSearchController::state(GFSSearchInfo *info, FSUI_EventType event)
+void GFSSearchController::state(GFSSearchInfo *info, GNUNET_FSUI_EventType
event)
{
searchSummaryCntrl->searchState(info->handle, event);
}
void GFSSearchController::closed(GFSEcrsUri &uri)
{
- FSUI_SearchList *list = searches[uri];
+ GNUNET_FSUI_SearchList *list = searches[uri];
- FSUI_abortSearch(fs->context(), list);
- FSUI_stopSearch(fs->context(), list);
+ GNUNET_FSUI_search_abort(fs->context(), list);
+ GNUNET_FSUI_search_stop(fs->context(), list);
}
void GFSSearchController::download(QStandardItemModel *model, GFSEcrsUri &uri,
@@ -235,7 +235,7 @@
for (it = indexes.begin(); it != indexes.end(); it++)
{
QModelIndex idx;
- FSUI_SearchList *handle;
+ GNUNET_FSUI_SearchList *handle;
QPersistentModelIndex persistIdx(*it);
QString gnPath;
@@ -270,7 +270,7 @@
/**
* @brief Callback that adds content of a directory to the search list
*/
-static int addFilesToDirectory(const ECRS_FileInfo *fi, const GNUNET_HashCode
*key,
+static int addFilesToDirectory(const GNUNET_ECRS_FileInfo *fi, const
GNUNET_HashCode *key,
int isRoot, void *closure)
{
Q_UNUSED(key)
@@ -308,7 +308,7 @@
{
QModelIndex index;
QAbstractItemModel *model;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_MetaData *meta;
model = (QAbstractItemModel *) idx.model();
@@ -332,11 +332,11 @@
return;
meta = NULL;
- ECRS_listDirectory(fs->errorContext(), data.data(), data.size(), &meta,
+ GNUNET_ECRS_directory_list_contents(fs->errorContext(), data.data(),
data.size(), &meta,
&addFilesToDirectory, &idx);
if (meta)
- ECRS_freeMetaData(meta);
+ GNUNET_ECRS_meta_data_destroy(meta);
}
}
Modified: gnunet-qt/src/plugins/fs/searchSummaryController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryController.cc 2007-11-25 13:00:36 UTC
(rev 5769)
+++ gnunet-qt/src/plugins/fs/searchSummaryController.cc 2007-11-25 13:10:33 UTC
(rev 5770)
@@ -38,33 +38,33 @@
delete model;
}
-void GFSSearchSummaryController::searchStarted(const struct FSUI_SearchList
*handle,
- const struct ECRS_URI *uri)
+void GFSSearchSummaryController::searchStarted(const struct
GNUNET_FSUI_SearchList *handle,
+ const struct GNUNET_ECRS_URI *uri)
{
model->setSearch(handle, 0, uri);
model->setStatus(handle, tr("active"), false);
}
-void GFSSearchSummaryController::searchResult(const struct FSUI_SearchList
*handle)
+void GFSSearchSummaryController::searchResult(const struct
GNUNET_FSUI_SearchList *handle)
{
model->incSearch(handle);
model->setStatus(handle, tr("active"), false);
}
-void GFSSearchSummaryController::searchStopped(const struct FSUI_SearchList
*handle)
+void GFSSearchSummaryController::searchStopped(const struct
GNUNET_FSUI_SearchList *handle)
{
model->removeSearch(handle);
}
-void GFSSearchSummaryController::searchState(const struct FSUI_SearchList
*handle, FSUI_EventType event)
+void GFSSearchSummaryController::searchState(const struct
GNUNET_FSUI_SearchList *handle, GNUNET_FSUI_EventType event)
{
bool done;
switch(event)
{
- case FSUI_search_started:
- case FSUI_search_result:
- case FSUI_search_resumed:
+ case GNUNET_FSUI_search_started:
+ case GNUNET_FSUI_search_result:
+ case GNUNET_FSUI_search_resumed:
done = false;
break;
default:
Modified: gnunet-qt/src/plugins/fs/searchSummaryModel.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryModel.cc 2007-11-25 13:00:36 UTC
(rev 5769)
+++ gnunet-qt/src/plugins/fs/searchSummaryModel.cc 2007-11-25 13:10:33 UTC
(rev 5770)
@@ -104,7 +104,7 @@
return QVariant();
}
-void GFSSearchSummaryModel::incSearch(const struct FSUI_SearchList *handle)
+void GFSSearchSummaryModel::incSearch(const struct GNUNET_FSUI_SearchList
*handle)
{
GFSSearchList::iterator it = find(handle);
@@ -118,8 +118,8 @@
}
}
-void GFSSearchSummaryModel::setSearch(const struct FSUI_SearchList *handle,
- unsigned int count, const struct ECRS_URI *uri)
+void GFSSearchSummaryModel::setSearch(const struct GNUNET_FSUI_SearchList
*handle,
+ unsigned int count, const struct GNUNET_ECRS_URI *uri)
{
int idx;
GFSSearchList::iterator it = find(handle);
@@ -148,7 +148,7 @@
}
}
-void GFSSearchSummaryModel::removeSearch(const struct FSUI_SearchList *handle)
+void GFSSearchSummaryModel::removeSearch(const struct GNUNET_FSUI_SearchList
*handle)
{
GFSSearchList::iterator it = find(handle);
@@ -159,7 +159,7 @@
}
}
-void GFSSearchSummaryModel::setStatus(const struct FSUI_SearchList *handle,
+void GFSSearchSummaryModel::setStatus(const struct GNUNET_FSUI_SearchList
*handle,
QString status, bool done)
{
GFSSearchList::iterator it = find(handle);
@@ -171,7 +171,7 @@
}
}
-GFSSearchSummaryModel::GFSSearchList::iterator
GFSSearchSummaryModel::find(const struct FSUI_SearchList *handle)
+GFSSearchSummaryModel::GFSSearchList::iterator
GFSSearchSummaryModel::find(const struct GNUNET_FSUI_SearchList *handle)
{
GFSSearchList::iterator it;
Modified: gnunet-qt/src/plugins/fs/uploadController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/uploadController.cc 2007-11-25 13:00:36 UTC
(rev 5769)
+++ gnunet-qt/src/plugins/fs/uploadController.cc 2007-11-25 13:10:33 UTC
(rev 5770)
@@ -40,7 +40,7 @@
return GNUNET_OK;
}
-static int getMetaData(EXTRACTOR_KeywordType type, const char *data, void
*list)
+static int meta_data_get_by_type(EXTRACTOR_KeywordType type, const char *data,
void *list)
{
((GFSMetaData *) list)->insert(type, data);
@@ -88,9 +88,9 @@
{
GFSMetaData metaData;
QStringList keywords;
- struct ECRS_MetaData *meta;
+ struct GNUNET_ECRS_MetaData *meta;
QFileInfo fileInfo;
- struct ECRS_URI *keywordUri;
+ struct GNUNET_ECRS_URI *keywordUri;
int thumbSize;
unsigned char *thumb;
@@ -102,7 +102,7 @@
char *config;
extractors = EXTRACTOR_loadDefaultLibraries();
- if (GC_get_configuration_value_string(fs->config(), "FS", "EXTRACTORS",
+ if (GNUNET_GC_get_configuration_value_string(fs->config(), "FS",
"EXTRACTORS",
NULL, &config) == 0 && config)
{
extractors = EXTRACTOR_loadConfigLibraries(extractors, config);
@@ -111,28 +111,28 @@
}
// extract meta data
- meta = ECRS_createMetaData();
+ meta = GNUNET_ECRS_meta_data_create();
if (!meta)
{
- GE_LOG(fs->errorContext(), (GE_KIND) (GE_ERROR | GE_USER | GE_IMMEDIATE),
+ GNUNET_GE_LOG(fs->errorContext(), (GNUNET_GE_KIND) (GNUNET_GE_ERROR |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
qPrintable(tr("Internal error: failed to create meta data for
publication.")));
return false;
}
- ECRS_extractMetaData(fs->errorContext(), meta, strPath.toLocal8Bit().data(),
extractors);
- ECRS_getMetaData(meta, &getMetaData, &metaData);
- thumbSize = ECRS_getThumbnailFromMetaData(meta, &thumb);
+ GNUNET_ECRS_meta_data_extract_from_file(fs->errorContext(), meta,
strPath.toLocal8Bit().data(), extractors);
+ GNUNET_ECRS_meta_data_get_contents(meta, &meta_data_get_by_type, &metaData);
+ thumbSize = GNUNET_ECRS_meta_data_get_thumbnail(meta, &thumb);
if (thumbSize)
metaData.insert(EXTRACTOR_THUMBNAIL_DATA, QByteArray((const char *) thumb,
thumbSize));
// Keywords
- keywordUri = ECRS_metaDataToUri(meta);
- ECRS_freeMetaData(meta);
+ keywordUri = GNUNET_ECRS_meta_data_to_uri(meta);
+ GNUNET_ECRS_meta_data_destroy(meta);
if (keywordUri)
{
- ECRS_getKeywordsFromUri(keywordUri, getKeyword, &keywords);
- ECRS_freeUri(keywordUri);
+ GNUNET_ECRS_uri_get_keywords_from_ksk(keywordUri, getKeyword, &keywords);
+ GNUNET_ECRS_uri_destroy(keywordUri);
}
fileInfo.setFile(strPath);
@@ -151,20 +151,20 @@
if (uploadDlg.exec() == QDialog::Accepted)
{
- struct FSUI_UploadList *handle;
+ struct GNUNET_FSUI_UploadList *handle;
GFSMetaData::iterator it;
- struct ECRS_URI *globalURI, *keywordURI;
+ struct GNUNET_ECRS_URI *globalURI, *keywordURI;
char **keys;
long idx;
// prepare meta data
- meta = ECRS_createMetaData();
+ meta = GNUNET_ECRS_meta_data_create();
for(it = metaData.begin(); it != metaData.end(); it++)
- ECRS_addToMetaData(meta, it.key(), it->data());
+ GNUNET_ECRS_meta_data_insert(meta, it.key(), it->data());
// prepare global URI
- globalURI = ECRS_stringToUri(fs->errorContext(), ECRS_URI_PREFIX
- ECRS_SEARCH_INFIX);
+ globalURI = GNUNET_ECRS_string_to_uri(fs->errorContext(),
GNUNET_ECRS_URI_PREFIX
+ GNUNET_ECRS_SEARCH_INFIX);
// prepare keywords URI
idx = keywords.count();
@@ -178,10 +178,10 @@
idx--;
}
- keywordURI = ECRS_keywordsToUri((const char **) keys);
+ keywordURI = GNUNET_ECRS_keyword_strings_to_uri((const char **) keys);
// upload
- handle = FSUI_startUpload(fs->context(), strPath.toLocal8Bit(),
+ handle = GNUNET_FSUI_upload_start(fs->context(), strPath.toLocal8Bit(),
(GNUNET_FSUI_DirectoryScanCallback) &GNUNET_disk_directory_scan,
fs->errorContext(),
anon, prio, index, uploadDlg.extract(), uploadDlg.useKeywords(),
GNUNET_get_time() + 2 * GNUNET_CRON_YEARS, meta, globalURI, keywordURI);
@@ -195,9 +195,9 @@
}
delete [] keys;
- ECRS_freeMetaData(meta);
- ECRS_freeUri(globalURI);
- ECRS_freeUri(keywordURI);
+ GNUNET_ECRS_meta_data_destroy(meta);
+ GNUNET_ECRS_uri_destroy(globalURI);
+ GNUNET_ECRS_uri_destroy(keywordURI);
return true;
}
@@ -205,12 +205,12 @@
return false;
}
-void GFSUploadController::state(QPersistentModelIndex *idx, FSUI_EventType
event)
+void GFSUploadController::state(QPersistentModelIndex *idx,
GNUNET_FSUI_EventType event)
{
QModelIndex index = uploadModel.index(idx->row(), 2, idx->parent());
uploadModel.setData(index, QVariant(fs->fsuiState(event)), Qt::DisplayRole);
- uploadModel.setData(index, QVariant(event == FSUI_upload_completed),
+ uploadModel.setData(index, QVariant(event == GNUNET_FSUI_upload_completed),
Qt::UserRole);
}
@@ -242,7 +242,7 @@
idx = new QPersistentModelIndex(item->index());
setProgress(idx, completed, total);
- state(idx, (total != completed || total == 0) ? FSUI_upload_started :
FSUI_upload_completed);
+ state(idx, (total != completed || total == 0) ? GNUNET_FSUI_upload_started :
GNUNET_FSUI_upload_completed);
return idx;
}
@@ -251,7 +251,7 @@
unsigned long long completed, unsigned long long total)
{
setProgress(idx, completed, total);
- state(idx, FSUI_upload_progress);
+ state(idx, GNUNET_FSUI_upload_progress);
}
void GFSUploadController::clear()
Modified: gnunet-qt/src/plugins/general/checkDaemonThread.cc
===================================================================
--- gnunet-qt/src/plugins/general/checkDaemonThread.cc 2007-11-25 13:00:36 UTC
(rev 5769)
+++ gnunet-qt/src/plugins/general/checkDaemonThread.cc 2007-11-25 13:10:33 UTC
(rev 5770)
@@ -46,8 +46,8 @@
strDesc = src.strDesc;
}
-GCheckDaemonThread::GCheckDaemonThread(struct GC_Configuration *config,
- struct GE_Context *errorContext, QObject *parent) : QThread(parent)
+GCheckDaemonThread::GCheckDaemonThread(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext, QObject *parent) : QThread(parent)
{
this->config = config;
this->errorContext = errorContext;
Modified: gnunet-qt/src/plugins/general/general.cc
===================================================================
--- gnunet-qt/src/plugins/general/general.cc 2007-11-25 13:00:36 UTC (rev
5769)
+++ gnunet-qt/src/plugins/general/general.cc 2007-11-25 13:10:33 UTC (rev
5770)
@@ -29,8 +29,8 @@
#include <QStringList>
#include "general.h"
-GGeneralPlugin::GGeneralPlugin(struct GC_Configuration *config,
- struct GE_Context *errorContext, QObject *parent) : GPlugin()
+GGeneralPlugin::GGeneralPlugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext, QObject *parent) : GPlugin()
{
Q_UNUSED(parent)
@@ -183,8 +183,8 @@
extern "C"
{
- GNUNETQT_API GPlugin *init_plugin(struct GC_Configuration *config,
- struct GE_Context *errorContext)
+ GNUNETQT_API GPlugin *init_plugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext)
{
return new GGeneralPlugin(config, errorContext);
}
Modified: gnunet-qt/src/plugins/general/startStopThread.cc
===================================================================
--- gnunet-qt/src/plugins/general/startStopThread.cc 2007-11-25 13:00:36 UTC
(rev 5769)
+++ gnunet-qt/src/plugins/general/startStopThread.cc 2007-11-25 13:10:33 UTC
(rev 5770)
@@ -30,8 +30,8 @@
#include "startStopThread.h"
-GStartStopThread::GStartStopThread(struct GC_Configuration *config,
- struct GE_Context *errorContext, QObject *parent) : QThread(parent)
+GStartStopThread::GStartStopThread(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext, QObject *parent) : QThread(parent)
{
this->config = config;
this->errorContext = errorContext;
@@ -62,7 +62,7 @@
ret = GNUNET_client_connection_request_daemon_shutdown(sock) !=
GNUNET_SYSERR;
}
- emit finished(ret, GE_strerror(errno));
+ emit finished(ret, GNUNET_GE_strerror(errno));
}
/* end of startStopThread.cc */
Modified: gnunet-qt/src/plugins/stats/statsPlugin.cc
===================================================================
--- gnunet-qt/src/plugins/stats/statsPlugin.cc 2007-11-25 13:00:36 UTC (rev
5769)
+++ gnunet-qt/src/plugins/stats/statsPlugin.cc 2007-11-25 13:10:33 UTC (rev
5770)
@@ -39,8 +39,8 @@
GStatsPlugin *plugin;
};
-GStatsPlugin::GStatsPlugin(struct GC_Configuration *config,
- struct GE_Context *errorContext) : GPlugin()
+GStatsPlugin::GStatsPlugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext) : GPlugin()
{
setupUi(this);
@@ -119,8 +119,8 @@
extern "C"
{
- GNUNETQT_API GPlugin *init_plugin(struct GC_Configuration *config,
- struct GE_Context *errorContext)
+ GNUNETQT_API GPlugin *init_plugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext)
{
return new GStatsPlugin(config, errorContext);
}
Modified: gnunet-qt/src/plugins/stats/statsThread.cc
===================================================================
--- gnunet-qt/src/plugins/stats/statsThread.cc 2007-11-25 13:00:36 UTC (rev
5769)
+++ gnunet-qt/src/plugins/stats/statsThread.cc 2007-11-25 13:10:33 UTC (rev
5770)
@@ -30,8 +30,8 @@
#include "config.h"
#include "statsThread.h"
-GStatsThread::GStatsThread(struct GC_Configuration *config,
- struct GE_Context *errorContext, QObject *parent)
+GStatsThread::GStatsThread(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext, QObject *parent)
{
this->config = config;
this->errorContext = errorContext;
@@ -60,7 +60,7 @@
sock = GNUNET_client_connection_create(errorContext, config);
if (!sock)
{
- GE_LOG(errorContext, (GE_KIND) (GE_ERROR | GE_USER | GE_IMMEDIATE),
+ GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_ERROR |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
qPrintable(tr("Error establishing connection with background process
gnunetd.")));
return;
}
@@ -79,7 +79,7 @@
#endif
if (res != GNUNET_OK)
- GE_LOG(errorContext, (GE_KIND) (GE_ERROR | GE_USER | GE_IMMEDIATE),
+ GNUNET_GE_LOG(errorContext, (GNUNET_GE_KIND) (GNUNET_GE_ERROR |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
qPrintable(tr("Error reading information from background process
gnunetd.")));
while (timer.elapsed() < 1000 && !stopSignalled)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5770 - in gnunet-qt: . src/common src/core src/plugins/about src/plugins/fs src/plugins/general src/plugins/stats,
gnunet <=