summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2011-01-27 13:45:58 +0100
committerJonathan Bauer2011-01-27 13:45:58 +0100
commit7f6cbe092e9eabed5e90429b569082a40f6a9379 (patch)
treef6fb06bdb3db87b576fc2f2418c2d451a9ff7987
parentgetPath(): some improvements... (diff)
downloadfbgui-7f6cbe092e9eabed5e90429b569082a40f6a9379.tar.gz
fbgui-7f6cbe092e9eabed5e90429b569082a40f6a9379.tar.xz
fbgui-7f6cbe092e9eabed5e90429b569082a40f6a9379.zip
renaming, little things..
-rw-r--r--src/fbbrowser.cpp5
-rw-r--r--src/fbbrowser.h2
-rwxr-xr-xsrc/testApp.sh3
3 files changed, 5 insertions, 5 deletions
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 5495a78..2e4fee6 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -3,8 +3,9 @@
#include <QtWebKit>
#include <QApplication>
-void fbbrowser::httpReadyRead()
+void fbbrowser::httpReqFinished()
{
+ // TODO: fix this up..
// This slot listens to readyRead() signal from our QNetworkReply.
qDebug() << "finished() signal emmited!" << endl;
if(reply->error() == QNetworkReply::NoError)
@@ -28,7 +29,7 @@ fbbrowser::fbbrowser(const QUrl & url)
// Let the manager send the request and receive the reply.
// QNetworkReply *reply = manager->get(request);
reply = manager->get(request);
- connect(reply, SIGNAL(finished()), this, SLOT(httpReadyRead()));
+ connect(reply, SIGNAL(finished()), this, SLOT(httpReqFinished()));
//connect(reply, SIGNAL(finished()), this, SLOT());
// Check if the reply is an error message.
diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index 397f469..3d20249 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -29,7 +29,7 @@ private:
//QApplication * app(int & argc, char ** argv);
private slots:
- void httpReadyRead();
+ void httpReqFinished();
void addJSObject();
signals:
diff --git a/src/testApp.sh b/src/testApp.sh
index 5b8768f..a34c653 100755
--- a/src/testApp.sh
+++ b/src/testApp.sh
@@ -10,8 +10,7 @@ fi
sleep 1
# Start the fbbrowser app.
# This requires the fbgui git repository to be in the user's home directory.
-export PATH=~/fbgui/src:$PATH
-fbgui -qws $1
+~/fbgui/src/fbgui -qws $1
# Check if fbbrowser is not running, if so kill the qvfb.
if [ $(ps aux | grep -v grep | grep -c fbgui) -eq 1 ]
then