[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5756 - in gnunet-qt/src: core include plugins/fs plugins/g
From: |
gnunet |
Subject: |
[GNUnet-SVN] r5756 - in gnunet-qt/src: core include plugins/fs plugins/general plugins/stats |
Date: |
Sun, 25 Nov 2007 05:05:28 -0700 (MST) |
Author: grothoff
Date: 2007-11-25 05:05:27 -0700 (Sun, 25 Nov 2007)
New Revision: 5756
Modified:
gnunet-qt/src/core/main.cc
gnunet-qt/src/core/main.h
gnunet-qt/src/include/gnunet_qt_common.h
gnunet-qt/src/plugins/fs/downloadController.h
gnunet-qt/src/plugins/fs/ecrsMetaData.h
gnunet-qt/src/plugins/fs/ecrsuri.h
gnunet-qt/src/plugins/fs/fs.h
gnunet-qt/src/plugins/fs/searchController.h
gnunet-qt/src/plugins/fs/searchSummaryController.h
gnunet-qt/src/plugins/fs/searchSummaryModel.h
gnunet-qt/src/plugins/fs/uploadController.cc
gnunet-qt/src/plugins/fs/uploadController.h
gnunet-qt/src/plugins/general/checkDaemonThread.h
gnunet-qt/src/plugins/general/general.h
gnunet-qt/src/plugins/general/startStopThread.h
gnunet-qt/src/plugins/stats/statsPlugin.h
gnunet-qt/src/plugins/stats/statsThread.cc
gnunet-qt/src/plugins/stats/statsThread.h
Log:
2nd round of renaming
Modified: gnunet-qt/src/core/main.cc
===================================================================
--- gnunet-qt/src/core/main.cc 2007-11-25 12:04:45 UTC (rev 5755)
+++ gnunet-qt/src/core/main.cc 2007-11-25 12:05:27 UTC (rev 5756)
@@ -42,7 +42,7 @@
#include <QMutex>
static GApplication *app;
-static char *cfgFilename = DEFAULT_CLIENT_CONFIG_FILE;
+static char *cfgFilename = GNUNET_DEFAULT_CLIENT_CONFIG_FILE;
static struct GE_Context *ectx, *stdECtx;
static struct GC_Configuration *cfg;
Modified: gnunet-qt/src/core/main.h
===================================================================
--- gnunet-qt/src/core/main.h 2007-11-25 12:04:45 UTC (rev 5755)
+++ gnunet-qt/src/core/main.h 2007-11-25 12:05:27 UTC (rev 5756)
@@ -37,18 +37,18 @@
public:
GApplication(int argc, char **argv,
- struct GC_Configuration *cfg);
+ struct GNUNET_GC_Configuration *cfg);
void loadPlugins();
void showWindow();
- void setErrorContext(struct GE_Context *ectx);
+ void setErrorContext(struct GNUNET_GE_Context *ectx);
GMainWindow *getWindow();
protected:
GMainWindow wnd;
GPluginLoader loader;
QString strCfgFile;
- struct GE_Context *ectx;
- struct GC_Configuration *cfg;
+ struct GNUNET_GE_Context *ectx;
+ struct GNUNET_GC_Configuration *cfg;
};
#endif /*MAIN_H_*/
Modified: gnunet-qt/src/include/gnunet_qt_common.h
===================================================================
--- gnunet-qt/src/include/gnunet_qt_common.h 2007-11-25 12:04:45 UTC (rev
5755)
+++ gnunet-qt/src/include/gnunet_qt_common.h 2007-11-25 12:05:27 UTC (rev
5756)
@@ -69,8 +69,8 @@
public:
~GPluginLoader();
- GPlugin *load(const QString &strName, struct GC_Configuration *config,
- struct GE_Context *errorContext);
+ GPlugin *load(const QString &strName, struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext);
void unloadAll();
protected:
@@ -108,8 +108,8 @@
char *cstr;
};
-typedef GPlugin *(*InitPlugin) (const struct GC_Configuration *config,
- const struct GE_Context *errorContext);
+typedef GPlugin *(*InitPlugin) (const struct GNUNET_GC_Configuration *config,
+ const struct GNUNET_GE_Context *errorContext);
typedef void (*ShutdownPlugin) (GPlugin *plugin);
Modified: gnunet-qt/src/plugins/fs/downloadController.h
===================================================================
--- gnunet-qt/src/plugins/fs/downloadController.h 2007-11-25 12:04:45 UTC
(rev 5755)
+++ gnunet-qt/src/plugins/fs/downloadController.h 2007-11-25 12:05:27 UTC
(rev 5756)
@@ -56,12 +56,12 @@
* @param recursive true for a recursive directory download
*/
void start(QPersistentModelIndex &searchIdx,
- struct FSUI_SearchList *parentSearch, GFSEcrsUri &uri,
+ struct GNUNET_FSUI_SearchList *parentSearch, GFSEcrsUri &uri,
GFSEcrsMetaData &meta, QString gnPath, QString name,
QString destPath, int anonymity, bool recursive);
- QPersistentModelIndex *started(struct FSUI_DownloadList *handle,
- QPersistentModelIndex *parent, const ECRS_FileInfo *fi, QString name,
+ QPersistentModelIndex *started(struct GNUNET_FSUI_DownloadList *handle,
+ QPersistentModelIndex *parent, const GNUNET_ECRS_FileInfo *fi, QString
name,
unsigned long long total, unsigned long long completed);
void progress(QPersistentModelIndex *idx, unsigned long long completed,
@@ -69,9 +69,9 @@
void completed(QPersistentModelIndex *idx, GFSEcrsUri uri, QString file);
- void state(QPersistentModelIndex *idx, FSUI_EventType type);
+ void state(QPersistentModelIndex *idx, GNUNET_FSUI_EventType type);
- void cancel(struct FSUI_DownloadList *handle);
+ void cancel(struct GNUNET_FSUI_DownloadList *handle);
void clear();
Modified: gnunet-qt/src/plugins/fs/ecrsMetaData.h
===================================================================
--- gnunet-qt/src/plugins/fs/ecrsMetaData.h 2007-11-25 12:04:45 UTC (rev
5755)
+++ gnunet-qt/src/plugins/fs/ecrsMetaData.h 2007-11-25 12:05:27 UTC (rev
5756)
@@ -20,7 +20,7 @@
/**
* @file src/plugins/fs/ecrsMetaData.h
- * @brief Encapsulates ECRS_MetaData
+ * @brief Encapsulates GNUNET_ECRS_MetaData
* @author Nils Durner
*/
@@ -36,21 +36,21 @@
GFSEcrsMetaData();
GFSEcrsMetaData(QByteArray serialized);
GFSEcrsMetaData(const class GFSEcrsMetaData &src);
- GFSEcrsMetaData(const struct ECRS_MetaData *src);
+ GFSEcrsMetaData(const struct GNUNET_ECRS_MetaData *src);
virtual ~GFSEcrsMetaData();
GFSEcrsMetaData &operator=(const class GFSEcrsMetaData &src);
- GFSEcrsMetaData &operator=(const struct ECRS_MetaData *src);
+ GFSEcrsMetaData &operator=(const struct GNUNET_ECRS_MetaData *src);
QByteArray serialized();
- struct ECRS_MetaData *meta();
+ struct GNUNET_ECRS_MetaData *meta();
protected:
- struct ECRS_MetaData *metaData;
+ struct GNUNET_ECRS_MetaData *metaData;
void copyFrom(const class GFSEcrsMetaData &src);
- void copyFrom(const struct ECRS_MetaData *src);
+ void copyFrom(const struct GNUNET_ECRS_MetaData *src);
};
#endif /*ECRSMETADATA_H_*/
Modified: gnunet-qt/src/plugins/fs/ecrsuri.h
===================================================================
--- gnunet-qt/src/plugins/fs/ecrsuri.h 2007-11-25 12:04:45 UTC (rev 5755)
+++ gnunet-qt/src/plugins/fs/ecrsuri.h 2007-11-25 12:05:27 UTC (rev 5756)
@@ -20,7 +20,7 @@
/**
* @file src/plugins/fs/ecrsuri.h
- * @brief Wrapper for ECRS_URI
+ * @brief Wrapper for GNUNET_ECRS_URI
* @author Nils Durner
*/
@@ -35,20 +35,20 @@
public:
GFSEcrsUri();
GFSEcrsUri(QString serialized);
- GFSEcrsUri(const ECRS_URI *uri);
+ GFSEcrsUri(const GNUNET_ECRS_URI *uri);
GFSEcrsUri(const GFSEcrsUri &src);
~GFSEcrsUri();
- const ECRS_URI *uri();
+ const GNUNET_ECRS_URI *uri();
QString toString();
QString serialized();
bool operator==(const GFSEcrsUri &rvalue);
GFSEcrsUri &operator=(const GFSEcrsUri &src);
- GFSEcrsUri &operator=(const ECRS_URI *src);
+ GFSEcrsUri &operator=(const GNUNET_ECRS_URI *src);
bool operator<(const class GFSEcrsUri &rvalue) const;
protected:
- ECRS_URI *ecrsUri;
+ GNUNET_ECRS_URI *ecrsUri;
};
#endif /*ECRSURI_H_*/
Modified: gnunet-qt/src/plugins/fs/fs.h
===================================================================
--- gnunet-qt/src/plugins/fs/fs.h 2007-11-25 12:04:45 UTC (rev 5755)
+++ gnunet-qt/src/plugins/fs/fs.h 2007-11-25 12:05:27 UTC (rev 5756)
@@ -50,8 +50,8 @@
Q_OBJECT
public:
- GFSPlugin(struct GC_Configuration *config,
- struct GE_Context *errorContext);
+ GFSPlugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext);
~GFSPlugin();
typedef enum {NewSearch = QEvent::User, CloseSearch = QEvent::User + 1}
EventType;
@@ -63,14 +63,14 @@
QTreeView *downloadView();
QAbstractItemView *searchSummaryView();
- struct GC_Configuration *config();
- struct GE_Context *errorContext();
- struct FSUI_Context *context();
- QString fsuiState(FSUI_EventType type);
+ struct GNUNET_GC_Configuration *config();
+ struct GNUNET_GE_Context *errorContext();
+ struct GNUNET_FSUI_Context *context();
+ QString fsuiState(GNUNET_FSUI_EventType type);
virtual bool event(QEvent *e);
- void download(QPersistentModelIndex &searchIdx, struct FSUI_SearchList
*handle,
+ void download(QPersistentModelIndex &searchIdx, struct
GNUNET_FSUI_SearchList *handle,
GFSEcrsUri &uri, GFSEcrsMetaData &meta, QString gnPath, QString &file,
int anonymity, bool recurse);
@@ -78,9 +78,9 @@
class GFSSearchController *searchCntrl;
class GFSUploadController *uploadCntrl;
class GFSDownloadController *downloadCntrl;
- struct FSUI_Context *fsuiContext;
- struct GC_Configuration *cfg;
- struct GE_Context *ectx;
+ struct GNUNET_FSUI_Context *fsuiContext;
+ struct GNUNET_GC_Configuration *cfg;
+ struct GNUNET_GE_Context *ectx;
class GSearchItemDelegate *searchItemDelegate;
protected slots:
Modified: gnunet-qt/src/plugins/fs/searchController.h
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.h 2007-11-25 12:04:45 UTC (rev
5755)
+++ gnunet-qt/src/plugins/fs/searchController.h 2007-11-25 12:05:27 UTC (rev
5756)
@@ -39,7 +39,7 @@
{
QStandardItemModel *model;
QWidget *searchWindow;
- const struct FSUI_SearchList *handle;
+ const struct GNUNET_FSUI_SearchList *handle;
} GFSSearchInfo;
class GFSSearchController : public QObject
@@ -50,25 +50,25 @@
GFSSearchController(class GFSPlugin *fs);
virtual ~GFSSearchController();
- GFSSearchInfo *started(struct FSUI_SearchList *list,
- const struct ECRS_URI *uri, unsigned int resultCount,
- const ECRS_FileInfo *results);
- void result(GFSSearchInfo *searchInfo, const ECRS_FileInfo *info);
- void result(QStandardItemModel *model, const struct FSUI_SearchList *list,
- const ECRS_FileInfo *info);
+ GFSSearchInfo *started(struct GNUNET_FSUI_SearchList *list,
+ const struct GNUNET_ECRS_URI *uri, unsigned int resultCount,
+ const GNUNET_ECRS_FileInfo *results);
+ void result(GFSSearchInfo *searchInfo, const GNUNET_ECRS_FileInfo *info);
+ void result(QStandardItemModel *model, const struct GNUNET_FSUI_SearchList
*list,
+ const GNUNET_ECRS_FileInfo *info);
void stopped(GFSSearchInfo *info);
void downloadCompleted(QPersistentModelIndex &idx, GString file);
- void state(GFSSearchInfo *info, FSUI_EventType event);
+ void state(GFSSearchInfo *info, GNUNET_FSUI_EventType event);
static void addSearchResult(QStandardItemModel *model, QModelIndex parent,
- const ECRS_FileInfo *info);
+ const GNUNET_ECRS_FileInfo *info);
protected slots:
void closed(GFSEcrsUri &uri);
void download(QStandardItemModel *model ,GFSEcrsUri &uri,
QModelIndexList indexes, int anonymity, bool recurse);
protected:
- typedef QMap<class GFSEcrsUri, struct FSUI_SearchList *> GFSSearches;
+ typedef QMap<class GFSEcrsUri, struct GNUNET_FSUI_SearchList *> GFSSearches;
class GFSSearchSummaryController *searchSummaryCntrl;
QAbstractItemModel *searchSummaryView;
Modified: gnunet-qt/src/plugins/fs/searchSummaryController.h
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryController.h 2007-11-25 12:04:45 UTC
(rev 5755)
+++ gnunet-qt/src/plugins/fs/searchSummaryController.h 2007-11-25 12:05:27 UTC
(rev 5756)
@@ -40,10 +40,10 @@
GFSSearchSummaryController(class GFSPlugin *fs);
virtual ~GFSSearchSummaryController();
- void searchStarted(const struct FSUI_SearchList *handle, const struct
ECRS_URI *uri);
- void searchResult(const struct FSUI_SearchList *handle);
- void searchStopped(const struct FSUI_SearchList *handle);
- void searchState(const struct FSUI_SearchList *handle, FSUI_EventType event);
+ void searchStarted(const struct GNUNET_FSUI_SearchList *handle, const struct
GNUNET_ECRS_URI *uri);
+ void searchResult(const struct GNUNET_FSUI_SearchList *handle);
+ void searchStopped(const struct GNUNET_FSUI_SearchList *handle);
+ void searchState(const struct GNUNET_FSUI_SearchList *handle,
GNUNET_FSUI_EventType event);
protected:
GFSPlugin *fs;
Modified: gnunet-qt/src/plugins/fs/searchSummaryModel.h
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryModel.h 2007-11-25 12:04:45 UTC
(rev 5755)
+++ gnunet-qt/src/plugins/fs/searchSummaryModel.h 2007-11-25 12:05:27 UTC
(rev 5756)
@@ -48,11 +48,11 @@
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- void setSearch(const struct FSUI_SearchList *handle, unsigned int count,
- const struct ECRS_URI *uri = NULL);
- void setStatus(const struct FSUI_SearchList *handle, QString status, bool
done);
- void removeSearch(const struct FSUI_SearchList *handle);
- void incSearch(const struct FSUI_SearchList *handle);
+ void setSearch(const struct GNUNET_FSUI_SearchList *handle, unsigned int
count,
+ const struct GNUNET_ECRS_URI *uri = NULL);
+ void setStatus(const struct GNUNET_FSUI_SearchList *handle, QString status,
bool done);
+ void removeSearch(const struct GNUNET_FSUI_SearchList *handle);
+ void incSearch(const struct GNUNET_FSUI_SearchList *handle);
protected:
class GFSSearchEntry
{
@@ -60,7 +60,7 @@
GFSSearchEntry();
GFSSearchEntry(const GFSSearchSummaryModel::GFSSearchEntry &src);
- const struct FSUI_SearchList *handle;
+ const struct GNUNET_FSUI_SearchList *handle;
int count;
GFSEcrsUri uri;
bool done;
@@ -69,7 +69,7 @@
typedef QList<GFSSearchEntry> GFSSearchList;
- GFSSearchList::iterator find(const struct FSUI_SearchList *handle);
+ GFSSearchList::iterator find(const struct GNUNET_FSUI_SearchList *handle);
GFSSearchList results;
};
Modified: gnunet-qt/src/plugins/fs/uploadController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/uploadController.cc 2007-11-25 12:04:45 UTC
(rev 5755)
+++ gnunet-qt/src/plugins/fs/uploadController.cc 2007-11-25 12:05:27 UTC
(rev 5756)
@@ -182,7 +182,7 @@
// upload
handle = FSUI_startUpload(fs->context(), strPath.toLocal8Bit(),
- (DirectoryScanCallback) &GNUNET_disk_directory_scan, fs->errorContext(),
+ (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);
Modified: gnunet-qt/src/plugins/fs/uploadController.h
===================================================================
--- gnunet-qt/src/plugins/fs/uploadController.h 2007-11-25 12:04:45 UTC (rev
5755)
+++ gnunet-qt/src/plugins/fs/uploadController.h 2007-11-25 12:05:27 UTC (rev
5756)
@@ -48,7 +48,7 @@
QString path, unsigned long long total, unsigned long long completed);
void progress(QPersistentModelIndex *idx, unsigned long long completed,
unsigned long long total);
- void state(QPersistentModelIndex *idx, FSUI_EventType event);
+ void state(QPersistentModelIndex *idx, GNUNET_FSUI_EventType event);
void clear();
QAbstractItemModel *model();
Modified: gnunet-qt/src/plugins/general/checkDaemonThread.h
===================================================================
--- gnunet-qt/src/plugins/general/checkDaemonThread.h 2007-11-25 12:04:45 UTC
(rev 5755)
+++ gnunet-qt/src/plugins/general/checkDaemonThread.h 2007-11-25 12:05:27 UTC
(rev 5756)
@@ -51,15 +51,15 @@
{
Q_OBJECT
public:
- GCheckDaemonThread(struct GC_Configuration *config,
- struct GE_Context *errorContext, QObject *parent = NULL);
+ GCheckDaemonThread(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext, QObject *parent = NULL);
~GCheckDaemonThread();
void run();
int checkAppsIn;
protected:
- struct GC_Configuration *config;
- struct GE_Context *errorContext;
+ struct GNUNET_GC_Configuration *config;
+ struct GNUNET_GE_Context *errorContext;
signals:
void running(bool isRunning);
void applications(GGNUnetAppDescs *apps);
Modified: gnunet-qt/src/plugins/general/general.h
===================================================================
--- gnunet-qt/src/plugins/general/general.h 2007-11-25 12:04:45 UTC (rev
5755)
+++ gnunet-qt/src/plugins/general/general.h 2007-11-25 12:05:27 UTC (rev
5756)
@@ -39,8 +39,8 @@
Q_OBJECT
public:
- GGeneralPlugin(struct GC_Configuration *config,
- struct GE_Context *errorContext, QObject *parent = NULL);
+ GGeneralPlugin(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext, QObject *parent = NULL);
virtual ~GGeneralPlugin();
protected:
void updateUi();
Modified: gnunet-qt/src/plugins/general/startStopThread.h
===================================================================
--- gnunet-qt/src/plugins/general/startStopThread.h 2007-11-25 12:04:45 UTC
(rev 5755)
+++ gnunet-qt/src/plugins/general/startStopThread.h 2007-11-25 12:05:27 UTC
(rev 5756)
@@ -33,8 +33,8 @@
{
Q_OBJECT
public:
- GStartStopThread(struct GC_Configuration *config,
- struct GE_Context *errorContext, QObject *parent = NULL);
+ GStartStopThread(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext, QObject *parent = NULL);
~GStartStopThread();
void start(bool doStart);
void run();
@@ -43,8 +43,8 @@
protected:
bool doStart;
int numRun;
- struct GC_Configuration *config;
- struct GE_Context *errorContext;
+ struct GNUNET_GC_Configuration *config;
+ struct GNUNET_GE_Context *errorContext;
};
#endif /*STARTSTOPTHREAD_H_*/
Modified: gnunet-qt/src/plugins/stats/statsPlugin.h
===================================================================
--- gnunet-qt/src/plugins/stats/statsPlugin.h 2007-11-25 12:04:45 UTC (rev
5755)
+++ gnunet-qt/src/plugins/stats/statsPlugin.h 2007-11-25 12:05:27 UTC (rev
5756)
@@ -37,15 +37,15 @@
Q_OBJECT
public:
- GStatsPlugin(struct GC_Configuration *config, struct GE_Context
*errorContext);
+ GStatsPlugin(struct GNUNET_GC_Configuration *config, struct
GNUNET_GE_Context *errorContext);
virtual ~GStatsPlugin();
protected slots:
void processStat(const char *name, qulonglong value);
protected:
- struct GC_Configuration *config;
- struct GE_Context *errorContext;
+ struct GNUNET_GC_Configuration *config;
+ struct GNUNET_GE_Context *errorContext;
class GStatsThread *statsThread;
};
Modified: gnunet-qt/src/plugins/stats/statsThread.cc
===================================================================
--- gnunet-qt/src/plugins/stats/statsThread.cc 2007-11-25 12:04:45 UTC (rev
5755)
+++ gnunet-qt/src/plugins/stats/statsThread.cc 2007-11-25 12:05:27 UTC (rev
5756)
@@ -69,7 +69,7 @@
{
timer.start();
#if HAVE_STATS
- res = STATS_getStatistics(errorContext,
+ res = GNUNET_STATS_get_statistics(errorContext,
sock,
&acquireStatistics,
this);
Modified: gnunet-qt/src/plugins/stats/statsThread.h
===================================================================
--- gnunet-qt/src/plugins/stats/statsThread.h 2007-11-25 12:04:45 UTC (rev
5755)
+++ gnunet-qt/src/plugins/stats/statsThread.h 2007-11-25 12:05:27 UTC (rev
5756)
@@ -33,16 +33,16 @@
{
Q_OBJECT
public:
- GStatsThread(struct GC_Configuration *config,
- struct GE_Context *errorContext, QObject *parent = NULL);
+ GStatsThread(struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext, QObject *parent = NULL);
void run();
void stop();
void processStat(const char *name, unsigned long long value);
protected:
- struct GC_Configuration *config;
- struct GE_Context *errorContext;
+ struct GNUNET_GC_Configuration *config;
+ struct GNUNET_GE_Context *errorContext;
bool stopSignalled;
signals:
void stat(const char *name, qulonglong value);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5756 - in gnunet-qt/src: core include plugins/fs plugins/general plugins/stats,
gnunet <=