[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/tests
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2010-07-02 9:45:53
Message-ID: 20100702094554.05FE4AC8FD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1145232 by skelly:

Write the log file automatically when the logger is destroyed.

It is also possible to create multiple log files in one session from one logger.

 M  +0 -9      proxymodeltestapp/descendantpmwidget.cpp  
 M  +13 -2     proxymodeltestsuite/modeleventlogger.cpp  
 M  +1 -1      proxymodeltestsuite/modeleventlogger.h  


--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestapp/descendantpmwidget.cpp #1145231:1145232
@@ -23,7 +23,6 @@
 
 #include <QTreeView>
 #include <QSplitter>
-#include <QFile>
 
 #include "dynamictreemodel.h"
 #include "dynamictreewidget.h"
@@ -131,14 +130,6 @@
 
 DescendantProxyModelWidget::~DescendantProxyModelWidget()
 {
-  QString logFileName = QString("main.%1.cpp").arg(reinterpret_cast<qint64>(m_rootModel));
-  kDebug() << "Writing to " << logFileName;
-  QFile outputFile(logFileName);
-  const bool logFileOpened = outputFile.open(QFile::WriteOnly | QFile::Text);
-  Q_ASSERT(logFileOpened);
-
-  m_eventLogger->writeLog(&outputFile);
-  outputFile.close();
 }
 
 
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp #1145231:1145232
@@ -24,6 +24,7 @@
 #include "indexfinder.h"
 
 #include <QStringList>
+#include <QFile>
 
 #include <kdebug.h>
 
@@ -167,9 +168,16 @@
 
 }
 
-void ModelEventLogger::writeLog(QIODevice* device)
+void ModelEventLogger::writeLog()
 {
 #ifdef Grantlee_FOUND
+  static int numLogs;
+  QString logFileName = QString("main.%1.%2.cpp").arg(reinterpret_cast<qint64>(this)).arg(numLogs++);
+  kDebug() << "Writing to " << logFileName;
+  QFile outputFile(logFileName);
+  const bool logFileOpened = outputFile.open(QFile::WriteOnly | QFile::Text);
+  Q_ASSERT(logFileOpened);
+
   Grantlee::Engine engine;
   Grantlee::FileSystemTemplateLoader::Ptr loader(new Grantlee::FileSystemTemplateLoader);
   loader->setTemplateDirs(QStringList() << ":/templates");
@@ -184,10 +192,12 @@
     c.insert("initEvent", m_initEvent);
     c.insert("events", m_events);
 
-    QTextStream textStream(device);
+    QTextStream textStream(&outputFile);
     NoEscapeOutputStream outputStream(&textStream);
     t->render(&outputStream, &c);
   }
+  outputFile.close();
+
   if (t->error())
     kDebug() << t->errorString();
 #else
@@ -197,6 +207,7 @@
 
 ModelEventLogger::~ModelEventLogger()
 {
+  writeLog();
   delete m_modelDumper;
 }
 
--- trunk/KDE/kdelibs/kdeui/tests/proxymodeltestsuite/modeleventlogger.h #1145231:1145232
@@ -108,7 +108,7 @@
   Q_OBJECT
 public:
   ModelEventLogger(QAbstractItemModel *model, QObject* parent = 0);
-  void writeLog(QIODevice *device);
+  void writeLog();
   virtual ~ModelEventLogger();
 
 private:
[prev in list] [next in list] [prev in thread] [next in thread]