[GNUnet-SVN] r4627 - in gnunet-qt/src: core plugins/about plugins/fs plugins/general

[gnunet]

Author: durner
Date: 2007-03-03 18:50:35 -0700 (Sat, 03 Mar 2007)
New Revision: 4627

Modified:
   gnunet-qt/src/core/main.cc
   gnunet-qt/src/plugins/about/about.cc
   gnunet-qt/src/plugins/fs/fs-search.cc
   gnunet-qt/src/plugins/fs/fs-search.h
   gnunet-qt/src/plugins/fs/fs.cc
   gnunet-qt/src/plugins/fs/searchController.cc
   gnunet-qt/src/plugins/fs/searchController.h
   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/fs/uploadController.h
   gnunet-qt/src/plugins/fs/uploadDialog.cc
   gnunet-qt/src/plugins/general/general.cc
   gnunet-qt/src/plugins/general/general.h
Log:
kill GCC 4 warnings

Modified: gnunet-qt/src/core/main.cc
===================================================================
--- gnunet-qt/src/core/main.cc  2007-03-04 01:05:55 UTC (rev 4626)
+++ gnunet-qt/src/core/main.cc  2007-03-04 01:50:35 UTC (rev 4627)
@@ -147,6 +147,8 @@
 
 static void logger(void *cls, GE_KIND kind, const char *date, const char *msg)
 {
+  Q_UNUSED(date)
+  
   QPixmap icon;
   
   if (kind & GE_DEBUG)

Modified: gnunet-qt/src/plugins/about/about.cc
===================================================================
--- gnunet-qt/src/plugins/about/about.cc        2007-03-04 01:05:55 UTC (rev 
4626)
+++ gnunet-qt/src/plugins/about/about.cc        2007-03-04 01:50:35 UTC (rev 
4627)
@@ -281,6 +281,9 @@
 GNUNETQT_API GPlugin *init_plugin(struct GC_Configuration *config,
   struct GE_Context *errorContext)
 {
+  Q_UNUSED(config)
+  Q_UNUSED(errorContext)
+  
   return new GAboutPlugin();
 }
 

Modified: gnunet-qt/src/plugins/fs/fs-search.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs-search.cc       2007-03-04 01:05:55 UTC (rev 
4626)
+++ gnunet-qt/src/plugins/fs/fs-search.cc       2007-03-04 01:50:35 UTC (rev 
4627)
@@ -140,7 +140,7 @@
   delete menu;
 }
 
-void GFSSearch::resultInserted(const QModelIndex &parent, int start, int end)
+void GFSSearch::resultInserted()
 {
     tab->setTabText(tab->indexOf(this),
       uri.toString() + " (" + QString::number(m->rowCount()) + ")");
@@ -157,7 +157,7 @@
   m = model;
   treeResults->setModel(model);
   connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this,
-    SLOT(resultInserted(const QModelIndex &, int, int)));
+    SLOT(resultInserted()));
 
   // set columns
   maxType = EXTRACTOR_getHighestKeywordTypeNumber();
@@ -184,7 +184,7 @@
   
   treeResults->setColumnWidth(0, 200);
     
-  resultInserted(m->index(-1, -1), 0, 0);
+  resultInserted();
 }
 
 void GFSSearch::setItemDelegate(QAbstractItemDelegate *itemDelegate)

Modified: gnunet-qt/src/plugins/fs/fs-search.h
===================================================================
--- gnunet-qt/src/plugins/fs/fs-search.h        2007-03-04 01:05:55 UTC (rev 
4626)
+++ gnunet-qt/src/plugins/fs/fs-search.h        2007-03-04 01:50:35 UTC (rev 
4627)
@@ -63,7 +63,7 @@
   void closeClicked();
   void downloadClicked();
   void headerRightClicked(const QPoint &pos);
-  void resultInserted(const QModelIndex &parent, int start, int end);
+  void resultInserted();
   void resultExpanded(const QModelIndex &index);
 };
 

Modified: gnunet-qt/src/plugins/fs/fs.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs.cc      2007-03-04 01:05:55 UTC (rev 4626)
+++ gnunet-qt/src/plugins/fs/fs.cc      2007-03-04 01:50:35 UTC (rev 4627)
@@ -54,8 +54,7 @@
   {
     case FSUI_search_started:
       return searchCntrl->started(event->data.SearchStarted.sc.pos,
-        event->data.SearchStarted.searchURI,
-        event->data.SearchStarted.anonymityLevel, 0, NULL, FSUI_ACTIVE);
+        event->data.SearchStarted.searchURI, 0, NULL);
     case FSUI_search_result:
       searchCntrl->result((GFSSearchInfo *) event->data.SearchResult.sc.cctx,
         &event->data.SearchResult.fi);
