From 9b9d4ea191b72a4742c67bbcdb12528dbe848dfd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:22:57 -0600 Subject: [PATCH] Rename additional global TQt functions --- src/svnfrontend/graphtree/graphtreelabel.cpp | 8 ++-- src/svnfrontend/graphtree/revgraphview.cpp | 8 ++-- src/svnfrontend/propertiesdlg.cpp | 2 +- src/svnqt/cache/LogCache.cpp | 28 +++++------ src/svnqt/cache/ReposLog.cpp | 50 ++++++++++---------- src/svnqt/client.cpp | 2 +- src/svnqt/client_diff.cpp | 2 +- src/svnqt/exception.cpp | 4 +- src/svnqt/path.cpp | 2 +- src/svnqt/repositorydata.cpp | 4 +- src/svnqt/svnstream.cpp | 4 +- src/svnqt/testmain.cpp | 2 +- 12 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/svnfrontend/graphtree/graphtreelabel.cpp b/src/svnfrontend/graphtree/graphtreelabel.cpp index 56bfa04..4d29e6d 100644 --- a/src/svnfrontend/graphtree/graphtreelabel.cpp +++ b/src/svnfrontend/graphtree/graphtreelabel.cpp @@ -100,14 +100,14 @@ TQPointArray GraphEdge::areaPoints() const int maxX = minX, maxY = minY; int i; - if (0) qDebug("GraphEdge::areaPoints\n P 0: %d/%d", minX, minY); + if (0) tqDebug("GraphEdge::areaPoints\n P 0: %d/%d", minX, minY); int len = poly.count(); for (i=1;i maxX) maxX = poly[i].x(); if (poly[i].y() > maxY) maxY = poly[i].y(); - if (0) qDebug(" P %d: %d/%d", i, poly[i].x(), poly[i].y()); + if (0) tqDebug(" P %d: %d/%d", i, poly[i].x(), poly[i].y()); } TQPointArray a = poly.copy(), b = poly.copy(); if (minX == maxX) { @@ -123,9 +123,9 @@ TQPointArray GraphEdge::areaPoints() const a[2 * len - 1 -i] = b[i]; if (0) { - qDebug(" Result:"); + tqDebug(" Result:"); for (i=0;i<2*len;i++) - qDebug(" P %d: %d/%d", i, a[i].x(), a[i].y()); + tqDebug(" P %d: %d/%d", i, a[i].x(), a[i].y()); } return a; diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index 5b0064a..3099689 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -253,12 +253,12 @@ void RevGraphView::dotExit(KProcess*p) int xx = (int)(scaleX * x + _xMargin); int yy = (int)(scaleY * (dotHeight - y) + _yMargin); - if (0) qDebug(" P %d: ( %f / %f ) => ( %d / %d)", + if (0) tqDebug(" P %d: ( %f / %f ) => ( %d / %d)", i, x, y, xx, yy); pa.setPoint(i, xx, yy); } if (i < points) { - qDebug("CallGraphView: Can't read %d spline points (%d)", + tqDebug("CallGraphView: Can't read %d spline points (%d)", points, lineno); continue; } @@ -593,7 +593,7 @@ void RevGraphView::updateSizes(TQSize s) if (zoom != _cvZoom) { _cvZoom = zoom; - if (0) qDebug("Canvas Size: %dx%d, Visible: %dx%d, Zoom: %f", + if (0) tqDebug("Canvas Size: %dx%d, Visible: %dx%d, Zoom: %f", m_Canvas->width(), m_Canvas->height(), cWidth, cHeight, zoom); @@ -680,7 +680,7 @@ void RevGraphView::contentsMovingSlot(int x,int y) { TQRect z(int(x * _cvZoom), int(y * _cvZoom), int(visibleWidth() * _cvZoom)-1, int(visibleHeight() * _cvZoom)-1); - if (0) qDebug("moving: (%d,%d) => (%d/%d - %dx%d)", + if (0) tqDebug("moving: (%d,%d) => (%d/%d - %dx%d)", x, y, z.x(), z.y(), z.width(), z.height()); m_CompleteView->setZoomRect(z); if (!_noUpdateZoomerPos) { diff --git a/src/svnfrontend/propertiesdlg.cpp b/src/svnfrontend/propertiesdlg.cpp index ec1f24d..cd5281b 100644 --- a/src/svnfrontend/propertiesdlg.cpp +++ b/src/svnfrontend/propertiesdlg.cpp @@ -125,7 +125,7 @@ void PropertiesDlg::languageChange() void PropertiesDlg::slotHelp() { - qWarning( "PropertiesDlg::slotHelp(): Not implemented yet" ); + tqWarning( "PropertiesDlg::slotHelp(): Not implemented yet" ); } void PropertiesDlg::slotSelectionChanged(TQListViewItem*item) diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp index 4dcb27b..d95284e 100644 --- a/src/svnqt/cache/LogCache.cpp +++ b/src/svnqt/cache/LogCache.cpp @@ -107,7 +107,7 @@ public: db = query.value(0).toString(); } else { - qDebug("Error select_01: %s (%s)",query.lastError().text().TOUTF8().data(), + tqDebug("Error select_01: %s (%s)",query.lastError().text().TOUTF8().data(), query.lastQuery().TOUTF8().data()); } if (!db.isEmpty()) { @@ -133,11 +133,11 @@ public: c.bindValue(0,reposroot.native()); c.exec(); - //qDebug("Check for path: "+reposroot.native()); + //tqDebug("Check for path: "+reposroot.native()); // only the first one if ( c.next() ) { -/* qDebug( c.value(0).toString() + ": " + +/* tqDebug( c.value(0).toString() + ": " + c.value(0).toString() );*/ dbFile = c.value(0).toString(); } @@ -156,19 +156,19 @@ public: while (TQSqlDatabase::contains(_key)) { _key = TQString("%1-%2").arg(dbFile).arg(i++); } -// qDebug("The repository key is now: %s",_key.TOUTF8().data()); +// tqDebug("The repository key is now: %s",_key.TOUTF8().data()); TQDataBase _db = TQSqlDatabase::addDatabase(SQLTYPE,_key); if (!_db) { return 0; } TQString fulldb = m_BasePath+"/"+dbFile+".db"; _db->setDatabaseName(fulldb); -// qDebug("try database open %s",fulldb.TOUTF8().data()); +// tqDebug("try database open %s",fulldb.TOUTF8().data()); if (!checkReposDb(_db)) { - qDebug("no DB opened"); + tqDebug("no DB opened"); _db = 0; } else { - qDebug("Insert into map"); + tqDebug("Insert into map"); m_mainDB.localData()->reposCacheNames[dbFile]=_key; } return _db; @@ -182,12 +182,12 @@ public: while (TQSqlDatabase::contains(_key)) { _key.sprintf("%s-%i",SQLMAIN,i++); } - qDebug("The key is now: %s",_key.TOUTF8().data()); + tqDebug("The key is now: %s",_key.TOUTF8().data()); TQDataBase db = TQSqlDatabase::addDatabase(SQLTYPE,_key); db->setDatabaseName(m_BasePath+"/maindb.db"); if (!db->open()) { - qWarning(TQString("Failed to open main database: " + db->lastError().text()).ascii()); + tqWarning(TQString("Failed to open main database: " + db->lastError().text()).ascii()); } else { m_mainDB.setLocalData(new ThreadDBStore); m_mainDB.localData()->key = _key; @@ -269,12 +269,12 @@ void LogCache::setupMainDb() #endif TQDataBase mainDB = m_CacheData->getMainDB(); if (!mainDB || !mainDB->open()) { - qWarning(TQString("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")).ascii()); + tqWarning(TQString("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")).ascii()); } else { TQSqlQuery q(TQString(), mainDB); mainDB->transaction(); if (!q.exec("CREATE TABLE IF NOT EXISTS \""+TQString(SQLMAINTABLE)+"\" (\"reposroot\" TEXT,\"id\" INTEGER PRIMARY KEY NOT NULL);")) { - qWarning(TQString("Failed create main database: " + mainDB->lastError().text()).ascii()); + tqWarning(TQString("Failed create main database: " + mainDB->lastError().text()).ascii()); } mainDB->commit(); } @@ -301,7 +301,7 @@ svn::cache::LogCache* svn::cache::LogCache::self() */ TQDataBase svn::cache::LogCache::reposDb(const TQString&aRepository) { -// qDebug("reposDB"); +// tqDebug("reposDB"); return m_CacheData->getReposDB(aRepository); } @@ -315,13 +315,13 @@ TQStringList svn::cache::LogCache::cachedRepositories()const TQDataBase mainDB = m_CacheData->getMainDB(); TQStringList _res; if (!mainDB || !mainDB->open()) { - qWarning("Failed to open main database."); + tqWarning("Failed to open main database."); return _res; } TQSqlQuery cur(TQString(),mainDB); cur.prepare(s_q); if (!cur.exec()) { - qDebug(cur.lastError().text().TOUTF8().data()); + tqDebug(cur.lastError().text().TOUTF8().data()); throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text()); return _res; } diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp index 34aa99f..0d79a15 100644 --- a/src/svnqt/cache/ReposLog.cpp +++ b/src/svnqt/cache/ReposLog.cpp @@ -40,12 +40,12 @@ svn::Revision svn::cache::ReposLog::latestHeadRev() } } /// no catch - exception has go trough... - qDebug("Getting headrev"); + tqDebug("Getting headrev"); svn::InfoEntries e = m_Client->info(m_ReposRoot,svn::DepthEmpty,svn::Revision::HEAD,svn::Revision::HEAD); if (e.count()<1||e[0].reposRoot().isEmpty()) { return svn::Revision::UNDEFINED; } - qDebug("Getting headrev done"); + tqDebug("Getting headrev done"); return e[0].revision(); } @@ -68,15 +68,15 @@ svn::Revision svn::cache::ReposLog::latestCachedRev() TQString q("select revision from 'logentries' order by revision DESC limit 1"); TQSqlQuery _q(TQString(), m_Database); if (!_q.exec(q)) { - qDebug(_q.lastError().text().TOUTF8().data()); + tqDebug(_q.lastError().text().TOUTF8().data()); return svn::Revision::UNDEFINED; } int _r; if (_q.isActive() && _q.next()) { - //qDebug("Sel result: %s",_q.value(0).toString().TOUTF8().data()); + //tqDebug("Sel result: %s",_q.value(0).toString().TOUTF8().data()); _r = _q.value(0).toInt(); } else { - qDebug(_q.lastError().text().TOUTF8().data()); + tqDebug(_q.lastError().text().TOUTF8().data()); return svn::Revision::UNDEFINED; } return _r; @@ -94,8 +94,8 @@ bool svn::cache::ReposLog::checkFill(svn::Revision&start,svn::Revision&end,bool long long icount=0; svn::Revision _latest=latestCachedRev(); -// qDebug("Latest cached rev: %i",_latest.revnum()); -// qDebug("End revision is: %s",end.toString().TOUTF8().data()); +// tqDebug("Latest cached rev: %i",_latest.revnum()); +// tqDebug("End revision is: %s",end.toString().TOUTF8().data()); if (checkHead && _latest.revnum()>=latestHeadRev().revnum()) { return true; @@ -113,21 +113,21 @@ bool svn::cache::ReposLog::checkFill(svn::Revision&start,svn::Revision&end,bool svn::Revision _rstart=_latest.revnum()+1; svn::Revision _rend = end; if (_rend==svn::Revision::UNDEFINED) { -// qDebug("Setting end to Head"); +// tqDebug("Setting end to Head"); _rend=svn::Revision::HEAD; } // no catch - exception should go outside. if (_rstart==0){ _rstart = 1; } -// qDebug("Getting log %s -> %s",_rstart.toString().TOUTF8().data(),_rend.toString().TOUTF8().data()); +// tqDebug("Getting log %s -> %s",_rstart.toString().TOUTF8().data(),_rend.toString().TOUTF8().data()); if (_rend==svn::Revision::HEAD) { _rend=latestHeadRev(); } if (_rend==svn::Revision::HEAD||_rend.revnum()>_latest.revnum()) { LogEntriesMap _internal; -// qDebug("Retrieving from network."); +// tqDebug("Retrieving from network."); if (!m_Client->log(m_ReposRoot,_rstart,_rend,_internal,svn::Revision::UNDEFINED,true,false)) { return false; } @@ -197,7 +197,7 @@ bool svn::cache::ReposLog::simpleLog(LogEntriesMap&target,const svn::Revision&_s bcount.bindValue(0,TQ_LLONG(end.revnum())); bcount.bindValue(1,TQ_LLONG(start.revnum())); if (!bcount.exec()) { - qDebug(bcount.lastError().text().TOUTF8().data()); + tqDebug(bcount.lastError().text().TOUTF8().data()); throw svn::cache::DatabaseException(TQString("Could not retrieve count: ")+bcount.lastError().text()); return false; } @@ -211,7 +211,7 @@ bool svn::cache::ReposLog::simpleLog(LogEntriesMap&target,const svn::Revision&_s bcur.bindValue(1,TQ_LLONG(start.revnum())); if (!bcur.exec()) { - qDebug(bcur.lastError().text().TOUTF8().data()); + tqDebug(bcur.lastError().text().TOUTF8().data()); throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+bcur.lastError().text()); return false; } @@ -220,7 +220,7 @@ bool svn::cache::ReposLog::simpleLog(LogEntriesMap&target,const svn::Revision&_s revision = bcur.value(0).toLongLong(); cur.bindValue(0,revision); if (!cur.exec()) { - qDebug(cur.lastError().text().TOUTF8().data()); + tqDebug(cur.lastError().text().TOUTF8().data()); throw svn::cache::DatabaseException(TQString("Could not retrieve values: ")+cur.lastError().text() ,cur.lastError().number()); return false; @@ -264,7 +264,7 @@ svn::Revision svn::cache::ReposLog::date2numberRev(const svn::Revision&aRev,bool TQSqlQuery query("select revision,date from logentries order by revision desc limit 1",m_Database); if (query.lastError().type()!=TQSqlError::None) { - qDebug(query.lastError().text().TOUTF8().data()); + tqDebug(query.lastError().text().TOUTF8().data()); } bool must_remote=!noNetwork; if (query.next()) { @@ -283,7 +283,7 @@ svn::Revision svn::cache::ReposLog::date2numberRev(const svn::Revision&aRev,bool query.bindValue(0,TQ_LLONG(aRev.date())); query.exec(); if (query.lastError().type()!=TQSqlError::None) { - qDebug(query.lastError().text().TOUTF8().data()); + tqDebug(query.lastError().text().TOUTF8().data()); } if (query.next()) { return query.value(0).toInt(); @@ -319,8 +319,8 @@ bool svn::cache::ReposLog::_insertLogEntry(const svn::LogEntry&aEntry) _q.bindValue(3,aEntry.message); if (!_q.exec()) { m_Database->rollback(); - qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data()); - qDebug(_q.lastQuery().TOUTF8().data()); + tqDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data()); + tqDebug(_q.lastQuery().TOUTF8().data()); throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number()); } _q.prepare(qPathes); @@ -333,8 +333,8 @@ bool svn::cache::ReposLog::_insertLogEntry(const svn::LogEntry&aEntry) _q.bindValue(4,TQ_LLONG((*cpit).copyFromRevision)); if (!_q.exec()) { m_Database->rollback(); - qDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data()); - qDebug(_q.lastQuery().TOUTF8().data()); + tqDebug("Could not insert values: %s",_q.lastError().text().TOUTF8().data()); + tqDebug(_q.lastQuery().TOUTF8().data()); throw svn::cache::DatabaseException(TQString("Could not insert values: ")+_q.lastError().text(),_q.lastError().number()); } } @@ -374,8 +374,8 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start, TQSqlQuery _q2(TQString(),m_Database); _q.prepare(query_string); if (!_q.exec()) { - qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data()); - qDebug(_q.lastQuery().TOUTF8().data()); + tqDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data()); + tqDebug(_q.lastQuery().TOUTF8().data()); throw svn::cache::DatabaseException(TQString("Could not select values: ")+_q.lastError().text(),_q.lastError().number()); } while(_q.next()) { @@ -387,7 +387,7 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start, query_string=s_e.arg(revision); _q2.prepare(query_string); if (!_q2.exec()) { - qDebug("Could not select values: %s",_q2.lastError().text().TOUTF8().data()); + tqDebug("Could not select values: %s",_q2.lastError().text().TOUTF8().data()); } else { while (_q2.next()) { target[revision].changedPaths.push_back ( @@ -418,11 +418,11 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa TQSqlQuery _q(TQString(),m_Database); TQString query_string=TQString(_s1).arg(path.native()).arg(peg.revnum()); if (!_q.exec(query_string)) { - qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data()); - qDebug(_q.lastQuery().TOUTF8().data()); + tqDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data()); + tqDebug(_q.lastQuery().TOUTF8().data()); throw svn::cache::DatabaseException(TQString("Could not select values: ")+_q.lastError().text(),_q.lastError().number()); } - qDebug(_q.lastQuery().TOUTF8().data()); + tqDebug(_q.lastQuery().TOUTF8().data()); svn::Path _p = path; diff --git a/src/svnqt/client.cpp b/src/svnqt/client.cpp index 37674fd..f7560a4 100644 --- a/src/svnqt/client.cpp +++ b/src/svnqt/client.cpp @@ -61,7 +61,7 @@ namespace svn SvnInit::SvnInit() { svn_cmdline_init("svnqt",0); - qDebug("svn_cmdline_init done"); + tqDebug("svn_cmdline_init done"); TQString BasePath=TQDir::HOMEDIR(); TQDir d; if (!d.exists(BasePath)) { diff --git a/src/svnqt/client_diff.cpp b/src/svnqt/client_diff.cpp index 448e3cd..9229a45 100644 --- a/src/svnqt/client_diff.cpp +++ b/src/svnqt/client_diff.cpp @@ -79,7 +79,7 @@ namespace svn DiffData ddata(tmpPath,path,revision1,path,revision2); #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) - qDebug("pegged diff4 call"); + tqDebug("pegged diff4 call"); error = svn_client_diff_peg4( options, path.cstr(), diff --git a/src/svnqt/exception.cpp b/src/svnqt/exception.cpp index 1824572..925c5f5 100644 --- a/src/svnqt/exception.cpp +++ b/src/svnqt/exception.cpp @@ -190,9 +190,9 @@ namespace svn TQString ClientException::getBackTrace() { TQString Result; - qDebug("getBackTrace"); + tqDebug("getBackTrace"); #ifdef HAS_BACKTRACE_H - qDebug("Generating backtrace"); + tqDebug("Generating backtrace"); void *array[SVNTQT_BACKTRACE_LENGTH]; size_t size; size_t i; diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp index 4e0b14d..ae94789 100644 --- a/src/svnqt/path.cpp +++ b/src/svnqt/path.cpp @@ -249,7 +249,7 @@ namespace svn if (error != 0) { throw ClientException (error); } - qDebug("Path: %s",truepath); + tqDebug("Path: %s",truepath); _peg = svn::Revision(&pegr); _path=Path(truepath); } diff --git a/src/svnqt/repositorydata.cpp b/src/svnqt/repositorydata.cpp index 5625f70..4e6f2ba 100644 --- a/src/svnqt/repositorydata.cpp +++ b/src/svnqt/repositorydata.cpp @@ -153,7 +153,7 @@ svn_error_t * RepositoryData::CreateOpen(const TQString&path, const TQString&fst #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 4) || SVN_VER_MAJOR>1) if (_pre_1_4_compat) { - qDebug("Pre 14"); + tqDebug("Pre 14"); apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_4_COMPATIBLE, APR_HASH_KEY_STRING,"1"); } @@ -162,7 +162,7 @@ svn_error_t * RepositoryData::CreateOpen(const TQString&path, const TQString&fst #endif #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5) || SVN_VER_MAJOR>1) if (_pre_1_5_compat) { - qDebug("Pre 15"); + tqDebug("Pre 15"); apr_hash_set(fs_config, SVN_FS_CONFIG_PRE_1_5_COMPATIBLE, APR_HASH_KEY_STRING,"1"); } diff --git a/src/svnqt/svnstream.cpp b/src/svnqt/svnstream.cpp index 009dbe3..53d115e 100644 --- a/src/svnqt/svnstream.cpp +++ b/src/svnqt/svnstream.cpp @@ -37,7 +37,7 @@ class SVNTQT_NOEXPORT SvnStream_private { public: SvnStream_private(){m_Stream=0;m_LastError="";_context=0;cancel_timeout.start();} - ~SvnStream_private(){qDebug("Time elapsed: %i ",cancel_timeout.elapsed());} + ~SvnStream_private(){tqDebug("Time elapsed: %i ",cancel_timeout.elapsed());} static svn_error_t * stream_write(void*baton,const char*data,apr_size_t*len); static svn_error_t * stream_read(void*baton,char*data,apr_size_t*len); @@ -75,7 +75,7 @@ svn_error_t * SvnStream_private::stream_write(void*baton,const char*data,apr_siz svn_client_ctx_t*ctx = b->context(); if (ctx&&ctx->cancel_func&&b->cancelElapsed()>50) { - qDebug("Check cancel"); + tqDebug("Check cancel"); SVN_ERR(ctx->cancel_func(ctx->cancel_baton)); b->cancelTimeReset(); } diff --git a/src/svnqt/testmain.cpp b/src/svnqt/testmain.cpp index 8e5cce3..fd46e9b 100644 --- a/src/svnqt/testmain.cpp +++ b/src/svnqt/testmain.cpp @@ -54,7 +54,7 @@ int main(int,char**) svn::LogEntriesMap::Iterator it; for (it=m_NewHistory.begin();it!=m_NewHistory.end();++it) { - qDebug("%lu %s %s",it.key(),it.data().author.ascii(),it.data().message.ascii()); + tqDebug("%lu %s %s",it.key(),it.data().author.ascii(),it.data().message.ascii()); } } #endif