TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename additional global TQt functions

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 3258267754
commit e8a1cdc01d
34 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File

2
drkonqi/krashconf.cpp
Unescape View File

@ -73,7 +73,7 @@ void KrashConfig :: readConfig()
if (programname.isEmpty()) if (programname.isEmpty())
programname.setStr(I18N_NOOP("unknown")); programname.setStr(I18N_NOOP("unknown"));
// leak some memory... Well. It's only done once anyway :-) // 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"), m_aboutData = new KAboutData(args->getOption("appname"),
progname, progname,
args->getOption("appversion"), args->getOption("appversion"),

2
kcontrol/energy/energy.cpp
Unescape View File

@ -344,7 +344,7 @@ void KEnergy::applySettings(bool enable, int standby, int suspend, int off)
} else } else
DPMSDisable(dpy); DPMSDisable(dpy);
} else } else
qWarning("Server has no DPMS extension"); tqWarning("Server has no DPMS extension");
XFlush(dpy); XFlush(dpy);
XSetErrorHandler(defaultHandler); XSetErrorHandler(defaultHandler);

4
kcontrol/keys/keyconfig.cpp
Unescape View File

@ -365,7 +365,7 @@ void KKeyModule::readScheme( int index )
TQDir d( kksPath ); TQDir d( kksPath );
if ( !d.exists() ) if ( !d.exists() )
if ( !d.mkdir( kksPath ) ) { 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; return;
} }
@ -375,7 +375,7 @@ void KKeyModule::readScheme( int index )
d.setPath( kksPath ); d.setPath( kksPath );
if ( !d.exists() ) if ( !d.exists() )
if ( !d.mkdir( kksPath ) ) { 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; return;
} }

2
kcontrol/keys/shortcuts.cpp
Unescape View File

@ -410,7 +410,7 @@ void ShortcutsModule::slotSaveSchemeAs()
TQDir dir( kksPath ); TQDir dir( kksPath );
if( !dir.exists() && !dir.mkdir( 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; return;
} }

2
kcontrol/kio/kmanualproxydlg.cpp
Unescape View File

@ -324,7 +324,7 @@ void KManualProxyDlg::copyDown()
void KManualProxyDlg::slotOk() void KManualProxyDlg::slotOk()
{ {
//qDebug("m_bHasValidData: %s" , m_bHasValidData ? "true" : "false"); //tqDebug("m_bHasValidData: %s" , m_bHasValidData ? "true" : "false");
if ( m_bHasValidData || validate() ) if ( m_bHasValidData || validate() )
{ {
KDialogBase::slotOk(); KDialogBase::slotOk();

2
kcontrol/krdb/krdb.cpp
Unescape View File

@ -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 // 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.. // 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 ) if ( qversion.contains( '.' ) > 1 )
qversion.truncate( qversion.findRev( '.' ) ); qversion.truncate( qversion.findRev( '.' ) );
if ( qversion.contains( '-' ) ) if ( qversion.contains( '-' ) )

4
kdesktop/desktop.cc
Unescape View File

@ -1172,7 +1172,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int
KIO::copy( i.uSource, i.uDest, false ); } KIO::copy( i.uSource, i.uDest, false ); }
// m_pIconView->addFuturePosition(filename, x, y); // 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()); // system(TQString("cp \"%1\" \"%2/%3\"").arg(KURL(_url).path()).arg(KURL(_dest).path()).arg(filename).latin1());
// m_pIconView->update( _dest ); // 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) void KDesktop::removeIcon(const TQString &_url)
{ {
if (_url.at(0) != '/') { if (_url.at(0) != '/') {
qDebug("removeIcon with relative path not supported for now"); tqDebug("removeIcon with relative path not supported for now");
return; return;
} }
unlink(KURL(_url).path().latin1()); unlink(KURL(_url).path().latin1());

2
kdialog/kdialog.cpp
Unescape View File

@ -235,7 +235,7 @@ static int directCommand(KCmdLineArgs *args)
dontagain = values[ 1 ]; dontagain = values[ 1 ];
} }
else else
qDebug( "Incorrect --dontagain!" ); tqDebug( "Incorrect --dontagain!" );
} }
int ret; int ret;

