Changeset cf385cd for src

Timestamp:

06/28/11 23:31:33 (12 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

bdeb1ff

Parents:

0145b04

Message:

Removed many of the qDebug() output lines (see ticket #10).

Location:

src

Files:

• gui/conferenceeditor.cpp (modified) (1 diff)
• gui/daynavigatorwidget.cpp (modified) (3 diffs)
• gui/eventdialog.cpp (modified) (2 diffs)
• gui/mainwindow.cpp (modified) (5 diffs)
• gui/searchhead.cpp (modified) (1 diff)
• mvc/eventmodel.cpp (modified) (8 diffs)
• mvc/treeview.cpp (modified) (4 diffs)
• orm/ormrecord.h (modified) (2 diffs)
• sql/sqlengine.cpp (modified) (8 diffs)

src/gui/conferenceeditor.cpp

@@ -199 +199 @@
 void ConferenceEditor::importFinished(const QString& title)
 {
-    qDebug() << __PRETTY_FUNCTION__ << title;
     addBtn->show();
     // removeItem should be shown later, but it takes some time,

src/gui/daynavigatorwidget.cpp

@@ -43 +43 @@
     Q_ASSERT(aStartDate<=aEndDate);
 
-    //qDebug() << "DayNavigatorWidget::setDates(): " << aStartDate << ", " << aEndDate;
     mStartDate = aStartDate;
     mEndDate = aEndDate;
@@ -67 +66 @@
 void DayNavigatorWidget::prevDayButtonClicked()
 {
-    //qDebug() << mStartDate << ":" << mCurDate << ":" << mEndDate;
     if(mCurDate>mStartDate)
     {
@@ -89 +87 @@
 void DayNavigatorWidget::nextDayButtonClicked()
 {
-    //qDebug() << mStartDate << ":" << mCurDate << ":" << mEndDate;
     if(mCurDate<mEndDate)
     {

src/gui/eventdialog.cpp

@@ -87 +87 @@
     }
 
-    qDebug() << " FAVOURITE [" << event.id() << "] -> " << event.isFavourite();
-
     // have to emit 'eventHasChanged' signal on all events in conflict
     for(int i=0; i<conflicts.count(); i++)
@@ -121 +119 @@
         Alarm alarm;
         int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10));
-        qDebug() << "cookie: " << cookie;
 #endif /* MAEMO */
     }
     event.update("alarm");
-    qDebug() << " ALARM [" << event.id() << "] -> " << event.hasAlarm();
     // since the Alarm icon has changed, update TreeView accordingly
     // all TreeViews have to listen on this signal

src/gui/mainwindow.cpp

@@ -70 +70 @@
         AppSettings::setDirectConnection(true);
 
+    /*
     if(AppSettings::isDirectConnection())
     {
         qDebug() << "Setting-up proxy: " << AppSettings::proxyAddress() << ":" << AppSettings::proxyPort();
     }
+    */
     QNetworkProxy proxy(
             AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
@@ -222 +224 @@
     dialog.exec();
 
-    qDebug() << "Setting-up proxy: " << AppSettings::proxyAddress() << ":" << AppSettings::proxyPort();
     QNetworkProxy proxy(
             AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
@@ -279 +280 @@
     else
     {
-        qDebug() << __PRETTY_FUNCTION__ << ": have data";
         importData(aReply->readAll(), aReply->url().toEncoded());
     }
@@ -291 +291 @@
 void MainWindow::importFromNetwork(const QString& url)
 {
-    qDebug() << __PRETTY_FUNCTION__;
     QNetworkRequest request;
     request.setUrl(QUrl(url));
@@ -301 +300 @@
 void MainWindow::importFromFile(const QString& filename)
 {
-    qDebug() << __PRETTY_FUNCTION__;
     QFile file(filename);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {    

src/gui/searchhead.cpp

@@ -41 +41 @@
 void SearchHead::searchButtonClicked()
 {
-    // qDebug() << "SearchHead::searchButtonClicked()";
     emit( searchClicked() );
 }

src/mvc/eventmodel.cpp

@@ -201 +201 @@
 void EventModel::clearModel()
 {
-    // qDebug() << __PRETTY_FUNCTION__ << this << mEvents.count();
     mGroups.clear();
     mEvents.clear();
@@ -215 +214 @@
     if(Conference::getAll().count())
     {
-        qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
         mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
     }
@@ -227 +225 @@
     if(Conference::getAll().count())
     {
-        qDebug() << "Loading FAV Conference Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
         mEvents = Event::getFavByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId);
     }
@@ -239 +236 @@
     if(Conference::getAll().count())
     {
-        // qDebug() << "Loading search result Data: [" << Conference::getById(aConferenceId).title() << "] " << aDate;
         try{
             mEvents = Event::getSearchResultByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "start");
@@ -262 +258 @@
     if (Conference::getAll().count())
     {
-        qDebug() << "Loading Conference Data (by Track): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
         mEvents = Event::getByDate(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId, "xid_track, start");
     }
@@ -273 +268 @@
     if (Conference::getAll().count())
     {
-        qDebug() << "Loading Conference Data (by Room): [" << Conference::getById(aConferenceId).title() << "] " << aDate;
         mEvents = Event::getByDateAndRoom(QDate(aDate.year(), aDate.month(), aDate.day()), aConferenceId);
     }
@@ -285 +279 @@
     if(Conference::getAll().count())
     {
-        qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] scheduled NOW";
         mEvents = Event::nowEvents(aConferenceId, "start");
     }
@@ -297 +290 @@
     if(Conference::getAll().count())
     {
-        qDebug() << "Loading Conference Data: [" << Conference::getById(aConferenceId).title() << "] in conflict with " << aEventId;
         mEvents = Event::conflictEvents(aEventId, aConferenceId);
     }

src/mvc/treeview.cpp

@@ -77 +77 @@
                 event.update("favourite");
 
-                qDebug() << " FAVOURITE [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.isFavourite();
-
                 if(event.isFavourite())
                 {
@@ -119 +117 @@
                     //int cookie = alarm.addAlarm(event.id(),QDateTime::currentDateTime().addSecs(10)); // testing
                     int cookie = alarm.addAlarm(event.id(),event.start().addSecs(-15*60)); // 15 minutes before real start
-                    qDebug() << "cookie: " << cookie;
 #endif /* MAEMO */
                 }
                 event.update("alarm");
-                qDebug() << " ALARM [" << qVariantValue<QString>(aIndex.data()) << "] -> " << event.hasAlarm();
                 // since the Alarm icon has changed, update TreeView accordingly
                 // all TreeViews have to listen on this signal
@@ -133 +129 @@
             {
                 // handle Alarm Control clicked
-                qDebug() << "MAP CLICKED: " << qVariantValue<QString>(aIndex.data());
                 emit(requestForMap(aIndex));
                 handled = true;
@@ -141 +136 @@
         {
 
-            qDebug() << "WARNING CLICKED: " << qVariantValue<QString>(aIndex.data());
             emit(requestForConflicts(aIndex));
             handled = true;

src/orm/ormrecord.h

@@ -152 +152 @@
             throw OrmSqlException(query.lastError().text());
         }
-        else
-        {
-            /*qDebug() << "SQL OK";*/
-        }
     }
 
@@ -163 +159 @@
         objects << hydrate(query.record());
     }
-    /*qDebug() << "Fetch done";*/
     return objects;
 }

src/sql/sqlengine.cpp

@@ -133 +133 @@
 void SqlEngine::addEventToDB(QHash<QString,QString> &aEvent)
 {
-    //LOG_DEBUG(QString("Adding event '%1' to DB").arg(*aEvent));
-
     QSqlDatabase db = QSqlDatabase::database();
 
@@ -148 +146 @@
             track = Track::retrieveByName(conference, name);
             trackId = track.id();
-            /*qDebug() << QString("DEBUG: Track %1 in DB").arg(name);*/
         }
         catch (OrmNoObjectException &e) {
@@ -154 +151 @@
             track.setName(name);
             trackId = track.insert();
-            /*qDebug() << QString("DEBUG: Track %1 added to DB").arg(name);*/
         }
         QDateTime startDateTime;
         startDateTime.setTimeSpec(Qt::UTC);
         startDateTime = QDateTime(QDate::fromString(aEvent["date"],DATE_FORMAT),QTime::fromString(aEvent["start"],TIME_FORMAT),Qt::UTC);
-        // qDebug() << "startDateTime: " << startDateTime.toString();
 
         bool event_exists = false;
@@ -276 +271 @@
         query.bindValue(":room_id", aRoom["id"]);
         if (!query.exec()) qDebug() << "Could not 'execute insert into event_room' query:" << query.lastError();
-        //LOG_AUTOTEST(query);
     }
 }
@@ -294 +288 @@
         query.bindValue(":url", aLink["url"]);
         if (!query.exec()) qDebug() << "Error executing 'insert into link' query: " << query.lastError();
-        //LOG_AUTOTEST(query);
     }
 }
@@ -388 +381 @@
 bool SqlEngine::execQuery(QSqlDatabase &aDatabase, const QString &aQuery)
 {
-    //qDebug() << "\nSQL: " << aQuery;
-
     QSqlQuery sqlQuery(aDatabase);
     if( !sqlQuery.exec(aQuery) ){
@@ -395 +386 @@
        return false;
     }
-    else{
-       //qDebug() << "SQL OK.\n";
-       return true;
-    }
+    return true;
 }
 
 bool SqlEngine::execQueryWithParameter(QSqlDatabase &aDatabase, const QString &aQuery, const QHash<QString, QVariant>& params)
 {
-    qDebug() << "SQL:" << aQuery << "params:" << params;
-
     QSqlQuery sqlQuery(aDatabase);
     sqlQuery.prepare(aQuery);
@@ -414 +400 @@
        return false;
     }
-    else{
-       //qDebug() << "SQL OK.\n";
-       return true;
-    }
+    return true;
 }