From 134c6188c43ff79a6a16c986bd90317a694e5582 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Sun, 31 May 2009 18:41:12 +0200
Subject: [PATCH] Explicitely prefix Qt includes with their respective Qt
 module

LMMS didn't compile successfully if individual paths to headers of
each Qt module were not added to the list of include directories to be
searched by the pre-processor. However it has to work this way,
therefore I changed lines like

  #include <QGraphicsScene>

to

  #include <QtGui/QGraphicsScene>

Please care in the future!

Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
---
 include/gui/tracks/bb_tco_item.h               | 10 +++++-----
 include/gui/tracks/pattern_item.h              |  9 ++++-----
 include/gui/tracks/track_container_scene.h     |  2 +-
 include/gui/tracks/track_content_object_item.h | 10 +++++-----
 include/lmms_style.h                           |  4 ++--
 src/gui/controller_connection_dialog.cpp       |  2 +-
 src/gui/cusis_style.cpp                        |  3 +--
 src/gui/main_window.cpp                        | 14 +++++---------
 src/gui/tracks/bb_tco_item.cpp                 |  6 +-----
 src/gui/tracks/pattern_item.cpp                |  6 +-----
 src/gui/tracks/track_container_scene.cpp       |  4 +---
 src/gui/tracks/track_content_object_item.cpp   |  6 ------
 12 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/include/gui/tracks/bb_tco_item.h b/include/gui/tracks/bb_tco_item.h
index 7140baff3..2df0d79f9 100644
--- a/include/gui/tracks/bb_tco_item.h
+++ b/include/gui/tracks/bb_tco_item.h
@@ -26,12 +26,12 @@
 #ifndef _BB_TCO_ITEM_H_
 #define _BB_TCO_ITEM_H_
 
+#include <QtCore/QTimeLine>
 #include <QtCore/QVector>
-#include <QGraphicsScene>
-#include <QGraphicsItem>
-#include <QTimeLine>
-#include <QGraphicsItemAnimation>
-#include <QPainter>
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsItem>
+#include <QtGui/QGraphicsItemAnimation>
+#include <QtGui/QPainter>
 #include <math.h>
 
 class trackContentObject;
diff --git a/include/gui/tracks/pattern_item.h b/include/gui/tracks/pattern_item.h
index 41555cf42..0012d3abb 100644
--- a/include/gui/tracks/pattern_item.h
+++ b/include/gui/tracks/pattern_item.h
@@ -27,11 +27,10 @@
 #define _PATTERN_ITEM_H_
 
 #include <QtCore/QVector>
-#include <QGraphicsScene>
-#include <QGraphicsItem>
-#include <QTimeLine>
-#include <QGraphicsItemAnimation>
-#include <QPainter>
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsItem>
+#include <QtGui/QGraphicsItemAnimation>
+#include <QtGui/QPainter>
 #include <math.h>
 
 #include "gui/tracks/track_content_object_item.h"
diff --git a/include/gui/tracks/track_container_scene.h b/include/gui/tracks/track_container_scene.h
index ba38b7fd0..57be2d617 100644
--- a/include/gui/tracks/track_container_scene.h
+++ b/include/gui/tracks/track_container_scene.h
@@ -29,7 +29,7 @@
 #define _TRACK_CONTAINER_SCENE_H
 
 #include <QtCore/QVector>
-#include <QGraphicsScene>
+#include <QtGui/QGraphicsScene>
 
 #include "track.h"
 
diff --git a/include/gui/tracks/track_content_object_item.h b/include/gui/tracks/track_content_object_item.h
index 1715fe007..28c1b1da2 100644
--- a/include/gui/tracks/track_content_object_item.h
+++ b/include/gui/tracks/track_content_object_item.h
@@ -26,12 +26,12 @@
 #ifndef TRACK_CONTENT_OBJECT_ITEM_H_
 #define TRACK_CONTENT_OBJECT_ITEM_H_
 
+#include <QtCore/QTimeLine>
 #include <QtCore/QVector>
-#include <QGraphicsScene>
-#include <QGraphicsItem>
-#include <QTimeLine>
-#include <QGraphicsItemAnimation>
-#include <QPainter>
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsItem>
+#include <QtGui/QGraphicsItemAnimation>
+#include <QtGui/QPainter>
 #include <math.h>
 
 #include "lmms_basics.h"
diff --git a/include/lmms_style.h b/include/lmms_style.h
index e26059428..eb6b0635c 100644
--- a/include/lmms_style.h
+++ b/include/lmms_style.h
@@ -27,9 +27,9 @@
 #ifndef _LMMS_STYLE_H
 #define _LMMS_STYLE_H
 