6
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -3514,14 +3514,14 @@ bool KMenu::ensureServiceRunning(const TQString & service)
if ( !kapp->dcopClient()->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)", if ( !kapp->dcopClient()->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)",
data, replyType, replyData) ) { data, replyType, replyData) ) {
qWarning( "call to klauncher failed."); tqWarning( "call to klauncher failed.");
return false; return false;
} }
TQDataStream reply(replyData, IO_ReadOnly); TQDataStream reply(replyData, IO_ReadOnly);
if ( replyType != "serviceResult" ) if ( replyType != "serviceResult" )
{ {
qWarning( "unexpected result '%s' from klauncher.", replyType.data()); tqWarning( "unexpected result '%s' from klauncher.", replyType.data());
return false; return false;
} }
int result; int result;
@ -3530,7 +3530,7 @@ bool KMenu::ensureServiceRunning(const TQString & service)
reply >> result >> dcopName >> error; reply >> result >> dcopName >> error;
if (result != 0) if (result != 0)
{ {
qWarning("Error starting: %s", error.local8Bit().data()); tqWarning("Error starting: %s", error.local8Bit().data());
return false; return false;
} }
return true; return true;

12
kioslave/man/kio_man.cpp
Unescape View File

@ -1124,7 +1124,7 @@ int compare_man_index(const void *s1, const void *s2)
// this is a bit tricky // this is a bit tricky
if ( m1->manpage_len > m2->manpage_len) if ( m1->manpage_len > m2->manpage_len)
{ {
i = qstrnicmp( m1->manpage_begin, i = tqstrnicmp( m1->manpage_begin,
m2->manpage_begin, m2->manpage_begin,
m2->manpage_len); m2->manpage_len);
if (!i) if (!i)
@ -1134,7 +1134,7 @@ int compare_man_index(const void *s1, const void *s2)
if ( m1->manpage_len < m2->manpage_len) if ( m1->manpage_len < m2->manpage_len)
{ {
i = qstrnicmp( m1->manpage_begin, i = tqstrnicmp( m1->manpage_begin,
m2->manpage_begin, m2->manpage_begin,
m1->manpage_len); m1->manpage_len);
if (!i) if (!i)
@ -1142,7 +1142,7 @@ int compare_man_index(const void *s1, const void *s2)
return i; return i;
} }
return qstrnicmp( m1->manpage_begin, return tqstrnicmp( m1->manpage_begin,
m2->manpage_begin, m2->manpage_begin,
m1->manpage_len); m1->manpage_len);
} }
@ -1167,7 +1167,7 @@ private:
// with the shorter length // with the shorter length
if (m1->manpage_len > m2->manpage_len) if (m1->manpage_len > m2->manpage_len)
{ {
i = qstrnicmp(m1->manpage_begin, i = tqstrnicmp(m1->manpage_begin,
m2->manpage_begin, m2->manpage_begin,
m2->manpage_len); m2->manpage_len);
if (!i) if (!i)
@ -1178,7 +1178,7 @@ private:
if (m1->manpage_len > m2->manpage_len) if (m1->manpage_len > m2->manpage_len)
{ {
i = qstrnicmp(m1->manpage_begin, i = tqstrnicmp(m1->manpage_begin,
m2->manpage_begin, m2->manpage_begin,
m1->manpage_len); m1->manpage_len);
if (!i) if (!i)
@ -1186,7 +1186,7 @@ private:
return i; return i;
} }
return qstrnicmp(m1->manpage_begin, return tqstrnicmp(m1->manpage_begin,
m2->manpage_begin, m2->manpage_begin,
m1->manpage_len); m1->manpage_len);
} }

12
kioslave/man/man2html.cpp
Unescape View File

