[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 1102577 by fischer:

Compiler warnings about unused params fixed and Q3ValueList replaced with QList.

 M  +3 -2      clipboard/umldragdata.cpp  
 M  +5 -4      codeimport/kdevcppparser/lexer.cpp  
 M  +2 -2      codeimport/kdevcppparser/preprocesslexer.cpp  


--- branches/work/soc-umbrello/umbrello/clipboard/umldragdata.cpp #1102576:1102577
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2008                                               *
+ *   copyright (C) 2002-2010                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -362,6 +362,7 @@
 bool UMLDragData::decodeClip2(const QMimeData* mimeData, UMLObjectList& objects,
                           UMLListViewItemList& umlListViewItems, UMLViewList& diagrams)
 {
+    Q_UNUSED(diagrams);
     if ( !mimeData->hasFormat("application/x-uml-clip2") ) {
         return false;
     }
@@ -436,9 +437,9 @@
             uError() << "Bad parent for view.";
             return false;
         }
-        UMLFolder *f = static_cast<UMLFolder*>(po);
         // [PORT]
 #if 0
+        UMLFolder *f = static_cast<UMLFolder*>(po);
         UMLView* view = new UMLView(f);
         view->loadFromXMI(diagramElement);
         diagrams.append(view);
--- branches/work/soc-umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp #1102576:1102577
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <qregexp.h>
-#include <qmap.h>
-#include <q3valuelist.h>
+#include <QtCore/QRegExp>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
@@ -267,7 +267,7 @@
 
 struct LexerData {
     typedef QMap<QString, QString> Scope;
-    typedef Q3ValueList<Scope> StaticChain;
+    typedef QList<Scope> StaticChain;
 
     StaticChain staticChain;
 
@@ -426,6 +426,7 @@
 
 void Lexer::handleDirective(const QString& directive)
 {
+    Q_UNUSED(directive);
     assert(directive != "define");
     assert(directive != "else");
     assert(directive != "elif");
--- branches/work/soc-umbrello/umbrello/codeimport/kdevcppparser/preprocesslexer.cpp #1102576:1102577
@@ -26,7 +26,7 @@
 
 #include <QtCore/QRegExp>
 #include <QtCore/QMap>
-#include <q3valuelist.h>
+#include <QtCore/QList>
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
@@ -248,7 +248,7 @@
 
 struct LexerData {
     typedef QMap<QString, QString> Scope;
-    typedef Q3ValueList<Scope> StaticChain;
+    typedef QList<Scope> StaticChain;
 
     StaticChain staticChain;