summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/file_layer.cpp7
-rw-r--r--noncore/apps/opie-console/file_layer.h6
-rw-r--r--noncore/apps/opie-console/io_layer.cpp8
-rw-r--r--noncore/apps/opie-console/main.cpp9
-rw-r--r--noncore/apps/opie-console/opie-console.pro4
5 files changed, 29 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/file_layer.cpp b/noncore/apps/opie-console/file_layer.cpp
index 3be5f10..3ff85af 100644
--- a/noncore/apps/opie-console/file_layer.cpp
+++ b/noncore/apps/opie-console/file_layer.cpp
@@ -1,8 +1,13 @@
#include "file_layer.h"
-FileTransferLayer::FileTransferLayer(IOLayer *layer) {
+FileTransferLayer::FileTransferLayer(IOLayer *layer)
+ : QObject(), m_layer( layer )
+{
}
FileTransferLayer::~FileTransferLayer() {
}
+IOLayer* FileTransferLayer::layer() {
+ return m_layer;
+}
diff --git a/noncore/apps/opie-console/file_layer.h b/noncore/apps/opie-console/file_layer.h
index 75fd94b..035e125 100644
--- a/noncore/apps/opie-console/file_layer.h
+++ b/noncore/apps/opie-console/file_layer.h
@@ -42,9 +42,15 @@ signals:
/*
* 100 == done
*
*/
void progress( const QString& file, int progress );
+protected:
+ IOLayer* layer();
+
+private:
+ IOLayer* m_layer;
+
};
#endif
diff --git a/noncore/apps/opie-console/io_layer.cpp b/noncore/apps/opie-console/io_layer.cpp
index 8da5886..ca1deb8 100644
--- a/noncore/apps/opie-console/io_layer.cpp
+++ b/noncore/apps/opie-console/io_layer.cpp
@@ -1,10 +1,14 @@
#include "io_layer.h"
-IOLayer::IOLayer() {
+IOLayer::IOLayer()
+ : QObject()
+{
}
-IOLayer::IOLayer(const Config &config) {
+IOLayer::IOLayer(const Config &)
+ : QObject()
+{
}
IOLayer::~IOLayer() {
}
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp
index 7594174..cf8bf05 100644
--- a/noncore/apps/opie-console/main.cpp
+++ b/noncore/apps/opie-console/main.cpp
@@ -1,5 +1,14 @@
#include <qpe/qpeapplication.h>
+#include <mainwindow.h>
+
int main(int argc, char **argv) {
+ QPEApplication app( argc, argv );
+ MainWindow* mw = new MainWindow();
+ app.setMainWidget( mw );
+
+ app.exec();
+
+ delete mw;
return 0;
}
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 4ce11a9..5b6fdc3 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,11 +1,11 @@
TEMPLATE = app
CONFIG = qt warn_on release
DESTDIR = $(OPIEDIR)/bin
HEADERS = io_layer.h io_serial.h file_layer.h
-SOURCES = io_layer.cpp io_serial.cpp file_layer.cpp
+SOURCES = io_layer.cpp io_serial.cpp file_layer.cpp main.cpp
INTERFACES =
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopie
-TARGET = sysinfo
+TARGET = opie-console