@ -203,7 +203,7 @@ static char *stralloc(int len)
static char *strlimitcpy(char *to, char *from, int n, int limit) static char *strlimitcpy(char *to, char *from, int n, int limit)
{ /* Assumes space for limit plus a null */ { /* Assumes space for limit plus a null */
const int len = n > limit ? limit : n; const int len = n > limit ? limit : n;
qstrncpy(to, from, len + 1); tqstrncpy(to, from, len + 1);
to[len] = '\0'; to[len] = '\0';
return to; return to;
} }
@ -956,7 +956,7 @@ static void out_html(const char *c)
if (!c) return; if (!c) return;
// Added, probably due to the const? // Added, probably due to the const?
char *c2 = qstrdup(c); char *c2 = tqstrdup(c);
char *c3 = c2; char *c3 = c2;
static int obp=0; static int obp=0;
@ -1848,7 +1848,7 @@ public:
} }
void setContents(const char *_contents) { void setContents(const char *_contents) {
delete [] contents; delete [] contents;
contents = qstrdup(_contents); contents = tqstrdup(_contents);
} }
const char *getContents() const { return contents; } const char *getContents() const { return contents; }
@ -2788,7 +2788,7 @@ static void request_while( char*& c, int j, bool mdoc )
while ( result ) while ( result )
{ {
// Unlike for a normal macro, we have the condition at start, so we do not need to prepend extra bytes // 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(7107) << "Scanning .while condition" << endl;
kdDebug(7101) << "Loop macro " << liveloop << endl; kdDebug(7101) << "Loop macro " << liveloop << endl;
char* end_expression = scan_expression( liveloop, &result ); char* end_expression = scan_expression( liveloop, &result );
@ -3165,7 +3165,7 @@ static char *scan_request(char *c)
scan_troff_mandoc(wordlist[i],1,&h); scan_troff_mandoc(wordlist[i],1,&h);
else else
scan_troff(wordlist[i],1,&h); scan_troff(wordlist[i],1,&h);
wordlist[i] = qstrdup(h); wordlist[i] = tqstrdup(h);
delete [] h; delete [] h;
} }
for ( i=words; i<max_wordlist; i++ ) wordlist[i]=NULL; for ( i=words; i<max_wordlist; i++ ) wordlist[i]=NULL;
@ -3175,7 +3175,7 @@ static char *scan_request(char *c)
const unsigned int length = (*it).m_output.length(); const unsigned int length = (*it).m_output.length();
char* work = new char [length+2]; char* work = new char [length+2];
work[0] = '\n'; // The macro must start after an end of line to allow a request on first line work[0] = '\n'; // The macro must start after an end of line to allow a request on first line
qstrncpy(work+1,(*it).m_output.data(),length+1); tqstrncpy(work+1,(*it).m_output.data(),length+1);
const TQValueList<char*> oldArgumentList( s_argumentList ); const TQValueList<char*> oldArgumentList( s_argumentList );
s_argumentList.clear(); s_argumentList.clear();
for ( i = 0 ; i < max_wordlist; i++ ) for ( i = 0 ; i < max_wordlist; i++ )

2
kioslave/sftp/process.cpp
Unescape View File

@ -396,7 +396,7 @@ int MyPtyProcess::waitForChild()
TQCString line = readLine(false); TQCString line = readLine(false);
while (!line.isNull()) 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); kill(m_Pid, SIGTERM);
if (m_bTerminal) if (m_bTerminal)
{ {

4
kioslave/smtp/interactivesmtpserver.cc
Unescape View File

@ -82,8 +82,8 @@ int main( int argc, char * argv[] ) {
InteractiveSMTPServer server; InteractiveSMTPServer server;
qDebug( "Server should now listen on localhost:2525" ); tqDebug( "Server should now listen on localhost:2525" );
qDebug( "Hit CTRL-C to quit." ); tqDebug( "Hit CTRL-C to quit." );
return app.exec(); return app.exec();
}; };

2
kioslave/smtp/smtp.cc
Unescape View File

@ -109,7 +109,7 @@ int kdemain(int argc, char **argv)
exit(-1); exit(-1);
} }
#endif #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(); slave.dispatchLoop();
#ifdef HAVE_LIBSASL2 #ifdef HAVE_LIBSASL2
sasl_done(); sasl_done();

