From: <kna...@us...> - 2006-05-30 18:53:44
|
Revision: 2050 Author: knackeback Date: 2006-05-30 11:53:32 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/tora/?rev=2050&view=rev Log Message: ----------- use SmartPtr instead of raw pointer in class toResultCombo Modified Paths: -------------- trunk/tora/src/Makefile.am trunk/tora/src/toresultcombo.cpp trunk/tora/src/toresultcombo.h Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2006-05-30 17:42:58 UTC (rev 2049) +++ trunk/tora/src/Makefile.am 2006-05-30 18:53:32 UTC (rev 2050) @@ -11,9 +11,10 @@ i18n/tora_it.ts \ i18n/tora_toad.ts -LOKIDIR=$(top_srcdir)/ext/loki/loki-0.1.4/include +LOKIDIR_INC=$(top_srcdir)/ext/loki/loki-0.1.4/include +LOKIDIR_SRC=$(top_srcdir)/ext/loki/loki-0.1.4/src -AM_CPPFLAGS = -I$(top_srcdir)/ext/otl -I$(LOKIDIR) $(KDE_INCLUDES) $(QT_INCLUDES) $(LTDLINCL) +AM_CPPFLAGS = -I$(top_srcdir)/ext/otl -I$(LOKIDIR_INC) $(KDE_INCLUDES) $(QT_INCLUDES) $(LTDLINCL) AM_CPPFLAGS += $(PCRE_CFLAGS) \ -DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \ -DTOVERSION=\"$(PACKAGE_VERSION)\" \ @@ -189,6 +190,8 @@ totool.cpp totool.h \ totoolsettingui.cpp totoolsettingui.h todroptablespaceui.h \ todroptablespaceui.cpp utils.cpp utils.h \ + $(LOKIDIR_SRC)/SmallObj.cpp \ + $(LOKIDIR_SRC)/Singleton.cpp \ $(EXTRA_tora_SOURCES) UI_FILES = toaboutui.ui \ Modified: trunk/tora/src/toresultcombo.cpp =================================================================== --- trunk/tora/src/toresultcombo.cpp 2006-05-30 17:42:58 UTC (rev 2049) +++ trunk/tora/src/toresultcombo.cpp 2006-05-30 18:53:32 UTC (rev 2050) @@ -47,17 +47,15 @@ #include "toresultcombo.moc" toResultCombo::toResultCombo(QWidget *parent, const char *name) - : QComboBox(parent, name) + : QComboBox(parent, name), Query(0) { - Query = NULL; connect(&Poll, SIGNAL(timeout()), this, SLOT(poll())); connect(this, SIGNAL(activated(int)), this, SLOT(changeSelected(void))); } toResultCombo::~toResultCombo() -{ - delete Query; +{ } void toResultCombo::query(const QString &sql, const toQList ¶m) @@ -73,12 +71,6 @@ if (Additional[i] == Selected) setCurrentItem(i); - if (Query) - { - delete Query; - Query = NULL; - } - Query = new toNoBlockQuery(connection(), toQuery::Background, sql, param); Poll.start(100); } @@ -108,8 +100,6 @@ if (Query->eof()) { - delete Query; - Query = NULL; Poll.stop(); setFont(font()); // Small hack to invalidate size hint of combobox which should resize to needed size. updateGeometry(); @@ -118,8 +108,6 @@ } catch (const QString &exc) { - delete Query; - Query = NULL; Poll.stop(); toStatusMessage(exc); } Modified: trunk/tora/src/toresultcombo.h =================================================================== --- trunk/tora/src/toresultcombo.h 2006-05-30 17:42:58 UTC (rev 2049) +++ trunk/tora/src/toresultcombo.h 2006-05-30 18:53:32 UTC (rev 2050) @@ -38,16 +38,20 @@ #ifndef TORESULTCOMBO_H #define TORESULTCOMBO_H +#include <qcombobox.h> +#include <qstringlist.h> + +#include <loki/SmartPtr.h> + #include "config.h" #include "tobackground.h" #include "toresult.h" -#include <qcombobox.h> -#include <qstringlist.h> - class toNoBlockQuery; class toSQL; +using Loki::SmartPtr; + /** This widget displays the result of a query where each field is added as an item * to a combobox. */ @@ -56,7 +60,7 @@ { Q_OBJECT - toNoBlockQuery *Query; + SmartPtr<toNoBlockQuery> Query; toBackground Poll; QString Selected; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |