From ebabab113252ed75baf5c8181937f14c55a8886b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:18:52 -0600 Subject: Rename additional global TQt functions --- lib/libchmfile/libchmfile.h | 4 ++-- lib/libchmfile/libchmfile_search.cpp | 4 ++-- lib/libchmfile/libchmfileimpl.cpp | 36 ++++++++++++++++++------------------ lib/libchmfile/libchmtocimage.cpp | 4 ++-- lib/libchmfile/libchmurlfactory.h | 2 +- src/iconstorage.cpp | 6 +++--- src/kchmconfig.cpp | 10 +++++----- src/kchmcontentswindow.cpp | 2 +- src/kchmindexwindow.cpp | 2 +- src/kchmmainwindow.cpp | 22 +++++++++++----------- src/kchmsearchengine_impl.cpp | 14 +++++++------- src/kchmsettings.cpp | 6 +++--- src/kchmsetupdialog.cpp | 2 +- src/kchmsourcefactory.cpp | 2 +- src/kchmtreeviewitem.cpp | 16 ++++++++-------- src/kchmviewwindow.cpp | 8 ++++---- src/kchmviewwindowmgr.cpp | 12 ++++++------ src/main.cpp | 2 +- 18 files changed, 77 insertions(+), 77 deletions(-) diff --git a/lib/libchmfile/libchmfile.h b/lib/libchmfile/libchmfile.h index f94de0b..f5707d2 100644 --- a/lib/libchmfile/libchmfile.h +++ b/lib/libchmfile/libchmfile.h @@ -143,7 +143,7 @@ class LCHMFile * \param topics A pointer to the container which will store the parsed results. * Will be cleaned before parsing. * \return true if the tree is present and parsed successfully, false otherwise. - * The parser is built to be error-prone, however it still can abort with qFatal() + * The parser is built to be error-prone, however it still can abort with tqFatal() * by really buggy chm file; please report a bug if the file is opened ok under Windows. * \ingroup fileparsing */ @@ -154,7 +154,7 @@ class LCHMFile * \param indexes A pointer to the container which will store the parsed results. * Will be cleaned before parsing. * \return true if the tree is present and parsed successfully, false otherwise. - * The parser is built to be error-prone, however it still can abort with qFatal() + * The parser is built to be error-prone, however it still can abort with tqFatal() * by really buggy chm file; so far it never happened on indexes. * \ingroup fileparsing */ diff --git a/lib/libchmfile/libchmfile_search.cpp b/lib/libchmfile/libchmfile_search.cpp index 3820879..13d4212 100644 --- a/lib/libchmfile/libchmfile_search.cpp +++ b/lib/libchmfile/libchmfile_search.cpp @@ -24,7 +24,7 @@ #include "libchmfile.h" #include "libchmfileimpl.h" -//#define DEBUG_SEARCH(A) qDebug A +//#define DEBUG_SEARCH(A) tqDebug A #define DEBUG_SEARCH(A) @@ -249,7 +249,7 @@ bool LCHMFile::searchQuery( const TQString& inquery, TQStringList * searchresult for ( i = 0; i < words_must_exist.size(); i++ ) qdump += TQString (" +") + words_must_exist[i]; - qDebug ("Search query dump: %s", qdump.ascii()); + tqDebug ("Search query dump: %s", qdump.ascii()); #endif // First search for phrases diff --git a/lib/libchmfile/libchmfileimpl.cpp b/lib/libchmfile/libchmfileimpl.cpp index 9ea1d21..c8e8801 100644 --- a/lib/libchmfile/libchmfileimpl.cpp +++ b/lib/libchmfile/libchmfileimpl.cpp @@ -40,7 +40,7 @@ #define TOPICS_ENTRY_LEN 16 #define URLTBL_ENTRY_LEN 12 -//#define DEBUGPARSER(A) qDebug A +//#define DEBUGPARSER(A) tqDebug A #define DEBUGPARSER(A) ; class KCHMShowWaitCursor @@ -310,7 +310,7 @@ TQString LCHMFileImpl::decodeEntity( const TQString & entity ) if ( !valid ) { - qWarning ( "LCHMFileImpl::decodeEntity: could not decode HTML entity '%s'", entity.ascii() ); + tqWarning ( "LCHMFileImpl::decodeEntity: could not decode HTML entity '%s'", entity.ascii() ); return TQString(); } @@ -322,7 +322,7 @@ TQString LCHMFileImpl::decodeEntity( const TQString & entity ) if ( it == m_entityDecodeMap.end() ) { - qWarning ("LCHMFileImpl::decodeEntity: could not decode HTML entity '%s'", entity.ascii()); + tqWarning ("LCHMFileImpl::decodeEntity: could not decode HTML entity '%s'", entity.ascii()); return TQString(); } @@ -336,12 +336,12 @@ inline int LCHMFileImpl::findStringInQuotes (const TQString& tag, int offset, TQ int qbegin = tag.find ('"', offset); if ( qbegin == -1 ) - qFatal ("LCHMFileImpl::findStringInQuotes: cannot find first quote in tag: '%s'", tag.ascii()); + tqFatal ("LCHMFileImpl::findStringInQuotes: cannot find first quote in tag: '%s'", tag.ascii()); int qend = firstquote ? tag.find ('"', qbegin + 1) : tag.findRev ('"'); if ( qend == -1 || qend <= qbegin ) - qFatal ("LCHMFileImpl::findStringInQuotes: cannot find last quote in tag: '%s'", tag.ascii()); + tqFatal ("LCHMFileImpl::findStringInQuotes: cannot find last quote in tag: '%s'", tag.ascii()); // If we do not need to decode HTML entities, just return. if ( decodeentities ) @@ -970,7 +970,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH int nextpos = src.find (src[i], i+1); if ( nextpos == -1 && (nextpos = src.find ('>', i+1)) == -1 ) { - qWarning ("LCHMFileImpl::ParseHhcAndFillTree: corrupted TOC: %s", src.mid(i).ascii()); + tqWarning ("LCHMFileImpl::ParseHhcAndFillTree: corrupted TOC: %s", src.mid(i).ascii()); return false; } @@ -989,7 +989,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH else tagword = tag.lower(); - //qDebug ("tag: '%s', tagword: '%s'\n", tag.ascii(), tagword.ascii()); + //tqDebug ("tag: '%s', tagword: '%s'\n", tag.ascii(), tagword.ascii()); // - a topic entry if ( tagword == "object" && tag.find ("text/sitemap", 0, false) != -1 ) @@ -1005,7 +1005,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH root_indent_offset = indent; if ( root_indent_offset > 1 ) - qWarning("CHM has improper index; root indent offset is %d", root_indent_offset); + tqWarning("CHM has improper index; root indent offset is %d", root_indent_offset); } int real_indent = indent - root_indent_offset; @@ -1016,9 +1016,9 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH else { if ( !entry.urls.isEmpty() ) - qDebug ("LCHMFileImpl::ParseAndFillTopicsTree: tag with url \"%s\" is parsed, but name is empty.", entry.urls[0].ascii()); + tqDebug ("LCHMFileImpl::ParseAndFillTopicsTree: tag with url \"%s\" is parsed, but name is empty.", entry.urls[0].ascii()); else - qDebug ("LCHMFileImpl::ParseAndFillTopicsTree: tag is parsed, but both name and url are empty."); + tqDebug ("LCHMFileImpl::ParseAndFillTopicsTree: tag is parsed, but both name and url are empty."); } entry.name = TQString(); @@ -1034,19 +1034,19 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH TQString pname, pvalue; if ( (offset = tag.find (name_pattern, 0, FALSE)) == -1 ) - qFatal ("LCHMFileImpl::ParseAndFillTopicsTree: bad tag '%s': no name=\n", tag.ascii()); + tqFatal ("LCHMFileImpl::ParseAndFillTopicsTree: bad tag '%s': no name=\n", tag.ascii()); // offset+5 skips 'name=' offset = findStringInQuotes (tag, offset + name_pattern.length(), pname, TRUE, FALSE); pname = pname.lower(); if ( (offset = tag.find (value_pattern, offset, FALSE)) == -1 ) - qFatal ("LCHMFileImpl::ParseAndFillTopicsTree: bad tag '%s': no value=\n", tag.ascii()); + tqFatal ("LCHMFileImpl::ParseAndFillTopicsTree: bad tag '%s': no value=\n", tag.ascii()); // offset+6 skips 'value=' findStringInQuotes (tag, offset + value_pattern.length(), pvalue, FALSE, TRUE); - //qDebug (": name '%s', value '%s'", pname.ascii(), pvalue.ascii()); + //tqDebug (": name '%s', value '%s'", pname.ascii(), pvalue.ascii()); if ( pname == "name" ) { @@ -1077,7 +1077,7 @@ bool LCHMFileImpl::parseFileAndFillArray( const TQString & file, QT34VECTOR< LCH { // Fix for buggy help files if ( ++indent >= MAX_NEST_DEPTH ) - qFatal("LCHMFileImpl::ParseAndFillTopicsTree: max nest depth (%d) is reached, error in help file", MAX_NEST_DEPTH); + tqFatal("LCHMFileImpl::ParseAndFillTopicsTree: max nest depth (%d) is reached, error in help file", MAX_NEST_DEPTH); // This intended to fix
      , which was seen in some buggy chm files, // and brokes rootentry[indent-1] check @@ -1175,7 +1175,7 @@ bool LCHMFileImpl::guessTextEncoding( ) const LCHMTextEncoding * enc = 0; if ( !m_detectedLCID || (enc = lookupByLCID (m_detectedLCID)) == 0 ) - qFatal ("Could not detect text encoding by LCID"); + tqFatal ("Could not detect text encoding by LCID"); if ( changeFileEncoding (enc->qtcodec) ) { @@ -1201,7 +1201,7 @@ bool LCHMFileImpl::changeFileEncoding( const char *qtencoding ) if ( !m_textCodec ) { - qWarning( "Could not set up Text Codec for encoding '%s'", buf ); + tqWarning( "Could not set up Text Codec for encoding '%s'", buf ); return false; } @@ -1209,7 +1209,7 @@ bool LCHMFileImpl::changeFileEncoding( const char *qtencoding ) if ( !m_textCodecForSpecialFiles ) { - qWarning( "Could not set up Text Codec for encoding '%s'", p + 1 ); + tqWarning( "Could not set up Text Codec for encoding '%s'", p + 1 ); return false; } } @@ -1219,7 +1219,7 @@ bool LCHMFileImpl::changeFileEncoding( const char *qtencoding ) if ( !m_textCodec ) { - qWarning( "Could not set up Text Codec for encoding '%s'", qtencoding ); + tqWarning( "Could not set up Text Codec for encoding '%s'", qtencoding ); return false; } } diff --git a/lib/libchmfile/libchmtocimage.cpp b/lib/libchmfile/libchmtocimage.cpp index 89fe45e..abf5ab7 100644 --- a/lib/libchmfile/libchmtocimage.cpp +++ b/lib/libchmfile/libchmtocimage.cpp @@ -2099,14 +2099,14 @@ LCHMTocImageKeeper::LCHMTocImageKeeper( ) const png_memory_image_t * image = png_image_bookarray + i; if ( !m_images[i].loadFromData ((const uchar*)image->data, image->size, "PNG") ) - qFatal ( "Could not load image %d", i ); + tqFatal ( "Could not load image %d", i ); } } const TQPixmap * LCHMTocImageKeeper::getImage( int id ) { if ( id < 0 || id > LCHMBookIcons::MAX_BUILTIN_ICONS ) - qFatal("LCHMTocImageKeeper::getImage: requested image id (%d) is out of range (%d)", id, LCHMBookIcons::MAX_BUILTIN_ICONS ); + tqFatal("LCHMTocImageKeeper::getImage: requested image id (%d) is out of range (%d)", id, LCHMBookIcons::MAX_BUILTIN_ICONS ); return &m_images[id]; } diff --git a/lib/libchmfile/libchmurlfactory.h b/lib/libchmfile/libchmurlfactory.h index 5481e8d..343ac75 100644 --- a/lib/libchmfile/libchmurlfactory.h +++ b/lib/libchmfile/libchmurlfactory.h @@ -93,7 +93,7 @@ static inline TQString makeURLabsoluteIfNeeded( const TQString & url ) newurl = "/" + newurl; } - //qDebug ("makeURLabsolute (%s) -> (%s)", url.ascii(), newurl.ascii()); + //tqDebug ("makeURLabsolute (%s) -> (%s)", url.ascii(), newurl.ascii()); return newurl; } diff --git a/src/iconstorage.cpp b/src/iconstorage.cpp index 5a1778a..7427156 100644 --- a/src/iconstorage.cpp +++ b/src/iconstorage.cpp @@ -1199,7 +1199,7 @@ const TQPixmap * KCHMIconStorage::getApplicationIcon( ) { m_iconApplication = new TQPixmap (); if ( !m_iconApplication->loadFromData ((const uchar*)png_image_cr64_app_kchmviewer, sizeof(png_image_cr64_app_kchmviewer) - 1, "PNG") ) - qFatal ("Could not load application icon"); + tqFatal ("Could not load application icon"); } return m_iconApplication; @@ -1256,7 +1256,7 @@ const TQPixmap * KCHMIconStorage::getCloseWindowIcon( ) m_iconCloseWindow = new TQPixmap (); if ( !m_iconCloseWindow->loadFromData ((const uchar*)png_image_cancel, sizeof(png_image_cancel) - 1, "PNG") ) - qFatal ("Could not load cancel icon"); + tqFatal ("Could not load cancel icon"); } return m_iconCloseWindow; @@ -1288,7 +1288,7 @@ const TQPixmap * KCHMIconStorage::returnOrLoadImage( unsigned int id, const png_ { m_iconMap[id] = new TQPixmap (); if ( !m_iconMap[id]->loadFromData ((const uchar*)image->data, image->size, "PNG") ) - qFatal ("Could not load image %d", id); + tqFatal ("Could not load image %d", id); } return m_iconMap[id]; diff --git a/src/kchmconfig.cpp b/src/kchmconfig.cpp index 5918a2c..8f33057 100644 --- a/src/kchmconfig.cpp +++ b/src/kchmconfig.cpp @@ -38,7 +38,7 @@ KCHMConfig::KCHMConfig() dir.setPath (m_datapath); if ( !dir.exists() && !dir.mkdir(m_datapath) ) - qWarning ("Could not create directory %s", m_datapath.ascii()); + tqWarning ("Could not create directory %s", m_datapath.ascii()); m_LoadLatestFileOnStartup = false; m_onNewChmClick = ACTION_ASK_USER; @@ -93,7 +93,7 @@ bool KCHMConfig::load() else if ( rxsection.cap (1) == "history" ) getting_history = true; else - qWarning ("Unknown configuration section: %s", TQString(rxsection.cap(1)).ascii()); + tqWarning ("Unknown configuration section: %s", TQString(rxsection.cap(1)).ascii()); continue; } @@ -132,7 +132,7 @@ bool KCHMConfig::load() else if ( key == "useSearchEngine" ) m_useSearchEngine = (use_search_engine) value.toInt(); else - qWarning ("Unknown key=value pair: %s", line.ascii()); + tqWarning ("Unknown key=value pair: %s", line.ascii()); } else if ( getting_history ) { @@ -140,7 +140,7 @@ bool KCHMConfig::load() addFileToHistory( line ); } else - qWarning ("Unknown line in configuration: %s", line.ascii()); + tqWarning ("Unknown line in configuration: %s", line.ascii()); } return true; @@ -151,7 +151,7 @@ bool KCHMConfig::save( ) TQFile file (m_datapath + "/config"); if ( !file.open (IO_WriteOnly) ) { - qWarning ("Could not write settings into file %s: %s", TQString(file.name()).ascii(), TQString(file.errorString()).ascii()); + tqWarning ("Could not write settings into file %s: %s", TQString(file.name()).ascii(), TQString(file.errorString()).ascii()); return false; } diff --git a/src/kchmcontentswindow.cpp b/src/kchmcontentswindow.cpp index 7415df3..b98b444 100644 --- a/src/kchmcontentswindow.cpp +++ b/src/kchmcontentswindow.cpp @@ -76,7 +76,7 @@ void KCHMContentsWindow::refillTableOfContents( ) if ( !::mainWindow->chmFile()->parseTableOfContents( &data ) || data.size() == 0 ) { - qWarning ("CHM toc present but is empty; wrong parsing?"); + tqWarning ("CHM toc present but is empty; wrong parsing?"); return; } diff --git a/src/kchmindexwindow.cpp b/src/kchmindexwindow.cpp index a4c8f60..b678187 100644 --- a/src/kchmindexwindow.cpp +++ b/src/kchmindexwindow.cpp @@ -156,7 +156,7 @@ void KCHMIndexWindow::refillIndex( ) if ( !::mainWindow->chmFile()->parseIndex( &data ) || data.size() == 0 ) { - qWarning ("CHM index present but is empty; wrong parsing?"); + tqWarning ("CHM index present but is empty; wrong parsing?"); return; } diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp index 31130dd..9c566cc 100644 --- a/src/kchmmainwindow.cpp +++ b/src/kchmmainwindow.cpp @@ -678,13 +678,13 @@ bool KCHMMainWindow::parseCmdLineArgs( ) { #if defined (ENABLE_AUTOTEST_SUPPORT) if ( filename.isEmpty() ) - qFatal ("Could not use Auto Test mode without a chm file!"); + tqFatal ("Could not use Auto Test mode without a chm file!"); m_autoteststate = STATE_INITIAL; showMinimized (); runAutoTest(); #else - qFatal ("Auto Test mode support is not compiled in."); + tqFatal ("Auto Test mode support is not compiled in."); #endif /* defined (ENABLE_AUTOTEST_SUPPORT) */ } return true; @@ -857,7 +857,7 @@ void KCHMMainWindow::setupSignals( ) void KCHMMainWindow::slotHistoryMenuItemActivated( int item ) { if ( item < 0 || item >= (signed) appConfig.m_History.size() ) - qFatal ("KCHMMainWindow::slotHistoryMenuItemActivated: bad history menu id %d", item); + tqFatal ("KCHMMainWindow::slotHistoryMenuItemActivated: bad history menu id %d", item); TQString filename = appConfig.m_History[item]; @@ -1115,7 +1115,7 @@ void KCHMMainWindow::slotExtractCHM( ) if ( !dir.exists() ) { if ( !dir.mkdir( dir.path() ) ) - qWarning( "Could not create subdir %s\n", dir.path().ascii() ); + tqWarning( "Could not create subdir %s\n", dir.path().ascii() ); } } } @@ -1124,7 +1124,7 @@ void KCHMMainWindow::slotExtractCHM( ) TQFile wf( filename ); if ( !wf.open( IO_WriteOnly ) ) { - qWarning( "Could not write file %s\n", filename.ascii() ); + tqWarning( "Could not write file %s\n", filename.ascii() ); continue; } @@ -1132,7 +1132,7 @@ void KCHMMainWindow::slotExtractCHM( ) wf.close(); } else - qWarning( "Could not get file %s\n", files[i].ascii() ); + tqWarning( "Could not get file %s\n", files[i].ascii() ); } progress.setProgress( files.size() ); @@ -1199,7 +1199,7 @@ bool KCHMMainWindow::handleUserEvent( const KCHMUserEvent * event ) if ( event->m_action == "loadAndOpen" ) { if ( event->m_args.size() != 1 && event->m_args.size() != 2 ) - qFatal("handleUserEvent: event loadAndOpen must receive 1 or 2 args"); + tqFatal("handleUserEvent: event loadAndOpen must receive 1 or 2 args"); TQString chmfile = event->m_args[0]; TQString openurl = event->m_args.size() > 1 ? event->m_args[1] : "/"; @@ -1209,14 +1209,14 @@ bool KCHMMainWindow::handleUserEvent( const KCHMUserEvent * event ) else if ( event->m_action == "openPage" ) { if ( event->m_args.size() != 1 ) - qFatal("handleUserEvent: event openPage must receive 1 arg"); + tqFatal("handleUserEvent: event openPage must receive 1 arg"); return openPage( event->m_args[0] ); } else if ( event->m_action == "findInIndex" ) { if ( event->m_args.size() != 1 ) - qFatal( "handleUserEvent: event searchQuery must receive 1 arg" ); + tqFatal( "handleUserEvent: event searchQuery must receive 1 arg" ); if ( m_tabIndexPage == -1 ) return false; @@ -1228,7 +1228,7 @@ bool KCHMMainWindow::handleUserEvent( const KCHMUserEvent * event ) else if ( event->m_action == "searchQuery" ) { if ( event->m_args.size() != 1 ) - qFatal( "handleUserEvent: event searchQuery must receive 1 arg" ); + tqFatal( "handleUserEvent: event searchQuery must receive 1 arg" ); if ( m_tabSearchPage == -1 ) return false; @@ -1238,7 +1238,7 @@ bool KCHMMainWindow::handleUserEvent( const KCHMUserEvent * event ) return true; } else - qWarning( "Unknown user event received: %s", event->m_action.ascii() ); + tqWarning( "Unknown user event received: %s", event->m_action.ascii() ); return false; } diff --git a/src/kchmsearchengine_impl.cpp b/src/kchmsearchengine_impl.cpp index b4b2c3a..0352ee3 100644 --- a/src/kchmsearchengine_impl.cpp +++ b/src/kchmsearchengine_impl.cpp @@ -163,13 +163,13 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList & if ( !::mainWindow->chmFile()->getFileContentAsString( &text, filename ) ) { - qWarning( "Index::parseDocument: Could not retrieve the content at %s", filename.ascii() ); + tqWarning( "Index::parseDocument: Could not retrieve the content at %s", filename.ascii() ); return false; } if ( text.isNull() ) { - qWarning( "Index::parseDocument: Retrieved content for %s is empty", filename.ascii() ); + tqWarning( "Index::parseDocument: Retrieved content for %s is empty", filename.ascii() ); return false; } @@ -243,7 +243,7 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList & parsedbuf += "&"; } else - qWarning( "Index::parseDocument: incorrectly terminated HTML entity '&%s%c', ignoring", parseentity.ascii(), ch.latin1() ); + tqWarning( "Index::parseDocument: incorrectly terminated HTML entity '&%s%c', ignoring", parseentity.ascii(), ch.latin1() ); j--; // parse this character again, but in different state continue; @@ -257,7 +257,7 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList & if ( entity.isNull() ) { // decodeEntity() already printed error message - //qWarning( "Index::parseDocument: failed to decode entity &%s;", parsedbuf.ascii() ); + //tqWarning( "Index::parseDocument: failed to decode entity &%s;", parsedbuf.ascii() ); continue; } @@ -346,7 +346,7 @@ void Index::writeDict() if ( !f.open( IO_WriteOnly ) ) { - qWarning( "Index::writeDict: could not write dictionary file %s", dictFile.ascii() ); + tqWarning( "Index::writeDict: could not write dictionary file %s", dictFile.ascii() ); return; } @@ -371,7 +371,7 @@ void Index::writeDocumentList() TQFile f( docListFile ); if ( !f.open( IO_WriteOnly ) ) { - qWarning( "Index::writeDocumentList: could not write dictionary file %s", docListFile.ascii() ); + tqWarning( "Index::writeDocumentList: could not write dictionary file %s", docListFile.ascii() ); return; } TQDataStream s( &f ); @@ -533,7 +533,7 @@ bool Index::searchForPhrases( const TQStringList &phrases, const TQStringList &w for ( unsigned int i = 1; i < pos.size(); i++ ) text += " " + TQString::number( pos[i] ); - qDebug( "%s", text.ascii()); + tqDebug( "%s", text.ascii()); } */ diff --git a/src/kchmsettings.cpp b/src/kchmsettings.cpp index bc9f354..5a73144 100644 --- a/src/kchmsettings.cpp +++ b/src/kchmsettings.cpp @@ -145,14 +145,14 @@ bool KCHMSettings::loadSettings( const TQString & filename ) if ( data != SETTINGS_MAGIC ) { - qWarning ("file %s has bad magic value, ignoring it.", file.name().ascii()); + tqWarning ("file %s has bad magic value, ignoring it.", file.name().ascii()); return false; } stream >> data; // version if ( data > SETTINGS_VERSION ) { - qWarning ("file %s has unsupported data version %d, ignoring it.", file.name().ascii(), data); + tqWarning ("file %s has unsupported data version %d, ignoring it.", file.name().ascii(), data); return false; } @@ -227,7 +227,7 @@ bool KCHMSettings::saveSettings( ) TQFile file( m_settingsFile ); if ( !file.open (IO_WriteOnly) ) { - qWarning ("Could not write settings into file %s: %s", TQString(file.name()).ascii(), TQString(file.errorString()).ascii()); + tqWarning ("Could not write settings into file %s: %s", TQString(file.name()).ascii(), TQString(file.errorString()).ascii()); return false; } diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp index a1d6b9b..e4809e9 100644 --- a/src/kchmsetupdialog.cpp +++ b/src/kchmsetupdialog.cpp @@ -389,7 +389,7 @@ void KCHMSetupDialog::languageChange() void KCHMSetupDialog::m_radioUseKHTMLPart_toggled(bool) { - qWarning( "KCHMSetupDialog::m_radioUseKHTMLPart_toggled(bool): Not implemented yet" ); + tqWarning( "KCHMSetupDialog::m_radioUseKHTMLPart_toggled(bool): Not implemented yet" ); } #include "kchmsetupdialog.moc" diff --git a/src/kchmsourcefactory.cpp b/src/kchmsourcefactory.cpp index 4b6e0a0..92d6db1 100644 --- a/src/kchmsourcefactory.cpp +++ b/src/kchmsourcefactory.cpp @@ -81,7 +81,7 @@ const TQMimeSource * KCHMSourceFactory::data( const TQString & abs_name ) const else { ((TQMimeSourceFactory*)this)->setImage( path, img ); - qWarning( "Could not resolve file %s\n", path.ascii() ); + tqWarning( "Could not resolve file %s\n", path.ascii() ); } } diff --git a/src/kchmtreeviewitem.cpp b/src/kchmtreeviewitem.cpp index 210be77..c7ae8dc 100644 --- a/src/kchmtreeviewitem.cpp +++ b/src/kchmtreeviewitem.cpp @@ -74,7 +74,7 @@ TQString KCHMIndTocItem::getUrl( ) const if ( !title ) { - qWarning ("Could not get item name for url '%s'", urls[i].ascii()); + tqWarning ("Could not get item name for url '%s'", urls[i].ascii()); titles.push_back(TQString()); } else @@ -170,7 +170,7 @@ void kchmFillListViewWithParsedData( TQListView * list, const TQValueVector< LCH // New non-root entry. It is possible (for some buggy CHMs) that there is no previous entry: previoous entry had indent 1, // and next entry has indent 3. Backtracking it up, creating missing entries. if ( rootentry[indent-1] == 0 ) - qFatal("Child entry indented as %d with no root entry!", indent); + tqFatal("Child entry indented as %d with no root entry!", indent); item = new KCHMIndTocItem( rootentry[indent-1], lastchild[indent], data[i].name, url, data[i].imageid ); } @@ -198,7 +198,7 @@ void kchmFillListViewWithParsedData( TQListView * list, const TQValueVector< LCH root_indent_offset = indent; if ( root_indent_offset > 1 ) - qWarning("CHM has improper index; root indent offset is %d", root_indent_offset); + tqWarning("CHM has improper index; root indent offset is %d", root_indent_offset); } int real_indent = indent - root_indent_offset; @@ -214,7 +214,7 @@ void kchmFillListViewWithParsedData( TQListView * list, const TQValueVector< LCH { // New non-root entry if ( !rootentry[real_indent-1] ) - qFatal("CHMFile::ParseAndFillTopicsTree: child entry \"%s\" indented as %d with no root entry!", name.ascii(), real_indent); + tqFatal("CHMFile::ParseAndFillTopicsTree: child entry \"%s\" indented as %d with no root entry!", name.ascii(), real_indent); item = new KCHMMainTreeViewItem (rootentry[real_indent-1], lastchild[real_indent], name, url, imagenum); DEBUGPARSER((": '%s', indent %d, rootentry %08X, item %08X\n", name.ascii(), real_indent, rootentry[real_indent-1], item)); @@ -236,9 +236,9 @@ void kchmFillListViewWithParsedData( TQListView * list, const TQValueVector< LCH else { if ( !urls.isEmpty() ) - qDebug ("CHMFile::ParseAndFillTopicsTree: tag with url \"%s\" is parsed, but name is empty.", urls[0].ascii()); + tqDebug ("CHMFile::ParseAndFillTopicsTree: tag with url \"%s\" is parsed, but name is empty.", urls[0].ascii()); else - qDebug ("CHMFile::ParseAndFillTopicsTree: tag is parsed, but both name and url are empty."); + tqDebug ("CHMFile::ParseAndFillTopicsTree: tag is parsed, but both name and url are empty."); } name = TQString(); @@ -251,7 +251,7 @@ void kchmFillListViewWithParsedData( TQListView * list, const TQValueVector< LCH { // Fix for buggy help files if ( ++indent >= MAX_NEST_DEPTH ) - qFatal("CHMFile::ParseAndFillTopicsTree: max nest depth (%d) is reached, error in help file", MAX_NEST_DEPTH); + tqFatal("CHMFile::ParseAndFillTopicsTree: max nest depth (%d) is reached, error in help file", MAX_NEST_DEPTH); lastchild[indent] = 0; rootentry[indent] = 0; @@ -264,7 +264,7 @@ void kchmFillListViewWithParsedData( TQListView * list, const TQValueVector< LCH && rootentry[real_indent - 2] != 0 ) { rootentry[real_indent - 1] = rootentry[real_indent - 2]; - qWarning("Broken CHM index/content: tree autocorrection enabled."); + tqWarning("Broken CHM index/content: tree autocorrection enabled."); } DEBUGPARSER(("
        : new indent is %d, last rootentry was %08X\n", indent - root_indent_offset, rootentry[indent-1])); diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp index c0c1a4c..394df67 100644 --- a/src/kchmviewwindow.cpp +++ b/src/kchmviewwindow.cpp @@ -90,7 +90,7 @@ TQString KCHMViewWindow::makeURLabsolute ( const TQString & url, bool set_as_bas } } -//qDebug ("KCHMViewWindow::makeURLabsolute (%s) -> (%s)", url.ascii(), newurl.ascii()); +//tqDebug ("KCHMViewWindow::makeURLabsolute (%s) -> (%s)", url.ascii(), newurl.ascii()); return newurl; } @@ -107,7 +107,7 @@ bool KCHMViewWindow::openUrl ( const TQString& origurl ) { // If a new chm file is opened here, and we do not use KCHMLPart, we better abort if ( chmfile != ::mainWindow->getOpenedFileName() && appConfig.m_kdeUseTQTextBrowser ) - qFatal("KCHMViewWindow::openUrl(): opened new chm file %s while current is %s", + tqFatal("KCHMViewWindow::openUrl(): opened new chm file %s while current is %s", chmfile.ascii(), ::mainWindow->getOpenedFileName().ascii() ); // It is OK to have a new file in chm for KHTMLPart @@ -267,9 +267,9 @@ void KCHMViewWindow::updateNavigationToolbar( ) { // Dump navigation for debugging #if 0 - qDebug("\nNavigation dump (%d entries, current pos %d)", m_history.size(), m_historyCurrentPos ); + tqDebug("\nNavigation dump (%d entries, current pos %d)", m_history.size(), m_historyCurrentPos ); for ( unsigned int i = 0; i < m_history.size(); i++ ) - qDebug("[%02d]: %s [%d]", i, m_history[i].getUrl().ascii(), m_history[i].getScrollPosition()); + tqDebug("[%02d]: %s [%d]", i, m_history[i].getUrl().ascii(), m_history[i].getScrollPosition()); #endif if ( mainWindow ) diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp index 8b3dad9..a59aa5a 100644 --- a/src/kchmviewwindowmgr.cpp +++ b/src/kchmviewwindowmgr.cpp @@ -84,7 +84,7 @@ KCHMViewWindow * KCHMViewWindowMgr::current() WindowsIterator it; if ( !w || (it = m_Windows.find( w )) == m_Windows.end() ) - qFatal( "KCHMViewWindowMgr::current called without any windows!" ); + tqFatal( "KCHMViewWindowMgr::current called without any windows!" ); return it.data().window; } @@ -131,7 +131,7 @@ void KCHMViewWindowMgr::setTabName( KCHMViewWindow * window ) WindowsIterator it = m_Windows.find( window->getTQWidget() ); if ( it == m_Windows.end() ) - qFatal( "KCHMViewWindowMgr::setTabName called with unknown window!" ); + tqFatal( "KCHMViewWindowMgr::setTabName called with unknown window!" ); TQString title = window->getTitle(); @@ -178,7 +178,7 @@ void KCHMViewWindowMgr::closeCurrentWindow( ) WindowsIterator it; if ( !w || (it = m_Windows.find( w )) == m_Windows.end() ) - qFatal( "KCHMViewWindowMgr::closeCurrentWindow called without any windows!" ); + tqFatal( "KCHMViewWindowMgr::closeCurrentWindow called without any windows!" ); closeWindow( it.data() ); } @@ -188,7 +188,7 @@ void KCHMViewWindowMgr::closeWindow( const tab_window_t & tab ) WindowsIterator it = m_Windows.find( tab.widget ); if ( it == m_Windows.end() ) - qFatal( "KCHMViewWindowMgr::closeWindow called with unknown widget!" ); + tqFatal( "KCHMViewWindowMgr::closeWindow called with unknown widget!" ); if ( tab.menuitem != 0 ) { @@ -256,7 +256,7 @@ void KCHMViewWindowMgr::saveSettings( KCHMSettings::viewindow_saved_settings_t & WindowsIterator it = m_Windows.find( p ); if ( it == m_Windows.end() ) - qFatal( "KCHMViewWindowMgr::saveSettings: could not find widget!" ); + tqFatal( "KCHMViewWindowMgr::saveSettings: could not find widget!" ); settings.push_back( KCHMSettings::SavedViewWindow( @@ -277,7 +277,7 @@ void KCHMViewWindowMgr::onTabChanged( TQWidget * newtab ) WindowsIterator it = m_Windows.find( newtab ); if ( it == m_Windows.end() ) - qFatal( "KCHMViewWindowMgr::onTabChanged called with unknown widget!" ); + tqFatal( "KCHMViewWindowMgr::onTabChanged called with unknown widget!" ); it.data().window->updateNavigationToolbar(); mainWindow->slotBrowserChanged( it.data().window ); diff --git a/src/main.cpp b/src/main.cpp index 1d1da63..662f050 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -77,7 +77,7 @@ int main( int argc, char ** argv ) DCOPClient *client = kapp->dcopClient(); if ( !client->attach() ) - qWarning("DCOP attach failed"); + tqWarning("DCOP attach failed"); //TQCString realAppId = client->registerAs( kapp->name() ); TQCString realAppId = client->registerAs( "kchmviewer" ); -- cgit v1.2.3