Git commit a4b5fec99693067524c980f93487a5c8279f515a by Peter Grasch.
Committed on 23/12/2012 at 20:20.
Pushed by grasch into branch 'master'.

Removed stale log manager

D  +0    -266  simonlib/simonlogging/logmanager.cpp
D  +0    -75   simonlib/simonlogging/logmanager.h
D  +0    -251  simonlib/simonlogging/logmanagerdlg.ui

http://commits.kde.org/simon/a4b5fec99693067524c980f93487a5c8279f515a

diff --git a/simonlib/simonlogging/logmanager.cpp b/simonlib/simonlogging/l=
ogmanager.cpp
deleted file mode 100644
index 5839e86..0000000
--- a/simonlib/simonlogging/logmanager.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- *   Copyright (C) 2008 Peter Grasch <peter.grasch@bedahr.org>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   or (at your option) any later version, as published by the Free
- *   Software Foundation
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details
- *
- *   You should have received a copy of the GNU General Public
- *   License along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include "logmanager.h"
-#include <QRegExp>
-#include <QFile>
-#include <QCoreApplication>
-#include <QDate>
-#include "logger.h"
-
-/**
- * \brief Constructor
- *
- * \author Peter Grasch
- */
-LogManager::LogManager()
-: entries(new LogEntryList()),
-killMe(false),
-finishedLoading(false)
-{
-  connect(this, SIGNAL(finished()), this, SLOT(resetKillFlag()));
-  connect(this, SIGNAL(terminated()), this, SLOT(resetKillFlag()));
-}
-
-
-/**
- * \brief Returns true if there would no point in (re-)reading the logfile
- * \author Peter Grasch
- *
- * If this is false either the logfile changed or we never actually comple=
tely read it
- *
- * @return have we finished reading the logfile?
- */
-bool LogManager::hasFinishedReading()
-{
-  QFile logF("log/simon.log");
-  return (this->finishedLoading && (logF.size() =3D=3D logFilesize));
-}
-
-
-/**
- * \brief reads the logfile, and saves the content into a vector of LogEnt=
ry
- * get the information of the loggfile by reading line by line. chops ever=
y line into
- * the tags;
- * researches every line if a extra information is given
- * 	[ERR] for Error
- * 	[INF] for Info
- * 	[UPD] for Update
- * saves the read information into a Vector of LogEntry
- *
- * \author Phillip Goriup, Peter Grasch
- */
-void LogManager::run ()
-{
-  finishedLoading =3D false;
-  if(!this->entries) {
-    this->entries =3D new LogEntryList;
-  }
-  else {
-    delete(this->entries);
-    this->entries =3D new LogEntryList;
-  }
-  QFile *LogF =3D new QFile("log/simon.log");
-  if (!LogF->open(QIODevice::ReadOnly)) {
-    emit logReadFinished(1);
-  }
-  logFilesize =3D LogF->size();
-  QString str;
-  int type;
-
-  int i =3D 0;
-
-  QCoreApplication::processEvents();
-  while (!LogF->atEnd () && !killMe) {
-    type =3D 0;
-
-    str =3D LogF->readLine();
-    if(str.contains("[ERR]", Qt::CaseInsensitive))
-      type =3D type|ERR;
-    if(str.contains("[INF]", Qt::CaseInsensitive))
-      type =3D type|INF;
-    if(str.contains("[UPD]", Qt::CaseInsensitive))
-      type =3D type|UPD;
-    if(str.contains("[SET]", Qt::CaseInsensitive))
-      type =3D type|SET;
-
-    //MMMMMMMMMMMMUUUUUUUUUUUUUUUUUUHHHHHHHAAAAAAHHHHHHAAAAAAAA
-    QTime funzi_der_erste =3D QTime::fromString(str.mid(12 ,8),"hh:mm:ss");
-    QDate funzus_der_grosse =3D QDate::fromString(str.mid(1,10),"yyyy/MM/d=
d");
-    //____________________________________________________________________=
___
-
-    this->entries->append(LogEntry(funzus_der_grosse ,
-      funzi_der_erste,
-      str.remove(QRegExp("\\[.*\\]")).trimmed().toUtf8(), type));
-
-    i++;
-  }
-  delete(LogF);
-  if (!killMe) {
-    finishedLoading =3D true;
-    emit this->logReadFinished(0);
-  }
-  else {
-    emit this->logReadFinished(2);
-  }
-}
-
-
-/**
- * \brief Retrieves the entries of the given day and emits them using foun=
dEntries()
- *
- * The method will try to determine if the thread is currently running (an=
d thus building the list)
- * by calling isBusy() and will queue the process by connecting itself to =
the finished() signal of
- * the process
- *
- * \param day The day we want to view
- *
- * \author Phillip Goriup, Peter Grasch
- */
-void LogManager::getDay(QDate day)
-{
-
-  if (this->isBusy()) {
-    dayToGet =3D day;
-    disconnect(this, SIGNAL(finished()));
-    connect(this, SIGNAL(finished()), this, SLOT(getDay()));
-    return;
-  }
-
-  if (day.isNull()) {
-    if (dayToGet.isNull()) return;
-    else day =3D dayToGet;
-  }
-
-  LogEntryList *entriesperday =3D new LogEntryList;
-
-  if (!this->entries || this->entries->count() =3D=3D 0) {
-    emit foundEntries(entriesperday,true);
-    return;                                       //if we haven't read the=
 logfile
-    //there is no point in filtering it afterwards
-  }
-
-  int i =3D 0;
-  int size =3D entries->count();
-  while((i<size) && (this->entries->at(i++).getDate() < day))
-    ;
-
-  i--;
-
-  size =3D entries->count();
-  while((i<size) && (this->entries->at(i).getDate() =3D=3D day)) {
-    entriesperday->append(this->entries->at(i));
-    i++;
-
-  }
-
-  emit foundEntries(entriesperday,true);
-
-  dayToGet =3D QDate();
-}
-
-
-/**
- * \brief Frees the memory (if the entries are not clean (i.e. hasFinished=
Reading() returns false)
- *
- * \author Phillip Goriup, Peter Grasch
- */
-void LogManager::stop()
-{
-  disconnect(this, SIGNAL(finished()), 0,0);
-
-  killMe=3Dtrue;
-
-  if (isRunning())
-    wait(5000);
-  if (isRunning())
-    terminate();                                  //make ABSOLUTELY sure
-  if (isRunning())                                //that the thread WILL s=
top
-    wait(500);
-
-  if(!hasFinishedReading())
-    this->entries->clear();
-
-  killMe=3Dfalse;
-}
-
-
-/**
- * \brief Will attempt to create a list of QDates ("Dates") and emit it us=
ing daysAvailable(Dates)
- *
- * The method will try to determine if the thread is currently running (an=
d thus building the list)
- * by calling isBusy() and will queue the process by connecting itself to =
the finished() signal of
- * the process
- *
- * \author Peter Grasch
- */
-void LogManager::getDateList()
-{
-  if (this->isBusy()) {
-    disconnect(this, SIGNAL(finished()));
-    connect(this, SIGNAL(finished()), this, SLOT(getDateList()));
-    return;
-  }
-
-  if (!entries) {
-    emit daysAvailable(Dates());
-    return;
-  }
-  Dates daysAvail;
-  QDate currentDate;
-  for (int i=3D0; i < this->entries->count(); i++) {
-    if (entries->at(i).getDate()!=3DcurrentDate) {
-      currentDate =3D entries->at(i).getDate();
-      daysAvail << currentDate;
-    }
-  }
-  emit daysAvailable(daysAvail);
-}
-
-
-/**
- * \brief Builds a list of all entries and emits them using foundEntries()
- *
- * The method will try to determine if the thread is currently running (an=
d thus building the list)
- * by calling isBusy() and will queue the process by connecting itself to =
the finished() signal of
- * the process
- *
- * \author Phillip Goriup
- */
-void LogManager::getAll()
-{
-  if (this->isBusy()) {
-    disconnect(this, SIGNAL(finished()));
-    connect(this, SIGNAL(finished()), this, SLOT(getAll()));
-    return;
-  }
-  emit foundEntries(this->entries,false);
-}
-
-
-/**
- * \brief Destructor
- *
- * \author Phillip Goriup
- */
-LogManager::~LogManager()
-{
-  this->entries->clear();
-  delete entries;
-}
diff --git a/simonlib/simonlogging/logmanager.h b/simonlib/simonlogging/log=
manager.h
deleted file mode 100644
index 4b1736b..0000000
--- a/simonlib/simonlogging/logmanager.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *   Copyright (C) 2008 Peter Grasch <peter.grasch@bedahr.org>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   or (at your option) any later version, as published by the Free
- *   Software Foundation
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details
- *
- *   You should have received a copy of the GNU General Public
- *   License along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#ifndef SIMON_LOGMANAGER_H_3CC0A73916E54CBFBCDF602ABFF87075
-#define SIMON_LOGMANAGER_H_3CC0A73916E54CBFBCDF602ABFF87075
-
-#include "logentry.h"
-#include <QThread>
-#include <QVector>
-
-class QDate;
-
-typedef QVector<QDate> Dates;
-
-/**
- * \class LogManager
- * \brief Manages the logfile
- * \author Phillip Goriup
- * \date 6.8.2007
- * \version 0.1
- */
-class LogManager : public QThread
-{
-  Q_OBJECT
-
-    private:
-    LogEntryList *entries;
-    bool killMe;
-    qint64 logFilesize;
-    bool finishedLoading;
-    QDate dayToGet;
-
-  private slots:
-    void resetKillFlag()  { killMe =3D false; }
-
-  public:
-    LogManager();
-
-    ~LogManager();
-
-    bool isBusy() { return isRunning(); }
-
-    bool hasFinishedReading();
-    void run ();
-
-  public slots:
-    void getDateList();
-    void stop();
-    void getDay(QDate day=3DQDate());
-    void getAll();
-
-    signals:
-    void done();
-    void logReadFinished(int value);
-    void foundEntries(LogEntryList* entries,bool copy);
-    void daysAvailable(Dates days);
-
-};
-#endif
diff --git a/simonlib/simonlogging/logmanagerdlg.ui b/simonlib/simonlogging=
/logmanagerdlg.ui
deleted file mode 100644
index 904ca15..0000000
--- a/simonlib/simonlogging/logmanagerdlg.ui
+++ /dev/null
@@ -1,251 +0,0 @@
-<ui version=3D"4.0" >
- <class>LogManagerDlg</class>
- <widget class=3D"QWidget" name=3D"LogManagerDlg" >
-  <property name=3D"geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>564</width>
-    <height>394</height>
-   </rect>
-  </property>
-  <property name=3D"windowTitle" >
-   <string>Log Manager</string>
-  </property>
-  <layout class=3D"QVBoxLayout" >
-   <item>
-    <widget class=3D"QTreeWidget" name=3D"twLogEntries" >
-     <column>
-      <property name=3D"text" >
-       <string>Date</string>
-      </property>
-     </column>
-     <column>
-      <property name=3D"text" >
-       <string>Message</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item>
-    <widget class=3D"QGroupBox" name=3D"gwSearchInLogs" >
-     <property name=3D"maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name=3D"title" >
-      <string comment=3D"Search for a specific log message">Search</string>
-     </property>
-     <property name=3D"flat" >
-      <bool>false</bool>
-     </property>
-     <layout class=3D"QHBoxLayout" >
-      <item>
-       <layout class=3D"QGridLayout" >
-        <item row=3D"0" column=3D"0" colspan=3D"2" >
-         <layout class=3D"QHBoxLayout" >
-          <item>
-           <widget class=3D"QLabel" name=3D"lbSearchLogsFor" >
-            <property name=3D"maximumSize" >
-             <size>
-              <width>16777215</width>
-              <height>15</height>
-             </size>
-            </property>
-            <property name=3D"text" >
-             <string comment=3D"Search pattern">Search:</string>
-            </property>
-            <property name=3D"buddy" >
-             <cstring>leSearchLogs</cstring>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class=3D"KLineEdit" name=3D"leSearchLogs" />
-          </item>
-          <item>
-           <widget class=3D"KPushButton" name=3D"pbClearSearch" >
-            <property name=3D"sizePolicy" >
-             <sizepolicy vsizetype=3D"Fixed" hsizetype=3D"Fixed" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name=3D"maximumSize" >
-             <size>
-              <width>16</width>
-              <height>16777215</height>
-             </size>
-            </property>
-            <property name=3D"text" >
-             <string>&amp;x</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class=3D"KPushButton" name=3D"pbLogSearch" >
-            <property name=3D"text" >
-             <string comment=3D"Start the log search">Search</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row=3D"1" column=3D"0" >
-         <widget class=3D"QCheckBox" name=3D"cbLogError" >
-          <property name=3D"maximumSize" >
-           <size>
-            <width>16777215</width>
-            <height>15</height>
-           </size>
-          </property>
-          <property name=3D"text" >
-           <string>Error</string>
-          </property>
-         </widget>
-        </item>
-        <item row=3D"1" column=3D"1" >
-         <widget class=3D"QCheckBox" name=3D"cbLogUpdate" >
-          <property name=3D"text" >
-           <string comment=3D"Display messages of the category 'Update'">U=
pdate</string>
-          </property>
-         </widget>
-        </item>
-        <item row=3D"2" column=3D"0" >
-         <widget class=3D"QCheckBox" name=3D"cbLogInfo" >
-          <property name=3D"maximumSize" >
-           <size>
-            <width>16777215</width>
-            <height>15</height>
-           </size>
-          </property>
-          <property name=3D"text" >
-           <string>Information</string>
-          </property>
-         </widget>
-        </item>
-        <item row=3D"2" column=3D"1" >
-         <widget class=3D"QCheckBox" name=3D"cbLogSettings" >
-          <property name=3D"text" >
-           <string>Settings</string>
-          </property>
-         </widget>
-        </item>
-        <item row=3D"3" column=3D"0" colspan=3D"2" >
-         <widget class=3D"QProgressBar" name=3D"pbLogLoad" >
-          <property name=3D"value" >
-           <number>24</number>
-          </property>
-         </widget>
-        </item>
-        <item row=3D"4" column=3D"0" >
-         <widget class=3D"QLabel" name=3D"lbLogLoad" >
-          <property name=3D"text" >
-           <string/>
-          </property>
-          <property name=3D"wordWrap" >
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row=3D"4" column=3D"1" >
-         <widget class=3D"KPushButton" name=3D"pbAbort" >
-          <property name=3D"text" >
-           <string>Cancel</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class=3D"SimonGroupBox" name=3D"gbOnlyDay" >
-        <property name=3D"title" >
-         <string>Only of day</string>
-        </property>
-        <property name=3D"flat" >
-         <bool>false</bool>
-        </property>
-        <property name=3D"checkable" >
-         <bool>true</bool>
-        </property>
-        <property name=3D"checked" >
-         <bool>false</bool>
-        </property>
-        <layout class=3D"QVBoxLayout" >
-         <item>
-          <widget class=3D"QLabel" name=3D"lbCalendar" >
-           <property name=3D"text" >
-            <string>Calendar</string>
-           </property>
-           <property name=3D"buddy" >
-            <cstring>cwLogDay</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class=3D"SimonCalendarWidget" name=3D"cwLogDay" >
-           <property name=3D"enabled" >
-            <bool>true</bool>
-           </property>
-           <property name=3D"sizePolicy" >
-            <sizepolicy vsizetype=3D"Fixed" hsizetype=3D"Fixed" >
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name=3D"minimumSize" >
-            <size>
-             <width>200</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name=3D"firstDayOfWeek" >
-            <enum>Qt::Monday</enum>
-           </property>
-           <property name=3D"gridVisible" >
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SimonGroupBox</class>
-   <extends>QGroupBox</extends>
-   <header>simongroupbox.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>SimonCalendarWidget</class>
-   <extends>QCalendarWidget</extends>
-   <header>simoncalendarwidget.h</header>
-  </customwidget>
- </customwidgets>
- <connections>
-  <connection>
-   <sender>pbClearSearch</sender>
-   <signal>clicked()</signal>
-   <receiver>leSearchLogs</receiver>
-   <slot>clear()</slot>
-   <hints>
-    <hint type=3D"sourcelabel" >
-     <x>149</x>
-     <y>48</y>
-    </hint>
-    <hint type=3D"destinationlabel" >
-     <x>90</x>
-     <y>47</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>