[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7048 - gnunet-qt/src/plugins/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7048 - gnunet-qt/src/plugins/fs |
Date: |
Wed, 4 Jun 2008 00:02:23 -0600 (MDT) |
Author: grothoff
Date: 2008-06-04 00:02:23 -0600 (Wed, 04 Jun 2008)
New Revision: 7048
Modified:
gnunet-qt/src/plugins/fs/ecrsMetaData.cc
gnunet-qt/src/plugins/fs/searchController.cc
gnunet-qt/src/plugins/fs/uploadController.cc
Log:
updating to new API
Modified: gnunet-qt/src/plugins/fs/ecrsMetaData.cc
===================================================================
--- gnunet-qt/src/plugins/fs/ecrsMetaData.cc 2008-06-04 05:58:31 UTC (rev
7047)
+++ gnunet-qt/src/plugins/fs/ecrsMetaData.cc 2008-06-04 06:02:23 UTC (rev
7048)
@@ -20,7 +20,7 @@
/**
* @file src/plugins/fs/ecrsMetaData.cc
- * @brief Encapsulates GNUNET_ECRS_MetaData
+ * @brief Encapsulates GNUNET_MetaData
* @author Nils Durner
*/
@@ -34,13 +34,13 @@
GFSEcrsMetaData::GFSEcrsMetaData(QByteArray serialized)
{
- metaData = GNUNET_ECRS_meta_data_deserialize(NULL, serialized.data(),
serialized.size());
+ metaData = GNUNET_meta_data_deserialize(NULL, serialized.data(),
serialized.size());
}
GFSEcrsMetaData::~GFSEcrsMetaData()
{
if (metaData)
- GNUNET_ECRS_meta_data_destroy(metaData);
+ GNUNET_meta_data_destroy(metaData);
}
GFSEcrsMetaData::GFSEcrsMetaData(const GFSEcrsMetaData &src)
@@ -48,7 +48,7 @@
copyFrom(src);
}
-GFSEcrsMetaData::GFSEcrsMetaData(const struct GNUNET_ECRS_MetaData *src)
+GFSEcrsMetaData::GFSEcrsMetaData(const struct GNUNET_MetaData *src)
{
copyFrom(src);
}
@@ -59,7 +59,7 @@
return *this;
}
-GFSEcrsMetaData &GFSEcrsMetaData::operator=(const struct GNUNET_ECRS_MetaData
*src)
+GFSEcrsMetaData &GFSEcrsMetaData::operator=(const struct GNUNET_MetaData *src)
{
copyFrom(src);
return *this;
@@ -67,15 +67,15 @@
void GFSEcrsMetaData::copyFrom(const class GFSEcrsMetaData &src)
{
- metaData = GNUNET_ECRS_meta_data_duplicate(src.metaData);
+ metaData = GNUNET_meta_data_duplicate(src.metaData);
}
-void GFSEcrsMetaData::copyFrom(const struct GNUNET_ECRS_MetaData *src)
+void GFSEcrsMetaData::copyFrom(const struct GNUNET_MetaData *src)
{
- metaData = GNUNET_ECRS_meta_data_duplicate(src);
+ metaData = GNUNET_meta_data_duplicate(src);
}
-struct GNUNET_ECRS_MetaData *GFSEcrsMetaData::meta()
+struct GNUNET_MetaData *GFSEcrsMetaData::meta()
{
return metaData;
}
@@ -84,15 +84,15 @@
{
int size;
- size = GNUNET_ECRS_meta_data_get_serialized_size(metaData,
GNUNET_ECRS_SERIALIZE_FULL);
+ size = GNUNET_meta_data_get_serialized_size(metaData, GNUNET_SERIALIZE_FULL);
if (size != GNUNET_SYSERR)
{
QByteArray ret;
char *data;
data = new char[size];
- GNUNETQT_ASSERT(GNUNET_ECRS_meta_data_serialize(NULL, metaData, data, size,
- GNUNET_ECRS_SERIALIZE_FULL) != GNUNET_SYSERR);
+ GNUNETQT_ASSERT(GNUNET_meta_data_serialize(NULL, metaData, data, size,
+ GNUNET_SERIALIZE_FULL) != GNUNET_SYSERR);
ret = QByteArray(data, size);
delete [] data;
Modified: gnunet-qt/src/plugins/fs/searchController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.cc 2008-06-04 05:58:31 UTC
(rev 7047)
+++ gnunet-qt/src/plugins/fs/searchController.cc 2008-06-04 06:02:23 UTC
(rev 7048)
@@ -129,10 +129,10 @@
childIdx = model->index(row, 0, parent);
// insert flat meta data
- GNUNET_ECRS_meta_data_get_contents(info->meta, &insertMetaData, &childIdx);
+ GNUNET_meta_data_get_contents(info->meta, &insertMetaData, &childIdx);
// insert thumbnail data
- thumbSize = GNUNET_ECRS_meta_data_get_thumbnail(info->meta, &thumb);
+ thumbSize = GNUNET_meta_data_get_thumbnail(info->meta, &thumb);
if (thumbSize)
{
QByteArray data((char *) thumb, thumbSize);
@@ -360,7 +360,7 @@
{
QModelIndex index;
QAbstractItemModel *model;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
model = (QAbstractItemModel *) idx.model();
@@ -388,7 +388,7 @@
&addFilesToDirectory, &idx);
if (meta)
- GNUNET_ECRS_meta_data_destroy(meta);
+ GNUNET_meta_data_destroy(meta);
}
}
Modified: gnunet-qt/src/plugins/fs/uploadController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/uploadController.cc 2008-06-04 05:58:31 UTC
(rev 7047)
+++ gnunet-qt/src/plugins/fs/uploadController.cc 2008-06-04 06:02:23 UTC
(rev 7048)
@@ -89,7 +89,7 @@
{
GFSMetaData metaData;
QStringList keywords;
- struct GNUNET_ECRS_MetaData *meta;
+ struct GNUNET_MetaData *meta;
QFileInfo fileInfo;
struct GNUNET_ECRS_URI *keywordUri;
int thumbSize;
@@ -112,7 +112,7 @@
}
// extract meta data
- meta = GNUNET_ECRS_meta_data_create();
+ meta = GNUNET_meta_data_create();
if (!meta)
{
GNUNET_GE_LOG(fs->errorContext(), (GNUNET_GE_KIND) (GNUNET_GE_ERROR |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE),
@@ -120,16 +120,16 @@
return false;
}
- 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);
+ GNUNET_meta_data_extract_from_file(fs->errorContext(), meta,
strPath.toLocal8Bit().data(), extractors);
+ GNUNET_meta_data_get_contents(meta, &meta_data_get_by_type, &metaData);
+ thumbSize = GNUNET_meta_data_get_thumbnail(meta, &thumb);
if (thumbSize)
metaData.insert(EXTRACTOR_THUMBNAIL_DATA, QByteArray((const char *) thumb,
thumbSize));
// Keywords
- keywordUri = GNUNET_ECRS_meta_data_to_uri(meta);
- GNUNET_ECRS_meta_data_destroy(meta);
+ keywordUri = GNUNET_meta_data_to_uri(meta);
+ GNUNET_meta_data_destroy(meta);
if (keywordUri)
{
GNUNET_ECRS_uri_get_keywords_from_ksk(keywordUri, getKeyword, &keywords);
@@ -159,9 +159,9 @@
long idx;
// prepare meta data
- meta = GNUNET_ECRS_meta_data_create();
+ meta = GNUNET_meta_data_create();
for(it = metaData.begin(); it != metaData.end(); it++)
- GNUNET_ECRS_meta_data_insert(meta, it.key(), it->data());
+ GNUNET_meta_data_insert(meta, it.key(), it->data());
// prepare global URI
globalURI = GNUNET_ECRS_string_to_uri(fs->errorContext(),
GNUNET_ECRS_URI_PREFIX
@@ -197,7 +197,7 @@
}
delete [] keys;
- GNUNET_ECRS_meta_data_destroy(meta);
+ GNUNET_meta_data_destroy(meta);
GNUNET_ECRS_uri_destroy(globalURI);
GNUNET_ECRS_uri_destroy(keywordURI);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7048 - gnunet-qt/src/plugins/fs,
gnunet <=