diff options
| author | Niklas Goby | 2011-02-22 16:12:34 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-02-22 16:12:34 +0100 |
| commit | a5d872f96d98c926ea024cb6ab0a9b845f3a2d3a (patch) | |
| tree | 525f9948d0e1104c54f2f04778e6e65c04313ae3 | |
| parent | nichts (diff) | |
| parent | commented out problem lines (diff) | |
| download | fbgui-a5d872f96d98c926ea024cb6ab0a9b845f3a2d3a.tar.gz fbgui-a5d872f96d98c926ea024cb6ab0a9b845f3a2d3a.tar.xz fbgui-a5d872f96d98c926ea024cb6ab0a9b845f3a2d3a.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
| -rw-r--r-- | src/fbbrowser.h | 3 | ||||
| -rw-r--r-- | src/jsObject.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/fbbrowser.h b/src/fbbrowser.h index 42d1d3d..fbd8f0a 100644 --- a/src/fbbrowser.h +++ b/src/fbbrowser.h @@ -2,6 +2,7 @@ #define FBBROWSER_H #include "DownloadManager.h" +#include "jsObject.h" #include <QtGui> #include <QtNetwork> @@ -32,7 +33,7 @@ private: void download(const QString & file); //the jsObject. connection to the webpage for emiting signals - jsObject * jso; + jsObject *jso; // connects all jsObject signals with fbbrowser slots void connectJsSignalsToSlots(); diff --git a/src/jsObject.h b/src/jsObject.h index db927c1..b049d11 100644 --- a/src/jsObject.h +++ b/src/jsObject.h @@ -11,7 +11,6 @@ #define JSOBJECT_H_ #include <QObject> -#include "fbbrowser.h" typedef enum { |