Home / Browse / OpenRPT report writer by xTuple / Mail / Archive

OpenRPT report writer by xTuple

Email Archive: openrpt-commit (read-only)

[Openrpt-commit] SF.net SVN: openrpt:[473] openrpt/trunk/MetaSQL/mqledit.cpp

From: <cryan@us...> - 2010-10-26 20:40

Revision: 473
          http://openrpt.svn.sourceforge.net/openrpt/?rev=473&view=rev
Author:   cryan
Date:     2010-10-26 20:40:21 +0000 (Tue, 26 Oct 2010)

Log Message:
-----------
Issue #12384. Fixed SelectMQL screen to populate correctly in stand-alone version.

Modified Paths:
--------------
    openrpt/trunk/MetaSQL/mqledit.cpp

Modified: openrpt/trunk/MetaSQL/mqledit.cpp
===================================================================
--- openrpt/trunk/MetaSQL/mqledit.cpp	2010-10-26 16:13:36 UTC (rev 472)
+++ openrpt/trunk/MetaSQL/mqledit.cpp	2010-10-26 20:40:21 UTC (rev 473)
@@ -126,10 +126,6 @@
 
   clear();
 
-  _mqlSelector= new SelectMQL(0, Qt::Dialog);
-  _mqlSelector->setWindowModality(Qt::WindowModal);
-  connect(_mqlSelector, SIGNAL(selectedQuery(int)), this, SLOT(sMQLSelected(int)));
-
   setDestType(MQLUnknown);
 }
 
@@ -416,11 +412,19 @@
 void MQLEdit::fileDatabaseOpen()
 {
   if (askSaveIfModified())
+  { 
+    _mqlSelector = new SelectMQL(0, Qt::Dialog);
+    _mqlSelector->setWindowModality(Qt::WindowModal);
+    connect(_mqlSelector, SIGNAL(selectedQuery(int)), this, SLOT(sMQLSelected(int)));
     _mqlSelector->setVisible(true);
+  }
 }
 
 void MQLEdit::sMQLSelected(int id)
 {
+  if(_mqlSelector == 0)
+    return;
+
   if (id > 0)
   {
     _text->setText(_mqlSelector->query());
@@ -436,6 +440,8 @@
     setDestType(MQLDatabase);
   }
   _mqlSelector->setVisible(false);
+  _mqlSelector->deleteLater();
+  _mqlSelector = 0;
 }
 
 void MQLEdit::fileDatabaseOpen(const int id)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Openrpt-commit] SF.net SVN: openrpt:[473] openrpt/trunk/MetaSQL/mqledit.cpp	<cryan@us...>

[Openrpt-commit] SF.net SVN: openrpt:[475] openrpt/trunk/MetaSQL/mqledit.cpp

From: <cryan@us...> - 2010-10-26 20:44

Revision: 475
          http://openrpt.svn.sourceforge.net/openrpt/?rev=475&view=rev
Author:   cryan
Date:     2010-10-26 20:44:39 +0000 (Tue, 26 Oct 2010)

Log Message:
-----------
Make sure variable is properly initialized.

Modified Paths:
--------------
    openrpt/trunk/MetaSQL/mqledit.cpp

Modified: openrpt/trunk/MetaSQL/mqledit.cpp
===================================================================
--- openrpt/trunk/MetaSQL/mqledit.cpp	2010-10-26 20:42:57 UTC (rev 474)
+++ openrpt/trunk/MetaSQL/mqledit.cpp	2010-10-26 20:44:39 UTC (rev 475)
@@ -55,6 +55,7 @@
   if (OpenRPT::name.isEmpty())
     OpenRPT::name = tr("MetaSQL Editor");
 
+  _mqlSelector = 0;
   _document = _text->document();
   _document->setDefaultFont(QFont("Courier"));
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openrpt-commit] SF.net SVN: openrpt:[535] openrpt/trunk/MetaSQL/mqledit.cpp

From: <cryan@us...> - 2011-06-27 15:00

Revision: 535
          http://openrpt.svn.sourceforge.net/openrpt/?rev=535&view=rev
Author:   cryan
Date:     2011-06-27 15:00:40 +0000 (Mon, 27 Jun 2011)

Log Message:
-----------
Issue #11722. Found/fixed another regular expression that was not correct.

Modified Paths:
--------------
    openrpt/trunk/MetaSQL/mqledit.cpp

Modified: openrpt/trunk/MetaSQL/mqledit.cpp
===================================================================
--- openrpt/trunk/MetaSQL/mqledit.cpp	2011-06-16 14:45:57 UTC (rev 534)
+++ openrpt/trunk/MetaSQL/mqledit.cpp	2011-06-27 15:00:40 UTC (rev 535)
@@ -772,7 +772,8 @@
     if (DEBUG)
       qDebug("getParamsFromMetaSQLText looking at %s", qPrintable(tag));
 
-    QRegExp paramre("(['\\\"])(\\w+)\\1");
+    //QRegExp paramre("(['\\\"])(\\w+)\\1");
+    QRegExp paramre("(['\\\"])([^'\\\"]+)\\1");
     for (int j = 0; (j = paramre.indexIn(tag, j)) != -1; j += paramre.matchedLength())
     {
       QString param = paramre.cap(2);   // the \w+, not the ['"]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.