6
klipper/toplevel.cpp
Unescape View File

@ -853,7 +853,7 @@ void KlipperWidget::checkClipData( bool selectionMode )
int i = 0; int i = 0;
while ( (format = clip->data()->format( i++ )) ) while ( (format = clip->data()->format( i++ )) )
{ {
qDebug( " format: %s", format); tqDebug( " format: %s", format);
} }
#endif #endif
TQMimeSource* data = clip->data( selectionMode ? TQClipboard::Selection : TQClipboard::Clipboard ); 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() void KlipperWidget::updateTimestamp()
{ // Qt3.3.0 and 3.3.1 use qt_x_user_time for clipboard operations { // Qt3.3.0 and 3.3.1 use qt_x_user_time for clipboard operations
Time time = ( strcmp( qVersion(), "3.3.1" ) == 0 Time time = ( strcmp( tqVersion(), "3.3.1" ) == 0
|| strcmp( qVersion(), "3.3.0" ) == 0 ) || strcmp( tqVersion(), "3.3.0" ) == 0 )
? GET_QT_X_USER_TIME() : GET_QT_X_TIME(); ? GET_QT_X_USER_TIME() : GET_QT_X_TIME();
static TQWidget* w = 0; static TQWidget* w = 0;
if ( !w ) if ( !w )

4
klipper/urlgrabber.cpp
Unescape View File

@ -227,7 +227,7 @@ void URLGrabber::slotItemSelected( int id )
ClipCommand *command = myCommandMapper.find( id ); ClipCommand *command = myCommandMapper.find( id );
TQStringList *backrefs = myGroupingMapper.find( id ); TQStringList *backrefs = myGroupingMapper.find( id );
if ( !command || !backrefs ) if ( !command || !backrefs )
qWarning("Klipper: can't find associated action"); tqWarning("Klipper: can't find associated action");
else else
execute( command, backrefs ); execute( command, backrefs );
} }
@ -259,7 +259,7 @@ void URLGrabber::execute( const struct ClipCommand *command,
proc << cmdLine.stripWhiteSpace(); proc << cmdLine.stripWhiteSpace();
if ( !proc.start(KProcess::DontCare, KProcess::NoCommunication )) if ( !proc.start(KProcess::DontCare, KProcess::NoCommunication ))
qWarning("Klipper: Couldn't start process!"); tqWarning("Klipper: Couldn't start process!");
} }
} }

2
kmenuedit/menufile.cpp
Unescape View File

