summaryrefslogtreecommitdiffstats
path: root/hyperui
diff options
context:
space:
mode:
authorAdriano Rezende <adriano.rezende@openbossa.org>2009-11-18 14:45:45 -0300
committerAdriano Rezende <adriano.rezende@openbossa.org>2009-11-18 14:46:35 -0300
commitc896aa6a0de666534e8b82d058ed02390bfdd47f (patch)
tree26bf48a80e77a3652aca2a66f3b419c7461b87c6 /hyperui
parent4fd5e145e34b92541ad2ddc0453755c67230aa6c (diff)
Shared: Changed resource.h to dataresource.h to avoid clash on symbian sdk
Signed-off-by: Adriano Rezende <adriano.rezende@openbossa.org>
Diffstat (limited to 'hyperui')
-rw-r--r--hyperui/clockwidget.cpp2
-rw-r--r--hyperui/draggablepreview.cpp2
-rw-r--r--hyperui/hyperui.pro4
-rw-r--r--hyperui/main.cpp2
-rw-r--r--hyperui/mainwindow.cpp2
-rw-r--r--hyperui/menuview.cpp2
-rw-r--r--hyperui/pagemenu.cpp2
-rw-r--r--hyperui/pageview.cpp2
-rw-r--r--hyperui/phoneview.cpp2
9 files changed, 10 insertions, 10 deletions
diff --git a/hyperui/clockwidget.cpp b/hyperui/clockwidget.cpp
index 3f0be2f..f6166ec 100644
--- a/hyperui/clockwidget.cpp
+++ b/hyperui/clockwidget.cpp
@@ -33,7 +33,7 @@
#include <QDateTime>
#include <QRadialGradient>
-#include "resource.h"
+#include "dataresource.h"
#include "clockwidget.h"
diff --git a/hyperui/draggablepreview.cpp b/hyperui/draggablepreview.cpp
index e2b5109..4ffe814 100644
--- a/hyperui/draggablepreview.cpp
+++ b/hyperui/draggablepreview.cpp
@@ -36,7 +36,7 @@
#include <QParallelAnimationGroup>
#include <QGraphicsSceneMouseEvent>
-#include "resource.h"
+#include "dataresource.h"
#include "draggablepreview.h"
diff --git a/hyperui/hyperui.pro b/hyperui/hyperui.pro
index d3b9a6b..1dbd4ea 100644
--- a/hyperui/hyperui.pro
+++ b/hyperui/hyperui.pro
@@ -25,7 +25,7 @@ HEADERS += mainwindow.h \
clockwidget.h \
../shared/button.h \
../shared/label.h \
- ../shared/resource.h
+ ../shared/dataresource.h
SOURCES += main.cpp \
mainwindow.cpp \
@@ -38,7 +38,7 @@ SOURCES += main.cpp \
clockwidget.cpp \
../shared/button.cpp \
../shared/label.cpp \
- ../shared/resource.cpp
+ ../shared/dataresource.cpp
isEmpty(RESOLUTION) {
RESOLUTION = "800x480"
diff --git a/hyperui/main.cpp b/hyperui/main.cpp
index 6589b0b..0d20181 100644
--- a/hyperui/main.cpp
+++ b/hyperui/main.cpp
@@ -34,7 +34,7 @@
#include <QGraphicsView>
#include "system.h"
-#include "resource.h"
+#include "dataresource.h"
#include "mainwindow.h"
diff --git a/hyperui/mainwindow.cpp b/hyperui/mainwindow.cpp
index 0449168..2606579 100644
--- a/hyperui/mainwindow.cpp
+++ b/hyperui/mainwindow.cpp
@@ -33,7 +33,7 @@
#include <QPainter>
#include <QGraphicsRectItem>
-#include "resource.h"
+#include "dataresource.h"
#include "mainwindow.h"
#include "pageview.h"
#include "menuview.h"
diff --git a/hyperui/menuview.cpp b/hyperui/menuview.cpp
index 789f77f..4c2f88f 100644
--- a/hyperui/menuview.cpp
+++ b/hyperui/menuview.cpp
@@ -29,7 +29,7 @@
**
****************************************************************************/
-#include "resource.h"
+#include "dataresource.h"
#include "button.h"
#include "menuview.h"
#include "phoneview.h"
diff --git a/hyperui/pagemenu.cpp b/hyperui/pagemenu.cpp
index 432b25e..9053ca7 100644
--- a/hyperui/pagemenu.cpp
+++ b/hyperui/pagemenu.cpp
@@ -32,7 +32,7 @@
#include <QPainter>
#include <QFontMetrics>
-#include "resource.h"
+#include "dataresource.h"
#include "pagemenu.h"
diff --git a/hyperui/pageview.cpp b/hyperui/pageview.cpp
index 5470ae9..e2be77c 100644
--- a/hyperui/pageview.cpp
+++ b/hyperui/pageview.cpp
@@ -36,7 +36,7 @@
#include <QParallelAnimationGroup>
#include <QGraphicsSceneResizeEvent>
-#include "resource.h"
+#include "dataresource.h"
#include "view.h"
#include "button.h"
#include "pagemenu.h"
diff --git a/hyperui/phoneview.cpp b/hyperui/phoneview.cpp
index bc2585d..8e95a37 100644
--- a/hyperui/phoneview.cpp
+++ b/hyperui/phoneview.cpp
@@ -39,7 +39,7 @@
#include <QGraphicsGridLayout>
#include <QSequentialAnimationGroup>
-#include "resource.h"
+#include "dataresource.h"
#include "label.h"
#include "button.h"
#include "phoneview.h"