From c896aa6a0de666534e8b82d058ed02390bfdd47f Mon Sep 17 00:00:00 2001 From: Adriano Rezende Date: Wed, 18 Nov 2009 14:45:45 -0300 Subject: Shared: Changed resource.h to dataresource.h to avoid clash on symbian sdk Signed-off-by: Adriano Rezende --- mybudget/src/calculator/calculatorscreen.cpp | 2 +- mybudget/src/lists/listscreen.cpp | 2 +- mybudget/src/main.cpp | 2 +- mybudget/src/pixmaploader.cpp | 2 +- mybudget/src/src.pri | 4 ++-- mybudget/src/widgets/horizontalmenu.cpp | 2 +- mybudget/src/widgets/listexpenses.cpp | 2 +- mybudget/src/widgets/timelinemenu.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'mybudget') 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 #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 -#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" -- cgit v1.2.3