summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJonathan Bauer2011-02-01 16:45:34 +0100
committerJonathan Bauer2011-02-01 16:45:34 +0100
commitb1d87768d9fdc0867ec25fa9d2244a612548f791 (patch)
treeb6b379654ccf6d14883d61040164b6d0254deab5 /src
parentAlternative to getPath() function using QT classes (diff)
downloadfbgui-b1d87768d9fdc0867ec25fa9d2244a612548f791.tar.gz
fbgui-b1d87768d9fdc0867ec25fa9d2244a612548f791.tar.xz
fbgui-b1d87768d9fdc0867ec25fa9d2244a612548f791.zip
deleted .metadata
Diffstat (limited to 'src')
-rw-r--r--src/.cproject1
-rw-r--r--src/Makefile.Debug80
-rw-r--r--src/Makefile.Release80
-rw-r--r--src/fbbrowser.cpp7
-rw-r--r--src/fbbrowser.h1
-rw-r--r--src/fbgui.cpp12
-rw-r--r--src/fbgui.pro6
7 files changed, 122 insertions, 65 deletions
diff --git a/src/.cproject b/src/.cproject
index 046216a..c852b37 100644
--- a/src/.cproject
+++ b/src/.cproject
@@ -228,7 +228,6 @@
<buildTargets>
<target name="Qt Release Build" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
<buildCommand>make</buildCommand>
- <buildArguments/>
<buildTarget>release</buildTarget>
<stopOnError>false</stopOnError>
<useDefaultCommand>false</useDefaultCommand>
diff --git a/src/Makefile.Debug b/src/Makefile.Debug
index 6758861..63474ce 100644
--- a/src/Makefile.Debug
+++ b/src/Makefile.Debug
@@ -1,7 +1,7 @@
#############################################################################
-# Makefile for building: fbbrowser
-# Generated by qmake (2.01a) (Qt 4.7.1) on: Wed Jan 12 12:12:05 2011
-# Project: fbbrowser.pro
+# Makefile for building: fbgui
+# Generated by qmake (2.01a) (Qt 4.7.1) on: Tue Feb 1 15:52:20 2011
+# Project: fbgui.pro
# Template: app
#############################################################################
@@ -9,13 +9,13 @@
CC = gcc
CXX = g++
-DEFINES = -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Idebug -I.
+DEFINES = -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
+CXXFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES)
+INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtWebKit -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Idebug -I.
LINK = g++
LFLAGS = -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.1/lib
-LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread
+LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtWebKit -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.1/bin/qmake
@@ -42,11 +42,17 @@ OBJECTS_DIR = debug/
####### Files
-SOURCES = main.cpp \
- fbbrowser.cpp debug/moc_fbbrowser.cpp
-OBJECTS = debug/main.o \
+SOURCES = fbgui.cpp \
+ fbbrowser.cpp \
+ downloadmanager.cpp debug/moc_fbbrowser.cpp \
+ debug/moc_downloadmanager.cpp \
+ debug/qrc_fbgui.cpp
+OBJECTS = debug/fbgui.o \
debug/fbbrowser.o \
- debug/moc_fbbrowser.o
+ debug/downloadmanager.o \
+ debug/moc_fbbrowser.o \
+ debug/moc_downloadmanager.o \
+ debug/qrc_fbgui.o
DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/linux.conf \
@@ -61,19 +67,19 @@ DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug_and_release.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_post.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/build_pass.prf \
- /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/unix/thread.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/moc.prf \
+ /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/resources.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/uic.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/yacc.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/lex.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/include_source_dir.prf \
- fbbrowser.pro
-QMAKE_TARGET = fbbrowser
+ fbgui.pro
+QMAKE_TARGET = fbgui
DESTDIR =
-TARGET = fbbrowser
+TARGET = fbgui
first: all
####### Implicit rules
@@ -103,11 +109,11 @@ $(TARGET): ui_fbbrowser.h $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
qmake: FORCE
- @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Debug fbbrowser.pro
+ @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Debug fbgui.pro
dist:
- @$(CHK_DIR_EXISTS) debug/fbbrowser1.0.0 || $(MKDIR) debug/fbbrowser1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.h debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents main.cpp fbbrowser.cpp debug/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui debug/fbbrowser1.0.0/ && (cd `dirname debug/fbbrowser1.0.0` && $(TAR) fbbrowser1.0.0.tar fbbrowser1.0.0 && $(COMPRESS) fbbrowser1.0.0.tar) && $(MOVE) `dirname debug/fbbrowser1.0.0`/fbbrowser1.0.0.tar.gz . && $(DEL_FILE) -r debug/fbbrowser1.0.0
+ @$(CHK_DIR_EXISTS) debug/fbgui1.0.0 || $(MKDIR) debug/fbgui1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.h downloadmanager.h debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.qrc debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.cpp fbbrowser.cpp downloadmanager.cpp debug/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui debug/fbgui1.0.0/ && (cd `dirname debug/fbgui1.0.0` && $(TAR) fbgui1.0.0.tar fbgui1.0.0 && $(COMPRESS) fbgui1.0.0.tar) && $(MOVE) `dirname debug/fbgui1.0.0`/fbgui1.0.0.tar.gz . && $(DEL_FILE) -r debug/fbgui1.0.0
clean:compiler_clean
@@ -128,15 +134,23 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-compiler_moc_header_make_all: debug/moc_fbbrowser.cpp
+compiler_moc_header_make_all: debug/moc_fbbrowser.cpp debug/moc_downloadmanager.cpp
compiler_moc_header_clean:
- -$(DEL_FILE) debug/moc_fbbrowser.cpp
-debug/moc_fbbrowser.cpp: ui_fbbrowser.h \
+ -$(DEL_FILE) debug/moc_fbbrowser.cpp debug/moc_downloadmanager.cpp
+debug/moc_fbbrowser.cpp: downloadmanager.h \
fbbrowser.h
/usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbbrowser.h -o debug/moc_fbbrowser.cpp
-compiler_rcc_make_all:
+debug/moc_downloadmanager.cpp: downloadmanager.h
+ /usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) downloadmanager.h -o debug/moc_downloadmanager.cpp
+
+compiler_rcc_make_all: debug/qrc_fbgui.cpp
compiler_rcc_clean:
+ -$(DEL_FILE) debug/qrc_fbgui.cpp
+debug/qrc_fbgui.cpp: fbgui.qrc \
+ html/errorPage.html
+ /usr/local/Trolltech/QtEmbedded-4.7.1/bin/rcc -name fbgui fbgui.qrc -o debug/qrc_fbgui.cpp
+
compiler_image_collection_make_all: qmake_image_collection.cpp
compiler_image_collection_clean:
-$(DEL_FILE) qmake_image_collection.cpp
@@ -154,21 +168,31 @@ compiler_yacc_impl_make_all:
compiler_yacc_impl_clean:
compiler_lex_make_all:
compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean compiler_uic_clean
+compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_uic_clean
####### Compile
-debug/main.o: main.cpp fbbrowser.h \
- ui_fbbrowser.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o main.cpp
+debug/fbgui.o: fbgui.cpp fbbrowser.h \
+ downloadmanager.h \
+ fbgui.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/fbgui.o fbgui.cpp
debug/fbbrowser.o: fbbrowser.cpp fbbrowser.h \
- ui_fbbrowser.h
+ downloadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/fbbrowser.o fbbrowser.cpp
+debug/downloadmanager.o: downloadmanager.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/downloadmanager.o downloadmanager.cpp
+
debug/moc_fbbrowser.o: debug/moc_fbbrowser.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_fbbrowser.o debug/moc_fbbrowser.cpp
+debug/moc_downloadmanager.o: debug/moc_downloadmanager.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_downloadmanager.o debug/moc_downloadmanager.cpp
+
+debug/qrc_fbgui.o: debug/qrc_fbgui.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/qrc_fbgui.o debug/qrc_fbgui.cpp
+
####### Install
install: FORCE
diff --git a/src/Makefile.Release b/src/Makefile.Release
index cbe28a3..673170b 100644
--- a/src/Makefile.Release
+++ b/src/Makefile.Release
@@ -1,7 +1,7 @@
#############################################################################
-# Makefile for building: fbbrowser
-# Generated by qmake (2.01a) (Qt 4.7.1) on: Wed Jan 12 12:12:05 2011
-# Project: fbbrowser.pro
+# Makefile for building: fbgui
+# Generated by qmake (2.01a) (Qt 4.7.1) on: Tue Feb 1 15:52:20 2011
+# Project: fbgui.pro
# Template: app
#############################################################################
@@ -9,13 +9,13 @@
CC = gcc
CXX = g++
-DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Irelease -I.
+DEFINES = -DQT_NO_DEBUG -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES)
+CXXFLAGS = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES)
+INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.1/include/QtWebKit -I/usr/local/Trolltech/QtEmbedded-4.7.1/include -Irelease -I.
LINK = g++
LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.1/lib
-LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread
+LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtWebKit -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.1/lib -lQtNetwork -lQtCore -lpthread
AR = ar cqs
RANLIB =
QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.1/bin/qmake
@@ -42,11 +42,17 @@ OBJECTS_DIR = release/
####### Files
-SOURCES = main.cpp \
- fbbrowser.cpp release/moc_fbbrowser.cpp
-OBJECTS = release/main.o \
+SOURCES = fbgui.cpp \
+ fbbrowser.cpp \
+ downloadmanager.cpp release/moc_fbbrowser.cpp \
+ release/moc_downloadmanager.cpp \
+ release/qrc_fbgui.cpp
+OBJECTS = release/fbgui.o \
release/fbbrowser.o \
- release/moc_fbbrowser.o
+ release/downloadmanager.o \
+ release/moc_fbbrowser.o \
+ release/moc_downloadmanager.o \
+ release/qrc_fbgui.o
DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/unix.conf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/linux.conf \
@@ -61,19 +67,19 @@ DIST = /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/common/g++.conf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/debug_and_release.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/default_post.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/build_pass.prf \
- /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/qt.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/unix/thread.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/moc.prf \
+ /usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/warn_on.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/resources.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/uic.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/yacc.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/lex.prf \
/usr/local/Trolltech/QtEmbedded-4.7.1/mkspecs/features/include_source_dir.prf \
- fbbrowser.pro
-QMAKE_TARGET = fbbrowser
+ fbgui.pro
+QMAKE_TARGET = fbgui
DESTDIR =
-TARGET = fbbrowser
+TARGET = fbgui
first: all
####### Implicit rules
@@ -103,11 +109,11 @@ $(TARGET): ui_fbbrowser.h $(OBJECTS)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
qmake: FORCE
- @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Release fbbrowser.pro
+ @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Release fbgui.pro
dist:
- @$(CHK_DIR_EXISTS) release/fbbrowser1.0.0 || $(MKDIR) release/fbbrowser1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) release/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.h release/fbbrowser1.0.0/ && $(COPY_FILE) --parents main.cpp fbbrowser.cpp release/fbbrowser1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui release/fbbrowser1.0.0/ && (cd `dirname release/fbbrowser1.0.0` && $(TAR) fbbrowser1.0.0.tar fbbrowser1.0.0 && $(COMPRESS) fbbrowser1.0.0.tar) && $(MOVE) `dirname release/fbbrowser1.0.0`/fbbrowser1.0.0.tar.gz . && $(DEL_FILE) -r release/fbbrowser1.0.0
+ @$(CHK_DIR_EXISTS) release/fbgui1.0.0 || $(MKDIR) release/fbgui1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) release/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.h downloadmanager.h release/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.qrc release/fbgui1.0.0/ && $(COPY_FILE) --parents fbgui.cpp fbbrowser.cpp downloadmanager.cpp release/fbgui1.0.0/ && $(COPY_FILE) --parents fbbrowser.ui release/fbgui1.0.0/ && (cd `dirname release/fbgui1.0.0` && $(TAR) fbgui1.0.0.tar fbgui1.0.0 && $(COMPRESS) fbgui1.0.0.tar) && $(MOVE) `dirname release/fbgui1.0.0`/fbgui1.0.0.tar.gz . && $(DEL_FILE) -r release/fbgui1.0.0
clean:compiler_clean
@@ -128,15 +134,23 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-compiler_moc_header_make_all: release/moc_fbbrowser.cpp
+compiler_moc_header_make_all: release/moc_fbbrowser.cpp release/moc_downloadmanager.cpp
compiler_moc_header_clean:
- -$(DEL_FILE) release/moc_fbbrowser.cpp
-release/moc_fbbrowser.cpp: ui_fbbrowser.h \
+ -$(DEL_FILE) release/moc_fbbrowser.cpp release/moc_downloadmanager.cpp
+release/moc_fbbrowser.cpp: downloadmanager.h \
fbbrowser.h
/usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) fbbrowser.h -o release/moc_fbbrowser.cpp
-compiler_rcc_make_all:
+release/moc_downloadmanager.cpp: downloadmanager.h
+ /usr/local/Trolltech/QtEmbedded-4.7.1/bin/moc $(DEFINES) $(INCPATH) downloadmanager.h -o release/moc_downloadmanager.cpp
+
+compiler_rcc_make_all: release/qrc_fbgui.cpp
compiler_rcc_clean:
+ -$(DEL_FILE) release/qrc_fbgui.cpp
+release/qrc_fbgui.cpp: fbgui.qrc \
+ html/errorPage.html
+ /usr/local/Trolltech/QtEmbedded-4.7.1/bin/rcc -name fbgui fbgui.qrc -o release/qrc_fbgui.cpp
+
compiler_image_collection_make_all: qmake_image_collection.cpp
compiler_image_collection_clean:
-$(DEL_FILE) qmake_image_collection.cpp
@@ -154,21 +168,31 @@ compiler_yacc_impl_make_all:
compiler_yacc_impl_clean:
compiler_lex_make_all:
compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean compiler_uic_clean
+compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_uic_clean
####### Compile
-release/main.o: main.cpp fbbrowser.h \
- ui_fbbrowser.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o main.cpp
+release/fbgui.o: fbgui.cpp fbbrowser.h \
+ downloadmanager.h \
+ fbgui.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/fbgui.o fbgui.cpp
release/fbbrowser.o: fbbrowser.cpp fbbrowser.h \
- ui_fbbrowser.h
+ downloadmanager.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/fbbrowser.o fbbrowser.cpp
+release/downloadmanager.o: downloadmanager.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/downloadmanager.o downloadmanager.cpp
+
release/moc_fbbrowser.o: release/moc_fbbrowser.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_fbbrowser.o release/moc_fbbrowser.cpp
+release/moc_downloadmanager.o: release/moc_downloadmanager.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_downloadmanager.o release/moc_downloadmanager.cpp
+
+release/qrc_fbgui.o: release/qrc_fbgui.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/qrc_fbgui.o release/qrc_fbgui.cpp
+
####### Install
install: FORCE
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 4b2b66f..d196f56 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -36,6 +36,7 @@ void fbbrowser::download(const QString &file)
QUrl u = baseUrl.resolved(file);
req.setUrl(u);
rep = manager->get(req);
+ QIODevice* qiod2 = rep;
qiod = rep;
QObject::connect(rep, SIGNAL(finished()), this, SLOT(saveData()));
}
@@ -73,9 +74,15 @@ fbbrowser::fbbrowser(const QUrl & url)
qDebug() << "Error occured, loading error page...";
view->load(QUrl("qrc:/html/errorPage.html"));
}
+ // **** TEST ****
// This part is just a test call of download()...
+ DownloadManager* dm = new DownloadManager();
+ dm->print();
+ //dm.setUrl(baseUrl);
+ //dm.downloadFile("test.php");
filename = "test.php";
download(filename);
+ // **** TEST ****
//remove the window decoration
this->setWindowFlags(Qt::SplashScreen);
diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index d9ffc44..b5c84e9 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -1,6 +1,7 @@
#ifndef FBBROWSER_H
#define FBBROWSER_H
+#include "downloadmanager.h"
#include <QtGui>
#include <QtNetwork>
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index d6631c7..4c8b2e8 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -1,13 +1,11 @@
#include "fbbrowser.h"
-
-#include <QApplication>
-//#include <iostream>
+#include "downloadmanager.h"
#include <getopt.h>
#include <fbgui.h>
-
-//#include <string>
#include <limits.h>
#include <unistd.h>
+#include <QApplication>
+
void printUsage()
{
@@ -27,11 +25,13 @@ QString getPath()
{
// Alternative 1
QDir qdir;
- qDebug() << qdir.currentPath();
+ return qdir.currentPath();
// Alternative 2
+ /*
char result[ PATH_MAX ];
readlink("/proc/self/exe", result, PATH_MAX);
return QString(result);
+ */
}
int main(int argc, char *argv[])
diff --git a/src/fbgui.pro b/src/fbgui.pro
index c1bcf82..3a8c518 100644
--- a/src/fbgui.pro
+++ b/src/fbgui.pro
@@ -5,8 +5,10 @@ QT += core \
gui \
webkit \
network
-HEADERS += fbbrowser.h
+HEADERS += fbbrowser.h \
+ downloadmanager.h
SOURCES += fbgui.cpp \
- fbbrowser.cpp
+ fbbrowser.cpp \
+ downloadmanager.cpp
FORMS += fbbrowser.ui
RESOURCES += fbgui.qrc