Replaced UNUSED(x) by Q_UNUSED(x).

Mapper.cpp

@@ -20,7 +20,6 @@
 
 #include "Mapper.h"
 #include "MainWindow.h"
-#include "unused.h"
 
 Mapper::Mapper(Mapping::ptr mapping)
   : _mapping(mapping)
@@ -171,7 +170,7 @@ void PolygonColorMapper::draw(QPainter* painter)
 
 void PolygonColorMapper::drawControls(QPainter* painter)
 {
-  UNUSED(painter);
+  Q_UNUSED(painter);
 }
 
 MeshColorMapper::MeshColorMapper(Mapping::ptr mapping)
@@ -296,7 +295,7 @@ void TextureMapper::updateShape(Shape* shape)
 
 void TextureMapper::draw(QPainter* painter)
 {
-  UNUSED(painter);
+  Q_UNUSED(painter);
   painter->beginNativePainting();
 
   // Only works for similar shapes.
@@ -328,7 +327,7 @@ void TextureMapper::draw(QPainter* painter)
 
 void TextureMapper::drawInput(QPainter* painter)
 {
-  UNUSED(painter);
+  Q_UNUSED(painter);
 }
 
 void TextureMapper::drawControls(QPainter* painter)
@@ -348,7 +347,7 @@ TriangleTextureMapper::TriangleTextureMapper(std::tr1::shared_ptr<TextureMapping
 
 void TriangleTextureMapper::_doDraw(QPainter* painter)
 {
-  UNUSED(painter);
+  Q_UNUSED(painter);
   glBegin(GL_TRIANGLES);
   {
     for (int i = 0; i < inputShape->nVertices(); i++)
@@ -404,7 +403,7 @@ void MeshTextureMapper::drawControls(QPainter* painter)
 
 void MeshTextureMapper::drawInputControls(QPainter* painter)
 {
-  UNUSED(painter);
+  Q_UNUSED(painter);
 
   std::tr1::shared_ptr<Mesh> inputMesh = std::tr1::static_pointer_cast<Mesh>(inputShape);
   QVector<Quad> inputQuads = inputMesh->getQuads();
@@ -416,7 +415,7 @@ void MeshTextureMapper::drawInputControls(QPainter* painter)
 
 void MeshTextureMapper::_doDraw(QPainter* painter)
 {
-  UNUSED(painter);
+  Q_UNUSED(painter);
   std::tr1::shared_ptr<Mesh> outputMesh = std::tr1::static_pointer_cast<Mesh>(outputShape);
   std::tr1::shared_ptr<Mesh> inputMesh  = std::tr1::static_pointer_cast<Mesh>(inputShape);
   QVector<QVector<Quad> > outputQuads = outputMesh->getQuads2d();
@@ -444,7 +443,7 @@ EllipseTextureMapper::EllipseTextureMapper(std::tr1::shared_ptr<TextureMapping>
 
 void EllipseTextureMapper::_doDraw(QPainter* painter)
 {
-  UNUSED(painter);
+  Q_UNUSED(painter);
   // Get input and output ellipses.
   std::tr1::shared_ptr<Ellipse> inputEllipse = std::tr1::static_pointer_cast<Ellipse>(inputShape);
   std::tr1::shared_ptr<Ellipse> outputEllipse = std::tr1::static_pointer_cast<Ellipse>(outputShape);

OscInterface.cpp

@@ -23,7 +23,6 @@
 #ifdef HAVE_OSC
 #include "OscInterface.h"
 #include "MainWindow.h"
-#include "unused.h"
 #include <QVariant>
 
 OscInterface::OscInterface(
@@ -192,7 +191,7 @@ static void printCommand(QVariantList &command)
 
 void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & command)
 {
-  UNUSED(main_window);
+  Q_UNUSED(main_window);
   bool VERBOSE = true;
 
   if (VERBOSE)

Util.cpp

@@ -19,7 +19,6 @@
  */
 
 #include "Util.h"
-#include "unused.h"
 #include <algorithm>
 
 namespace Util {
@@ -73,8 +72,8 @@ int map_int(int value, int istart, int istop, int ostart, int ostop)
 
 Mesh* createMeshForTexture(Texture* texture, int frameWidth, int frameHeight)
 {
-  UNUSED(frameHeight);
-  UNUSED(frameWidth);
+  Q_UNUSED(frameHeight);
+  Q_UNUSED(frameWidth);
 
   return new Mesh(
     QPointF(texture->getX(), texture->getY()),
@@ -86,8 +85,8 @@ Mesh* createMeshForTexture(Texture* texture, int frameWidth, int frameHeight)
 
 Triangle* createTriangleForTexture(Texture* texture, int frameWidth, int frameHeight)
 {
-  UNUSED(frameHeight);
-  UNUSED(frameWidth);
+  Q_UNUSED(frameHeight);
+  Q_UNUSED(frameWidth);
 
   return new Triangle(
     QPointF(texture->getX(), texture->getY() + texture->getHeight()),
@@ -99,8 +98,8 @@ Triangle* createTriangleForTexture(Texture* texture, int frameWidth, int frameHe
 Ellipse* createEllipseForTexture(Texture* texture, int frameWidth,
     int frameHeight)
 {
-  UNUSED(frameHeight);
-  UNUSED(frameWidth);
+  Q_UNUSED(frameHeight);
+  Q_UNUSED(frameWidth);
 
   qreal halfWidth  = texture->getWidth() / 2;
   qreal halfHeight = texture->getHeight() / 2;

unused.h

@@ -1,7 +0,0 @@
-#ifndef __mapmap_unused_h__
-#define __mapmap_unused_h__
-
-#define UNUSED(x) (void)(x)
-
-#endif // ifndef
-