diff options
author | Adriano Rezende <adriano.rezende@openbossa.org> | 2009-11-18 14:45:45 -0300 |
---|---|---|
committer | Adriano Rezende <adriano.rezende@openbossa.org> | 2009-11-18 14:46:35 -0300 |
commit | c896aa6a0de666534e8b82d058ed02390bfdd47f (patch) | |
tree | 26bf48a80e77a3652aca2a66f3b419c7461b87c6 | |
parent | 4fd5e145e34b92541ad2ddc0453755c67230aa6c (diff) |
Shared: Changed resource.h to dataresource.h to avoid clash on symbian sdk
Signed-off-by: Adriano Rezende <adriano.rezende@openbossa.org>
-rw-r--r-- | hyperui/clockwidget.cpp | 2 | ||||
-rw-r--r-- | hyperui/draggablepreview.cpp | 2 | ||||
-rw-r--r-- | hyperui/hyperui.pro | 4 | ||||
-rw-r--r-- | hyperui/main.cpp | 2 | ||||
-rw-r--r-- | hyperui/mainwindow.cpp | 2 | ||||
-rw-r--r-- | hyperui/menuview.cpp | 2 | ||||
-rw-r--r-- | hyperui/pagemenu.cpp | 2 | ||||
-rw-r--r-- | hyperui/pageview.cpp | 2 | ||||
-rw-r--r-- | hyperui/phoneview.cpp | 2 | ||||
-rw-r--r-- | mybudget/src/calculator/calculatorscreen.cpp | 2 | ||||
-rw-r--r-- | mybudget/src/lists/listscreen.cpp | 2 | ||||
-rw-r--r-- | mybudget/src/main.cpp | 2 | ||||
-rw-r--r-- | mybudget/src/pixmaploader.cpp | 2 | ||||
-rw-r--r-- | mybudget/src/src.pri | 4 | ||||
-rw-r--r-- | mybudget/src/widgets/horizontalmenu.cpp | 2 | ||||
-rw-r--r-- | mybudget/src/widgets/listexpenses.cpp | 2 | ||||
-rw-r--r-- | mybudget/src/widgets/timelinemenu.cpp | 2 | ||||
-rw-r--r-- | shared/dataresource.cpp (renamed from shared/resource.cpp) | 2 | ||||
-rw-r--r-- | shared/dataresource.h (renamed from shared/resource.h) | 0 |
19 files changed, 20 insertions, 20 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" diff --git a/mybudget/src/calculator/calculatorscreen.cpp b/mybudget/src/calculator/calculatorscreen.cpp index ff41fac..a55dc8a 100644 --- a/mybudget/src/calculator/calculatorscreen.cpp +++ b/mybudget/src/calculator/calculatorscreen.cpp @@ -37,7 +37,7 @@ #include "label.h" #include "button.h" #include "titlebar.h" -#include "resource.h" +#include "dataresource.h" #include "calculatorengine.h" diff --git a/mybudget/src/lists/listscreen.cpp b/mybudget/src/lists/listscreen.cpp index 06ed971..4cc0eaf 100644 --- a/mybudget/src/lists/listscreen.cpp +++ b/mybudget/src/lists/listscreen.cpp @@ -34,7 +34,7 @@ #include "model.h" #include "pdata.h" #include "label.h" -#include "resource.h" +#include "dataresource.h" #include "listview.h" #include "titlebar.h" #include "scrollbar.h" diff --git a/mybudget/src/main.cpp b/mybudget/src/main.cpp index 3075ae5..b0522da 100644 --- a/mybudget/src/main.cpp +++ b/mybudget/src/main.cpp @@ -34,7 +34,7 @@ #include "pdata.h" #include "system.h" -#include "resource.h" +#include "dataresource.h" #include "calculator/calculatorscreen.h" #include "lists/listscreen.h" #include "chart/chartscreen.h" diff --git a/mybudget/src/pixmaploader.cpp b/mybudget/src/pixmaploader.cpp index 9cf1ee8..bf68db9 100644 --- a/mybudget/src/pixmaploader.cpp +++ b/mybudget/src/pixmaploader.cpp @@ -32,7 +32,7 @@ #include <QPixmap> #include "pixmaploader.h" -#include "resource.h" +#include "dataresource.h" PixmapLoader::PixmapLoader() diff --git a/mybudget/src/src.pri b/mybudget/src/src.pri index fb28e4c..d118f67 100644 --- a/mybudget/src/src.pri +++ b/mybudget/src/src.pri @@ -20,7 +20,7 @@ HEADERS += src/pdata.h \ ../shared/pageslider.h \ ../shared/flickablearea.h \ ../shared/pixmapwidget.h \ - ../shared/resource.h + ../shared/dataresource.h INCLUDEPATH += src src/widgets @@ -46,4 +46,4 @@ SOURCES += src/main.cpp \ ../shared/pageslider.cpp \ ../shared/flickablearea.cpp \ ../shared/pixmapwidget.cpp \ - ../shared/resource.cpp + ../shared/dataresource.cpp diff --git a/mybudget/src/widgets/horizontalmenu.cpp b/mybudget/src/widgets/horizontalmenu.cpp index dce7bfa..fd937d6 100644 --- a/mybudget/src/widgets/horizontalmenu.cpp +++ b/mybudget/src/widgets/horizontalmenu.cpp @@ -31,7 +31,7 @@ #include "horizontalmenu.h" -#include "resource.h" +#include "dataresource.h" #include "pixmaploader.h" diff --git a/mybudget/src/widgets/listexpenses.cpp b/mybudget/src/widgets/listexpenses.cpp index 56f9616..676173f 100644 --- a/mybudget/src/widgets/listexpenses.cpp +++ b/mybudget/src/widgets/listexpenses.cpp @@ -31,7 +31,7 @@ #include <QPainter> -#include "resource.h" +#include "dataresource.h" #include "listexpenses.h" #include "pixmaploader.h" diff --git a/mybudget/src/widgets/timelinemenu.cpp b/mybudget/src/widgets/timelinemenu.cpp index 0be4022..9e2b0e1 100644 --- a/mybudget/src/widgets/timelinemenu.cpp +++ b/mybudget/src/widgets/timelinemenu.cpp @@ -38,7 +38,7 @@ #include "pdata.h" #include "button.h" -#include "resource.h" +#include "dataresource.h" #include "pixmaploader.h" #include "coingraphicwidget.h" diff --git a/shared/resource.cpp b/shared/dataresource.cpp index 1687cd1..083389e 100644 --- a/shared/resource.cpp +++ b/shared/dataresource.cpp @@ -31,7 +31,7 @@ #include <QSettings> -#include "resource.h" +#include "dataresource.h" Resource::Resource() diff --git a/shared/resource.h b/shared/dataresource.h index 6376c5b..6376c5b 100644 --- a/shared/resource.h +++ b/shared/dataresource.h |