+#include <QtCore/QRect>
+#include <QtGui/QColor>
 
-#include <QColor>
-#include <QRect>
 #include "lmms_basics.h"
 
 class QPainter;
diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp
index 7912d948e..9ac981dc7 100644
--- a/src/gui/controller_connection_dialog.cpp
+++ b/src/gui/controller_connection_dialog.cpp
@@ -30,7 +30,7 @@
 #include <QtGui/QLineEdit>
 #include <QtGui/QPushButton>
 #include <QtGui/QScrollArea>
-#include <QMessageBox>
+#include <QtGui/QMessageBox>
 
 #include "controller_connection_dialog.h"
 #include "controller_connection.h"
diff --git a/src/gui/cusis_style.cpp b/src/gui/cusis_style.cpp
index 9cc7e8bd0..d39aff0f2 100644
--- a/src/gui/cusis_style.cpp
+++ b/src/gui/cusis_style.cpp
@@ -32,8 +32,7 @@ const int BUTTON_LENGTH = 24;
 #include <QtGui/QPixmapCache>
 #include <QtGui/QStyleOption>
 #include <QtGui/QLinearGradient>
-
-#include <QScrollBar>
+#include <QtGui/QScrollBar>
 
 #include "cusis_style.h"
 #include "gui_templates.h"
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 9b03f376b..fc75d0677 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -1,9 +1,7 @@
-#ifndef SINGLE_SOURCE_COMPILE
-
 /*
  * main_window.cpp - implementation of LMMS-main-window
  *
- * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -38,10 +36,9 @@
 #include <QtGui/QSplitter>
 #include <QtGui/QCheckBox>
 #include <QtGui/QRadioButton>
-#include <QShortcut>
-
-#include <QGraphicsView>
-#include <QPixmapCache>
+#include <QtGui/QShortcut>
+#include <QtGui/QGraphicsView>
+#include <QtGui/QPixmapCache>
 
 
 #include "lmmsversion.h"
@@ -1564,7 +1561,6 @@ void mainWindow::toggleRecordAutomation( bool _recording )
 }
 
 
+
 #include "moc_main_window.cxx"
 
-
-#endif
diff --git a/src/gui/tracks/bb_tco_item.cpp b/src/gui/tracks/bb_tco_item.cpp
index 9330cf868..db6648022 100644
--- a/src/gui/tracks/bb_tco_item.cpp
+++ b/src/gui/tracks/bb_tco_item.cpp
@@ -23,11 +23,7 @@
  */
 
 
-#include <QObject>
-#include <QGraphicsItem>
-#include <QTimeLine>
-#include <QGraphicsItemAnimation>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/QStyleOptionGraphicsItem>
 
 #include "gui/tracks/bb_tco_item.h"
 #include "gui/tracks/track_content_object_item.h"
diff --git a/src/gui/tracks/pattern_item.cpp b/src/gui/tracks/pattern_item.cpp
index 9e2221541..31b9ffa36 100644
--- a/src/gui/tracks/pattern_item.cpp
+++ b/src/gui/tracks/pattern_item.cpp
@@ -23,11 +23,7 @@
  */
 
 
-#include <QObject>
-#include <QGraphicsItem>
-#include <QTimeLine>
-#include <QGraphicsItemAnimation>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/QStyleOptionGraphicsItem>
 
 #include "gui/tracks/pattern_item.h"
 #include "gui/tracks/track_content_object_item.h"
diff --git a/src/gui/tracks/track_container_scene.cpp b/src/gui/tracks/track_container_scene.cpp
index dab9c231a..b198fed22 100644
--- a/src/gui/tracks/track_container_scene.cpp
+++ b/src/gui/tracks/track_container_scene.cpp
@@ -24,9 +24,7 @@
  */
 
 
-#include <QGraphicsScene>
-#include <QKeyEvent>
-#include <QTimeLine>
+#include <QtGui/QKeyEvent>
 
 #include <stdio.h>
 
diff --git a/src/gui/tracks/track_content_object_item.cpp b/src/gui/tracks/track_content_object_item.cpp
index 95c217ec6..aa14b8a48 100644
--- a/src/gui/tracks/track_content_object_item.cpp
+++ b/src/gui/tracks/track_content_object_item.cpp
@@ -23,12 +23,6 @@
  */
 
 
-#include <QObject>
-#include <QGraphicsItem>
-#include <QTimeLine>
-#include <QGraphicsItemAnimation>
-#include <QStyleOptionGraphicsItem>
-
 #include "gui/tracks/track_content_object_item.h"
 #include "gui/tracks/track_container_scene.h"
 #include "gui/tracks/track_item.h"