diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index d27e7b6fb..7dc8b6f26 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -73,7 +73,7 @@ void KrashConfig :: readConfig() if (programname.isEmpty()) programname.setStr(I18N_NOOP("unknown")); // leak some memory... Well. It's only done once anyway :-) - const char * progname = qstrdup(programname); + const char * progname = tqstrdup(programname); m_aboutData = new KAboutData(args->getOption("appname"), progname, args->getOption("appversion"), diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index 1d0241914..d9fa4cb08 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -344,7 +344,7 @@ void KEnergy::applySettings(bool enable, int standby, int suspend, int off) } else DPMSDisable(dpy); } else - qWarning("Server has no DPMS extension"); + tqWarning("Server has no DPMS extension"); XFlush(dpy); XSetErrorHandler(defaultHandler); diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 3de43f6a9..4e35f46a5 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -365,7 +365,7 @@ void KKeyModule::readScheme( int index ) TQDir d( kksPath ); if ( !d.exists() ) if ( !d.mkdir( kksPath ) ) { - qWarning("KKeyModule: Could not make directory to store user info."); + tqWarning("KKeyModule: Could not make directory to store user info."); return; } @@ -375,7 +375,7 @@ void KKeyModule::readScheme( int index ) d.setPath( kksPath ); if ( !d.exists() ) if ( !d.mkdir( kksPath ) ) { - qWarning("KKeyModule: Could not make directory to store user info."); + tqWarning("KKeyModule: Could not make directory to store user info."); return; } diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 6bb9a08c2..ff71990c6 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -410,7 +410,7 @@ void ShortcutsModule::slotSaveSchemeAs() TQDir dir( kksPath ); if( !dir.exists() && !dir.mkdir( kksPath ) ) { - qWarning("KShortcutsModule: Could not make directory to store user info."); + tqWarning("KShortcutsModule: Could not make directory to store user info."); return; } diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index 92e8a98e6..f240791c2 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -324,7 +324,7 @@ void KManualProxyDlg::copyDown() void KManualProxyDlg::slotOk() { - //qDebug("m_bHasValidData: %s" , m_bHasValidData ? "true" : "false"); + //tqDebug("m_bHasValidData: %s" , m_bHasValidData ? "true" : "false"); if ( m_bHasValidData || validate() ) { KDialogBase::slotOk(); diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index dbbc2b9d0..b31b1ae6b 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -173,7 +173,7 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) // users. So we need to know whether a path being added is from KApp, and in this case // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. - TQString qversion = qVersion(); + TQString qversion = tqVersion(); if ( qversion.contains( '.' ) > 1 ) qversion.truncate( qversion.findRev( '.' ) ); if ( qversion.contains( '-' ) ) diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index cf571a8e4..2690f0341 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -1172,7 +1172,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int KIO::copy( i.uSource, i.uDest, false ); } // m_pIconView->addFuturePosition(filename, x, y); - // qDebug("addIcon %s %s %d %d", _url.latin1(), _dest.latin1(), x, y); + // tqDebug("addIcon %s %s %d %d", _url.latin1(), _dest.latin1(), x, y); // system(TQString("cp \"%1\" \"%2/%3\"").arg(KURL(_url).path()).arg(KURL(_dest).path()).arg(filename).latin1()); // m_pIconView->update( _dest ); } @@ -1180,7 +1180,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int void KDesktop::removeIcon(const TQString &_url) { if (_url.at(0) != '/') { - qDebug("removeIcon with relative path not supported for now"); + tqDebug("removeIcon with relative path not supported for now"); return; } unlink(KURL(_url).path().latin1()); diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index f02ebba5a..a46e100f5 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -235,7 +235,7 @@ static int directCommand(KCmdLineArgs *args) dontagain = values[ 1 ]; } else - qDebug( "Incorrect --dontagain!" ); + tqDebug( "Incorrect --dontagain!" ); } int ret; diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 1a25aa10b..3d78f18ec 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -3514,14 +3514,14 @@ bool KMenu::ensureServiceRunning(const TQString & service) if ( !kapp->dcopClient()->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, replyData) ) { - qWarning( "call to klauncher failed."); + tqWarning( "call to klauncher failed."); return false; } TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { - qWarning( "unexpected result '%s' from klauncher.", replyType.data()); + tqWarning( "unexpected result '%s' from klauncher.", replyType.data()); return false; } int result; @@ -3530,7 +3530,7 @@ bool KMenu::ensureServiceRunning(const TQString & service) reply >> result >> dcopName >> error; if (result != 0) { - qWarning("Error starting: %s", error.local8Bit().data()); + tqWarning("Error starting: %s", error.local8Bit().data()); return false; } return true; diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index 61f3ef45f..4f796c6f9 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -1124,7 +1124,7 @@ int compare_man_index(const void *s1, const void *s2) // this is a bit tricky if ( m1->manpage_len > m2->manpage_len) { - i = qstrnicmp( m1->manpage_begin, + i = tqstrnicmp( m1->manpage_begin, m2->manpage_begin, m2->manpage_len); if (!i) @@ -1134,7 +1134,7 @@ int compare_man_index(const void *s1, const void *s2) if ( m1->manpage_len < m2->manpage_len) { - i = qstrnicmp( m1->manpage_begin, + i = tqstrnicmp( m1->manpage_begin, m2->manpage_begin, m1->manpage_len); if (!i) @@ -1142,7 +1142,7 @@ int compare_man_index(const void *s1, const void *s2) return i; } - return qstrnicmp( m1->manpage_begin, + return tqstrnicmp( m1->manpage_begin, m2->manpage_begin, m1->manpage_len); } @@ -1167,7 +1167,7 @@ private: // with the shorter length if (m1->manpage_len > m2->manpage_len) { - i = qstrnicmp(m1->manpage_begin, + i = tqstrnicmp(m1->manpage_begin, m2->manpage_begin, m2->manpage_len); if (!i) @@ -1178,7 +1178,7 @@ private: if (m1->manpage_len > m2->manpage_len) { - i = qstrnicmp(m1->manpage_begin, + i = tqstrnicmp(m1->manpage_begin, m2->manpage_begin, m1->manpage_len); if (!i) @@ -1186,7 +1186,7 @@ private: return i; } - return qstrnicmp(m1->manpage_begin, + return tqstrnicmp(m1->manpage_begin, m2->manpage_begin, m1->manpage_len); } diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp index 2a8a1a19c..ec46b2d3d 100644 --- a/kioslave/man/man2html.cpp +++ b/kioslave/man/man2html.cpp @@ -203,7 +203,7 @@ static char *stralloc(int len) static char *strlimitcpy(char *to, char *from, int n, int limit) { /* Assumes space for limit plus a null */ const int len = n > limit ? limit : n; - qstrncpy(to, from, len + 1); + tqstrncpy(to, from, len + 1); to[len] = '\0'; return to; } @@ -956,7 +956,7 @@ static void out_html(const char *c) if (!c) return; // Added, probably due to the const? - char *c2 = qstrdup(c); + char *c2 = tqstrdup(c); char *c3 = c2; static int obp=0; @@ -1848,7 +1848,7 @@ public: } void setContents(const char *_contents) { delete [] contents; - contents = qstrdup(_contents); + contents = tqstrdup(_contents); } const char *getContents() const { return contents; } @@ -2788,7 +2788,7 @@ static void request_while( char*& c, int j, bool mdoc ) while ( result ) { // Unlike for a normal macro, we have the condition at start, so we do not need to prepend extra bytes - char* liveloop = qstrdup( macro.data() ); + char* liveloop = tqstrdup( macro.data() ); kdDebug(7107) << "Scanning .while condition" << endl; kdDebug(7101) << "Loop macro " << liveloop << endl; char* end_expression = scan_expression( liveloop, &result ); @@ -3165,7 +3165,7 @@ static char *scan_request(char *c) scan_troff_mandoc(wordlist[i],1,&h); else scan_troff(wordlist[i],1,&h); - wordlist[i] = qstrdup(h); + wordlist[i] = tqstrdup(h); delete [] h; } for ( i=words; i oldArgumentList( s_argumentList ); s_argumentList.clear(); for ( i = 0 ; i < max_wordlist; i++ ) diff --git a/kioslave/sftp/process.cpp b/kioslave/sftp/process.cpp index 5fcf734c9..885fe7636 100644 --- a/kioslave/sftp/process.cpp +++ b/kioslave/sftp/process.cpp @@ -396,7 +396,7 @@ int MyPtyProcess::waitForChild() TQCString line = readLine(false); while (!line.isNull()) { - if (!m_Exit.isEmpty() && !qstrnicmp(line, m_Exit, m_Exit.length())) + if (!m_Exit.isEmpty() && !tqstrnicmp(line, m_Exit, m_Exit.length())) kill(m_Pid, SIGTERM); if (m_bTerminal) { diff --git a/kioslave/smtp/interactivesmtpserver.cc b/kioslave/smtp/interactivesmtpserver.cc index 50cd6f036..54c0b58be 100644 --- a/kioslave/smtp/interactivesmtpserver.cc +++ b/kioslave/smtp/interactivesmtpserver.cc @@ -82,8 +82,8 @@ int main( int argc, char * argv[] ) { InteractiveSMTPServer server; - qDebug( "Server should now listen on localhost:2525" ); - qDebug( "Hit CTRL-C to quit." ); + tqDebug( "Server should now listen on localhost:2525" ); + tqDebug( "Hit CTRL-C to quit." ); return app.exec(); }; diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc index e493f5132..b9eb94d62 100644 --- a/kioslave/smtp/smtp.cc +++ b/kioslave/smtp/smtp.cc @@ -109,7 +109,7 @@ int kdemain(int argc, char **argv) exit(-1); } #endif - SMTPProtocol slave( argv[2], argv[3], qstricmp( argv[1], "smtps" ) == 0 ); + SMTPProtocol slave( argv[2], argv[3], tqstricmp( argv[1], "smtps" ) == 0 ); slave.dispatchLoop(); #ifdef HAVE_LIBSASL2 sasl_done(); diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index d9821e45a..3c75502af 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -853,7 +853,7 @@ void KlipperWidget::checkClipData( bool selectionMode ) int i = 0; while ( (format = clip->data()->format( i++ )) ) { - qDebug( " format: %s", format); + tqDebug( " format: %s", format); } #endif TQMimeSource* data = clip->data( selectionMode ? TQClipboard::Selection : TQClipboard::Clipboard ); @@ -1075,8 +1075,8 @@ static Bool update_x_time_predicate( Display*, XEvent* event, XPointer ) void KlipperWidget::updateTimestamp() { // Qt3.3.0 and 3.3.1 use qt_x_user_time for clipboard operations - Time time = ( strcmp( qVersion(), "3.3.1" ) == 0 - || strcmp( qVersion(), "3.3.0" ) == 0 ) + Time time = ( strcmp( tqVersion(), "3.3.1" ) == 0 + || strcmp( tqVersion(), "3.3.0" ) == 0 ) ? GET_QT_X_USER_TIME() : GET_QT_X_TIME(); static TQWidget* w = 0; if ( !w ) diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index c814508c1..dfe5d80e5 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -227,7 +227,7 @@ void URLGrabber::slotItemSelected( int id ) ClipCommand *command = myCommandMapper.find( id ); TQStringList *backrefs = myGroupingMapper.find( id ); if ( !command || !backrefs ) - qWarning("Klipper: can't find associated action"); + tqWarning("Klipper: can't find associated action"); else execute( command, backrefs ); } @@ -259,7 +259,7 @@ void URLGrabber::execute( const struct ClipCommand *command, proc << cmdLine.stripWhiteSpace(); if ( !proc.start(KProcess::DontCare, KProcess::NoCommunication )) - qWarning("Klipper: Couldn't start process!"); + tqWarning("Klipper: Couldn't start process!"); } } diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp index d1582c23b..162464a94 100644 --- a/kmenuedit/menufile.cpp +++ b/kmenuedit/menufile.cpp @@ -513,7 +513,7 @@ void MenuFile::popAction(ActionAtom *atom) { if (m_actionList.getLast() != atom) { - qWarning("MenuFile::popAction Error, action not last in list."); + tqWarning("MenuFile::popAction Error, action not last in list."); return; } m_actionList.removeLast(); diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 61607f0ce..e0196ee06 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -2047,7 +2047,7 @@ void KonqMainWindow::slotUndoAvailable( bool avail ) if ( avail && m_currentView && m_currentView->part() ) { - // Avoid qWarning from TQObject::property if it doesn't exist + // Avoid tqWarning from TQObject::property if it doesn't exist if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 ) { TQVariant prop = m_currentView->part()->property( "supportsUndo" ); diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index b57ae53bc..8fce3f146 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -1804,7 +1804,7 @@ void KonqViewManager::printSizeInfo( KonqFrameBase* frame, { TQRect r; r = frame->widget()->geometry(); - qDebug("Child size %s : x: %d, y: %d, w: %d, h: %d", msg, r.x(),r.y(),r.width(),r.height() ); + tqDebug("Child size %s : x: %d, y: %d, w: %d, h: %d", msg, r.x(),r.y(),r.width(),r.height() ); if ( parent->frameType() == "Container" ) { diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8a5395b65..056671cab 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -534,7 +534,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) { TQFile f(m_path+m_currentButton->file); if (!f.remove()) - qDebug("Error, file not deleted"); + tqDebug("Error, file not deleted"); TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); } break; diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp index 86e916e57..409f4ca43 100644 --- a/konsole/konsole/TEPty.cpp +++ b/konsole/konsole/TEPty.cpp @@ -115,12 +115,12 @@ void TEPty::setErase(char erase) if(tcgetattr(fd, &tios)) { - qWarning("Uh oh.. can't get terminal attributes.."); + tqWarning("Uh oh.. can't get terminal attributes.."); return; } tios.c_cc[VERASE] = erase; if(tcsetattr(fd, TCSANOW, &tios)) - qWarning("Uh oh.. can't set terminal attributes.."); + tqWarning("Uh oh.. can't set terminal attributes.."); } /*! @@ -217,7 +217,7 @@ void TEPty::doSendJobs() { SendJob& job = pendingSendJobs.first(); if (!writeStdin(job.buffer.data(), job.length)) { - qWarning("Uh oh.. can't write data.."); + tqWarning("Uh oh.. can't write data.."); return; } m_bufferFull = true; diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp index d0c17e084..8b6da6d70 100644 --- a/konsole/konsole/fontembedder.cpp +++ b/konsole/konsole/fontembedder.cpp @@ -61,13 +61,13 @@ int main(int argc, char **argv) { if (argc < 1) { - qWarning("usage: fontembedder font.src > font.h"); + tqWarning("usage: fontembedder font.src > font.h"); exit(1); } TQFile inFile(argv[1]); if (!inFile.open(IO_ReadOnly)) { - qFatal("Can not open %s", argv[1]); + tqFatal("Can not open %s", argv[1]); } TQTextStream input(&inFile); @@ -88,7 +88,7 @@ int main(int argc, char **argv) //Must be a glyph ID. int glyph = line.toInt(0, 16); if ((glyph < 0x2500) || (glyph > 0x257f)) - qFatal("Invalid glyph number"); + tqFatal("Invalid glyph number"); glyph = glyph - 0x2500; diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index 53990af2f..2559ac288 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -657,18 +657,18 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T void TESession::zmodemSendBlock(KProcess *, char *data, int len) { sh->send_bytes(data, len); -// qWarning("<-- %d bytes", len); +// tqWarning("<-- %d bytes", len); if (sh->buffer_full()) { zmodemProc->suspend(); -// qWarning("ZModem suspend"); +// tqWarning("ZModem suspend"); } } void TESession::zmodemContinue() { zmodemProc->resume(); -// qWarning("ZModem resume"); +// tqWarning("ZModem resume"); } void TESession::zmodemStatus(KProcess *, char *data, int len) @@ -703,7 +703,7 @@ void TESession::zmodemRcvBlock(const char *data, int len) TQByteArray ba; ba.duplicate(data, len); zmodemProc->writeStdin(ba); -// qWarning("--> %d bytes", len); +// tqWarning("--> %d bytes", len); } void TESession::zmodemDone() diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp index 2f6708963..1dbe2e245 100644 --- a/ksmserver/client.cpp +++ b/ksmserver/client.cpp @@ -92,7 +92,7 @@ static char * safeSmsGenerateClientID( SmsConn /*c*/ ) if (!ret) { static TQString *my_addr = 0; if (!my_addr) { -// qWarning("Can't get own host name. Your system is severely misconfigured\n"); +// tqWarning("Can't get own host name. Your system is severely misconfigured\n"); smy_addr.setObject(my_addr,new TQString); /* Faking our IP address, the 0 below is "unknown" address format diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index c971c2dde..b425cedc7 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -199,7 +199,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) kapp->dcopClient()->registerAs("ksmserver", false); if (!kapp->dcopClient()->isRegistered()) { - qWarning("Could not register with DCOPServer. Aborting."); + tqWarning("Could not register with DCOPServer. Aborting."); return 1; } @@ -215,7 +215,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) * does nothing on this platform, as here the default is reversed) */ if (!only_local) { - qWarning("--[no]local is not supported on your platform. Sorry."); + tqWarning("--[no]local is not supported on your platform. Sorry."); } only_local = false; #endif diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index f47f10ab2..cacaabdfa 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -435,7 +435,7 @@ Status SetAuthentication (int count, IceListenObj *listenObjs, TQString iceAuth = KGlobal::dirs()->findExe("iceauth"); if (iceAuth.isEmpty()) { - qWarning("KSMServer: could not find iceauth"); + tqWarning("KSMServer: could not find iceauth"); return 0; } @@ -465,7 +465,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries) TQString iceAuth = KGlobal::dirs()->findExe("iceauth"); if (iceAuth.isEmpty()) { - qWarning("KSMServer: could not find iceauth"); + tqWarning("KSMServer: could not find iceauth"); return; } @@ -479,7 +479,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries) static int Xio_ErrorHandler( Display * ) { - qWarning("ksmserver: Fatal IO error: client killed"); + tqWarning("ksmserver: Fatal IO error: client killed"); // Don't do anything that might require the X connection if (the_server) @@ -617,14 +617,14 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag (SmPointer) this, HostBasedAuthProc, 256, errormsg ) ) { - qWarning("KSMServer: could not register XSM protocol"); + tqWarning("KSMServer: could not register XSM protocol"); } if (!IceListenForConnections (&numTransports, &listenObjs, 256, errormsg)) { - qWarning("KSMServer: Error listening for connections: %s", errormsg); - qWarning("KSMServer: Aborting."); + tqWarning("KSMServer: Error listening for connections: %s", errormsg); + tqWarning("KSMServer: Aborting."); exit(1); } @@ -643,8 +643,8 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag f = ::fopen(fName.data(), "w+"); if (!f) { - qWarning("KSMServer: can't open %s: %s", fName.data(), strerror(errno)); - qWarning("KSMServer: Aborting."); + tqWarning("KSMServer: can't open %s: %s", fName.data(), strerror(errno)); + tqWarning("KSMServer: Aborting."); exit(1); } char* session_manager = IceComposeNetworkIdList(numTransports, listenObjs); @@ -657,10 +657,10 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag if (only_local) { if (!SetAuthentication_local(numTransports, listenObjs)) - qFatal("KSMSERVER: authentication setup failed."); + tqFatal("KSMSERVER: authentication setup failed."); } else { if (!SetAuthentication(numTransports, listenObjs, &authDataEntries)) - qFatal("KSMSERVER: authentication setup failed."); + tqFatal("KSMSERVER: authentication setup failed."); } IceAddConnectionWatch (KSMWatchProc, (IcePointer) this); diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp index fae42829f..aa39845dd 100644 --- a/kxkb/x11helper.cpp +++ b/kxkb/x11helper.cpp @@ -120,7 +120,7 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly) for (int i = 0; i < xkbRules->layouts.num_desc; ++i) { TQString layoutName(xkbRules->layouts.desc[i].name); - rulesInfo->layouts.replace( layoutName, qstrdup( xkbRules->layouts.desc[i].desc ) ); + rulesInfo->layouts.replace( layoutName, tqstrdup( xkbRules->layouts.desc[i].desc ) ); if( m_layoutsClean == true && layoutName.find( NON_CLEAN_LAYOUT_REGEXP ) != -1 @@ -136,9 +136,9 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly) } for (int i = 0; i < xkbRules->models.num_desc; ++i) - rulesInfo->models.replace(xkbRules->models.desc[i].name, qstrdup( xkbRules->models.desc[i].desc ) ); + rulesInfo->models.replace(xkbRules->models.desc[i].name, tqstrdup( xkbRules->models.desc[i].desc ) ); for (int i = 0; i < xkbRules->options.num_desc; ++i) - rulesInfo->options.replace(xkbRules->options.desc[i].name, qstrdup( xkbRules->options.desc[i].desc ) ); + rulesInfo->options.replace(xkbRules->options.desc[i].name, tqstrdup( xkbRules->options.desc[i].desc ) ); XkbRF_Free(xkbRules, true); diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index 8250f6bba..0ae7c7367 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -273,7 +273,7 @@ QXtEventLoop::QXtEventLoop( const char *applicationClass, XtAppContext context, { #if defined(QT_CHECK_STATE) if ( static_d ) - qWarning( "QXtEventLoop: should only have one QXtEventLoop instance!" ); + tqWarning( "QXtEventLoop: should only have one QXtEventLoop instance!" ); #endif d = static_d = new QXtEventLoopPrivate; @@ -377,7 +377,7 @@ void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier ) break; default: - qWarning( "QXtEventLoopEventLoop: socket notifier has invalid type" ); + tqWarning( "QXtEventLoopEventLoop: socket notifier has invalid type" ); return; } @@ -398,7 +398,7 @@ void QXtEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier ) ++it; if ( ! it.current() ) { // this shouldn't happen - qWarning( "QXtEventLoopEventLoop: failed to unregister socket notifier" ); + tqWarning( "QXtEventLoopEventLoop: failed to unregister socket notifier" ); return; } diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index eb5a0956d..a02db4c52 100644 --- a/nsplugins/viewer/viewer.cpp +++ b/nsplugins/viewer/viewer.cpp @@ -156,7 +156,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable ) { if ( sockfd < 0 || type < 0 || type > 2 || obj == 0 ) { #if defined(CHECK_RANGE) - qWarning( "TQSocketNotifier: Internal error" ); + tqWarning( "TQSocketNotifier: Internal error" ); #endif return FALSE; } @@ -185,7 +185,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable ) #if defined(CHECK_STATE) if ( p && p->fd==sockfd ) { static const char *t[] = { "read", "write", "exception" }; - qWarning( "TQSocketNotifier: Multiple socket notifiers for " + tqWarning( "TQSocketNotifier: Multiple socket notifiers for " "same socket %d and type %s", sockfd, t[type] ); } #endif diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index 075b435d2..4c3b45da0 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -226,7 +226,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa if (!stack.isEmpty()) isdoublequote = stack.pop(); else - qWarning("Parse error."); + tqWarning("Parse error."); i++; } else if (cmd[i]=='\'') diff --git a/twin/client.cpp b/twin/client.cpp index e6bb2b720..8a8745664 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -2763,7 +2763,7 @@ void Client::setOpacity(bool translucent, uint opacity) { if (isDesktop()) return; // xcompmgr does not like non solid desktops and the user could set it accidently by mouse scrolling -// qWarning("setting opacity for %d",qt_xdisplay()); +// tqWarning("setting opacity for %d",qt_xdisplay()); //rule out activated translulcency with 100% opacity if (!translucent || opacity == 0xFFFFFFFF) { @@ -2814,15 +2814,15 @@ void Client::updateOpacity() if ((*it) != this && (*it)->isBMP()) // potential "to activate" client found { -// qWarning("client found"); +// tqWarning("client found"); if ((*it)->touches(this)) // first test, if the new client touches the just activated one { -// qWarning("found client touches me"); +// tqWarning("found client touches me"); if( ruleOpacityActive() ) (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); else (*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity); -// qWarning("activated, search restarted (1)"); +// tqWarning("activated, search restarted (1)"); (*it)->setShadowSize(options->activeWindowShadowSize); activeGroupMembers.append(*it); tmpGroupMembers.remove(it); @@ -2836,7 +2836,7 @@ void Client::updateOpacity() { if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) { -// qWarning("found client touches other active client"); +// tqWarning("found client touches other active client"); if( ruleOpacityActive() ) (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); else @@ -2846,7 +2846,7 @@ void Client::updateOpacity() tmpGroupMembers.remove(it); it = tmpGroupMembers.begin(); // reset potential client search found = true; -// qWarning("activated, search restarted (2)"); +// tqWarning("activated, search restarted (2)"); break; // skip this loop } } @@ -2891,16 +2891,16 @@ void Client::updateOpacity() if ((*it) != this && (*it)->isBMP()) // potential "to activate" client found { -// qWarning("client found"); +// tqWarning("client found"); if ((*it)->touches(this)) // first test, if the new client touches the just activated one { -// qWarning("found client touches me"); +// tqWarning("found client touches me"); if( (*it)->ruleOpacityInactive() ) (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); else (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); (*it)->setShadowSize(options->inactiveWindowShadowSize); -// qWarning("deactivated, search restarted (1)"); +// tqWarning("deactivated, search restarted (1)"); inactiveGroupMembers.append(*it); tmpGroupMembers.remove(it); it = tmpGroupMembers.begin(); // restart, search next client @@ -2913,13 +2913,13 @@ void Client::updateOpacity() { if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) { -// qWarning("found client touches other inactive client"); +// tqWarning("found client touches other inactive client"); if( (*it)->ruleOpacityInactive() ) (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); else (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); (*it)->setShadowSize(options->inactiveWindowShadowSize); -// qWarning("deactivated, search restarted (2)"); +// tqWarning("deactivated, search restarted (2)"); inactiveGroupMembers.append(*it); tmpGroupMembers.remove(it); it = tmpGroupMembers.begin(); // reset potential client search diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 873331ce6..4f04764ac 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -476,7 +476,7 @@ static int tbl_txt_lookup( const char* const arr[], const char* txt ) arr[ i ][ 0 ] != '\0'; ++i ) { - if( qstricmp( txt, arr[ i ] ) == 0 ) + if( tqstricmp( txt, arr[ i ] ) == 0 ) return pos; ++pos; } diff --git a/twin/plugins.cpp b/twin/plugins.cpp index c1c1a4d40..d514c0963 100644 --- a/twin/plugins.cpp +++ b/twin/plugins.cpp @@ -29,7 +29,7 @@ PluginMgr::PluginMgr() void PluginMgr::error( const TQString &error_msg ) { - qWarning( "%s", (i18n("KWin: ") + error_msg + + tqWarning( "%s", (i18n("KWin: ") + error_msg + i18n("\nKWin will now exit...")).local8Bit().data() ); exit(1); } diff --git a/twin/workspace.cpp b/twin/workspace.cpp index e6e18e1aa..b46697d99 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -561,7 +561,7 @@ Client* Workspace::createClient( Window w, bool is_mapped ) void Workspace::addClient( Client* c, allowed_t ) { // waited with trans settings until window figured out if active or not ;) -// qWarning("%s", (const char*)(c->resourceClass())); +// tqWarning("%s", (const char*)(c->resourceClass())); c->setBMP(c->resourceName() == "beep-media-player" || c->decorationId() == None); // first check if the window has it's own opinion of it's translucency ;) c->getWindowOpacity();