@ -513,7 +513,7 @@ void MenuFile::popAction(ActionAtom *atom)
{ {
if (m_actionList.getLast() != 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; return;
} }
m_actionList.removeLast(); m_actionList.removeLast();

2
konqueror/konq_mainwindow.cc
Unescape View File

@ -2047,7 +2047,7 @@ void KonqMainWindow::slotUndoAvailable( bool avail )
if ( avail && m_currentView && m_currentView->part() ) 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 ) if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 )
{ {
TQVariant prop = m_currentView->part()->property( "supportsUndo" ); TQVariant prop = m_currentView->part()->property( "supportsUndo" );

2
konqueror/konq_viewmgr.cc
Unescape View File

@ -1804,7 +1804,7 @@ void KonqViewManager::printSizeInfo( KonqFrameBase* frame,
{ {
TQRect r; TQRect r;
r = frame->widget()->geometry(); 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" ) if ( parent->frameType() == "Container" )
{ {

2
konqueror/sidebar/sidebar_widget.cpp
Unescape View File

@ -534,7 +534,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
{ {
TQFile f(m_path+m_currentButton->file); TQFile f(m_path+m_currentButton->file);
if (!f.remove()) if (!f.remove())
qDebug("Error, file not deleted"); tqDebug("Error, file not deleted");
TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
} }
break; break;

6
konsole/konsole/TEPty.cpp
Unescape View File

@ -115,12 +115,12 @@ void TEPty::setErase(char erase)
if(tcgetattr(fd, &tios)) if(tcgetattr(fd, &tios))
{ {
qWarning("Uh oh.. can't get terminal attributes.."); tqWarning("Uh oh.. can't get terminal attributes..");
return; return;
} }
tios.c_cc[VERASE] = erase; tios.c_cc[VERASE] = erase;
if(tcsetattr(fd, TCSANOW, &tios)) 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(); SendJob& job = pendingSendJobs.first();
if (!writeStdin(job.buffer.data(), job.length)) if (!writeStdin(job.buffer.data(), job.length))
{ {
qWarning("Uh oh.. can't write data.."); tqWarning("Uh oh.. can't write data..");
return; return;
} }
m_bufferFull = true; m_bufferFull = true;

6
konsole/konsole/fontembedder.cpp
Unescape View File

@ -61,13 +61,13 @@ int main(int argc, char **argv)
{ {
if (argc < 1) if (argc < 1)
{ {
qWarning("usage: fontembedder font.src > font.h"); tqWarning("usage: fontembedder font.src > font.h");
exit(1); exit(1);
} }
TQFile inFile(argv[1]); TQFile inFile(argv[1]);
if (!inFile.open(IO_ReadOnly)) if (!inFile.open(IO_ReadOnly))
{ {
qFatal("Can not open %s", argv[1]); tqFatal("Can not open %s", argv[1]);
} }
TQTextStream input(&inFile); TQTextStream input(&inFile);
@ -88,7 +88,7 @@ int main(int argc, char **argv)
//Must be a glyph ID. //Must be a glyph ID.
int glyph = line.toInt(0, 16); int glyph = line.toInt(0, 16);
if ((glyph < 0x2500) || (glyph > 0x257f)) if ((glyph < 0x2500) || (glyph > 0x257f))
qFatal("Invalid glyph number"); tqFatal("Invalid glyph number");
glyph = glyph - 0x2500; glyph = glyph - 0x2500;

8
konsole/konsole/session.cpp
Unescape View File

@ -657,18 +657,18 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
void TESession::zmodemSendBlock(KProcess *, char *data, int len) void TESession::zmodemSendBlock(KProcess *, char *data, int len)
{ {
sh->send_bytes(data, len); sh->send_bytes(data, len);
// qWarning("<-- %d bytes", len); // tqWarning("<-- %d bytes", len);
if (sh->buffer_full()) if (sh->buffer_full())
{ {
zmodemProc->suspend(); zmodemProc->suspend();
// qWarning("ZModem suspend"); // tqWarning("ZModem suspend");
} }
} }
void TESession::zmodemContinue() void TESession::zmodemContinue()
{ {
zmodemProc->resume(); zmodemProc->resume();
// qWarning("ZModem resume"); // tqWarning("ZModem resume");
} }
void TESession::zmodemStatus(KProcess *, char *data, int len) void TESession::zmodemStatus(KProcess *, char *data, int len)
@ -703,7 +703,7 @@ void TESession::zmodemRcvBlock(const char *data, int len)
TQByteArray ba; TQByteArray ba;
ba.duplicate(data, len); ba.duplicate(data, len);
zmodemProc->writeStdin(ba); zmodemProc->writeStdin(ba);
// qWarning("--> %d bytes", len); // tqWarning("--> %d bytes", len);
} }
void TESession::zmodemDone() void TESession::zmodemDone()

2
ksmserver/client.cpp
Unescape View File

@ -92,7 +92,7 @@ static char * safeSmsGenerateClientID( SmsConn /*c*/ )
if (!ret) { if (!ret) {
static TQString *my_addr = 0; static TQString *my_addr = 0;
if (!my_addr) { 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); smy_addr.setObject(my_addr,new TQString);
/* Faking our IP address, the 0 below is "unknown" address format /* Faking our IP address, the 0 below is "unknown" address format

4
ksmserver/main.cpp
Unescape View File

@ -199,7 +199,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
kapp->dcopClient()->registerAs("ksmserver", false); kapp->dcopClient()->registerAs("ksmserver", false);
if (!kapp->dcopClient()->isRegistered()) if (!kapp->dcopClient()->isRegistered())
{ {
qWarning("Could not register with DCOPServer. Aborting."); tqWarning("Could not register with DCOPServer. Aborting.");
return 1; 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) * does nothing on this platform, as here the default is reversed)
*/ */
if (!only_local) { 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; only_local = false;
#endif #endif

20
ksmserver/server.cpp
Unescape View File

@ -435,7 +435,7 @@ Status SetAuthentication (int count, IceListenObj *listenObjs,
TQString iceAuth = KGlobal::dirs()->findExe("iceauth"); TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty()) if (iceAuth.isEmpty())
{ {
qWarning("KSMServer: could not find iceauth"); tqWarning("KSMServer: could not find iceauth");
return 0; return 0;
} }
@ -465,7 +465,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
TQString iceAuth = KGlobal::dirs()->findExe("iceauth"); TQString iceAuth = KGlobal::dirs()->findExe("iceauth");
if (iceAuth.isEmpty()) if (iceAuth.isEmpty())
{ {
qWarning("KSMServer: could not find iceauth"); tqWarning("KSMServer: could not find iceauth");
return; return;
} }
@ -479,7 +479,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
static int Xio_ErrorHandler( Display * ) 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 // Don't do anything that might require the X connection
if (the_server) if (the_server)
@ -617,14 +617,14 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
(SmPointer) this, (SmPointer) this,
HostBasedAuthProc, 256, errormsg ) ) { HostBasedAuthProc, 256, errormsg ) ) {
qWarning("KSMServer: could not register XSM protocol"); tqWarning("KSMServer: could not register XSM protocol");
} }
if (!IceListenForConnections (&numTransports, &listenObjs, if (!IceListenForConnections (&numTransports, &listenObjs,
256, errormsg)) 256, errormsg))
{ {
qWarning("KSMServer: Error listening for connections: %s", errormsg); tqWarning("KSMServer: Error listening for connections: %s", errormsg);
qWarning("KSMServer: Aborting."); tqWarning("KSMServer: Aborting.");
exit(1); exit(1);
} }
@ -643,8 +643,8 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
f = ::fopen(fName.data(), "w+"); f = ::fopen(fName.data(), "w+");
if (!f) if (!f)
{ {
qWarning("KSMServer: can't open %s: %s", fName.data(), strerror(errno)); tqWarning("KSMServer: can't open %s: %s", fName.data(), strerror(errno));
qWarning("KSMServer: Aborting."); tqWarning("KSMServer: Aborting.");
exit(1); exit(1);
} }
char* session_manager = IceComposeNetworkIdList(numTransports, listenObjs); char* session_manager = IceComposeNetworkIdList(numTransports, listenObjs);
@ -657,10 +657,10 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
if (only_local) { if (only_local) {
if (!SetAuthentication_local(numTransports, listenObjs)) if (!SetAuthentication_local(numTransports, listenObjs))
qFatal("KSMSERVER: authentication setup failed."); tqFatal("KSMSERVER: authentication setup failed.");
} else { } else {
if (!SetAuthentication(numTransports, listenObjs, &authDataEntries)) if (!SetAuthentication(numTransports, listenObjs, &authDataEntries))
qFatal("KSMSERVER: authentication setup failed."); tqFatal("KSMSERVER: authentication setup failed.");
} }
IceAddConnectionWatch (KSMWatchProc, (IcePointer) this); IceAddConnectionWatch (KSMWatchProc, (IcePointer) this);

6
kxkb/x11helper.cpp
Unescape View File

@ -120,7 +120,7 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly)
for (int i = 0; i < xkbRules->layouts.num_desc; ++i) { for (int i = 0; i < xkbRules->layouts.num_desc; ++i) {
TQString layoutName(xkbRules->layouts.desc[i].name); 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 if( m_layoutsClean == true
&& layoutName.find( NON_CLEAN_LAYOUT_REGEXP ) != -1 && 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) 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) 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); XkbRF_Free(xkbRules, true);

6
nsplugins/viewer/qxteventloop.cpp
Unescape View File

@ -273,7 +273,7 @@ QXtEventLoop::QXtEventLoop( const char *applicationClass, XtAppContext context,
{ {
#if defined(QT_CHECK_STATE) #if defined(QT_CHECK_STATE)
if ( static_d ) if ( static_d )
qWarning( "QXtEventLoop: should only have one QXtEventLoop instance!" ); tqWarning( "QXtEventLoop: should only have one QXtEventLoop instance!" );
#endif #endif
d = static_d = new QXtEventLoopPrivate; d = static_d = new QXtEventLoopPrivate;
@ -377,7 +377,7 @@ void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
break; break;
default: default:
qWarning( "QXtEventLoopEventLoop: socket notifier has invalid type" ); tqWarning( "QXtEventLoopEventLoop: socket notifier has invalid type" );
return; return;
} }
@ -398,7 +398,7 @@ void QXtEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier )
++it; ++it;
if ( ! it.current() ) { if ( ! it.current() ) {
// this shouldn't happen // this shouldn't happen
qWarning( "QXtEventLoopEventLoop: failed to unregister socket notifier" ); tqWarning( "QXtEventLoopEventLoop: failed to unregister socket notifier" );
return; return;
} }

4
nsplugins/viewer/viewer.cpp
Unescape View File

@ -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 ( sockfd < 0 || type < 0 || type > 2 || obj == 0 ) {
#if defined(CHECK_RANGE) #if defined(CHECK_RANGE)
qWarning( "TQSocketNotifier: Internal error" ); tqWarning( "TQSocketNotifier: Internal error" );
#endif #endif
return FALSE; return FALSE;
} }
@ -185,7 +185,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
#if defined(CHECK_STATE) #if defined(CHECK_STATE)
if ( p && p->fd==sockfd ) { if ( p && p->fd==sockfd ) {
static const char *t[] = { "read", "write", "exception" }; 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] ); "same socket %d and type %s", sockfd, t[type] );
} }
#endif #endif

2
tdeprint/tdeprintfax/faxctrl.cpp
Unescape View File

@ -226,7 +226,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
if (!stack.isEmpty()) if (!stack.isEmpty())
isdoublequote = stack.pop(); isdoublequote = stack.pop();
else else
qWarning("Parse error."); tqWarning("Parse error.");
i++; i++;
} }
else if (cmd[i]=='\'') else if (cmd[i]=='\'')

