From d446f61d869683cce860e717726805fa859ebbfc Mon Sep 17 00:00:00 2001 From: eshe Date: Thu, 3 Jun 2010 11:46:06 +0100 Subject: [PATCH] Added missing build dependency to control file and fixed connection handling in gui. --- Makefile | 76 ++++++++++++------------ debian/control | 2 +- src/daemon/Makefile | 147 +++++++++++++++++++++++----------------------- src/gui/Makefile | 129 ++++++++++++++++++++-------------------- src/gui/resultwindow.cpp | 15 ++++- src/gui/resultwindow.h | 5 +- 6 files changed, 191 insertions(+), 183 deletions(-) diff --git a/Makefile b/Makefile index 952e0be..54d932e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: jenirok -# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Jun 2 16:30:11 2010 +# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Jun 3 11:00:56 2010 # Project: jenirok.pro # Template: subdirs # Command: /usr/bin/qmake -unix -o Makefile jenirok.pro @@ -73,45 +73,43 @@ sub-src-daemon-install_subtargets: src/daemon/$(MAKEFILE) FORCE sub-src-daemon-uninstall_subtargets: src/daemon/$(MAKEFILE) FORCE cd src/daemon/ && $(MAKE) -f $(MAKEFILE) uninstall -Makefile: jenirok.pro /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf +Makefile: jenirok.pro /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf $(QMAKE) -unix -o Makefile jenirok.pro -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf: qmake: qmake_all FORCE @$(QMAKE) -unix -o Makefile jenirok.pro diff --git a/debian/control b/debian/control index f0009b0..a54319a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: jenirok Section: user/utilities Priority: optional Maintainer: Jesse Hakanen -Build-Depends: debhelper (>= 5), libqt4-dev, libebook-dev, libx11-dev +Build-Depends: debhelper (>= 5), libqt4-dev, libebook-dev, libx11-dev, icd2-dev Standards-Version: 3.7.2 Package: jenirok diff --git a/src/daemon/Makefile b/src/daemon/Makefile index ae49bea..0c4898e 100644 --- a/src/daemon/Makefile +++ b/src/daemon/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: jenirokd -# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Jun 2 16:30:40 2010 +# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Jun 3 11:01:33 2010 # Project: daemon.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile daemon.pro @@ -10,12 +10,12 @@ CC = gcc CXX = g++ -DEFINES = -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++ -I. -I/targets/FREMANTLE_X86/usr/include/QtCore -I/targets/FREMANTLE_X86/usr/include/QtNetwork -I/targets/FREMANTLE_X86/usr/include/QtGui -I/targets/FREMANTLE_X86/usr/include/QtSql -I/targets/FREMANTLE_X86/usr/include/QtMaemo5 -I/targets/FREMANTLE_X86/usr/include -I/targets/FREMANTLE_X86/usr/include/QtDBus -I../common -I. +DEFINES = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtSql -I/targets/FREMANTLE_ARMEL/usr/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/usr/include -I/targets/FREMANTLE_ARMEL/usr/include/QtDBus -I../common -I. LINK = g++ -LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/lib +LFLAGS = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib LIBS = $(SUBLIBS) -L/usr/lib -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -L/usr/lib -lQtMaemo5 -L/usr/X11R6/lib -lQtSql -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread AR = ar cqs RANLIB = @@ -70,29 +70,28 @@ OBJECTS = main.o \ moc_eniro.o \ moc_connectionmanager.o \ qrc_translations.o -DIST = /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qdbus.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusadaptors.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \ +DIST = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qdbus.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \ daemon.pro QMAKE_TARGET = jenirokd DESTDIR = @@ -125,29 +124,28 @@ all: Makefile $(TARGET) $(TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) -Makefile: daemon.pro /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qdbus.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusadaptors.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \ +Makefile: daemon.pro /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qdbus.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \ /usr/lib/libQtDBus.prl \ /usr/lib/libQtXml.prl \ /usr/lib/libQtCore.prl \ @@ -156,29 +154,28 @@ Makefile: daemon.pro /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qma /usr/lib/libQtSql.prl \ /usr/lib/libQtNetwork.prl $(QMAKE) -unix -o Makefile daemon.pro -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qdbus.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusinterfaces.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/dbusadaptors.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qdbus.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusinterfaces.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/dbusadaptors.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf: /usr/lib/libQtDBus.prl: /usr/lib/libQtXml.prl: /usr/lib/libQtCore.prl: diff --git a/src/gui/Makefile b/src/gui/Makefile index 80aea84..634ae92 100644 --- a/src/gui/Makefile +++ b/src/gui/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: jenirok -# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed Jun 2 16:30:56 2010 +# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Jun 3 11:01:00 2010 # Project: gui.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile gui.pro @@ -10,12 +10,12 @@ CC = gcc CXX = g++ -DEFINES = -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES) -CXXFLAGS = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES) -INCPATH = -I/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++ -I. -I/targets/FREMANTLE_X86/usr/include/QtCore -I/targets/FREMANTLE_X86/usr/include/QtNetwork -I/targets/FREMANTLE_X86/usr/include/QtGui -I/targets/FREMANTLE_X86/usr/include/QtSql -I/targets/FREMANTLE_X86/usr/include/QtMaemo5 -I/targets/FREMANTLE_X86/usr/include -I../common -I. +DEFINES = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtSql -I/targets/FREMANTLE_ARMEL/usr/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/usr/include -I../common -I. LINK = g++ -LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/lib +LFLAGS = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib LIBS = $(SUBLIBS) -L/usr/lib -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lQtSql -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread AR = ar cqs RANLIB = @@ -92,26 +92,25 @@ OBJECTS = main.o \ moc_connectionmanager.o \ qrc_icons.o \ qrc_translations.o -DIST = /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \ +DIST = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \ gui.pro QMAKE_TARGET = jenirok DESTDIR = @@ -144,26 +143,25 @@ all: Makefile $(TARGET) $(TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) -Makefile: gui.pro /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \ - /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \ +Makefile: gui.pro /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \ + /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \ /usr/lib/libQtMaemo5.prl \ /usr/lib/libQtDBus.prl \ /usr/lib/libQtXml.prl \ @@ -172,26 +170,25 @@ Makefile: gui.pro /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake. /usr/lib/libQtSql.prl \ /usr/lib/libQtNetwork.prl $(QMAKE) -unix -o Makefile gui.pro -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf: -/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf: +/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf: /usr/lib/libQtMaemo5.prl: /usr/lib/libQtDBus.prl: /usr/lib/libQtXml.prl: diff --git a/src/gui/resultwindow.cpp b/src/gui/resultwindow.cpp index 7c556c6..605ecb1 100644 --- a/src/gui/resultwindow.cpp +++ b/src/gui/resultwindow.cpp @@ -28,12 +28,18 @@ #include "cache.h" ResultWindow::ResultWindow(QWidget* parent): QMainWindow(parent), -eniro_(0), list_(0) +eniro_(0), list_(0), connectionManager_(0) { setAttribute(Qt::WA_Maemo5StackedWindow); setWindowTitle(tr("Search results")); } +ResultWindow::~ResultWindow() +{ + delete connectionManager_; + connectionManager_ = 0; +} + void ResultWindow::search(SearchDialog::SearchDetails& details) { if(!list_) @@ -97,6 +103,13 @@ void ResultWindow::search(SearchDialog::SearchDetails& details) show(); setAttribute(Qt::WA_Maemo5ShowProgressIndicator, true); + if(!connectionManager_) + { + connectionManager_ = new ConnectionManager(); + } + + connectionManager_->connect(); + eniro_->abort(); eniro_->search(Eniro::SearchDetails(details.name, details.location, type)); diff --git a/src/gui/resultwindow.h b/src/gui/resultwindow.h index 4b9f521..8bd3228 100644 --- a/src/gui/resultwindow.h +++ b/src/gui/resultwindow.h @@ -25,6 +25,7 @@ #include #include "searchdialog.h" #include "eniro.h" +#include "connectionmanager.h" class ResultWindow : public QMainWindow { @@ -32,7 +33,8 @@ class ResultWindow : public QMainWindow public: ResultWindow(QWidget* parent = 0); - static const int REQUEST_TIMEOUT = 20000; + ~ResultWindow(); + static const int REQUEST_TIMEOUT = 30000; signals: void itemSelected(Eniro::Result const& result); @@ -48,6 +50,7 @@ private slots: private: Eniro* eniro_; QListWidget* list_; + ConnectionManager* connectionManager_; }; -- 1.7.9.5