@@ -72,20 +71,16 @@
     case FSUI_search_resumed:
       return searchCntrl->started(event->data.SearchResumed.sc.pos,
         event->data.SearchResumed.searchURI,
-        event->data.SearchResumed.anonymityLevel,
         event->data.SearchResumed.fisSize,
-        event->data.SearchResumed.fis,
-        event->data.SearchResumed.state);
+        event->data.SearchResumed.fis);
     case FSUI_search_stopped:
       searchCntrl->stopped((GFSSearchInfo *) 
event->data.SearchStopped.sc.cctx);
       break;
     case FSUI_upload_started:
-      return uploadCntrl->started(event->data.UploadStarted.uc.pos,
-        (QPersistentModelIndex *) event->data.UploadStarted.uc.pcctx,
+      return uploadCntrl->started((QPersistentModelIndex *) 
event->data.UploadStarted.uc.pcctx,
         event->data.UploadStarted.filename, event->data.UploadStarted.total, 
0);
     case FSUI_upload_resumed:
-      return uploadCntrl->started(event->data.UploadResumed.uc.pos,
-        (QPersistentModelIndex *) event->data.UploadResumed.uc.pcctx,
+      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:
@@ -412,7 +407,7 @@
   }
   
   if (uploadCntrl->start(this, strPath, rbIndex->isChecked(),
-    rbDirectory->isChecked(), spinPrio->value(), spinUploadAnon->value()))
+    spinPrio->value(), spinUploadAnon->value()))
   {
     icon.load(":/pixmaps/upload.png");
     emit setStatusText(icon, tr("Publication of \"%0\" queued.").arg(strPath));

Modified: gnunet-qt/src/plugins/fs/searchController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.cc        2007-03-04 01:05:55 UTC 
(rev 4626)
+++ gnunet-qt/src/plugins/fs/searchController.cc        2007-03-04 01:50:35 UTC 
(rev 4627)
@@ -64,9 +64,7 @@
 }
 
 GFSSearchInfo *GFSSearchController::started(struct FSUI_SearchList *list,
-  const struct ECRS_URI *uri, unsigned int anonymityLevel,
-  unsigned int resultCount, const ECRS_FileInfo *results,
-  FSUI_State state)
+  const struct ECRS_URI *uri, unsigned int resultCount, const ECRS_FileInfo 
*results)
 {
   GEvent *event;
   GFSSearch *view = NULL;
@@ -272,9 +270,11 @@
 /**
  * @brief Callback that adds content of a directory to the search list
  */
-static int addFilesToDirectory(const ECRS_FileInfo *fi, const HashCode512 * 
key,
+static int addFilesToDirectory(const ECRS_FileInfo *fi, const HashCode512 *key,
   int isRoot, void *closure)
 {
+  Q_UNUSED(key)
+  
   QPersistentModelIndex *pIdx;
   QStandardItemModel *model;
   QModelIndex parentIdx, child;

Modified: gnunet-qt/src/plugins/fs/searchController.h
===================================================================
--- gnunet-qt/src/plugins/fs/searchController.h 2007-03-04 01:05:55 UTC (rev 
4626)
+++ gnunet-qt/src/plugins/fs/searchController.h 2007-03-04 01:50:35 UTC (rev 
4627)
@@ -51,9 +51,8 @@
        virtual ~GFSSearchController();
   
   GFSSearchInfo *started(struct FSUI_SearchList *list,
-    const struct ECRS_URI *uri, unsigned int anonymityLevel,
-    unsigned int resultCount, const ECRS_FileInfo *results,
-    FSUI_State state);
+    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);

Modified: gnunet-qt/src/plugins/fs/searchSummaryController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryController.cc 2007-03-04 01:05:55 UTC 
(rev 4626)
+++ gnunet-qt/src/plugins/fs/searchSummaryController.cc 2007-03-04 01:50:35 UTC 
(rev 4627)
@@ -66,6 +66,7 @@
     case FSUI_search_result:
     case FSUI_search_resumed:
       done = false;
+      break;
     default:
       done = true;
   }

Modified: gnunet-qt/src/plugins/fs/searchSummaryModel.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryModel.cc      2007-03-04 01:05:55 UTC 
(rev 4626)
+++ gnunet-qt/src/plugins/fs/searchSummaryModel.cc      2007-03-04 01:50:35 UTC 
(rev 4627)
@@ -31,6 +31,8 @@
 QVariant GFSSearchSummaryModel::headerData(int section, Qt::Orientation 
orientation,
     int role) const
 {
+  Q_UNUSED(orientation)
+  
   if (role == Qt::DisplayRole)
   {
     if (section == 0)
@@ -51,11 +53,15 @@
 QModelIndex GFSSearchSummaryModel::index(int row, int column,
   const QModelIndex &parent) const
 {
+  Q_UNUSED(parent)
+  
   return createIndex(row, column);
 }
 
 QModelIndex GFSSearchSummaryModel::parent(const QModelIndex &index) const
 {
+  Q_UNUSED(index)
+  
   return QModelIndex();
 }
 
@@ -69,6 +75,8 @@
 
 int GFSSearchSummaryModel::columnCount(const QModelIndex &parent) const
 {
+  Q_UNUSED(parent)
+  
   return 3;
 }
 

Modified: gnunet-qt/src/plugins/fs/uploadController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/uploadController.cc        2007-03-04 01:05:55 UTC 
(rev 4626)
+++ gnunet-qt/src/plugins/fs/uploadController.cc        2007-03-04 01:50:35 UTC 
(rev 4627)
@@ -106,7 +106,7 @@
 }
 
 bool GFSUploadController::start(QWidget *parent, const QString &strPath,
-  bool index, bool recursive, int prio, int anon)
+  bool index, int prio, int anon)
 {
   GFSMetaData metaData;
   QStringList keywords;
@@ -241,7 +241,7 @@
   return &uploadModel;
 }
 
-QPersistentModelIndex *GFSUploadController::started(struct FSUI_UploadList 
*handle, QPersistentModelIndex *parent,
+QPersistentModelIndex *GFSUploadController::started(QPersistentModelIndex 
*parent,
     QString path, unsigned long long total, unsigned long long completed)
 {
   QPersistentModelIndex *idx;

Modified: gnunet-qt/src/plugins/fs/uploadController.h
===================================================================
--- gnunet-qt/src/plugins/fs/uploadController.h 2007-03-04 01:05:55 UTC (rev 
4626)
+++ gnunet-qt/src/plugins/fs/uploadController.h 2007-03-04 01:50:35 UTC (rev 
4627)
@@ -43,8 +43,8 @@
        virtual ~GFSUploadController();
   
   bool start(QWidget *parent, const QString &strPath, bool index,
-    bool recursive, int prio, int anon);
-  QPersistentModelIndex *started(struct FSUI_UploadList *handle, 
QPersistentModelIndex *parent,
+    int prio, int anon);
+  QPersistentModelIndex *started(QPersistentModelIndex *parent,
     QString path, unsigned long long total, unsigned long long completed);
   void progress(QPersistentModelIndex *idx, unsigned long long completed,
     unsigned long long total);

Modified: gnunet-qt/src/plugins/fs/uploadDialog.cc
===================================================================
--- gnunet-qt/src/plugins/fs/uploadDialog.cc    2007-03-04 01:05:55 UTC (rev 
4626)
+++ gnunet-qt/src/plugins/fs/uploadDialog.cc    2007-03-04 01:50:35 UTC (rev 
4627)
@@ -112,6 +112,8 @@
 
 void GFSUploadDialog::metaSelectionChanged(QTreeWidgetItem *current, 
QTreeWidgetItem *previous)
 {
+  Q_UNUSED(previous)
+  
   if (current)
   {
     cmbType->setCurrentIndex(cmbType->findText(current->text(0)));
@@ -171,6 +173,8 @@
 
 void GFSUploadDialog::keywordSelectionChanged(QTreeWidgetItem *current, 
QTreeWidgetItem *previous)
 {
+  Q_UNUSED(previous)
+  
   if (current)
     editKeyword->setText(current->text(0));
   else

Modified: gnunet-qt/src/plugins/general/general.cc
===================================================================
--- gnunet-qt/src/plugins/general/general.cc    2007-03-04 01:05:55 UTC (rev 
4626)
+++ gnunet-qt/src/plugins/general/general.cc    2007-03-04 01:50:35 UTC (rev 
4627)
@@ -32,6 +32,8 @@
 GGeneralPlugin::GGeneralPlugin(struct GC_Configuration *config,
     struct GE_Context *errorContext, QObject *parent) : GPlugin()
 {
+  Q_UNUSED(parent)
+  
   setupUi(this);
   
   startStopThread = new GStartStopThread(config, errorContext);
@@ -41,7 +43,7 @@
   headerList << tr("Application") << tr("Description");
   treeApps->setHeaderLabels(headerList);
 
-  connect(pbStartStop, SIGNAL(clicked(bool)), SLOT(startStopDaemon(bool)));
+  connect(pbStartStop, SIGNAL(clicked(bool)), SLOT(startStopDaemon()));
   connect(startStopThread, SIGNAL(finished(bool)), this, 
SLOT(startStopDone(bool)));
   connect(&timer, SIGNAL(timeout()), this, SLOT(checkDaemon()));
   connect(checkDaemonThread, SIGNAL(running(bool)), this, SLOT(running(bool)));
@@ -63,7 +65,7 @@
   delete checkDaemonThread;
 }
 
-void GGeneralPlugin::startStopDaemon(bool unused)
+void GGeneralPlugin::startStopDaemon()
 {
   pbStartStop->setEnabled(false);
   startStopThread->start(!isRunning);

Modified: gnunet-qt/src/plugins/general/general.h
===================================================================
--- gnunet-qt/src/plugins/general/general.h     2007-03-04 01:05:55 UTC (rev 
4626)
+++ gnunet-qt/src/plugins/general/general.h     2007-03-04 01:50:35 UTC (rev 
4627)
@@ -51,7 +51,7 @@
   int runs;
   bool isRunning, pending;
 protected slots:
-  void startStopDaemon(bool unused);
+  void startStopDaemon();
   void startStopDone(bool success);
   void applications(GGNUnetAppDescs *apps);
   void running(bool isRunning);