22
twin/client.cpp
Unescape View File

@ -2763,7 +2763,7 @@ void Client::setOpacity(bool translucent, uint opacity)
{ {
if (isDesktop()) if (isDesktop())
return; // xcompmgr does not like non solid desktops and the user could set it accidently by mouse scrolling 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 //rule out activated translulcency with 100% opacity
if (!translucent || opacity == 0xFFFFFFFF) if (!translucent || opacity == 0xFFFFFFFF)
{ {
@ -2814,15 +2814,15 @@ void Client::updateOpacity()
if ((*it) != this && (*it)->isBMP()) if ((*it) != this && (*it)->isBMP())
// potential "to activate" client found // 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 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() ) if( ruleOpacityActive() )
(*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active);
else else
(*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity); (*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity);
// qWarning("activated, search restarted (1)"); // tqWarning("activated, search restarted (1)");
(*it)->setShadowSize(options->activeWindowShadowSize); (*it)->setShadowSize(options->activeWindowShadowSize);
activeGroupMembers.append(*it); activeGroupMembers.append(*it);
tmpGroupMembers.remove(it); tmpGroupMembers.remove(it);
@ -2836,7 +2836,7 @@ void Client::updateOpacity()
{ {
if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2))
{ {
// qWarning("found client touches other active client"); // tqWarning("found client touches other active client");
if( ruleOpacityActive() ) if( ruleOpacityActive() )
(*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active); (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active);
else else
@ -2846,7 +2846,7 @@ void Client::updateOpacity()
tmpGroupMembers.remove(it); tmpGroupMembers.remove(it);
it = tmpGroupMembers.begin(); // reset potential client search it = tmpGroupMembers.begin(); // reset potential client search
found = true; found = true;
// qWarning("activated, search restarted (2)"); // tqWarning("activated, search restarted (2)");
break; // skip this loop break; // skip this loop
} }
} }
@ -2891,16 +2891,16 @@ void Client::updateOpacity()
if ((*it) != this && (*it)->isBMP()) if ((*it) != this && (*it)->isBMP())
// potential "to activate" client found // 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 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() ) if( (*it)->ruleOpacityInactive() )
(*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive());
else else
(*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity);
(*it)->setShadowSize(options->inactiveWindowShadowSize); (*it)->setShadowSize(options->inactiveWindowShadowSize);
// qWarning("deactivated, search restarted (1)"); // tqWarning("deactivated, search restarted (1)");
inactiveGroupMembers.append(*it); inactiveGroupMembers.append(*it);
tmpGroupMembers.remove(it); tmpGroupMembers.remove(it);
it = tmpGroupMembers.begin(); // restart, search next client it = tmpGroupMembers.begin(); // restart, search next client
@ -2913,13 +2913,13 @@ void Client::updateOpacity()
{ {
if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2)) 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() ) if( (*it)->ruleOpacityInactive() )
(*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive()); (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive());
else else
(*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity); (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity);
(*it)->setShadowSize(options->inactiveWindowShadowSize); (*it)->setShadowSize(options->inactiveWindowShadowSize);
// qWarning("deactivated, search restarted (2)"); // tqWarning("deactivated, search restarted (2)");
inactiveGroupMembers.append(*it); inactiveGroupMembers.append(*it);
tmpGroupMembers.remove(it); tmpGroupMembers.remove(it);
it = tmpGroupMembers.begin(); // reset potential client search it = tmpGroupMembers.begin(); // reset potential client search

2
twin/kcmtwin/twinoptions/mouse.cpp
Unescape View File

@ -476,7 +476,7 @@ static int tbl_txt_lookup( const char* const arr[], const char* txt )
arr[ i ][ 0 ] != '\0'; arr[ i ][ 0 ] != '\0';
++i ) ++i )
{ {
if( qstricmp( txt, arr[ i ] ) == 0 ) if( tqstricmp( txt, arr[ i ] ) == 0 )
return pos; return pos;
++pos; ++pos;
} }

2
twin/plugins.cpp
Unescape View File

@ -29,7 +29,7 @@ PluginMgr::PluginMgr()
void PluginMgr::error( const TQString &error_msg ) 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() ); i18n("\nKWin will now exit...")).local8Bit().data() );
exit(1); exit(1);
} }

2
twin/workspace.cpp
Unescape View File

@ -561,7 +561,7 @@ Client* Workspace::createClient( Window w, bool is_mapped )
void Workspace::addClient( Client* c, allowed_t ) void Workspace::addClient( Client* c, allowed_t )
{ {
// waited with trans settings until window figured out if active or not ;) // 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); c->setBMP(c->resourceName() == "beep-media-player" || c->decorationId() == None);
// first check if the window has it's own opinion of it's translucency ;) // first check if the window has it's own opinion of it's translucency ;)
c->getWindowOpacity(); c->getWindowOpacity();

Write Preview
Loading…
Cancel
Save