diff options
1403 files changed, 11183 insertions, 10958 deletions
diff --git a/KDE2PORTING.html b/KDE2PORTING.html index 1154682c8..0cd2e8a80 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -18,7 +18,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> <UL> <LI><A HREF="#gettingstarted">Getting Started</A></LI> <LI><A HREF="#general">Global changes</A></LI> -<LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI> +<LI><A HREF="#autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></LI> <LI><A HREF="#KApplication">KApplication</A></LI> <LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI> <LI><A HREF="#KLocale">KLocale</A></LI> @@ -95,12 +95,12 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> -<H3><A NAME="automoc">automoc/am_edit, Makefile.am tags</A></H3> +<H3><A NAME="autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></H3> - On the subject of the compilation framework, automoc has been removed from + On the subject of the compilation framework, autotqmoc has been removed from the admin directory. It has been replaced by am_edit which provides a lot of additional features.<P> - METASOURCES=AUTO still does the job of generating the appropriate moc files, + METASOURCES=AUTO still does the job of generating the appropriate tqmoc files, but in addition, you should use KDE_ICON for the icons representing the application (and naming those icons conforming to lo16-app-<appname>.png), and install the application-specific icons under $(kde_datadir)/<appname>/pics. @@ -189,7 +189,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P> to klocale->translate with i18n.<P> The return value of i18n is also no longer a const char*, - but a unicode TQString.<P> + but a tqunicode TQString.<P> <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> diff --git a/KDE3PORTING.html b/KDE3PORTING.html index e249020f6..ab89d2d0f 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory. <p>The API for Kicker panel applets and extensions has changed. Panels can now be left/top, center, or right/bottom aligned, and applets and extensions may receive -notification about a change in alignment. +notification about a change in tqalignment. <H4>KPanelApplet</H4> <p>The virtual methods orientationChange() and popupDirectionChange() are deprecated. -Instead you should reimplement positionChange() and alignmentChange() to be -notified of changes in the position and alignment of the panel on which your applet +Instead you should reimplement positionChange() and tqalignmentChange() to be +notified of changes in the position and tqalignment of the panel on which your applet resides. In addition, the popupDirection() method and the Direction enum are deprecated. Instead you should use the position() method and Position enum. Applets that use the deprecated methods will still work with KDE 3, but may not compile or work with @@ -661,8 +661,8 @@ a future version. <H4>KPanelExtension</H4> -<p>There is a new method alignmentChange() that your extension should reimplement if -it needs to know about changes in alignment. +<p>There is a new method tqalignmentChange() that your extension should reimplement if +it needs to know about changes in tqalignment. <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> <p> diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h index dcd094844..26eb115d9 100644 --- a/arts/kde/kartsdispatcher.h +++ b/arts/kde/kartsdispatcher.h @@ -61,7 +61,7 @@ namespace Arts * } * \endcode */ -class KDE_EXPORT KArtsDispatcher : public QObject +class KDE_EXPORT KArtsDispatcher : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index ee220be17..a1b75e2f5 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void) X11CommConfig.sync(); - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper"))); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data(); if(rt) - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data(); else - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data(); proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) ); diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h index c01829cf1..0735e2082 100644 --- a/arts/kde/kartsserver.h +++ b/arts/kde/kartsserver.h @@ -34,7 +34,7 @@ * artsd on KDE startup, but at the very least there will always be third * party PlayObjects that will crash. So, this is necessary. */ -class KDE_ARTS_EXPORT KArtsServer : public QObject +class KDE_ARTS_EXPORT KArtsServer : public TQObject { Q_OBJECT diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h index 21876e037..0022d9bba 100644 --- a/arts/kde/kaudioconverter.h +++ b/arts/kde/kaudioconverter.h @@ -29,7 +29,7 @@ class KURL; class TQString; -class KAudioConverter : public QObject +class KAudioConverter : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h index fdd4353fe..8caab8325 100644 --- a/arts/kde/kaudiorecordstream.h +++ b/arts/kde/kaudiorecordstream.h @@ -38,7 +38,7 @@ namespace Arts { class StereoEffectStack; } * @author Matthias Kretz <kretz@kde.org> * @since 3.2 */ -class KDE_ARTS_EXPORT KAudioRecordStream : public QObject +class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject { Q_OBJECT diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h index 1d0b10f87..7e7cc6c50 100644 --- a/arts/kde/kconverttest.h +++ b/arts/kde/kconverttest.h @@ -24,7 +24,7 @@ #include <tqobject.h> -class KConvertTest : public QObject +class KConvertTest : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index f7df6347c..15994625e 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart() m_job = KIO::get(m_url, false, false); m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg"); - m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION)); + m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION)); TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); @@ -213,7 +213,7 @@ void KIOInputStream_impl::processQueue() void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet) { processQueue(); - packet->size = std::min(m_packetSize, m_data.size()); + packet->size = std::min(m_packetSize, (unsigned int)m_data.size()); kdDebug( 400 ) << "STREAMING: Filling one DataPacket with " << packet->size << " bytes of the stream!" << endl; if (!m_finished) { diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cc index becb20a58..7c71be31f 100644 --- a/arts/kde/kplayobject.cc +++ b/arts/kde/kplayobject.cc @@ -65,7 +65,7 @@ void KPlayObject::halt() TQString KPlayObject::description() { - return TQString::fromLatin1(object().description().c_str()); + return TQString::tqfromLatin1(object().description().c_str()); } Arts::poTime KPlayObject::currentTime() @@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities() TQString KPlayObject::mediaName() { - return TQString::fromLatin1(object().mediaName().c_str()); + return TQString::tqfromLatin1(object().mediaName().c_str()); } Arts::poState KPlayObject::state() @@ -243,7 +243,7 @@ TQString KDE::PlayObject::description() { if ( object().isNull() ) return TQString(); - return TQString::fromLatin1(object().description().c_str()); + return TQString::tqfromLatin1(object().description().c_str()); } Arts::poTime KDE::PlayObject::currentTime() @@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName() { if ( object().isNull() ) return TQString(); - return TQString::fromLatin1(object().mediaName().c_str()); + return TQString::tqfromLatin1(object().mediaName().c_str()); } Arts::poState KDE::PlayObject::state() diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h index 907723cf3..4aafe0b58 100644 --- a/arts/kde/kplayobject.h +++ b/arts/kde/kplayobject.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <tqobject.h> -class KDE_EXPORT KPlayObject : public QObject +class KDE_EXPORT KPlayObject : public TQObject { Q_OBJECT public: @@ -185,7 +185,7 @@ class PlayObjectFactory; * internal state until the real Arts::PlayObject got created, afterwards * the state of the Arts::PlayObject will be returned. */ -class KDE_EXPORT PlayObject : public QObject +class KDE_EXPORT PlayObject : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h index f012de2cd..d52e18a1e 100644 --- a/arts/kde/kplayobjectcreator.h +++ b/arts/kde/kplayobjectcreator.h @@ -29,7 +29,7 @@ namespace KDE { -class PlayObjectCreator : public QObject +class PlayObjectCreator : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index 99a2e2edb..3e83d54da 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons } // decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd - if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) ) + if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) ) { // we rely on the delivered mimetype if it's a local file d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false ); @@ -202,7 +202,7 @@ TQStringList KDE::PlayObjectFactory::mimeTypes(void) for(vector<string>::iterator mimetype = mimetypes->begin(); mimetype != mimetypes->end(); ++mimetype) { - TQString name = TQString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace(); + TQString name = TQString(TQString::fromLocal8Bit((*mimetype).c_str())).stripWhiteSpace(); if(KMimeType::mimeType(name)) results.append(name); } diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h index f81349251..6d4b1fa26 100644 --- a/arts/kde/kplayobjectfactory_p.h +++ b/arts/kde/kplayobjectfactory_p.h @@ -29,7 +29,7 @@ namespace KDE /** * @internal */ -class POFHelper : public QObject +class POFHelper : public TQObject { friend class PlayObjectFactory; Q_OBJECT diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index 6aeeb8e8f..3f7193166 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -92,8 +92,8 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f ) void KVideoWidget::init(void) { setMinimumSize(0, 0); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - setFocusPolicy( ClickFocus ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + setFocusPolicy( TQ_ClickFocus ); fullscreenWidget = 0; poVideo = Arts::VideoPlayObject::null(); @@ -102,16 +102,16 @@ void KVideoWidget::init(void) // Setup actions new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen", - CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()), + CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()), actionCollection(), "fullscreen_mode" ); new KRadioAction( i18n("&Half Size"), ALT+Key_0, - this, TQT_SLOT(halfSizeActivated()), + TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()), actionCollection(), "half_size" ); new KRadioAction( i18n("&Normal Size"), ALT+Key_1, - this, TQT_SLOT(normalSizeActivated()), + TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()), actionCollection(), "normal_size" ); new KRadioAction( i18n("&Double Size"), ALT+Key_2, - this, TQT_SLOT(doubleSizeActivated()), + TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()), actionCollection(), "double_size" ); ((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" ); @@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo ) } setBackgroundMode( PaletteBackground ); - repaint(); + tqrepaint(); // Resize GUI videoWidth = 0; @@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize() doubleSizeActivated(); } -TQSize KVideoWidget::sizeHint() const +TQSize KVideoWidget::tqsizeHint() const { return TQSize( videoWidth, videoHeight ); } @@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event ) emit mouseButtonPressed( event->button(), pos, event->state() ); // ### Remove in KDE4 - if ( event->button() == RightButton ) + if ( event->button() == Qt::RightButton ) emit rightButtonPressed( pos ); } diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h index 0e3881a93..734fe4b01 100644 --- a/arts/kde/kvideowidget.h +++ b/arts/kde/kvideowidget.h @@ -36,7 +36,7 @@ public: bool isNormalSize(); bool isDoubleSize(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; virtual int heightForWidth ( int w ) const; diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index ea20608ba..40d85d460 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp, if ( !event.isEmpty() ) { // get config file - if ( d->events.contains( fromApp ) ) { + if ( d->events.tqcontains( fromApp ) ) { eventsFile = d->events[fromApp]; } else { eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false); d->events.insert( fromApp, eventsFile ); } - if ( d->configs.contains( fromApp) ) { + if ( d->configs.tqcontains( fromApp) ) { configFile = d->configs[fromApp]; } else { configFile=new KConfig(fromApp+".eventsrc",true,false); @@ -550,7 +550,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int return false; // Skip } proc->clearArguments(); - (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ); + (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data(); d->externalPlayerEventId = eventId; proc->start(KProcess::NotifyOnExit); return true; @@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file) // append msg TQTextStream strm( &logFile ); - strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": "; + strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": "; strm << text << endl; // close file @@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text) TQTextStream strm( stderr, IO_WriteOnly ); // output msg - strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": "; + strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": "; strm << text << endl; return true; @@ -695,7 +695,7 @@ void KNotify::playTimeout() ++it; if ( (*current)->state() != Arts::posPlaying ) { - TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current ); + TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current ); if ( eit != d->playObjectEventMap.end() ) { soundFinished( *eit, PlayedOK ); @@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc ) void KNotify::abortFirstPlayObject() { #ifndef WITHOUT_ARTS - TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() ); + TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() ); if ( it != d->playObjectEventMap.end() ) { soundFinished( it.data(), Aborted ); diff --git a/dcop/KDE-ICE/ICEmsg.h b/dcop/KDE-ICE/ICEmsg.h index cf4d98975..666d776b6 100644 --- a/dcop/KDE-ICE/ICEmsg.h +++ b/dcop/KDE-ICE/ICEmsg.h @@ -221,7 +221,7 @@ extern void _IceErrorBadValue ( /* - * Write pad bytes. Used to force 32 or 64 bit alignment. + * Write pad bytes. Used to force 32 or 64 bit tqalignment. * A maxium of 7 pad bytes can be specified. */ @@ -306,7 +306,7 @@ extern void _IceErrorBadValue ( /* - * Read pad bytes (for 32 or 64 bit alignment). + * Read pad bytes (for 32 or 64 bit tqalignment). * A maxium of 7 pad bytes can be specified. */ diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index 1d167ce70..a76610505 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -158,9 +158,9 @@ void queryFunctions( const char* app, const char* obj ) int callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - TQString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + TQString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); if ( right < left ) { @@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt return( 1 ); } for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { - int l = (*it).find( '(' ); + int l = (*it).tqfind( '(' ); int s; if (l > 0) - s = (*it).findRev( ' ', l); + s = (*it).tqfindRev( ' ', l); else - s = (*it).find( ' ' ); + s = (*it).tqfind( ' ' ); if ( s < 0 ) s = 0; @@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); - const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1); - uint a = arguments.contains(','); + const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1); + uint a = arguments.tqcontains(','); if ( (a==0 && !arguments.isEmpty()) || a>0) a++; if ( a == args.count() ) @@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt return( 1 ); } f = realfunc; - left = f.find( '(' ); - right = f.find( ')' ); + left = f.tqfind( '(' ); + right = f.tqfind( ')' ); } doit: @@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) { TQString lt = (*it).simplifyWhiteSpace(); - int s = lt.find(' '); + int s = lt.tqfind(' '); // If there are spaces in the name, there may be two // reasons: the parameter name is still there, ie. @@ -250,7 +250,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt // s=1; - while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s])) + while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s])) { s++; } @@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session, QCStringList params; DCOPClient *client = 0L; int retval = 0; - if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) { - int delimPos = args[ 0 ].findRev( ',' ); + int delimPos = args[ 0 ].tqfindRev( ',' ); if( delimPos == -1 ) { cerr_ << "Error: '" << args[ 0 ] @@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session, } else if( !sessionName.isEmpty() ) { - if( sessions.contains( sessionName ) ) + if( sessions.tqcontains( sessionName ) ) { sessions.clear(); sessions.append( sessionName ); @@ -861,7 +861,7 @@ int main( int argc, char** argv ) if (prog[prog.length()-1] != '*') { // Strip a trailing -<PID> part. - int i = prog.findRev('-'); + int i = prog.tqfindRev('-'); if ((i >= 0) && prog.mid(i+1).toLong()) { prog = prog.left(i); diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp index cd3e4d517..0cc48c435 100644 --- a/dcop/client/dcopfind.cpp +++ b/dcop/client/dcopfind.cpp @@ -40,9 +40,9 @@ static bool bLaunchApp = 0; bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - TQString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + TQString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); if ( right < left ) { @@ -66,7 +66,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) { TQString lt = (*it).simplifyWhiteSpace(); - int s = lt.find(' '); + int s = lt.tqfind(' '); // If there are spaces in the name, there may be two // reasons: the parameter name is still there, ie. @@ -86,7 +86,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis // s=1; - while (s < (int)partl.count() && intTypes.contains(partl[s])) + while (s < (int)partl.count() && intTypes.tqcontains(partl[s])) { s++; } diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp index 5741ef775..f46531735 100644 --- a/dcop/client/dcopstart.cpp +++ b/dcop/client/dcopstart.cpp @@ -33,7 +33,7 @@ static DCOPClient* dcop = 0; void startApp(const char *_app, int argc, const char **args) { const char *function = 0; - TQString app = TQString::fromLatin1(_app); + TQString app = TQString::tqfromLatin1(_app); if (app.endsWith(".desktop")) function = "start_service_by_desktop_path(TQString,TQStringList)"; else diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp index f9b7955f2..496880aad 100644 --- a/dcop/client/marshall.cpp +++ b/dcop/client/marshall.cpp @@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) { TQCString result; - if ( type == "int" || type == "Q_INT32" ) + if ( type == "int" || type == "TQ_INT32" ) { int i; stream >> i; result.setNum( i ); - } else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" ) + } else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" ) { uint i; stream >> i; @@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) double d; stream >> d; result.setNum( d, 'f' ); - } else if ( type == "Q_INT64" ) { - Q_INT64 i; + } else if ( type == "TQ_INT64" ) { + TQ_INT64 i; stream >> i; result.sprintf( "%lld", i ); - } else if ( type == "Q_UINT64" ) { - Q_UINT64 i; + } else if ( type == "TQ_UINT64" ) { + TQ_UINT64 i; stream >> i; result.sprintf( "%llu", i ); } else if ( type == "bool" ) @@ -163,7 +163,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) { TQColor c; stream >> c; - result = c.name().local8Bit(); + result = TQString(c.name()).local8Bit(); } else if ( type == "TQSize" ) { TQSize s; @@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() ); } else if ( type == "TQVariant" ) { - Q_INT32 type; + TQ_INT32 type; stream >> type; return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) ); } else if ( type == "DCOPRef" ) @@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) result = r.url().local8Bit(); } else if ( type.left( 11 ) == "TQValueList<" ) { - if ( (uint)type.find( '>', 11 ) != type.length() - 1 ) + if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 ) return result; TQString nestedType = type.mid( 11, type.length() - 12 ); @@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) if ( nestedType.isEmpty() ) return result; - Q_UINT32 count; + TQ_UINT32 count; stream >> count; - Q_UINT32 i = 0; + TQ_UINT32 i = 0; for (; i < count; ++i ) { TQCString arg = demarshal( stream, nestedType ); @@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type ) } } else if ( type.left( 5 ) == "TQMap<" ) { - int commaPos = type.find( ',', 5 ); + int commaPos = type.tqfind( ',', 5 ); if ( commaPos == -1 ) return result; - if ( (uint)type.find( '>', commaPos ) != type.length() - 1 ) + if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 ) return result; TQString keyType = type.mid( 5, commaPos - 5 ); TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 ); - Q_UINT32 count; + TQ_UINT32 count; stream >> count; - Q_UINT32 i = 0; + TQ_UINT32 i = 0; for (; i < count; ++i ) { TQCString key = demarshal( stream, keyType ); @@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) arg << s.toUInt(); else if ( type == "unsigned int" ) arg << s.toUInt(); - else if ( type == "Q_INT32" ) + else if ( type == "TQ_INT32" ) arg << s.toInt(); - else if ( type == "Q_INT64" ) { + else if ( type == "TQ_INT64" ) { TQVariant qv = TQVariant( s ); arg << qv.toLongLong(); } - else if ( type == "Q_UINT32" ) + else if ( type == "TQ_UINT32" ) arg << s.toUInt(); - else if ( type == "Q_UINT64" ) { + else if ( type == "TQ_UINT64" ) { TQVariant qv = TQVariant( s ); arg << qv.toULongLong(); } @@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type ) marshall( dummy_arg, args, j, type ); count++; } - arg << (Q_UINT32) count; + arg << (TQ_UINT32) count; // Parse the list for real while (true) { if( i > args.count() ) diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 8006ecd52..8f4b7ce15 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -97,13 +97,13 @@ client_map_t *cliMap() DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId ) { - return cliMap()->find(_appId.data()); + return cliMap()->tqfind(_appId.data()); } static void registerLocalClient( const TQCString &_appId, DCOPClient *client ) { - cliMap()->replace(_appId.data(), client); + cliMap()->tqreplace(_appId.data(), client); } static @@ -141,7 +141,7 @@ public: TQCString* replyType; TQByteArray* replyData; int replyId; - Q_INT32 transactionId; + TQ_INT32 transactionId; TQCString calledApp; TQGuardedPtr<TQObject> replyObject; TQCString replySlot; @@ -173,7 +173,7 @@ public: TQCString defaultObject; TQPtrList<DCOPClientTransaction> *transactionList; bool transaction; - Q_INT32 transactionId; + TQ_INT32 transactionId; int opcode; // Special key values: @@ -205,7 +205,7 @@ public: class DCOPClientTransaction { public: - Q_INT32 id; + TQ_INT32 id; CARD32 key; TQCString senderId; }; @@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old) disp = "NODISPLAY"; int i; - if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0) + if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0) disp.truncate(i); if (!old) { - while( (i = disp.find(KPATH_SEPARATOR)) >= 0) + while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0) disp[i] = '_'; } @@ -382,7 +382,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject, case DCOPReplyWait: if ( replyStruct ) { TQCString calledApp, app; - Q_INT32 id; + TQ_INT32 id; TQDataStream ds( dataReceived, IO_ReadOnly ); ds >> calledApp >> app >> id; replyStruct->transactionId = id; @@ -398,7 +398,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject, { TQDataStream ds( dataReceived, IO_ReadOnly ); TQCString calledApp, app; - Q_INT32 id; + TQ_INT32 id; ds >> calledApp >> app >> id; if (replyStruct && (id == replyStruct->transactionId) && (calledApp == replyStruct->calledApp)) @@ -531,7 +531,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ TQByteArray reply; TQDataStream replyStream( reply, IO_WriteOnly ); - Q_INT32 id = c->transactionId(); + TQ_INT32 id = c->transactionId(); if (id) { // Call delayed. Send back the transaction ID. replyStream << d->appId << fromApp << id; @@ -672,9 +672,9 @@ bool DCOPClient::attach() void DCOPClient::bindToApp() { - // check if we have a qApp instantiated. If we do, + // check if we have a tqApp instantiated. If we do, // we can create a TQSocketNotifier and use it for receiving data. - if (qApp) { + if (tqApp) { if ( d->notifier ) delete d->notifier; d->notifier = new TQSocketNotifier(socket(), @@ -690,7 +690,7 @@ void DCOPClient::suspend() if (!d->notifier) return; #endif - assert(d->notifier); // Suspending makes no sense if we didn't had a qApp yet + assert(d->notifier); // Suspending makes no sense if we didn't had a tqApp yet d->notifier->setEnabled(false); } @@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) DCOPAuthCount, const_cast<char **>(DCOPAuthNames), DCOPClientAuthProcs, 0L)) < 0) { - emit attachFailed(TQString::fromLatin1( "Communications could not be established." )); + emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." )); return false; } @@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) TQCString fName = dcopServerFile(); TQFile f(TQFile::decodeName(fName)); if (!f.open(IO_ReadOnly)) { - emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); + emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); return false; } int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file @@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) // Should we abort ? } contents[size] = '\0'; - int pos = contents.find('\n'); + int pos = contents.tqfind('\n'); if ( pos == -1 ) // Shouldn't happen { qDebug("Only one line in dcopserver file !: %s", contents.data()); @@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) delete [] d->serverAddr; d->serverAddr = 0; } - emit attachFailed(TQString::fromLatin1( errBuf )); + emit attachFailed(TQString::tqfromLatin1( errBuf )); return false; } fcntl(socket(), F_SETFL, FD_CLOEXEC); @@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) delete [] d->serverAddr; d->serverAddr = 0; } - emit attachFailed(TQString::fromLatin1( errBuf )); + emit attachFailed(TQString::tqfromLatin1( errBuf )); return false; } else if (setupstat == IceProtocolAlreadyActive) { if (bClearServerAddr) { @@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) d->serverAddr = 0; } /* should not happen because 3rd arg to IceOpenConnection was 0. */ - emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" )); + emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" )); return false; } @@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) delete [] d->serverAddr; d->serverAddr = 0; } - emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." )); + emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." )); return false; } @@ -1017,7 +1017,7 @@ TQCString DCOPClient::normalizeFunctionSignature( const TQCString& fun ) { if ( fun.isEmpty() ) // nothing to do return fun.copy(); TQCString result( fun.size() ); - char *from = fun.data(); + char *from = const_cast<TQCString&>(fun).data(); char *to = result.data(); char *first = to; char last = 0; @@ -1056,7 +1056,7 @@ bool DCOPClient::send(const TQCString &remApp, const TQCString &remObjId, if ( localClient ) { bool saveTransaction = d->transaction; - Q_INT32 saveTransactionId = d->transactionId; + TQ_INT32 saveTransactionId = d->transactionId; TQCString saveSenderId = d->senderId; d->senderId = 0; // Local call @@ -1167,13 +1167,13 @@ bool DCOPClient::findObject(const TQCString &remApp, const TQCString &remObj, if ( (phase == 1) && localClient ) { // In phase 1 we do all local clients bool saveTransaction = d->transaction; - Q_INT32 saveTransactionId = d->transactionId; + TQ_INT32 saveTransactionId = d->transactionId; TQCString saveSenderId = d->senderId; d->senderId = 0; // Local call result = localClient->find( remApp, remObj, remFun, data, replyType, replyData ); - Q_INT32 id = localClient->transactionId(); + TQ_INT32 id = localClient->transactionId(); if (id) { // Call delayed. We have to wait till it has been processed. do { @@ -1298,7 +1298,7 @@ void DCOPClient::setNotifications(bool enabled) { TQByteArray data; TQDataStream ds(data, IO_WriteOnly); - ds << static_cast<Q_INT8>(enabled); + ds << static_cast<TQ_INT8>(enabled); TQCString replyType; TQByteArray reply; @@ -1310,7 +1310,7 @@ void DCOPClient::setDaemonMode( bool daemonMode ) { TQByteArray data; TQDataStream ds(data, IO_WriteOnly); - ds << static_cast<Q_INT8>( daemonMode ); + ds << static_cast<TQ_INT8>( daemonMode ); TQCString replyType; TQByteArray reply; @@ -1331,9 +1331,9 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path ) path += '/'; int unnamed = 0; - const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees(); - if ( list ) { - TQObjectListIt it( *list ); + const TQObjectList list = o ? o->childrenListObject() : TQObject::objectTreesListObject(); + if ( !list.isEmpty() ) { + TQObjectListIt it( list ); TQObject *obj; while ( (obj=it.current()) ) { ++it; @@ -1341,11 +1341,11 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path ) if ( n == "unnamed" || n.isEmpty() ) { n.sprintf("%p", (void *) obj); - n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1(); + n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1(); } TQCString fn = path + n; l.append( fn ); - if ( obj->tqchildren() ) + if ( !obj->childrenListObject().isEmpty() ) fillQtObjects( l, obj, fn ); } } @@ -1368,9 +1368,9 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path ) path += '/'; int unnamed = 0; - const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees(); - if ( list ) { - TQObjectListIt it( *list ); + const TQObjectList list = o ? o->childrenListObject() : TQObject::objectTreesListObject(); + if ( !list.isEmpty() ) { + TQObjectListIt it( list ); TQObject *obj; while ( (obj=it.current()) ) { ++it; @@ -1378,11 +1378,11 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path ) if ( n == "unnamed" || n.isEmpty() ) { n.sprintf("%p", (void *) obj); - n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1(); + n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1(); } TQCString fn = path + n; l.append( O( fn, obj ) ); - if ( obj->tqchildren() ) + if ( !obj->childrenListObject().isEmpty() ) fillQtObjectsEx( l, obj, fn ); } } @@ -1399,7 +1399,7 @@ static TQObject* findQtObject( TQCString id ) for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) { if ( (*it).s == id ) // exact match return (*it).o; - if ( !firstContains && (*it).s.contains( expr ) ) { + if ( !firstContains && (*it).s.tqcontains( expr ) ) { firstContains = (*it).o; } } @@ -1413,7 +1413,7 @@ static QCStringList findQtObjects( TQCString id ) fillQtObjectsEx( l, 0, "qt" ); QCStringList result; for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) { - if ( (*it).s.contains( expr ) ) + if ( (*it).s.tqcontains( expr ) ) result << (*it).s; } return result; @@ -1470,10 +1470,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const l << "QCStringList properties()"; l << "bool setProperty(TQCString,TQVariant)"; l << "TQVariant property(TQCString)"; - TQStrList lst = o->metaObject()->slotNames( true ); + TQStrList lst = o->tqmetaObject()->slotNames( true ); int i = 0; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( o->metaObject()->slot( i++, true )->tqaccess != QMetaData::Public ) + if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public ) continue; TQCString slot = it.current(); if ( slot.contains( "()" ) ) { @@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const replyType = "QCStringList"; TQDataStream reply( replyData, IO_WriteOnly ); QCStringList l; - TQMetaObject *meta = o->metaObject(); + TQMetaObject *meta = o->tqmetaObject(); while ( meta ) { l.prepend( meta->className() ); - meta = meta->superClass(); + meta = meta->tqsuperClass(); } reply << l; return true; @@ -1498,10 +1498,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const replyType = "QCStringList"; TQDataStream reply( replyData, IO_WriteOnly ); QCStringList l; - TQStrList lst = o->metaObject()->propertyNames( true ); + TQStrList lst = o->tqmetaObject()->propertyNames( true ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - TQMetaObject *mo = o->metaObject(); - const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true ); + TQMetaObject *mo = o->tqmetaObject(); + const TQMetaProperty* p = mo->property( mo->tqfindProperty( it.current(), true ), true ); if ( !p ) continue; TQCString prop = p->type(); @@ -1529,13 +1529,13 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const ds >> name >> value; replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8) o->setProperty( name, value ); + reply << (TQ_INT8) o->setProperty( name, value ); return true; } else { - int slot = o->metaObject()->findSlot( fun, true ); + int slot = o->tqmetaObject()->tqfindSlot( fun, true ); if ( slot != -1 ) { replyType = "void"; - QUObject uo[ 1 ]; + TQUObject uo[ 1 ]; o->qt_invoke( slot, uo ); return true; } @@ -1656,7 +1656,7 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId, // return true. Return false otherwise. static bool findResultOk(TQCString &replyType, TQByteArray &replyData) { - Q_INT8 success; // Tsk.. why is there no operator>>(bool)? + TQ_INT8 success; // Tsk.. why is there no operator>>(bool)? if (replyType != "bool") return false; TQDataStream reply( replyData, IO_ReadOnly ); @@ -1746,13 +1746,13 @@ bool DCOPClient::call(const TQCString &remApp, const TQCString &remObjId, if ( localClient ) { bool saveTransaction = d->transaction; - Q_INT32 saveTransactionId = d->transactionId; + TQ_INT32 saveTransactionId = d->transactionId; TQCString saveSenderId = d->senderId; d->senderId = 0; // Local call bool b = localClient->receive( remApp, remObjId, remFun, data, replyType, replyData ); - Q_INT32 id = localClient->transactionId(); + TQ_INT32 id = localClient->transactionId(); if (id) { // Call delayed. We have to wait till it has been processed. do { @@ -1882,7 +1882,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId for(;;) { bool checkMessages = true; if ( useEventLoop - ? d->notifier != NULL // useEventLoop needs a socket notifier and a qApp + ? d->notifier != NULL // useEventLoop needs a socket notifier and a tqApp : timeout >= 0 ) { // !useEventLoop doesn't block only for timeout >= 0 const int guiTimeout = 100; checkMessages = false; @@ -1907,7 +1907,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId } if( timeout >= 0 ) d->eventLoopTimer.start(time_left - guiTimeout, true); - qApp->enter_loop(); + tqApp->enter_loop(); d->eventLoopTimer.stop(); if ( !old_lock ) { d->non_blocking_call_lock = false; @@ -1974,7 +1974,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId // Wake up parent call, maybe it's reply is available already. if ( d->non_blocking_call_lock ) { - qApp->exit_loop(); + tqApp->exit_loop(); } d->currentKey = oldCurrentKey; @@ -1983,7 +1983,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId void DCOPClient::eventLoopTimeout() { - qApp->exit_loop(); + tqApp->exit_loop(); } void DCOPClient::processSocketData(int fd) @@ -2000,8 +2000,8 @@ void DCOPClient::processSocketData(int fd) return; if ( d->non_blocking_call_lock ) { - if( qApp ) - qApp->exit_loop(); + if( tqApp ) + tqApp->exit_loop(); return; } @@ -2034,7 +2034,7 @@ TQCString DCOPClient::defaultObject() const } bool -DCOPClient::isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData) +DCOPClient::isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData) { DCOPClientPrivate::LocalTransactionResult *result = d->localTransActionList.take(id); if (!result) @@ -2068,7 +2068,7 @@ DCOPClient::beginTransaction() return trans; } -Q_INT32 +TQ_INT32 DCOPClient::transactionId() const { if (d->transaction) @@ -2147,7 +2147,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO { TQCString replyType; TQByteArray data, replyData; - Q_INT8 iVolatile = Volatile ? 1 : 0; + TQ_INT8 iVolatile = Volatile ? 1 : 0; TQDataStream args(data, IO_WriteOnly ); args << sender << senderObj << normalizeFunctionSignature(signal) << receiverObj << normalizeFunctionSignature(slot) << iVolatile; @@ -2163,7 +2163,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO return false; TQDataStream reply(replyData, IO_ReadOnly ); - Q_INT8 result; + TQ_INT8 result; reply >> result; return (result != 0); } @@ -2197,7 +2197,7 @@ DCOPClient::disconnectDCOPSignal( const TQCString &sender, const TQCString &send return false; TQDataStream reply(replyData, IO_ReadOnly ); - Q_INT8 result; + TQ_INT8 result; reply >> result; return (result != 0); } diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h index 41266c187..0575cd1ed 100644 --- a/dcop/dcopclient.h +++ b/dcop/dcopclient.h @@ -65,9 +65,10 @@ typedef TQValueList<TQCString> QCStringList; * @see KApplication::dcopClient() * @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org> */ -class DCOP_EXPORT DCOPClient : public QObject +class DCOP_EXPORT DCOPClient : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -511,7 +512,7 @@ class DCOP_EXPORT DCOPClient : public QObject * @see process() * @see beginTransaction() */ - Q_INT32 transactionId() const; + TQ_INT32 transactionId() const; /** * Checks whether @p remApp is registered with the DCOP server. @@ -816,7 +817,7 @@ public: private: - bool isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData); + bool isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData); bool attachInternal( bool registerAsAnonymous = true ); diff --git a/dcop/dcopidl/main.cpp b/dcop/dcopidl/main.cpp index aa60e2c41..0cbb32a1e 100644 --- a/dcop/dcopidl/main.cpp +++ b/dcop/dcopidl/main.cpp @@ -47,7 +47,7 @@ int main( int argc, char** argv ) return -1; } - TQByteArray arr = file.readAll(); + TQByteArray arr = TQByteArray(file.readAll()); uint len = arr.size(); uint j = 1; for (uint i = 1; i<len; i++, j++) { diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc index e91b21d68..f118a67e9 100644 --- a/dcop/dcopidl/scanner.cc +++ b/dcop/dcopidl/scanner.cc @@ -1226,8 +1226,8 @@ YY_RULE_SETUP #line 170 "scanner.ll" { TQString s( yytext ); - int i = s.find(TQRegExp("[\"<]"))+1; - int j = s.find(TQRegExp("[\">]"), i); + int i = s.tqfind(TQRegExp("[\"<]"))+1; + int j = s.tqfind(TQRegExp("[\">]"), i); yylval._str = new TQString( s.mid( i, j - i ) ); idl_line_no++; return T_INCLUDE; diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll index 63e8ca59c..d9f870512 100644 --- a/dcop/dcopidl/scanner.ll +++ b/dcop/dcopidl/scanner.ll @@ -236,6 +236,7 @@ FALSE return T_FALSE; typedef return T_TYPEDEF; K_DCOP return T_DCOP; Q_OBJECT ; +TQ_OBJECT ; ("0"|"0L") return T_NULL; "extern "[A-Za-z0-9_ \t*]+ return T_EXTERN; "extern \"C\"" return T_EXTERN_C; diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cc index d41fa6dbd..1fbc4c0bd 100644 --- a/dcop/dcopidl/yacc.cc +++ b/dcop/dcopidl/yacc.cc @@ -1643,7 +1643,7 @@ yyreduce: case 15: #line 221 "yacc.yy" { - int pos = in_namespace.findRev( "::", -3 ); + int pos = in_namespace.tqfindRev( "::", -3 ); if( pos >= 0 ) in_namespace = in_namespace.left( pos + 2 ); else diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy index ca22c65e1..7870eb6e9 100644 --- a/dcop/dcopidl/yacc.yy +++ b/dcop/dcopidl/yacc.yy @@ -219,7 +219,7 @@ declaration } main T_RIGHT_CURLY_BRACKET opt_semicolon { - int pos = in_namespace.findRev( "::", -3 ); + int pos = in_namespace.tqfindRev( "::", -3 ); if( pos >= 0 ) in_namespace = in_namespace.left( pos + 2 ); else diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp index 5e0f27525..c0fb786c8 100644 --- a/dcop/dcopidl2cpp/main.cpp +++ b/dcop/dcopidl2cpp/main.cpp @@ -104,11 +104,11 @@ int main( int argc, char** argv ) TQString base( argv[argpos] ); TQString idl = base; - int pos = base.findRev( '.' ); + int pos = base.tqfindRev( '.' ); if ( pos != -1 ) base = base.left( pos ); - pos = idl.findRev('/'); + pos = idl.tqfindRev('/'); if ( pos != -1 ) idl = idl.mid( pos+1 ); @@ -118,7 +118,7 @@ int main( int argc, char** argv ) if ( generate_stub ) { TQString header = base; generateStub( idl, header + "_stub.h", de ); - pos = header.findRev('/'); + pos = header.tqfindRev('/'); if ( pos != -1 ) header = header.mid( pos+1 ); generateStubImpl( idl, header + "_stub.h", base+".h", base + "_stub." + suffix, de); diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp index 5cc30de3e..7c26e5647 100644 --- a/dcop/dcopidl2cpp/skel.cpp +++ b/dcop/dcopidl2cpp/skel.cpp @@ -177,7 +177,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d TQString namespace_tmp = className; str << endl; for(;;) { - int pos = namespace_tmp.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); if( pos < 0 ) { className = namespace_tmp; break; @@ -223,7 +223,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d str << "\t fdict->insert( " << className << "_ftable[i][1], new int( i ) );" << endl; str << " }" << endl; - str << " int* fp = fdict->find( fun );" << endl; + str << " int* fp = fdict->tqfind( fun );" << endl; str << " switch ( fp?*fp:-1) {" << endl; } s = n.nextSibling().toElement(); diff --git a/dcop/dcopidl2cpp/stub.cpp b/dcop/dcopidl2cpp/stub.cpp index 887945262..5191abde8 100644 --- a/dcop/dcopidl2cpp/stub.cpp +++ b/dcop/dcopidl2cpp/stub.cpp @@ -54,7 +54,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d str << endl; TQString ifdefstring = idl.upper(); - int pos = idl.findRev( '.' ); + int pos = idl.tqfindRev( '.' ); if ( pos != -1 ) ifdefstring = ifdefstring.left( pos ); @@ -107,13 +107,13 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d } if( DCOPParent != "DCOPObject" ) { // we need to include the .h file for the base stub - if( all_includes.contains( DCOPParent + ".h" )) + if( all_includes.tqcontains( DCOPParent + ".h" )) str << "#include <" << DCOPParent << "_stub.h>" << endl; - else if( all_includes.contains( DCOPParent.lower() + ".h" )) + else if( all_includes.tqcontains( DCOPParent.lower() + ".h" )) str << "#include <" << DCOPParent.lower() << "_stub.h>" << endl; else {// damn ... let's assume it's the last include TQString stub_h = all_includes.last(); - unsigned int pos = stub_h.find( ".h" ); + unsigned int pos = stub_h.tqfind( ".h" ); if( pos > 0 ) { stub_h = stub_h.remove( pos, 100000 ); str << "#include <" << stub_h << "_stub.h>" << endl; @@ -128,7 +128,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d int namespace_count = 0; TQString namespace_tmp = className; for(;;) { - int pos = namespace_tmp.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); if( pos < 0 ) { className = namespace_tmp; break; diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp index 5cdd2a00d..7e9990e61 100644 --- a/dcop/dcopidl2cpp/stubimpl.cpp +++ b/dcop/dcopidl2cpp/stubimpl.cpp @@ -98,7 +98,7 @@ void generateStubImpl( const TQString& idl, const TQString& header, const TQStri TQString namespace_tmp = className_stub; str << endl; for(;;) { - int pos = namespace_tmp.find( "::" ); + int pos = namespace_tmp.tqfind( "::" ); if( pos < 0 ) { className_stub = namespace_tmp; break; diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp index fd39fb347..348f13d4a 100644 --- a/dcop/dcopobject.cpp +++ b/dcop/dcopobject.cpp @@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj) while (currentObj != 0L) { ident.prepend( currentObj->name() ); ident.prepend("/"); - currentObj = currentObj->parent(); + currentObj = TQT_TQOBJECT(currentObj->parent()); } if ( ident[0] == '/' ) ident = ident.mid(1); @@ -116,7 +116,7 @@ TQCString DCOPObject::objId() const bool DCOPObject::hasObject(const TQCString &_objId) { - if (objMap()->contains(_objId)) + if (objMap()->tqcontains(_objId)) return true; else return false; @@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj ) { identity.prepend( currentObj->name() ); identity.prepend("/"); - currentObj = currentObj->parent(); + currentObj = TQT_TQOBJECT(currentObj->parent()); } if ( identity[0] == '/' ) identity = identity.mid(1); diff --git a/dcop/dcopref.cpp b/dcop/dcopref.cpp index bb39c109b..c446eb0ee 100644 --- a/dcop/dcopref.cpp +++ b/dcop/dcopref.cpp @@ -62,9 +62,9 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co return reply; } TQCString sig = fun; - if ( fun.find('(') == -1 ) { + if ( fun.tqfind('(') == -1 ) { sig += args; - if( args.find( "<unknown" ) != -1 ) + if( args.tqfind( "<unknown" ) != -1 ) qWarning("DCOPRef: unknown type error " "<\"%s\",\"%s\">::call(\"%s\",%s", STR(m_app), STR(m_obj), STR(fun), args.data()+1 ); @@ -87,9 +87,9 @@ bool DCOPRef::sendInternal( const TQCString& fun, const TQCString& args, const T } Q_UNUSED( data ); TQCString sig = fun; - if ( fun.find('(') == -1 ) { + if ( fun.tqfind('(') == -1 ) { sig += args; - if( args.find( "<unknown" ) != -1 ) + if( args.tqfind( "<unknown" ) != -1 ) qWarning("DCOPRef: unknown type error " "<\"%s\",\"%s\">::send(\"%s\",%s", STR(m_app), STR(m_obj), STR(fun), args.data()+1 ); diff --git a/dcop/dcopref.h b/dcop/dcopref.h index 92cb921bb..c7fa69822 100644 --- a/dcop/dcopref.h +++ b/dcop/dcopref.h @@ -396,7 +396,7 @@ public: * Flag for allowing entering the event loop if the call blocks too long. * @p NoEventLoop disables entering the event loop. * @p UseEventLoop allows entering the event loop while waiting for long - * blocking DCOP call, thus making the GUI repaint if needed, and possibly + * blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly * allowing also other code in the application to be executed. * @see DCOPClient::call() */ diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index 41a639b2e..b8994f699 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -124,9 +124,9 @@ void DCOPIceWriteChar(register IceConn iceConn, unsigned long nbytes, char *ptr) static TQCString readQCString(TQDataStream &ds) { TQCString result; - Q_UINT32 len; + TQ_UINT32 len; ds >> len; - TQIODevice *device = ds.device(); + TQIODevice *device = ds.tqdevice(); int bytesLeft = device->size()-device->at(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { @@ -142,9 +142,9 @@ static TQCString readQCString(TQDataStream &ds) static TQByteArray readQByteArray(TQDataStream &ds) { TQByteArray result; - Q_UINT32 len; + TQ_UINT32 len; ds >> len; - TQIODevice *device = ds.device(); + TQIODevice *device = ds.tqdevice(); int bytesLeft = device->size()-device->at(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { @@ -287,7 +287,7 @@ qWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.si // assert(conn->outputBuffer.isEmpty()); } - unsigned long nleft = writeIceData(iceConn, _data.size(), _data.data()); + unsigned long nleft = writeIceData(iceConn, _data.size(), const_cast<TQByteArray&>(_data).data()); if ((nleft > 0) && conn) { conn->waitForOutputReady(_data, _data.size() - nleft); @@ -319,7 +319,7 @@ void DCOPServer::slotOutputReady(int socket) qWarning("DCOPServer: slotOutputReady fd = %d", socket); #endif // Find out connection. - DCOPConnection *conn = fd_clients.find(socket); + DCOPConnection *conn = fd_clients.tqfind(socket); //assert(conn); //assert(conn->outputBlocked); //assert(conn->socket() == socket); @@ -396,7 +396,7 @@ qWarning("DCOPServer: Flushing data, fd = %d", IceConnectionNumber(_iceConn)); DCOPIceWrite(_iceConn, _data); } -class DCOPListener : public QSocketNotifier +class DCOPListener : public TQSocketNotifier { public: DCOPListener( IceListenObj obj ) @@ -710,7 +710,7 @@ void DCOPProcessMessage( IceConn iceConn, IcePointer /*clientData*/, void DCOPServer::processMessage( IceConn iceConn, int opcode, unsigned long length, Bool /*swap*/) { - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if ( !conn ) { qWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode); return; @@ -1109,7 +1109,7 @@ DCOPConnection* DCOPServer::findApp( const TQCString& appId ) { if ( appId.isNull() ) return 0; - DCOPConnection* conn = appIds.find( appId ); + DCOPConnection* conn = appIds.tqfind( appId ); return conn; } @@ -1204,7 +1204,7 @@ void DCOPServer::removeConnection( void* data ) while (!conn->waitingForReply.isEmpty()) { IceConn iceConn = conn->waitingForReply.take(0); if (iceConn) { - DCOPConnection* target = clients.find( iceConn ); + DCOPConnection* target = clients.tqfind( iceConn ); qWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "<unknown>" , conn->appId.data() ); TQByteArray reply; DCOPMsg *pMsg; @@ -1226,7 +1226,7 @@ void DCOPServer::removeConnection( void* data ) while (!conn->waitingForDelayedReply.isEmpty()) { IceConn iceConn = conn->waitingForDelayedReply.take(0); if (iceConn) { - DCOPConnection* target = clients.find( iceConn ); + DCOPConnection* target = clients.tqfind( iceConn ); qWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "<unknown>", conn->appId.data() ); TQByteArray reply; DCOPMsg *pMsg; @@ -1247,7 +1247,7 @@ void DCOPServer::removeConnection( void* data ) { IceConn iceConn = conn->waitingOnReply.take(0); if (iceConn) { - DCOPConnection* target = clients.find( iceConn ); + DCOPConnection* target = clients.tqfind( iceConn ); if (!target) { qWarning("DCOP Error: still waiting for answer from non-existing client."); @@ -1359,7 +1359,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, if ( obj == "emit") { - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if (conn) { //qDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data()); dcopSignals->emitSignal(conn, fun, data, false); @@ -1370,13 +1370,13 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, if ( fun == "setDaemonMode(bool)" ) { TQDataStream args( data, IO_ReadOnly ); if ( !args.atEnd() ) { - Q_INT8 iDaemon; + TQ_INT8 iDaemon; bool daemon; args >> iDaemon; daemon = static_cast<bool>( iDaemon ); - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if ( conn && !conn->appId.isNull() ) { if ( daemon ) { if ( !conn->daemon ) @@ -1414,10 +1414,10 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, if (!args.atEnd()) { TQCString app2 = readQCString(args); TQDataStream reply( replyData, IO_WriteOnly ); - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if ( conn && !app2.isEmpty() ) { if ( !conn->appId.isNull() && - appIds.find( conn->appId ) == conn ) { + appIds.tqfind( conn->appId ) == conn ) { appIds.remove( conn->appId ); } @@ -1440,7 +1440,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, #endif conn->appId = app2; - if ( appIds.find( app2 ) != 0 ) { + if ( appIds.tqfind( app2 ) != 0 ) { // we already have this application, unify int n = 1; TQCString tmp; @@ -1449,12 +1449,12 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, tmp.setNum( n ); tmp.prepend("-"); tmp.prepend( app2 ); - } while ( appIds.find( tmp ) != 0 ); + } while ( appIds.tqfind( tmp ) != 0 ); conn->appId = tmp; } appIds.insert( conn->appId, conn ); - int c = conn->appId.find( '-' ); + int c = conn->appId.tqfind( '-' ); if ( c > 0 ) conn->plainAppId = conn->appId.left( c ); else @@ -1494,9 +1494,9 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, } else if ( fun == "setNotifications(bool)" ) { TQDataStream args( data, IO_ReadOnly ); if (!args.atEnd()) { - Q_INT8 notifyActive; + TQ_INT8 notifyActive; args >> notifyActive; - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if ( conn ) { if ( notifyActive ) conn->notifyRegister++; @@ -1507,7 +1507,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, return true; } } else if ( fun == "connectSignal(TQCString,TQCString,TQCString,TQCString,TQCString,bool)") { - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if (!conn) return false; TQDataStream args(data, IO_ReadOnly ); if (args.atEnd()) return false; @@ -1516,16 +1516,16 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, TQCString signal = readQCString(args); TQCString receiverObj = readQCString(args); TQCString slot = readQCString(args); - Q_INT8 Volatile; + TQ_INT8 Volatile; args >> Volatile; //qDebug("DCOPServer: connectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data()); bool b = dcopSignals->connectSignal(sender, senderObj, signal, conn, receiverObj, slot, (Volatile != 0)); replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8) (b?1:0); + reply << (TQ_INT8) (b?1:0); return true; } else if ( fun == "disconnectSignal(TQCString,TQCString,TQCString,TQCString,TQCString)") { - DCOPConnection* conn = clients.find( iceConn ); + DCOPConnection* conn = clients.tqfind( iceConn ); if (!conn) return false; TQDataStream args(data, IO_ReadOnly ); if (args.atEnd()) return false; @@ -1538,7 +1538,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj, bool b = dcopSignals->disconnectSignal(sender, senderObj, signal, conn, receiverObj, slot); replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8) (b?1:0); + reply << (TQ_INT8) (b?1:0); return true; } @@ -1618,7 +1618,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false) TQCString contents( size+1 ); bool ok = f.readBlock( contents.data(), size ) == size; contents[size] = '\0'; - int pos = contents.find('\n'); + int pos = contents.tqfind('\n'); ok = ok && ( pos != -1 ); pid_t pid = ok ? contents.mid(pos+1).toUInt(&ok) : 0; f.close(); diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h index 7b649ccf2..7abc6497a 100644 --- a/dcop/dcopserver.h +++ b/dcop/dcopserver.h @@ -66,7 +66,7 @@ typedef TQValueList<TQCString> QCStringList; /** * @internal */ -class DCOPConnection : public QSocketNotifier +class DCOPConnection : public TQSocketNotifier { public: DCOPConnection( IceConn conn ); @@ -112,7 +112,7 @@ public: /** * @internal */ -class DCOPServer : public QObject +class DCOPServer : public TQObject { Q_OBJECT public: @@ -130,7 +130,7 @@ public: DCOPConnection *findApp(const TQCString &appId); DCOPConnection *findConn(IceConn iceConn) - { return clients.find(iceConn); } + { return clients.tqfind(iceConn); } void sendMessage(DCOPConnection *conn, const TQCString &sApp, const TQCString &rApp, const TQCString &rObj, diff --git a/dcop/dcopsignals.cpp b/dcop/dcopsignals.cpp index 437051a55..1e0eee354 100644 --- a/dcop/dcopsignals.cpp +++ b/dcop/dcopsignals.cpp @@ -39,14 +39,14 @@ DCOPSignals::emitSignal( DCOPConnection *conn, const TQCString &_fun, const TQBy { TQCString senderObj; TQCString fun = _fun; - int i = fun.find('#'); + int i = fun.tqfind('#'); if (i > -1) { senderObj = fun.left(i); fun = fun.mid(i+1); } - DCOPSignalConnectionList *list = connections.find(fun); + DCOPSignalConnectionList *list = connections.tqfind(fun); if (!list) return; for(DCOPSignalConnection *current = list->first(); current; current = list->next()) { @@ -102,16 +102,16 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj, // TODO: Check if signal and slot match TQCString signalArgs, slotArgs; int i,j; - i = signal.find('('); + i = signal.tqfind('('); if (i < 0) return false; signalArgs = signal.mid(i+1); - j = signalArgs.find(')'); + j = signalArgs.tqfind(')'); if (j < 0) return false; signalArgs.truncate(j); - i = slot.find('('); + i = slot.tqfind('('); if (i < 0) return false; slotArgs = slot.mid(i+1); - j = slotArgs.find(')'); + j = slotArgs.tqfind(')'); if (j < 0) return false; slotArgs.truncate(j); @@ -142,7 +142,7 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj, current->recvObj = receiverObj; current->slot = slot; - DCOPSignalConnectionList *list = connections.find(signal); + DCOPSignalConnectionList *list = connections.tqfind(signal); if (!list) { list = new DCOPSignalConnectionList; @@ -177,7 +177,7 @@ DCOPSignals::disconnectSignal( const TQCString &sender, const TQCString &senderO return true; } - DCOPSignalConnectionList *list = connections.find(signal); + DCOPSignalConnectionList *list = connections.tqfind(signal); if (!list) return false; // Not found... @@ -255,7 +255,7 @@ DCOPSignals::removeConnections(DCOPConnection *conn, const TQCString &obj) if (current->recvConn != conn) current->recvConn->signalConnectionList()->removeRef(current); - DCOPSignalConnectionList *signalList = connections.find(current->signal); + DCOPSignalConnectionList *signalList = connections.tqfind(current->signal); if (signalList) { signalList->removeRef(current); diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h index de85ebb47..6551295f6 100644 --- a/dcop/kdatastream.h +++ b/dcop/kdatastream.h @@ -6,13 +6,13 @@ #ifdef USE_QT3 inline TQDataStream & operator << (TQDataStream & str, bool b) { - str << Q_INT8(b); + str << TQ_INT8(b); return str; } inline TQDataStream & operator >> (TQDataStream & str, bool & b) { - Q_INT8 l; + TQ_INT8 l; str >> l; b = bool(l); return str; @@ -22,7 +22,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b) #if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) inline TQDataStream & operator << (TQDataStream & str, long long int ll) { - Q_UINT32 l1,l2; + TQ_UINT32 l1,l2; l1 = ll & 0xffffffffLL; l2 = ll >> 32; str << l1 << l2; @@ -31,7 +31,7 @@ inline TQDataStream & operator << (TQDataStream & str, long long int ll) inline TQDataStream & operator >> (TQDataStream & str, long long int&ll) { - Q_UINT32 l1,l2; + TQ_UINT32 l1,l2; str >> l1 >> l2; ll = ((unsigned long long int)(l2) << 32) + (long long int) l1; return str; @@ -39,7 +39,7 @@ inline TQDataStream & operator >> (TQDataStream & str, long long int&ll) inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll) { - Q_UINT32 l1,l2; + TQ_UINT32 l1,l2; l1 = ll & 0xffffffffLL; l2 = ll >> 32; str << l1 << l2; @@ -48,7 +48,7 @@ inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll) { - Q_UINT32 l1,l2; + TQ_UINT32 l1,l2; str >> l1 >> l2; ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1; return str; diff --git a/dcop/testdcop.h b/dcop/testdcop.h index 135812e39..936632b55 100644 --- a/dcop/testdcop.h +++ b/dcop/testdcop.h @@ -35,13 +35,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdio.h> /** - $QTDIR/bin/moc testdcop.cpp -o testdcop.moc + $QTDIR/bin/tqmoc testdcop.cpp -o testdcop.moc g++ -o testdcop testdcop.cpp -I$QTDIR/include -L$QTDIR/lib @internal **/ -class TestObject : public QObject +class TestObject : public TQObject { Q_OBJECT public: diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp index 8a24f11b6..6cab652ac 100644 --- a/dnssd/domainbrowser.cpp +++ b/dnssd/domainbrowser.cpp @@ -125,7 +125,7 @@ void DomainBrowser::startBrowse() void DomainBrowser::gotNewDomain(const TQString& domain) { - if (d->m_domains.contains(domain)) return; + if (d->m_domains.tqcontains(domain)) return; d->m_domains.append(domain); emit domainAdded(domain); } diff --git a/dnssd/domainbrowser.h b/dnssd/domainbrowser.h index a77849240..199163cb1 100644 --- a/dnssd/domainbrowser.h +++ b/dnssd/domainbrowser.h @@ -38,7 +38,7 @@ class DomainBrowserPrivate; @short Class used to provide current list of domains for browsing. @author Jakub Stachowski */ -class KDNSSD_EXPORT DomainBrowser : public QObject +class KDNSSD_EXPORT DomainBrowser : public TQObject { Q_OBJECT public: diff --git a/dnssd/query.h b/dnssd/query.h index 90e9fe19d..42dae32e2 100644 --- a/dnssd/query.h +++ b/dnssd/query.h @@ -36,7 +36,7 @@ name, either multicast or unicast DNS will be used. @short Class that represents service query in one domain. @author Jakub Stachowski */ -class KDNSSD_EXPORT Query : public QObject +class KDNSSD_EXPORT Query : public TQObject { Q_OBJECT public: diff --git a/dnssd/remoteservice.cpp b/dnssd/remoteservice.cpp index 62ec01eb0..2f5bc5927 100644 --- a/dnssd/remoteservice.cpp +++ b/dnssd/remoteservice.cpp @@ -166,7 +166,7 @@ void RemoteService::virtual_hook(int, void*) TQDataStream & operator<< (TQDataStream & s, const RemoteService & a) { s << (static_cast<ServiceBase>(a)); - Q_INT8 resolved = a.d->m_resolved ? 1:0; + TQ_INT8 resolved = a.d->m_resolved ? 1:0; s << resolved; return s; } @@ -177,7 +177,7 @@ TQDataStream & operator>> (TQDataStream & s, RemoteService & a) #ifdef HAVE_DNSSD a.d->stop(); #endif - Q_INT8 resolved; + TQ_INT8 resolved; operator>>(s,(static_cast<ServiceBase&>(a))); s >> resolved; a.d->m_resolved = (resolved == 1); diff --git a/dnssd/responder.cpp b/dnssd/responder.cpp index d85358429..31f37598d 100644 --- a/dnssd/responder.cpp +++ b/dnssd/responder.cpp @@ -72,7 +72,7 @@ Responder& Responder::self() void Responder::process() { - qApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); + tqApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); } #ifdef HAVE_DNSSD @@ -88,7 +88,7 @@ AvahiClientState Responder::state() const bool domainIsLocal(const TQString& domain) { - return domain.section('.',-1,-1).lower()=="local"; + return TQString(domain.section('.',-1,-1)).lower()=="local"; } TQCString domainToDNS(const TQString &domain) diff --git a/dnssd/responder.h b/dnssd/responder.h index ae909b59b..187683c7b 100644 --- a/dnssd/responder.h +++ b/dnssd/responder.h @@ -41,7 +41,7 @@ This class should not be used directly. @author Jakub Stachowski @short Internal class wrapping avahi client */ -class Responder : public QObject +class Responder : public TQObject { Q_OBJECT diff --git a/dnssd/sdevent.h b/dnssd/sdevent.h index 90f4a64d5..e609a4901 100644 --- a/dnssd/sdevent.h +++ b/dnssd/sdevent.h @@ -30,13 +30,13 @@ namespace DNSSD enum Operation { SD_ERROR = 101,SD_ADDREMOVE, SD_PUBLISH, SD_RESOLVE}; -class ErrorEvent : public QCustomEvent +class ErrorEvent : public TQCustomEvent { public: ErrorEvent() : TQCustomEvent(TQEvent::User+SD_ERROR) {} }; -class AddRemoveEvent : public QCustomEvent +class AddRemoveEvent : public TQCustomEvent { public: enum Operation { Add, Remove }; @@ -51,7 +51,7 @@ public: const TQString m_domain; }; -class PublishEvent : public QCustomEvent +class PublishEvent : public TQCustomEvent { public: PublishEvent(bool ok) : TQCustomEvent(TQEvent::User+SD_PUBLISH), m_ok(ok) @@ -60,7 +60,7 @@ public: bool m_ok; }; -class ResolveEvent : public QCustomEvent +class ResolveEvent : public TQCustomEvent { public: ResolveEvent(const TQString& hostname, unsigned short port, diff --git a/dnssd/servicebase.cpp b/dnssd/servicebase.cpp index 52d18cca3..544b56fbb 100644 --- a/dnssd/servicebase.cpp +++ b/dnssd/servicebase.cpp @@ -51,14 +51,14 @@ void ServiceBase::decode(const TQString& name) } else { // normal service or domain TQString decoded_name=name; decoded_name=decoded_name.replace("\\\\","\\"); - int i = decoded_name.find(TQRegExp("[^\\\\]\\.")); + int i = decoded_name.tqfind(TQRegExp("[^\\\\]\\.")); if (i==-1) return; // first find service name rest = decoded_name.mid(i+2); m_serviceName=decoded_name.left(i+1).replace("\\.","."); } m_type = rest.section('.',0,1); // does it really have a type? - if (m_type[0]=='_' && m_type[m_type.find('.')+1]=='_') + if (m_type[0]=='_' && m_type[m_type.tqfind('.')+1]=='_') m_domain = rest.section('.',2,-1,TQString::SectionIncludeTrailingSep); else { m_type=""; @@ -100,13 +100,13 @@ void ServiceBase::virtual_hook(int, void*) TQDataStream & operator<< (TQDataStream & s, const ServiceBase & a) { - s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << Q_INT16(a.m_port) << a.m_textData; + s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << TQ_INT16(a.m_port) << a.m_textData; return s; } TQDataStream & operator>> (TQDataStream & s, ServiceBase & a) { - Q_INT16 port; + TQ_INT16 port; s >> a.m_serviceName >> a.m_type >> a.m_domain >> a.m_hostName >> port >> a.m_textData; a.m_port = port; return s; diff --git a/dnssd/servicebrowser.cpp b/dnssd/servicebrowser.cpp index 3c64ffe66..2ca87ef86 100644 --- a/dnssd/servicebrowser.cpp +++ b/dnssd/servicebrowser.cpp @@ -108,7 +108,7 @@ const DomainBrowser* ServiceBrowser::browsedDomains() const void ServiceBrowser::serviceResolved(bool success) { - TQObject* sender_obj = const_cast<TQObject*>(sender()); + TQObject* sender_obj = const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())); RemoteService* svr = static_cast<RemoteService*>(sender_obj); disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool))); TQValueList<RemoteService::Ptr>::Iterator it = d->m_duringResolve.begin(); diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h index fac4d407c..cb270dea8 100644 --- a/dnssd/servicebrowser.h +++ b/dnssd/servicebrowser.h @@ -51,7 +51,7 @@ to constructor, domains configured by user will be searched. @author Jakub Stachowski @short Browsing for specific type of services or all available service types */ -class KDNSSD_EXPORT ServiceBrowser : public QObject +class KDNSSD_EXPORT ServiceBrowser : public TQObject { Q_OBJECT public: diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index dc0a9dca5..5acb9a259 100644 --- a/interfaces/khexedit/byteseditinterface.h +++ b/interfaces/khexedit/byteseditinterface.h @@ -143,8 +143,8 @@ class BytesEditInterface virtual bool isModified() const = 0; public: // call for action - /** repaint the indizes from i1 to i2 */ - virtual void repaintRange( int i1, int i2 ) = 0; + /** tqrepaint the indizes from i1 to i2 */ + virtual void tqrepaintRange( int i1, int i2 ) = 0; }; @@ -159,7 +159,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) if( !t ) return 0; - return static_cast<BytesEditInterface*>( t->qt_cast("KHE::BytesEditInterface") ); + return static_cast<BytesEditInterface*>( t->tqqt_cast("KHE::BytesEditInterface") ); } /** tries to create an instance of a hexedit widget for arrays of chars (char[]) @@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 ) { return KParts::ComponentFactory::createInstanceFromQuery<TQWidget> - ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name ); + ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name ); } } diff --git a/interfaces/khexedit/charcolumninterface.h b/interfaces/khexedit/charcolumninterface.h index 4221de0c4..753ff7ab1 100644 --- a/interfaces/khexedit/charcolumninterface.h +++ b/interfaces/khexedit/charcolumninterface.h @@ -97,7 +97,7 @@ CharColumnInterface *charColumnInterface( T *t ) if( !t ) return 0; - return static_cast<CharColumnInterface*>( t->qt_cast("KHE::CharColumnInterface") ); + return static_cast<CharColumnInterface*>( t->tqqt_cast("KHE::CharColumnInterface") ); } } diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h index eeaf9d391..0e106aa32 100644 --- a/interfaces/khexedit/clipboardinterface.h +++ b/interfaces/khexedit/clipboardinterface.h @@ -78,7 +78,7 @@ ClipboardInterface *clipboardInterface( T *t ) if( !t ) return 0; - return static_cast<ClipboardInterface*>( t->qt_cast("KHE::ClipboardInterface") ); + return static_cast<ClipboardInterface*>( t->tqqt_cast("KHE::ClipboardInterface") ); } } diff --git a/interfaces/khexedit/valuecolumninterface.h b/interfaces/khexedit/valuecolumninterface.h index 7dafa7d42..e23c91761 100644 --- a/interfaces/khexedit/valuecolumninterface.h +++ b/interfaces/khexedit/valuecolumninterface.h @@ -162,7 +162,7 @@ ValueColumnInterface *valueColumnInterface( T *t ) if( !t ) return 0; - return static_cast<ValueColumnInterface*>( t->qt_cast("KHE::ValueColumnInterface") ); + return static_cast<ValueColumnInterface*>( t->tqqt_cast("KHE::ValueColumnInterface") ); } } diff --git a/interfaces/khexedit/zoominterface.h b/interfaces/khexedit/zoominterface.h index 494fbfd86..5fdaa8c24 100644 --- a/interfaces/khexedit/zoominterface.h +++ b/interfaces/khexedit/zoominterface.h @@ -71,7 +71,7 @@ ZoomInterface *zoomInterface( T *t ) if( !t ) return 0; - return static_cast<ZoomInterface*>( t->qt_cast("KHE::ZoomInterface") ); + return static_cast<ZoomInterface*>( t->tqqt_cast("KHE::ZoomInterface") ); } } diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h index f3212df6d..a41172fdf 100644 --- a/interfaces/kimproxy/interface/kimiface.h +++ b/interfaces/kimproxy/interface/kimiface.h @@ -467,7 +467,7 @@ k_dcop_signals: /** * @brief Indicates that a contact's presence has changed * - * Notifies connected DCOP receivers about a change in a contact's + * Notifies connected DCOP tqreceivers about a change in a contact's * presence. * * Implementations just have to call this method with the appropriate diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp index 44f828a02..38462a158 100644 --- a/interfaces/kimproxy/library/kimproxy.cpp +++ b/interfaces/kimproxy/library/kimproxy.cpp @@ -248,7 +248,7 @@ bool KIMProxy::initialize() { m_apps_available = true; //kdDebug( 790 ) << " app name: " << (*offer)->name() << ", has instance " << *app << ", dcopService: " << dcopService << endl; - if ( !m_im_client_stubs.find( dcopService ) ) + if ( !m_im_client_stubs.tqfind( dcopService ) ) { kdDebug( 790 ) << "App " << *app << ", dcopObjectId " << dcopObjectId << " found, using it for presence info." << endl; m_im_client_stubs.insert( *app, new KIMIface_stub( d->dc, *app, dcopObjectId ) ); @@ -284,7 +284,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId ) if ( appId.left( dcopService.length() ) == dcopService ) { // if it's not already known, insert it - if ( !m_im_client_stubs.find( appId ) ) + if ( !m_im_client_stubs.tqfind( appId ) ) { newApp = true; kdDebug( 790 ) << "App: " << appId << ", dcopService: " << dcopService << " started, using it for presence info."<< endl; @@ -301,7 +301,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId ) void KIMProxy::unregisteredFromDCOP( const TQCString& appId ) { //kdDebug( 790 ) << k_funcinfo << appId << endl; - if ( m_im_client_stubs.find( appId ) ) + if ( m_im_client_stubs.tqfind( appId ) ) { kdDebug( 790 ) << appId << " quit, removing its presence info." << endl; @@ -618,7 +618,7 @@ KIMIface_stub * KIMProxy::stubForUid( const TQString &uid ) // get best appPresence AppPresenceCurrent ap = d->presence_map[ uid ].best(); // look up the presence string from that app - return m_im_client_stubs.find( ap.appId ); + return m_im_client_stubs.tqfind( ap.appId ); } KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol) @@ -626,7 +626,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol) KIMIface_stub * app; // see if the preferred client supports this protocol TQString preferred = preferredApp(); - if ( ( app = m_im_client_stubs.find( preferred ) ) ) + if ( ( app = m_im_client_stubs.tqfind( preferred ) ) ) { if ( app->protocols().grep( protocol ).count() > 0 ) return app; diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index 11fa58f27..0ce32c6cd 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -83,7 +83,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) { TQHBox *frame = new TQHBox( box ); frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + frame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); view->videoWidget()->reparent( frame, TQPoint(0,0) ); } @@ -110,7 +110,7 @@ void KFileAudioPreview::showPreview( const KURL &url ) return; KMimeType::Ptr mt = KMimeType::findByURL( url ); - bool supported = m_supportedFormats.find( mt->name() ); + bool supported = m_supportedFormats.tqfind( mt->name() ); d->player->view()->setEnabled( supported ); if ( !supported ) return; diff --git a/interfaces/kmediaplayer/player.h b/interfaces/kmediaplayer/player.h index 10e9f4a74..32990840e 100644 --- a/interfaces/kmediaplayer/player.h +++ b/interfaces/kmediaplayer/player.h @@ -56,7 +56,7 @@ public: /** This constructor is what to use when a GUI is required, as in the * case of a KMediaPlayer/Player. */ - Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name); + Player(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name); virtual ~Player(void); diff --git a/interfaces/kmediaplayer/view.h b/interfaces/kmediaplayer/view.h index 54f46a8ca..ae6ee2ea2 100644 --- a/interfaces/kmediaplayer/view.h +++ b/interfaces/kmediaplayer/view.h @@ -31,7 +31,7 @@ namespace KMediaPlayer { /** View is part of the user interface of a Player. */ -class KDE_EXPORT View : public QWidget +class KDE_EXPORT View : public TQWidget { Q_OBJECT diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h index 01fab0fdf..c10b86ea9 100644 --- a/interfaces/kregexpeditor/kregexpeditorinterface.h +++ b/interfaces/kregexpeditor/kregexpeditorinterface.h @@ -25,7 +25,7 @@ * TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" ); * if ( editorDialog ) { * // kdeutils was installed, so the dialog was found fetch the editor interface - * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->qt_cast( "KRegExpEditorInterface" ) ); + * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->tqqt_cast( "KRegExpEditorInterface" ) ); * Q_ASSERT( editor ); // This should not fail! * * // now use the editor. @@ -53,7 +53,7 @@ * "KRegExpEditor/KRegExpEditor", TQString::null, parent ); * if ( editorWidget ) { * // kdeutils was installed, so the widget was found fetch the editor interface - * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->qt_cast( "KRegExpEditorInterface" ) ); + * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->tqqt_cast( "KRegExpEditorInterface" ) ); * Q_ASSERT( editor ); // This should not fail! * * // now use the editor. diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/kscript/scriptinterface.h index e711e82ca..1c37b7f71 100644 --- a/interfaces/kscript/scriptinterface.h +++ b/interfaces/kscript/scriptinterface.h @@ -44,7 +44,7 @@ class KScriptClientInterface; * @author Ian Reinhart Geiser <geiseri@kde.org> * **/ - class KDE_EXPORT KScriptInterface : public QObject + class KDE_EXPORT KScriptInterface : public TQObject { Q_OBJECT public: diff --git a/interfaces/ktexteditor/blockselectioninterface.cpp b/interfaces/ktexteditor/blockselectioninterface.cpp index c1af4a6ed..af3372829 100644 --- a/interfaces/ktexteditor/blockselectioninterface.cpp +++ b/interfaces/ktexteditor/blockselectioninterface.cpp @@ -70,5 +70,5 @@ BlockSelectionInterface *KTextEditor::blockSelectionInterface (Document *doc) if (!doc) return 0; - return static_cast<BlockSelectionInterface*>(doc->qt_cast("KTextEditor::BlockSelectionInterface")); + return static_cast<BlockSelectionInterface*>(doc->tqqt_cast("KTextEditor::BlockSelectionInterface")); } diff --git a/interfaces/ktexteditor/clipboardinterface.cpp b/interfaces/ktexteditor/clipboardinterface.cpp index 4401b29de..c1bc2803f 100644 --- a/interfaces/ktexteditor/clipboardinterface.cpp +++ b/interfaces/ktexteditor/clipboardinterface.cpp @@ -52,5 +52,5 @@ ClipboardInterface *KTextEditor::clipboardInterface (View *view) if (!view) return 0; - return static_cast<ClipboardInterface*>(view->qt_cast("KTextEditor::ClipboardInterface")); + return static_cast<ClipboardInterface*>(view->tqqt_cast("KTextEditor::ClipboardInterface")); } diff --git a/interfaces/ktexteditor/codecompletioninterface.cpp b/interfaces/ktexteditor/codecompletioninterface.cpp index ae60b2162..1d185a629 100644 --- a/interfaces/ktexteditor/codecompletioninterface.cpp +++ b/interfaces/ktexteditor/codecompletioninterface.cpp @@ -45,7 +45,7 @@ CodeCompletionInterface *KTextEditor::codeCompletionInterface (View *view) if (!view) return 0; - return static_cast<CodeCompletionInterface*>(view->qt_cast("KTextEditor::CodeCompletionInterface")); + return static_cast<CodeCompletionInterface*>(view->tqqt_cast("KTextEditor::CodeCompletionInterface")); } diff --git a/interfaces/ktexteditor/configinterface.cpp b/interfaces/ktexteditor/configinterface.cpp index 2ca2e4b12..7a88261c9 100644 --- a/interfaces/ktexteditor/configinterface.cpp +++ b/interfaces/ktexteditor/configinterface.cpp @@ -67,7 +67,7 @@ ConfigInterface *KTextEditor::configInterface (Document *doc) if (!doc) return 0; - return static_cast<ConfigInterface*>(doc->qt_cast("KTextEditor::ConfigInterface")); + return static_cast<ConfigInterface*>(doc->tqqt_cast("KTextEditor::ConfigInterface")); } ConfigInterface *KTextEditor::configInterface (Plugin *plugin) @@ -75,5 +75,5 @@ ConfigInterface *KTextEditor::configInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast<ConfigInterface*>(plugin->qt_cast("KTextEditor::ConfigInterface")); + return static_cast<ConfigInterface*>(plugin->tqqt_cast("KTextEditor::ConfigInterface")); } diff --git a/interfaces/ktexteditor/configinterfaceextension.cpp b/interfaces/ktexteditor/configinterfaceextension.cpp index 8557c422f..fe4704d44 100644 --- a/interfaces/ktexteditor/configinterfaceextension.cpp +++ b/interfaces/ktexteditor/configinterfaceextension.cpp @@ -72,7 +72,7 @@ ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Document *doc) if (!doc) return 0; - return static_cast<ConfigInterfaceExtension*>(doc->qt_cast("KTextEditor::ConfigInterfaceExtension")); + return static_cast<ConfigInterfaceExtension*>(doc->tqqt_cast("KTextEditor::ConfigInterfaceExtension")); } ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Plugin *plugin) @@ -80,5 +80,5 @@ ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Plugin *plugin) if (!plugin) return 0; - return static_cast<ConfigInterfaceExtension*>(plugin->qt_cast("KTextEditor::ConfigInterfaceExtension")); + return static_cast<ConfigInterfaceExtension*>(plugin->tqqt_cast("KTextEditor::ConfigInterfaceExtension")); } diff --git a/interfaces/ktexteditor/configinterfaceextension.h b/interfaces/ktexteditor/configinterfaceextension.h index 6ebfd8895..e324e2ba2 100644 --- a/interfaces/ktexteditor/configinterfaceextension.h +++ b/interfaces/ktexteditor/configinterfaceextension.h @@ -26,7 +26,7 @@ namespace KTextEditor { -class KTEXTEDITOR_EXPORT ConfigPage : public QWidget +class KTEXTEDITOR_EXPORT ConfigPage : public TQWidget { Q_OBJECT diff --git a/interfaces/ktexteditor/cursorinterface.cpp b/interfaces/ktexteditor/cursorinterface.cpp index 91a14b06a..3b7857bbb 100644 --- a/interfaces/ktexteditor/cursorinterface.cpp +++ b/interfaces/ktexteditor/cursorinterface.cpp @@ -65,5 +65,5 @@ CursorInterface *KTextEditor::cursorInterface (Document *doc) if (!doc) return 0; - return static_cast<CursorInterface*>(doc->qt_cast("KTextEditor::CursorInterface")); + return static_cast<CursorInterface*>(doc->tqqt_cast("KTextEditor::CursorInterface")); } diff --git a/interfaces/ktexteditor/dynwordwrapinterface.cpp b/interfaces/ktexteditor/dynwordwrapinterface.cpp index 49d4060c0..a60f1129b 100644 --- a/interfaces/ktexteditor/dynwordwrapinterface.cpp +++ b/interfaces/ktexteditor/dynwordwrapinterface.cpp @@ -65,5 +65,5 @@ DynWordWrapInterface *KTextEditor::dynWordWrapInterface (View *view) if (!view) return 0; - return static_cast<DynWordWrapInterface*>(view->qt_cast("KTextEditor::DynWordWrapInterface")); + return static_cast<DynWordWrapInterface*>(view->tqqt_cast("KTextEditor::DynWordWrapInterface")); } diff --git a/interfaces/ktexteditor/editinterface.cpp b/interfaces/ktexteditor/editinterface.cpp index 6722fc555..3a03002b2 100644 --- a/interfaces/ktexteditor/editinterface.cpp +++ b/interfaces/ktexteditor/editinterface.cpp @@ -52,6 +52,6 @@ EditInterface *KTextEditor::editInterface (Document *doc) if (!doc) return 0; - return static_cast<EditInterface*>(doc->qt_cast("KTextEditor::EditInterface")); + return static_cast<EditInterface*>(doc->tqqt_cast("KTextEditor::EditInterface")); } diff --git a/interfaces/ktexteditor/editinterfaceext.cpp b/interfaces/ktexteditor/editinterfaceext.cpp index 7d4acf55f..944b662d9 100644 --- a/interfaces/ktexteditor/editinterfaceext.cpp +++ b/interfaces/ktexteditor/editinterfaceext.cpp @@ -45,6 +45,6 @@ EditInterfaceExt *KTextEditor::editInterfaceExt (Document *doc) if (!doc) return 0; - return static_cast<EditInterfaceExt*>(doc->qt_cast("KTextEditor::EditInterfaceExt")); + return static_cast<EditInterfaceExt*>(doc->tqqt_cast("KTextEditor::EditInterfaceExt")); } diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h index 650bb9ec2..e5f2d9101 100644 --- a/interfaces/ktexteditor/editinterfaceext.h +++ b/interfaces/ktexteditor/editinterfaceext.h @@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt /** * Begin an editing sequence. Edit commands during this sequence will be * bunched together such that they represent a single undo command in the - * editor, and so that repaint events do not occur inbetween. + * editor, and so that tqrepaint events do not occur inbetween. * * Your application should not return control to the event loop while it * has an unterminated (no matching editEnd() call) editing sequence diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h index 11f9a8c15..fa4761432 100644 --- a/interfaces/ktexteditor/editor.h +++ b/interfaces/ktexteditor/editor.h @@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart unsigned int myEditorNumber; }; -KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 ); +KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 ); } diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp index 96cf3649e..60aef8d10 100644 --- a/interfaces/ktexteditor/editorchooser.cpp +++ b/interfaces/ktexteditor/editorchooser.cpp @@ -130,7 +130,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char return 0; } -KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName, +KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName, const char* name,const TQString& postfix,bool fallBackToKatePart){ KTextEditor::Editor *tmpEd=0; @@ -151,11 +151,11 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject KService::Ptr serv=KService::serviceByDesktopName(editor); if (serv) { - tmpEd=KTextEditor::createEditor(serv->library().latin1(),parentWidget,widgetName,parent,name); + tmpEd=KTextEditor::createEditor(serv->library().latin1(),tqparentWidget,widgetName,parent,name); if (tmpEd) return tmpEd; } if (fallBackToKatePart) - return KTextEditor::createEditor("libkatepart",parentWidget,widgetName,parent,name); + return KTextEditor::createEditor("libkatepart",tqparentWidget,widgetName,parent,name); return 0; } diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h index 20fba94e1..a5118c3d4 100644 --- a/interfaces/ktexteditor/editorchooser.h +++ b/interfaces/ktexteditor/editorchooser.h @@ -12,7 +12,7 @@ class TQString; namespace KTextEditor { -class KTEXTEDITOR_EXPORT EditorChooser: public QWidget +class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget { friend class PrivateEditorChooser; @@ -28,7 +28,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public QWidget void writeAppSetting(const TQString& postfix=TQString::null); static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true); - static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true); + static KTextEditor::Editor *createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true); private: class PrivateEditorChooser *d; }; diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui index fa1d99184..831d8d37a 100644 --- a/interfaces/ktexteditor/editorchooser_ui.ui +++ b/interfaces/ktexteditor/editorchooser_ui.ui @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>460</width> <height>0</height> @@ -40,7 +40,7 @@ <property name="text"> <string>Please choose the default text editing component that you wish to use in this application. If you choose <B>System Default</B>, the application will honor your changes in the Control Center. All other choices will override that setting.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> </widget> diff --git a/interfaces/ktexteditor/encodinginterface.cpp b/interfaces/ktexteditor/encodinginterface.cpp index 341847fb7..e864525e0 100644 --- a/interfaces/ktexteditor/encodinginterface.cpp +++ b/interfaces/ktexteditor/encodinginterface.cpp @@ -72,5 +72,5 @@ EncodingInterface *KTextEditor::encodingInterface (Document *doc) if (!doc) return 0; - return static_cast<EncodingInterface*>(doc->qt_cast("KTextEditor::EncodingInterface")); + return static_cast<EncodingInterface*>(doc->tqqt_cast("KTextEditor::EncodingInterface")); } diff --git a/interfaces/ktexteditor/highlightinginterface.cpp b/interfaces/ktexteditor/highlightinginterface.cpp index f606ab5c0..188545079 100644 --- a/interfaces/ktexteditor/highlightinginterface.cpp +++ b/interfaces/ktexteditor/highlightinginterface.cpp @@ -65,5 +65,5 @@ HighlightingInterface *KTextEditor::highlightingInterface (Document *doc) if (!doc) return 0; - return static_cast<HighlightingInterface*>(doc->qt_cast("KTextEditor::HighlightingInterface")); + return static_cast<HighlightingInterface*>(doc->tqqt_cast("KTextEditor::HighlightingInterface")); } diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp index 0b50fdaeb..09bd63ea9 100644 --- a/interfaces/ktexteditor/ktexteditor.cpp +++ b/interfaces/ktexteditor/ktexteditor.cpp @@ -206,9 +206,9 @@ unsigned int Editor::editorNumber () const return myEditorNumber; } -Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) +Editor *KTextEditor::createEditor ( const char* libname, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name ) { - return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name ); + return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, tqparentWidget, widgetName, parent, name ); } Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name ) @@ -226,6 +226,6 @@ PluginViewInterface *KTextEditor::pluginViewInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast<PluginViewInterface*>(plugin->qt_cast("KTextEditor::PluginViewInterface")); + return static_cast<PluginViewInterface*>(plugin->tqqt_cast("KTextEditor::PluginViewInterface")); } diff --git a/interfaces/ktexteditor/markinterface.cpp b/interfaces/ktexteditor/markinterface.cpp index d711b5245..97c23f1e7 100644 --- a/interfaces/ktexteditor/markinterface.cpp +++ b/interfaces/ktexteditor/markinterface.cpp @@ -65,7 +65,7 @@ MarkInterface *KTextEditor::markInterface (Document *doc) if (!doc) return 0; - return static_cast<MarkInterface*>(doc->qt_cast("KTextEditor::MarkInterface")); + return static_cast<MarkInterface*>(doc->tqqt_cast("KTextEditor::MarkInterface")); } int MarkInterface::reservedMarkersCount() diff --git a/interfaces/ktexteditor/markinterfaceextension.cpp b/interfaces/ktexteditor/markinterfaceextension.cpp index 57c981421..19b327e96 100644 --- a/interfaces/ktexteditor/markinterfaceextension.cpp +++ b/interfaces/ktexteditor/markinterfaceextension.cpp @@ -65,5 +65,5 @@ MarkInterfaceExtension *KTextEditor::markInterfaceExtension (Document *doc) if (!doc) return 0; - return static_cast<MarkInterfaceExtension*>(doc->qt_cast("KTextEditor::MarkInterfaceExtension")); + return static_cast<MarkInterfaceExtension*>(doc->tqqt_cast("KTextEditor::MarkInterfaceExtension")); } diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/ktexteditor/plugin.h index dc7978f92..71266d3e2 100644 --- a/interfaces/ktexteditor/plugin.h +++ b/interfaces/ktexteditor/plugin.h @@ -33,7 +33,7 @@ class View; * Basic KTextEditor plugin class. * This plugin will be bound to a Document. */ -class KTEXTEDITOR_EXPORT Plugin : public QObject +class KTEXTEDITOR_EXPORT Plugin : public TQObject { friend class PrivatePlugin; diff --git a/interfaces/ktexteditor/popupmenuinterface.cpp b/interfaces/ktexteditor/popupmenuinterface.cpp index d2d51e4af..6de6f201c 100644 --- a/interfaces/ktexteditor/popupmenuinterface.cpp +++ b/interfaces/ktexteditor/popupmenuinterface.cpp @@ -65,5 +65,5 @@ PopupMenuInterface *KTextEditor::popupMenuInterface (View *view) if (!view) return 0; - return static_cast<PopupMenuInterface*>(view->qt_cast("KTextEditor::PopupMenuInterface")); + return static_cast<PopupMenuInterface*>(view->tqqt_cast("KTextEditor::PopupMenuInterface")); } diff --git a/interfaces/ktexteditor/printinterface.cpp b/interfaces/ktexteditor/printinterface.cpp index 936e803ea..0f6c6afd8 100644 --- a/interfaces/ktexteditor/printinterface.cpp +++ b/interfaces/ktexteditor/printinterface.cpp @@ -70,5 +70,5 @@ PrintInterface *KTextEditor::printInterface (Document *doc) if (!doc) return 0; - return static_cast<PrintInterface*>(doc->qt_cast("KTextEditor::PrintInterface")); + return static_cast<PrintInterface*>(doc->tqqt_cast("KTextEditor::PrintInterface")); } diff --git a/interfaces/ktexteditor/searchinterface.cpp b/interfaces/ktexteditor/searchinterface.cpp index d23a25e31..e1a58ed6b 100644 --- a/interfaces/ktexteditor/searchinterface.cpp +++ b/interfaces/ktexteditor/searchinterface.cpp @@ -51,5 +51,5 @@ SearchInterface *KTextEditor::searchInterface (Document *doc) if (!doc) return 0; - return static_cast<SearchInterface*>(doc->qt_cast("KTextEditor::SearchInterface")); + return static_cast<SearchInterface*>(doc->tqqt_cast("KTextEditor::SearchInterface")); } diff --git a/interfaces/ktexteditor/selectioninterface.cpp b/interfaces/ktexteditor/selectioninterface.cpp index 2e9ae5204..61bc7a995 100644 --- a/interfaces/ktexteditor/selectioninterface.cpp +++ b/interfaces/ktexteditor/selectioninterface.cpp @@ -52,7 +52,7 @@ SelectionInterface *KTextEditor::selectionInterface (Document *doc) if (!doc) return 0; - return static_cast<SelectionInterface*>(doc->qt_cast("KTextEditor::SelectionInterface")); + return static_cast<SelectionInterface*>(doc->tqqt_cast("KTextEditor::SelectionInterface")); } SelectionInterface *KTextEditor::selectionInterface (View *view) @@ -60,6 +60,6 @@ SelectionInterface *KTextEditor::selectionInterface (View *view) if (!view) return 0; - return static_cast<SelectionInterface*>(view->qt_cast("KTextEditor::SelectionInterface")); + return static_cast<SelectionInterface*>(view->tqqt_cast("KTextEditor::SelectionInterface")); } diff --git a/interfaces/ktexteditor/selectioninterfaceext.cpp b/interfaces/ktexteditor/selectioninterfaceext.cpp index f59468c17..c8404a9b5 100644 --- a/interfaces/ktexteditor/selectioninterfaceext.cpp +++ b/interfaces/ktexteditor/selectioninterfaceext.cpp @@ -68,7 +68,7 @@ SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (Document *doc) if (!doc) return 0; - return static_cast<SelectionInterfaceExt*>(doc->qt_cast("KTextEditor::SelectionInterfaceExt")); + return static_cast<SelectionInterfaceExt*>(doc->tqqt_cast("KTextEditor::SelectionInterfaceExt")); } SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (View *view) @@ -76,7 +76,7 @@ SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (View *view) if (!view) return 0; - return static_cast<SelectionInterfaceExt*>(view->qt_cast("KTextEditor::SelectionInterfaceExt")); + return static_cast<SelectionInterfaceExt*>(view->tqqt_cast("KTextEditor::SelectionInterfaceExt")); } //END KTextEditor::SelectionInterfaceExt diff --git a/interfaces/ktexteditor/sessionconfiginterface.cpp b/interfaces/ktexteditor/sessionconfiginterface.cpp index 7180aae38..1720584cc 100644 --- a/interfaces/ktexteditor/sessionconfiginterface.cpp +++ b/interfaces/ktexteditor/sessionconfiginterface.cpp @@ -68,7 +68,7 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (Document *doc) if (!doc) return 0; - return static_cast<SessionConfigInterface*>(doc->qt_cast("KTextEditor::SessionConfigInterface")); + return static_cast<SessionConfigInterface*>(doc->tqqt_cast("KTextEditor::SessionConfigInterface")); } SessionConfigInterface *KTextEditor::sessionConfigInterface (View *view) @@ -76,7 +76,7 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (View *view) if (!view) return 0; - return static_cast<SessionConfigInterface*>(view->qt_cast("KTextEditor::SessionConfigInterface")); + return static_cast<SessionConfigInterface*>(view->tqqt_cast("KTextEditor::SessionConfigInterface")); } SessionConfigInterface *KTextEditor::sessionConfigInterface (Plugin *plugin) @@ -84,5 +84,5 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (Plugin *plugin) if (!plugin) return 0; - return static_cast<SessionConfigInterface*>(plugin->qt_cast("KTextEditor::SessionConfigInterface")); + return static_cast<SessionConfigInterface*>(plugin->tqqt_cast("KTextEditor::SessionConfigInterface")); } diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp index 4f9f83706..b19b1d10a 100644 --- a/interfaces/ktexteditor/templateinterface.cpp +++ b/interfaces/ktexteditor/templateinterface.cpp @@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget * { KABC::StdAddressBook *addrBook = 0; KABC::Addressee userAddress; - TQDateTime datetime = TQDateTime::currentDateTime(); + TQDateTime datetime = TQDateTime::tqcurrentDateTime(); TQDate date = datetime.date(); TQTime time = datetime.time(); @@ -192,6 +192,6 @@ TemplateInterface *KTextEditor::templateInterface ( KTextEditor::Document *doc ) if ( !doc ) return 0; - return static_cast<TemplateInterface*>( doc->qt_cast( "KTextEditor::TemplateInterface" ) ); + return static_cast<TemplateInterface*>( doc->tqqt_cast( "KTextEditor::TemplateInterface" ) ); } diff --git a/interfaces/ktexteditor/texthintinterface.cpp b/interfaces/ktexteditor/texthintinterface.cpp index 079a1edda..3a6c3a759 100644 --- a/interfaces/ktexteditor/texthintinterface.cpp +++ b/interfaces/ktexteditor/texthintinterface.cpp @@ -58,7 +58,7 @@ TextHintInterface *textHintInterface (View *view) if (!view) return 0; - return static_cast<TextHintInterface*>(view->qt_cast("KTextEditor::TextHintInterface")); + return static_cast<TextHintInterface*>(view->tqqt_cast("KTextEditor::TextHintInterface")); } diff --git a/interfaces/ktexteditor/undointerface.cpp b/interfaces/ktexteditor/undointerface.cpp index d19a56deb..c86a3ecf2 100644 --- a/interfaces/ktexteditor/undointerface.cpp +++ b/interfaces/ktexteditor/undointerface.cpp @@ -70,5 +70,5 @@ UndoInterface *KTextEditor::undoInterface (Document *doc) if (!doc) return 0; - return static_cast<UndoInterface*>(doc->qt_cast("KTextEditor::UndoInterface")); + return static_cast<UndoInterface*>(doc->tqqt_cast("KTextEditor::UndoInterface")); } diff --git a/interfaces/ktexteditor/variableinterface.cpp b/interfaces/ktexteditor/variableinterface.cpp index 0ac55167e..f8bfcfe91 100644 --- a/interfaces/ktexteditor/variableinterface.cpp +++ b/interfaces/ktexteditor/variableinterface.cpp @@ -44,5 +44,5 @@ VariableInterface *KTextEditor::variableInterface( Document *doc ) if ( ! doc ) return 0; - return static_cast<VariableInterface*>(doc->qt_cast("KTextEditor::VariableInterface")); + return static_cast<VariableInterface*>(doc->tqqt_cast("KTextEditor::VariableInterface")); } diff --git a/interfaces/ktexteditor/viewcursorinterface.cpp b/interfaces/ktexteditor/viewcursorinterface.cpp index 0c834be42..dd718a7dd 100644 --- a/interfaces/ktexteditor/viewcursorinterface.cpp +++ b/interfaces/ktexteditor/viewcursorinterface.cpp @@ -70,5 +70,5 @@ ViewCursorInterface *KTextEditor::viewCursorInterface (View *view) if (!view) return 0; - return static_cast<ViewCursorInterface*>(view->qt_cast("KTextEditor::ViewCursorInterface")); + return static_cast<ViewCursorInterface*>(view->tqqt_cast("KTextEditor::ViewCursorInterface")); } diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/ktexteditor/viewstatusmsginterface.cpp index ff0815c89..643e2e798 100644 --- a/interfaces/ktexteditor/viewstatusmsginterface.cpp +++ b/interfaces/ktexteditor/viewstatusmsginterface.cpp @@ -72,5 +72,5 @@ ViewStatusMsgInterface *KTextEditor::viewStatusMsgInterface (View *view) if (!view) return 0; - return static_cast<ViewStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewStatusMsgInterface")); + return static_cast<ViewStatusMsgInterface*>(view->tqqt_cast("KTextEditor::ViewStatusMsgInterface")); } diff --git a/interfaces/ktexteditor/wordwrapinterface.cpp b/interfaces/ktexteditor/wordwrapinterface.cpp index 3afe5c230..ff6d17362 100644 --- a/interfaces/ktexteditor/wordwrapinterface.cpp +++ b/interfaces/ktexteditor/wordwrapinterface.cpp @@ -66,5 +66,5 @@ WordWrapInterface *KTextEditor::wordWrapInterface (Document *doc) if (!doc) return 0; - return static_cast<WordWrapInterface*>(doc->qt_cast("KTextEditor::WordWrapInterface")); + return static_cast<WordWrapInterface*>(doc->tqqt_cast("KTextEditor::WordWrapInterface")); } diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index 450d1e27d..0e3acb22f 100644 --- a/interfaces/terminal/kde_terminal_interface.h +++ b/interfaces/terminal/kde_terminal_interface.h @@ -60,7 +60,7 @@ class TQStrList; * setCentralWidget( p->widget() ); * * // cast the part to the TerminalInterface.. - * TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) ); + * TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) ); * if( ! t ) * { * // This probably happens because the konsole that is installed diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc index be3f4165e..905eedbb6 100644 --- a/interfaces/terminal/test/main.cc +++ b/interfaces/terminal/test/main.cc @@ -20,7 +20,7 @@ Win::Win() KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) ); setCentralWidget( p->widget() ); - TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) ); + TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) ); t->showShellInDir( TQDir::home().path() ); // TQStrList l; // l.append( "python" ); @@ -46,11 +46,11 @@ int main( int argc, char** argv ) void Win::pythonExited() { std::cerr << "hee, " << p << std::endl; - std::cerr << ( p->qt_cast( "TerminalInterface" ) ) << std::endl; + std::cerr << ( p->tqqt_cast( "TerminalInterface" ) ) << std::endl; // KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) ); disconnect(p, TQT_SIGNAL( processExited() ), this, TQT_SLOT( pythonExited() )); - TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) ); + TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) ); TQStrList l; l.append( "echo" ); l.append( "hello world" ); diff --git a/kab/addressbook.cc b/kab/addressbook.cc index d5813237c..9795c42a7 100644 --- a/kab/addressbook.cc +++ b/kab/addressbook.cc @@ -139,7 +139,7 @@ KabKey::setKey(const TQCString& text) // ########################################################################### } -QCString +TQCString KabKey::getKey() const { // ########################################################################### @@ -1729,7 +1729,7 @@ AddressBook::makeEntryFromVCard(const TQString&, Entry&) // ########################################################################### } -QString +TQString AddressBook::getStandardFileName() { // ########################################################################### @@ -1814,7 +1814,7 @@ AddressBook::ErrorCode AddressBook::Entry::get(const char* fieldname, TQVariant& } if(fieldname==Fields[dummy++]) { // the birthday - field=birthday.toString(); + field=TQString(birthday.toString()); return NoError; } if(fieldname==Fields[dummy++]) diff --git a/kab/addressbook.h b/kab/addressbook.h index 5057c990c..2e6656bed 100644 --- a/kab/addressbook.h +++ b/kab/addressbook.h @@ -127,7 +127,7 @@ class CategoriesMap : public TQMap<int, TQString> * keys). Of course, in different files a key might be used twice. <BR> * The keys are objects of the type KabKey and define the section in the * addressbook database where the entry is stored (see QConfigDB - * reference). Keys invalidate on file changes, so keep track of the + * reference). Keys tqinvalidate on file changes, so keep track of the * signal ::changed. <BR> * kab watches file changes. If the opened file changes on disk, it is * automatically reloaded and ::changed() is emitted. @@ -180,7 +180,7 @@ class CategoriesMap : public TQMap<int, TQString> * displayed as transparent KURLLabels that react when the user clicks on it. * These interactive parts have to be enabled by calling setInteractiveMode(). */ -class AddressBook : public QFrame +class AddressBook : public TQFrame { // ############################################################################ Q_OBJECT @@ -572,7 +572,7 @@ public: ErrorCode createConfigFile(); ErrorCode loadConfigFile(); /**< Load the local configuration file. */ // ErrorCode configureKab(); /**< Open the configuration dialog for the KabAPI. */ - // TQSize sizeHint(); /**< The preferred (minimal) size of the view. */ // ni + // TQSize tqsizeHint(); /**< The preferred (minimal) size of the view. */ // ni /** * This method parses a vCard and creates an Entry object from it. */ diff --git a/kab/kabapi.cc b/kab/kabapi.cc index 0cf97905c..0910df18b 100644 --- a/kab/kabapi.cc +++ b/kab/kabapi.cc @@ -72,9 +72,9 @@ int KabAPI::exec() { listbox->setCurrentItem(0); } - listbox->setMinimumSize(listbox->sizeHint()); + listbox->setMinimumSize(listbox->tqsizeHint()); adjustSize(); - resize(minimumSize()); + resize(tqminimumSize()); return KDialogBase::exec(); } else { kdDebug(KAB_KDEBUG_AREA) << "KabAPI::exec: error creating interface." diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cc index a49388ff9..a682a1ed1 100644 --- a/kab/qconfigDB.cc +++ b/kab/qconfigDB.cc @@ -73,7 +73,7 @@ static void tokenize(list<TQCString>& res, const TQCString& text, char tr, bool while(zwei!=-1) { teil=""; - zwei=text.find(tr, eins); + zwei=text.tqfind(tr, eins); if(zwei!=-1) { teil=text.mid(eins, zwei-eins); @@ -412,7 +412,7 @@ KeyValueMap::parseComplexString return true; } -QCString +TQCString KeyValueMap::makeComplexString(const TQCString& orig) { register bool GUARD; GUARD=false; @@ -573,7 +573,7 @@ KeyValueMap::insertLine(TQCString line, bool force, bool relax, bool encode) return false; } // ----- - index=line.find('='); + index=line.tqfind('='); if(index==-1) // not found { kdDebug() << "KeyValueMap::insertLine: no \"=\" found in \""<<line<<"\".\n"; @@ -1015,7 +1015,7 @@ KeyValueMap::get(const TQCString& key, list<TQCString>& values) const second=first; for(;;) { - second=raw.find('\\', second); + second=raw.tqfind('\\', second); // ----- this may never be the last and also not the second last // character in a complex string: if(second!=-1) @@ -1124,7 +1124,7 @@ KeyValueMap::get(const TQCString& key, TQStrList& values) const second=first; for(;;) { - second=raw.find('\\', second); + second=raw.tqfind('\\', second); // ----- this may never be the last and also not the second last // character in a complex string: if(second!=-1) @@ -1725,7 +1725,7 @@ Section::isEndOfSection(TQCString line) // ########################################################################### } -QCString +TQCString Section::nameOfSection(const TQCString& line) { register bool GUARD; GUARD=false; @@ -1975,7 +1975,7 @@ QConfigDB::stringToKeylist(const TQCString& desc) } for(;;) { - second=desc.find('/', first); + second=desc.tqfind('/', first); if(second==-1) { if((unsigned)first<desc.length()+1) @@ -2432,7 +2432,7 @@ QConfigDB::setFileName(const TQString& filename_, bool mustexist, bool readonly_ // ############################################################################ } -QString +TQString QConfigDB::fileName() { // ############################################################################ diff --git a/kab/qconfigDB.h b/kab/qconfigDB.h index bea329887..1da422920 100644 --- a/kab/qconfigDB.h +++ b/kab/qconfigDB.h @@ -548,7 +548,7 @@ public: * See the code examples provided with the library for details. */ -class QConfigDB : public QWidget +class QConfigDB : public TQWidget { // ############################################################################ Q_OBJECT diff --git a/kabc/address.cpp b/kabc/address.cpp index 0787bcc4e..b653d168f 100644 --- a/kabc/address.cpp +++ b/kabc/address.cpp @@ -399,7 +399,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, bool ret = false; // first check for brackets that have to be evaluated first - int fpos = result.find( KABC_FMTTAG_purgeempty, stpos ); + int fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos ); while ( -1 != fpos ) { int bpos1 = fpos + KABC_FMTTAG_purgeempty.length(); int bpos2; @@ -430,7 +430,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, stpos = bpos1; } } - fpos = result.find( KABC_FMTTAG_purgeempty, stpos ); + fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos ); } // after sorting out all purge tags, we just search'n'replace the rest, @@ -438,7 +438,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, // The following macro needs TQString for R_FIELD // It substitutes !_P_! for empty fields so conditional tags work later #define REPLTAG(R_TAG,R_FIELD) \ - if ( result.find(R_TAG, false) != -1 ) { \ + if ( result.tqfind(R_TAG, false) != -1 ) { \ TQString rpl = R_FIELD.isEmpty() ? TQString("!_P_!") : R_FIELD; \ result.replace( R_TAG, rpl ); \ if ( !R_FIELD.isEmpty() ) { \ @@ -461,7 +461,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, #undef REPLTAG // conditional comma - fpos = result.find( KABC_FMTTAG_condcomma, 0 ); + fpos = result.tqfind( KABC_FMTTAG_condcomma, 0 ); while ( -1 != fpos ) { TQString str1 = result.mid( fpos - 5, 5 ); TQString str2 = result.mid( fpos + 2, 5 ); @@ -470,10 +470,10 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, } else { result.remove( fpos, 2 ); } - fpos = result.find( KABC_FMTTAG_condcomma, fpos ); + fpos = result.tqfind( KABC_FMTTAG_condcomma, fpos ); } // conditional whitespace - fpos = result.find( KABC_FMTTAG_condwhite, 0 ); + fpos = result.tqfind( KABC_FMTTAG_condwhite, 0 ); while ( -1 != fpos ) { TQString str1 = result.mid( fpos - 5, 5 ); TQString str2 = result.mid( fpos + 2, 5 ); @@ -482,7 +482,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection, } else { result.remove( fpos, 2 ); } - fpos = result.find( KABC_FMTTAG_condwhite, fpos ); + fpos = result.tqfind( KABC_FMTTAG_condwhite, fpos ); } // remove purged: @@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname ) return it.data(); TQString mapfile = KGlobal::dirs()->findResource( "data", - TQString::fromLatin1( "kabc/countrytransl.map" ) ); + TQString::tqfromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); if ( file.open( IO_ReadOnly ) ) { @@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname ) return TQString::null; TQString mapfile = KGlobal::dirs()->findResource( "data", - TQString::fromLatin1( "kabc/countrytransl.map" ) ); + TQString::tqfromLatin1( "kabc/countrytransl.map" ) ); TQFile file( mapfile ); if ( file.open( IO_ReadOnly ) ) { @@ -560,7 +560,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname ) TQString strbuf = s.readLine(); int pos; while ( !strbuf.isEmpty() ) { - if ( (pos = strbuf.find( searchStr )) != -1 ) { + if ( (pos = strbuf.tqfind( searchStr )) != -1 ) { file.close(); return i18n( strbuf.left( pos ).utf8() ); } diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index bf6d0d17a..29bbd0f1f 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -527,7 +527,7 @@ void AddressBook::insertAddressee( const Addressee &a ) Addressee addr( a ); if ( !fAddr.isEmpty() ) { if ( fAddr != a ) - addr.setRevision( TQDateTime::currentDateTime() ); + addr.setRevision( TQDateTime::tqcurrentDateTime() ); else { if ( fAddr.resource() == 0 ) { fAddr.setResource( resource ); diff --git a/kabc/addressbook.h b/kabc/addressbook.h index 0da25b30e..7b973be28 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h @@ -40,7 +40,7 @@ class Ticket; This class provides access to a collection of address book entries. */ -class KABC_EXPORT AddressBook : public QObject +class KABC_EXPORT AddressBook : public TQObject { Q_OBJECT diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 829664179..fa15f4317 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -152,7 +152,7 @@ void AddresseeDialog::selectItem( const TQString &str ) { if ( str.isEmpty() ) return; - TQListViewItem *item = mItemDict.find( str ); + TQListViewItem *item = mItemDict.tqfind( str ); if ( item ) { mAddresseeList->blockSignals( true ); mAddresseeList->setSelected( item, true ); @@ -174,7 +174,7 @@ void AddresseeDialog::addSelected( TQListViewItem *item ) Addressee a = addrItem->addressee(); - TQListViewItem *selectedItem = mSelectedDict.find( a.uid() ); + TQListViewItem *selectedItem = mSelectedDict.tqfind( a.uid() ); if ( !selectedItem ) { selectedItem = new AddresseeItem( mSelectedList, a ); mSelectedDict.insert( a.uid(), selectedItem ); diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h index 51dbc98b6..ebb4bbfcd 100644 --- a/kabc/addresseedialog.h +++ b/kabc/addresseedialog.h @@ -34,7 +34,7 @@ namespace KABC { /** @short Special ListViewItem, that is used by the AddresseeDialog. */ -class KABC_EXPORT AddresseeItem : public QListViewItem +class KABC_EXPORT AddresseeItem : public TQListViewItem { public: diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp index df4085a02..2ca4a1b10 100644 --- a/kabc/addresseehelper.cpp +++ b/kabc/addresseehelper.cpp @@ -38,7 +38,7 @@ AddresseeHelper *AddresseeHelper::self() } AddresseeHelper::AddresseeHelper() - : TQObject( qApp ), + : TQObject( tqApp ), DCOPObject( "KABC::AddresseeHelper" ) { initSettings(); @@ -92,17 +92,17 @@ void AddresseeHelper::initSettings() bool AddresseeHelper::containsTitle( const TQString& title ) const { - return mTitles.find( title ) != mTitles.end(); + return mTitles.tqfind( title ) != mTitles.end(); } bool AddresseeHelper::containsPrefix( const TQString& prefix ) const { - return mPrefixes.find( prefix ) != mPrefixes.end(); + return mPrefixes.tqfind( prefix ) != mPrefixes.end(); } bool AddresseeHelper::containsSuffix( const TQString& suffix ) const { - return mSuffixes.find( suffix ) != mSuffixes.end(); + return mSuffixes.tqfind( suffix ) != mSuffixes.end(); } bool AddresseeHelper::tradeAsFamilyName() const diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp index cb9446927..47324001c 100644 --- a/kabc/addresseelist.cpp +++ b/kabc/addresseelist.cpp @@ -208,7 +208,7 @@ void AddresseeList::sortByTrait() while( j1 != i2 ) { if ( !mReverseSorting && Trait::lt( *j2, *j1 ) || mReverseSorting && Trait::lt( *j1, *j2 ) ) { - qSwap( *j1, *j2 ); + tqSwap( *j1, *j2 ); } ++j1; ++j2; diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index b048d9f96..9fb2e423a 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -219,13 +219,13 @@ void AddressLineEdit::insert(const TQString &t) KURL u(newText); newText = u.path(); } - else if (newText.find(" at ") != -1) + else if (newText.tqfind(" at ") != -1) { // Anti-spam stuff newText.replace( " at ", "@" ); newText.replace( " dot ", "." ); } - else if (newText.find("(at)") != -1) + else if (newText.tqfind("(at)") != -1) { newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" ); } @@ -343,7 +343,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) items += s_completion->substringCompletion( '<' + s ); uint beforeDollarCompletionCount = items.count(); - if( s.find( ' ' ) == -1 ) // one word, possibly given name + if( s.tqfind( ' ' ) == -1 ) // one word, possibly given name items += s_completion->allMatches( "$$" + s ); if ( !items.isEmpty() ) @@ -355,7 +355,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) it != items.end(); ++it ) { - int pos = (*it).find( '$', 2 ); + int pos = (*it).tqfind( '$', 2 ); if( pos < 0 ) // ??? continue; (*it)=(*it).mid( pos + 1 ); @@ -373,7 +373,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) if (!autoSuggest) { - int index = items.first().find( s ); + int index = items.first().tqfind( s ); TQString newText = prevAddr + items.first().mid( index ); //kdDebug() << "OLD TEXT: " << text() << endl; //kdDebug() << "NEW TEXT: " << newText << endl; @@ -437,11 +437,11 @@ void AddressLineEdit::loadAddresses() void AddressLineEdit::addAddress( const TQString& adr ) { s_completion->addItem( adr ); - int pos = adr.find( '<' ); + int pos = adr.tqfind( '<' ); if( pos >= 0 ) { ++pos; - int pos2 = adr.find( pos, '>' ); + int pos2 = adr.tqfind( pos, '>' ); if( pos2 >= 0 ) s_completion->addItem( adr.mid( pos, pos2 - pos )); } @@ -484,8 +484,8 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs ) return; for( TQStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) { TQString name(*it); - int pos = name.find( " <" ); - int pos_comma = name.find( ',' ); + int pos = name.tqfind( " <" ); + int pos_comma = name.tqfind( ',' ); // put name in quotes, if we have a comma in the name if (pos>0 && pos_comma>0 && pos_comma<pos) { name.insert(pos, '\"'); @@ -577,18 +577,18 @@ TQStringList AddressLineEdit::addresses() for ( mit = emails.begin(); mit != emails.end(); ++mit ) { email = *mit; if (!email.isEmpty()) { - if (n.isEmpty() || (email.find( '<' ) != -1)) + if (n.isEmpty() || (email.tqfind( '<' ) != -1)) addr = TQString::null; else { /* do we really need quotes around this name ? */ - if (n.find(needQuotes) != -1) + if (n.tqfind(needQuotes) != -1) addr = '"' + n + endQuote; else addr = n + space; } - if (!addr.isEmpty() && (email.find( '<' ) == -1) - && (email.find( '>' ) == -1) - && (email.find( ',' ) == -1)) + if (!addr.isEmpty() && (email.tqfind( '<' ) == -1) + && (email.tqfind( '>' ) == -1) + && (email.tqfind( ',' ) == -1)) addr += '<' + email + '>'; else addr += email; diff --git a/kabc/agent.cpp b/kabc/agent.cpp index d21fa2998..571b7803e 100644 --- a/kabc/agent.cpp +++ b/kabc/agent.cpp @@ -124,7 +124,7 @@ TQString Agent::asString() const TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent ) { - Q_UINT32 hasAddressee = ( agent.mAddressee != 0 ); + TQ_UINT32 hasAddressee = ( agent.mAddressee != 0 ); s << agent.mIntern << agent.mUrl << hasAddressee; if ( hasAddressee ) @@ -135,7 +135,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent ) TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent ) { - Q_UINT32 hasAddressee; + TQ_UINT32 hasAddressee; s >> agent.mIntern >> agent.mUrl >> hasAddressee; diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp index ee2f2e30a..1802cb0a1 100644 --- a/kabc/distributionlist.cpp +++ b/kabc/distributionlist.cpp @@ -250,7 +250,7 @@ bool DistributionListManager::save() value.append( (*it).email ); } - if ( d->mMissingEntries.find( list->name() ) != d->mMissingEntries.end() ) { + if ( d->mMissingEntries.tqfind( list->name() ) != d->mMissingEntries.end() ) { const MissingEntryList missList = d->mMissingEntries[ list->name() ]; MissingEntryList::ConstIterator missIt; for ( missIt = missList.begin(); missIt != missList.end(); ++missIt ) { @@ -270,7 +270,7 @@ bool DistributionListManager::save() DistributionListWatcher* DistributionListWatcher::mSelf = 0; DistributionListWatcher::DistributionListWatcher() - : TQObject( qApp, "DistributionListWatcher" ) + : TQObject( tqApp, "DistributionListWatcher" ) { mDirWatch = new KDirWatch; mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); @@ -287,7 +287,7 @@ DistributionListWatcher::~DistributionListWatcher() DistributionListWatcher *DistributionListWatcher::self() { - kdWarning( !qApp ) << "No TQApplication object available, you'll get a memleak!" << endl; + kdWarning( !tqApp ) << "No TQApplication object available, you'll get a memleak!" << endl; if ( !mSelf ) mSelf = new DistributionListWatcher(); diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h index 7ad8dff81..78d182467 100644 --- a/kabc/distributionlist.h +++ b/kabc/distributionlist.h @@ -186,7 +186,7 @@ class KABC_EXPORT DistributionListManager \endcode */ -class KABC_EXPORT DistributionListWatcher : public QObject +class KABC_EXPORT DistributionListWatcher : public TQObject { Q_OBJECT diff --git a/kabc/distributionlistdialog.h b/kabc/distributionlistdialog.h index f4cc143b5..1bd6fc788 100644 --- a/kabc/distributionlistdialog.h +++ b/kabc/distributionlistdialog.h @@ -98,7 +98,7 @@ class KABC_EXPORT EmailSelector : public KDialogBase /** @short Helper class */ -class KABC_EXPORT DistributionListEditorWidget : public QWidget +class KABC_EXPORT DistributionListEditorWidget : public TQWidget { Q_OBJECT diff --git a/kabc/distributionlisteditor.h b/kabc/distributionlisteditor.h index 310d83741..faec280e6 100644 --- a/kabc/distributionlisteditor.h +++ b/kabc/distributionlisteditor.h @@ -51,7 +51,7 @@ class KABC_EXPORT EmailSelectDialog : public KDialogBase /** @obsolete */ -class DistributionListEditor : public QWidget +class DistributionListEditor : public TQWidget { Q_OBJECT public: diff --git a/kabc/errorhandler.cpp b/kabc/errorhandler.cpp index 55b0f459d..d8ab650c7 100644 --- a/kabc/errorhandler.cpp +++ b/kabc/errorhandler.cpp @@ -50,6 +50,6 @@ GuiErrorHandler::GuiErrorHandler( TQWidget *parent ) void GuiErrorHandler::error( const TQString &msg ) { - if (qApp) + if (tqApp) KMessageBox::error( mParent, msg ); } diff --git a/kabc/formats/binaryformat.cpp b/kabc/formats/binaryformat.cpp index d5e3cf499..d09be306b 100644 --- a/kabc/formats/binaryformat.cpp +++ b/kabc/formats/binaryformat.cpp @@ -66,7 +66,7 @@ bool BinaryFormat::loadAll( AddressBook*, Resource *resource, TQFile *file ) if ( !checkHeader( stream ) ) return false; - Q_UINT32 entries; + TQ_UINT32 entries; stream >> entries; @@ -89,7 +89,7 @@ void BinaryFormat::save( const Addressee &addressee, TQFile *file ) writeHeader( stream ); - Q_UINT32 entries = 1; + TQ_UINT32 entries = 1; stream << entries; saveAddressee( addressee, stream ); } @@ -98,7 +98,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file ) { kdDebug(5700) << "BinaryFormat::saveAll()" << endl; - Q_UINT32 counter = 0; + TQ_UINT32 counter = 0; TQDataStream stream( file ); writeHeader( stream ); @@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file ) } // set real number of entries - stream.device()->at( 2 * sizeof( Q_UINT32 ) ); + stream.device()->at( 2 * sizeof( TQ_UINT32 ) ); stream << counter; } @@ -128,7 +128,7 @@ bool BinaryFormat::checkFormat( TQFile *file ) const bool BinaryFormat::checkHeader( TQDataStream &stream ) const { - Q_UINT32 magic, version; + TQ_UINT32 magic, version; stream >> magic >> version; @@ -154,7 +154,7 @@ bool BinaryFormat::checkHeader( TQDataStream &stream ) const void BinaryFormat::writeHeader( TQDataStream &stream ) { - Q_UINT32 magic, version; + TQ_UINT32 magic, version; magic = 0x2e93e; version = BINARY_FORMAT_VERSION; diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index 9d8ea75ee..c83c29c38 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -180,7 +180,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a ) TQStringList::ConstIterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { - int pos = (*it).find( "\n" ); + int pos = (*it).tqfind( "\n" ); TQString fieldName = (*it).left( pos ); TQString fieldValue = (*it).mid( pos + 2 ); @@ -325,7 +325,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet ) TQStringList::ConstIterator customIt; for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) { if ( (*customIt).startsWith( "X-KABC-UID:" ) ) { - a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) ); + a.setUid( (*customIt).mid( (*customIt).tqfind( ":" ) + 1 ) ); idFound = true; } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) { readKAddressBookEntries( *customIt, a ); diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp index 724f039ec..4f60dfa78 100644 --- a/kabc/ldapclient.cpp +++ b/kabc/ldapclient.cpp @@ -50,7 +50,7 @@ public: TQString LdapObject::toString() const { - TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn ); + TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn ); for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) { TQString attr = it.key(); for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) { @@ -306,11 +306,11 @@ void LdapSearch::startSearch( const TQString& txt ) cancelSearch(); - int pos = txt.find( '\"' ); + int pos = txt.tqfind( '\"' ); if( pos >= 0 ) { ++pos; - int pos2 = txt.find( '\"', pos ); + int pos2 = txt.tqfind( '\"', pos ); if( pos2 >= 0 ) mSearchText = txt.mid( pos , pos2 - pos ); else diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h index b4ee9d749..2054b1302 100644 --- a/kabc/ldapclient.h +++ b/kabc/ldapclient.h @@ -82,7 +82,7 @@ class KABC_EXPORT LdapObject * We mean it! * */ -class KABC_EXPORT LdapClient : public QObject +class KABC_EXPORT LdapClient : public TQObject { Q_OBJECT @@ -204,7 +204,7 @@ typedef TQValueList<LdapResult> LdapResultList; * We mean it! * */ -class KABC_EXPORT LdapSearch : public QObject +class KABC_EXPORT LdapSearch : public TQObject { Q_OBJECT diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp index a4b7fc571..671cac98f 100644 --- a/kabc/ldapconfigwidget.cpp +++ b/kabc/ldapconfigwidget.cpp @@ -129,7 +129,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_PORT ) { label = new TQLabel( i18n( "Port:" ), this ); mPort = new TQSpinBox( 0, 65535, 1, this, "kcfg_ldapport" ); - mPort->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); + mPort->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); mPort->setValue( 389 ); mainLayout->addWidget( label, row, col ); @@ -140,7 +140,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_VER ) { label = new TQLabel( i18n( "LDAP version:" ), this ); mVer = new TQSpinBox( 2, 3, 1, this, "kcfg_ldapver" ); - mVer->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); + mVer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); mVer->setValue( 3 ); mainLayout->addWidget( label, row, col ); mainLayout->addWidget( mVer, row, col+1 ); @@ -151,7 +151,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_SIZELIMIT ) { label = new TQLabel( i18n( "Size limit:" ), this ); mSizeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldapsizelimit" ); - mSizeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); + mSizeLimit->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); mSizeLimit->setValue( 0 ); mSizeLimit->setSpecialValueText( i18n("Default") ); mainLayout->addWidget( label, row, col ); @@ -162,7 +162,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_TIMELIMIT ) { label = new TQLabel( i18n( "Time limit:" ), this ); mTimeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldaptimelimit" ); - mTimeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); + mTimeLimit->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); mTimeLimit->setValue( 0 ); mTimeLimit->setSuffix( i18n(" sec") ); mTimeLimit->setSpecialValueText( i18n("Default") ); diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h index 9f383b40f..aeba6572b 100644 --- a/kabc/ldapconfigwidget.h +++ b/kabc/ldapconfigwidget.h @@ -47,7 +47,7 @@ namespace KABC { It's KConfigXT compatible, using widget names starting with kcfg_ */ - class KABC_EXPORT LdapConfigWidget : public QWidget + class KABC_EXPORT LdapConfigWidget : public TQWidget { Q_OBJECT Q_PROPERTY( LCW_Flags flags READ flags WRITE setFlags ) diff --git a/kabc/ldapurl.cpp b/kabc/ldapurl.cpp index 9032c16d3..8315b1cfe 100644 --- a/kabc/ldapurl.cpp +++ b/kabc/ldapurl.cpp @@ -65,7 +65,7 @@ LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const { TQMap<TQString, Extension>::const_iterator it; - it = m_extensions.find( key ); + it = m_extensions.tqfind( key ); if ( it != m_extensions.constEnd() ) return (*it); else { diff --git a/kabc/ldif.cpp b/kabc/ldif.cpp index 19895fce5..27cf16cf1 100644 --- a/kabc/ldif.cpp +++ b/kabc/ldif.cpp @@ -112,7 +112,7 @@ bool LDIF::splitLine( const TQCString &line, TQString &fieldname, TQByteArray &v // kdDebug(5700) << "splitLine line: " << TQString::fromUtf8(line) << endl; - position = line.find( ":" ); + position = line.tqfind( ":" ); if ( position == -1 ) { // strange: we did not find a fieldname fieldname = ""; diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp index 6f875cffb..a05076db3 100644 --- a/kabc/ldifconverter.cpp +++ b/kabc/ldifconverter.cpp @@ -175,7 +175,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis LDIF ldif; LDIF::ParseVal ret; const char *latinstr = str.latin1(); - int latinstrlen = qstrlen( latinstr ); + int latinstrlen = tqstrlen( latinstr ); TQByteArray data; Addressee a; Address homeAddr, workAddr; @@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis data.setRawData( latinstr, latinstrlen ); ldif.setLDIF( data ); if (!dt.isValid()) - dt = TQDateTime::currentDateTime(); + dt = TQDateTime::tqcurrentDateTime(); a.setRevision(dt); homeAddr = Address( Address::Home ); workAddr = Address( Address::Work ); @@ -235,7 +235,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr, Address &workAddr, TQString &fieldname, TQString &value ) { - if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false! + if ( fieldname == TQString::tqfromLatin1( "dn" ) ) // ignore & return false! return false; if ( fieldname.startsWith("#") ) { @@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr, return true; } - if ( fieldname == TQString::fromLatin1( "givenname" ) ) { + if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) { a.setGivenName( value ); return true; } - if ( fieldname == TQString::fromLatin1( "xmozillanickname") || - fieldname == TQString::fromLatin1( "nickname") ) { + if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") || + fieldname == TQString::tqfromLatin1( "nickname") ) { a.setNickName( value ); return true; } - if ( fieldname == TQString::fromLatin1( "sn" ) ) { + if ( fieldname == TQString::tqfromLatin1( "sn" ) ) { a.setFamilyName( value ); return true; } - if ( fieldname == TQString::fromLatin1( "uid" ) ) { + if ( fieldname == TQString::tqfromLatin1( "uid" ) ) { a.setUid( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mail" ) || - fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mail" ) || + fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla if ( a.emails().findIndex( value ) == -1 ) a.insertEmail( value ); return true; } - if ( fieldname == TQString::fromLatin1( "title" ) ) { + if ( fieldname == TQString::tqfromLatin1( "title" ) ) { a.setTitle( value ); return true; } - if ( fieldname == TQString::fromLatin1( "vocation" ) ) { + if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) { a.setPrefix( value ); return true; } - if ( fieldname == TQString::fromLatin1( "cn" ) ) { + if ( fieldname == TQString::tqfromLatin1( "cn" ) ) { a.setFormattedName( value ); return true; } - if ( fieldname == TQString::fromLatin1( "o" ) || - fieldname == TQString::fromLatin1( "organization" ) || // Exchange - fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange + if ( fieldname == TQString::tqfromLatin1( "o" ) || + fieldname == TQString::tqfromLatin1( "organization" ) || // Exchange + fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange a.setOrganization( value ); return true; } - if ( fieldname == TQString::fromLatin1( "description" ) ) { + if ( fieldname == TQString::tqfromLatin1( "description" ) ) { addComment: if ( !a.note().isEmpty() ) a.setNote( a.note() + "\n" ); @@ -306,15 +306,15 @@ addComment: return true; } - if ( fieldname == TQString::fromLatin1( "custom1" ) || - fieldname == TQString::fromLatin1( "custom2" ) || - fieldname == TQString::fromLatin1( "custom3" ) || - fieldname == TQString::fromLatin1( "custom4" ) ) { + if ( fieldname == TQString::tqfromLatin1( "custom1" ) || + fieldname == TQString::tqfromLatin1( "custom2" ) || + fieldname == TQString::tqfromLatin1( "custom3" ) || + fieldname == TQString::tqfromLatin1( "custom4" ) ) { goto addComment; } - if ( fieldname == TQString::fromLatin1( "homeurl" ) || - fieldname == TQString::fromLatin1( "workurl" ) ) { + if ( fieldname == TQString::tqfromLatin1( "homeurl" ) || + fieldname == TQString::tqfromLatin1( "workurl" ) ) { if (a.url().isEmpty()) { a.setUrl( KURL( value ) ); return true; @@ -325,139 +325,139 @@ addComment: // TODO: change this with KDE 4 } - if ( fieldname == TQString::fromLatin1( "homephone" ) ) { + if ( fieldname == TQString::tqfromLatin1( "homephone" ) ) { a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) ); return true; } - if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) { + if ( fieldname == TQString::tqfromLatin1( "telephonenumber" ) ) { a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) ); return true; } - if ( fieldname == TQString::fromLatin1( "mobile" ) ) { // mozilla/Netscape 7 + if ( fieldname == TQString::tqfromLatin1( "mobile" ) ) { // mozilla/Netscape 7 a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) ); return true; } - if ( fieldname == TQString::fromLatin1( "cellphone" ) ) { + if ( fieldname == TQString::tqfromLatin1( "cellphone" ) ) { a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) ); return true; } - if ( fieldname == TQString::fromLatin1( "pager" ) || // mozilla - fieldname == TQString::fromLatin1( "pagerphone" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "pager" ) || // mozilla + fieldname == TQString::tqfromLatin1( "pagerphone" ) ) { // mozilla a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) ); return true; } - if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) { + if ( fieldname == TQString::tqfromLatin1( "facsimiletelephonenumber" ) ) { a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) ); return true; } - if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "xmozillaanyphone" ) ) { // mozilla a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) ); return true; } - if ( fieldname == TQString::fromLatin1( "street" ) || - fieldname == TQString::fromLatin1( "streethomeaddress" ) ) { + if ( fieldname == TQString::tqfromLatin1( "street" ) || + fieldname == TQString::tqfromLatin1( "streethomeaddress" ) ) { homeAddr.setStreet( value ); return true; } - if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "postaladdress" ) ) { // mozilla workAddr.setStreet( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) { // mozilla - workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value ); + if ( fieldname == TQString::tqfromLatin1( "mozillapostaladdress2" ) ) { // mozilla + workAddr.setStreet( workAddr.street() + TQString::tqfromLatin1( "\n" ) + value ); return true; } - if ( fieldname == TQString::fromLatin1( "postalcode" ) ) { + if ( fieldname == TQString::tqfromLatin1( "postalcode" ) ) { workAddr.setPostalCode( value ); return true; } - if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) { + if ( fieldname == TQString::tqfromLatin1( "postofficebox" ) ) { workAddr.setPostOfficeBox( value ); return true; } - if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) { // Netscape 7 + if ( fieldname == TQString::tqfromLatin1( "homepostaladdress" ) ) { // Netscape 7 homeAddr.setStreet( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla - homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value ); + if ( fieldname == TQString::tqfromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla + homeAddr.setStreet( homeAddr.street() + TQString::tqfromLatin1( "\n" ) + value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mozillahomelocalityname" ) ) { // mozilla homeAddr.setLocality( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomestate" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mozillahomestate" ) ) { // mozilla homeAddr.setRegion( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mozillahomepostalcode" ) ) { // mozilla homeAddr.setPostalCode( value ); return true; } - if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "mozillahomecountryname" ) ) { // mozilla if ( value.length() <= 2 ) value = Address::ISOtoCountry(value); homeAddr.setCountry( value ); return true; } - if ( fieldname == TQString::fromLatin1( "locality" ) ) { + if ( fieldname == TQString::tqfromLatin1( "locality" ) ) { workAddr.setLocality( value ); return true; } - if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x + if ( fieldname == TQString::tqfromLatin1( "streetaddress" ) ) { // Netscape 4.x workAddr.setStreet( value ); return true; } - if ( fieldname == TQString::fromLatin1( "countryname" ) || - fieldname == TQString::fromLatin1( "c" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "countryname" ) || + fieldname == TQString::tqfromLatin1( "c" ) ) { // mozilla if ( value.length() <= 2 ) value = Address::ISOtoCountry(value); workAddr.setCountry( value ); return true; } - if ( fieldname == TQString::fromLatin1( "l" ) ) { // mozilla + if ( fieldname == TQString::tqfromLatin1( "l" ) ) { // mozilla workAddr.setLocality( value ); return true; } - if ( fieldname == TQString::fromLatin1( "st" ) ) { + if ( fieldname == TQString::tqfromLatin1( "st" ) ) { workAddr.setRegion( value ); return true; } - if ( fieldname == TQString::fromLatin1( "ou" ) ) { + if ( fieldname == TQString::tqfromLatin1( "ou" ) ) { a.setRole( value ); return true; } - if ( fieldname == TQString::fromLatin1( "department" ) ) { + if ( fieldname == TQString::tqfromLatin1( "department" ) ) { a.setDepartment( value ); return true; } - if ( fieldname == TQString::fromLatin1( "member" ) ) { + if ( fieldname == TQString::tqfromLatin1( "member" ) ) { // this is a mozilla list member (cn=xxx, mail=yyy) TQStringList list( TQStringList::split( ',', value ) ); TQString name, email; @@ -476,8 +476,8 @@ addComment: return true; } - if ( fieldname == TQString::fromLatin1( "modifytimestamp" ) ) { - if (value == TQString::fromLatin1("0Z")) // ignore + if ( fieldname == TQString::tqfromLatin1( "modifytimestamp" ) ) { + if (value == TQString::tqfromLatin1("0Z")) // ignore return true; TQDateTime dt = VCardStringToDate( value ); if ( dt.isValid() ) { @@ -486,7 +486,7 @@ addComment: } } - if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore + if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore return true; kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n") @@ -528,7 +528,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value, return TQString(); // append format if not given - if (formatStr.find(':') == -1) + if (formatStr.tqfind(':') == -1) formatStr.append(": %1\n"); // check if base64-encoding is needed @@ -543,12 +543,12 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value, } if (printable) // always encode if we find special chars... - printable = (value.find('\n') == -1); + printable = (value.tqfind('\n') == -1); if (!printable && allowEncode) { // encode to base64 value = KCodecs::base64Encode( value.utf8() ); - int p = formatStr.find(':'); + int p = formatStr.tqfind(':'); if (p>=0) formatStr.insert(p, ':'); } diff --git a/kabc/ldifconverter.h b/kabc/ldifconverter.h index a8052a65f..a2225ad2d 100644 --- a/kabc/ldifconverter.h +++ b/kabc/ldifconverter.h @@ -44,7 +44,7 @@ namespace KABC { * @param dt The date & time value of the last modification (e.g. file modification time). * @since 3.2 */ - KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::currentDateTime() ); + KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::tqcurrentDateTime() ); /** * Converts a list of addressees to a LDIF string. diff --git a/kabc/lock.h b/kabc/lock.h index 95f5c87a3..b682ea9e2 100644 --- a/kabc/lock.h +++ b/kabc/lock.h @@ -32,7 +32,7 @@ namespace KABC { This class provides locking functionality for a file, directory or an arbitrary string-represented resource. */ -class KABC_EXPORT Lock : public QObject +class KABC_EXPORT Lock : public TQObject { Q_OBJECT public: diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp index df0baf455..0a12ea34f 100644 --- a/kabc/plugins/ldapkio/resourceldapkio.cpp +++ b/kabc/plugins/ldapkio/resourceldapkio.cpp @@ -125,7 +125,7 @@ void ResourceLDAPKIO::enter_loop() TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } @@ -154,7 +154,7 @@ void ResourceLDAPKIO::listResult( KIO::Job *job) mErrorMsg = job->errorString(); else mErrorMsg = ""; - qApp->exit_loop(); + tqApp->exit_loop(); } TQString ResourceLDAPKIO::findUid( const TQString &uid ) @@ -766,7 +766,7 @@ void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job ) mErrorMsg = ""; activateCache(); - qApp->exit_loop(); + tqApp->exit_loop(); } void ResourceLDAPKIO::saveResult( KIO::Job *job ) diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp index 55f02bae7..7dae03d22 100644 --- a/kabc/plugins/sql/resourcesql.cpp +++ b/kabc/plugins/sql/resourcesql.cpp @@ -317,8 +317,8 @@ bool ResourceSql::save( Ticket * ) TQStringList list = (*it).customs(); TQStringList::ConstIterator it; for( it = list.begin(); it != list.end(); ++it ) { - int dashPos = (*it).find( '-' ); - int colonPos = (*it).find( ':' ); + int dashPos = (*it).tqfind( '-' ); + int colonPos = (*it).tqfind( ':' ); TQString app = (*it).left( dashPos ); TQString name = (*it).mid( dashPos + 1, colonPos - dashPos - 1 ); TQString value = (*it).right( (*it).length() - colonPos - 1 ); diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp index ef1651cde..403f8a6d0 100644 --- a/kabc/plugins/sql/resourcesqlconfig.cpp +++ b/kabc/plugins/sql/resourcesqlconfig.cpp @@ -60,7 +60,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name ) label = new TQLabel( i18n( "Port:" ), this ); TQVBox *box = new TQVBox(this); mPort = new TQSpinBox(0, 65535, 1, box ); - mPort->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + mPort->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); mPort->setValue(389); new TQWidget(box, "dummy"); diff --git a/kabc/resource.cpp b/kabc/resource.cpp index d43c68320..9807d53a3 100644 --- a/kabc/resource.cpp +++ b/kabc/resource.cpp @@ -268,7 +268,7 @@ void Resource::removeAddressee( const Addressee &addr ) Addressee Resource::findByUid( const TQString &uid ) { - Addressee::Map::ConstIterator it = mAddrMap.find( uid ); + Addressee::Map::ConstIterator it = mAddrMap.tqfind( uid ); if ( it != mAddrMap.end() ) return it.data(); diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp index 36c449f19..11384e456 100644 --- a/kabc/scripts/addressee.src.cpp +++ b/kabc/scripts/addressee.src.cpp @@ -225,7 +225,7 @@ void Addressee::setNameFromString( const TQString &s ) TQString emptyStr = ""; AddresseeHelper *helper = AddresseeHelper::self(); - int i = str.find( ',' ); + int i = str.tqfind( ',' ); if( i < 0 ) { TQStringList parts = TQStringList::split( spaceStr, str ); int leftOffset = 0; @@ -398,7 +398,7 @@ TQString Addressee::fullEmail( const TQString &email ) const text = e; else { TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ); - if ( realName().find( needQuotes ) != -1 ) { + if ( realName().tqfind( needQuotes ) != -1 ) { TQString name = realName(); name.replace( "\"", "\\\"" ); text = "\"" + name + "\" <" + e + ">"; @@ -417,7 +417,7 @@ void Addressee::insertEmail( const TQString &email, bool preferred ) detach(); mData->empty = false; - TQStringList::Iterator it = mData->emails.find( email ); + TQStringList::Iterator it = mData->emails.tqfind( email ); if ( it != mData->emails.end() ) { if ( !preferred || it == mData->emails.begin() ) return; @@ -436,7 +436,7 @@ void Addressee::removeEmail( const TQString &email ) { detach(); - TQStringList::Iterator it = mData->emails.find( email ); + TQStringList::Iterator it = mData->emails.tqfind( email ); if ( it == mData->emails.end() ) return; mData->emails.remove( it ); @@ -764,7 +764,7 @@ void Addressee::removeCategory( const TQString &c ) { detach(); - TQStringList::Iterator it = mData->categories.find( c ); + TQStringList::Iterator it = mData->categories.tqfind( c ); if ( it == mData->categories.end() ) return; mData->categories.remove( it ); @@ -832,7 +832,7 @@ TQString Addressee::custom( const TQString &app, const TQString &name ) const TQStringList::ConstIterator it; for( it = mData->custom.constBegin(); it != mData->custom.constEnd(); ++it ) { if ( (*it).startsWith( qualifiedName ) ) { - value = (*it).mid( (*it).find( ":" ) + 1 ); + value = (*it).mid( (*it).tqfind( ":" ) + 1 ); break; } } @@ -1104,7 +1104,7 @@ bool listEquals( const TQValueList<L> &list, const TQValueList<L> &pattern ) return false; for ( uint i = 0; i < list.count(); ++i ) - if ( pattern.find( list[ i ] ) == pattern.end() ) + if ( pattern.tqfind( list[ i ] ) == pattern.end() ) return false; return true; @@ -1120,7 +1120,7 @@ bool emailsEquals( const TQStringList &list, const TQStringList &pattern ) TQStringList::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) - if ( pattern.find( *it ) == pattern.end() ) + if ( pattern.tqfind( *it ) == pattern.end() ) return false; return true; diff --git a/kabc/tests/testldapclient.h b/kabc/tests/testldapclient.h index ea1293b51..1995914c3 100644 --- a/kabc/tests/testldapclient.h +++ b/kabc/tests/testldapclient.h @@ -24,7 +24,7 @@ #include "../ldapclient.h" typedef KABC::LdapClient LdapClient; -class TestLDAPClient : public QObject +class TestLDAPClient : public TQObject { Q_OBJECT diff --git a/kabc/tests/testlock.h b/kabc/tests/testlock.h index 92244cd30..a94d4e8c6 100644 --- a/kabc/tests/testlock.h +++ b/kabc/tests/testlock.h @@ -28,7 +28,7 @@ class TQLabel; class TQListView; -class KABC_EXPORT LockWidget : public QWidget +class KABC_EXPORT LockWidget : public TQWidget { Q_OBJECT public: diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp index 5ad56f4fb..899912553 100644 --- a/kabc/vcard/AdrParam.cpp +++ b/kabc/vcard/AdrParam.cpp @@ -80,7 +80,7 @@ AdrParam::operator == (AdrParam & x) TQStrListIterator it(x.adrTypeList_); for (; it.current(); ++it) - if (!adrTypeList_.find(it.current())) + if (!adrTypeList_.tqfind(it.current())) return false; return true; diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp index 52bcdf4f5..31151be9f 100644 --- a/kabc/vcard/ContentLine.cpp +++ b/kabc/vcard/ContentLine.cpp @@ -122,7 +122,7 @@ ContentLine::operator == (ContentLine & x) TQPtrListIterator<Param> it(x.paramList()); - if (!paramList_.find(it.current())) + if (!paramList_.tqfind(it.current())) return false; return true; @@ -142,7 +142,7 @@ ContentLine::_parse() // Unqote newlines strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" ); - int split = strRep_.find(':'); + int split = strRep_.tqfind(':'); if (split == -1) { // invalid content line vDebug("No ':'"); @@ -152,7 +152,7 @@ ContentLine::_parse() TQCString firstPart(strRep_.left(split)); TQCString valuePart(strRep_.mid(split + 1)); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); @@ -193,7 +193,7 @@ ContentLine::_parse() TQCString str = *it; - split = str.find("="); + split = str.tqfind("="); if (split < 0 ) { vDebug("No '=' in parameter."); continue; diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp index aedfe5eba..0311ac2e2 100644 --- a/kabc/vcard/DateValue.cpp +++ b/kabc/vcard/DateValue.cpp @@ -152,7 +152,7 @@ DateValue::_parse() // time = time-hour [":"] time-minute [":"] time-second [":"] // [time-secfrac] [time-zone] - int timeSep = strRep_.find('T'); + int timeSep = strRep_.tqfind('T'); TQCString dateStr; TQCString timeStr; @@ -192,7 +192,7 @@ DateValue::_parse() /////////////////////////////////////////////////////////////// ZONE - int zoneSep = timeStr.find('Z'); + int zoneSep = timeStr.tqfind('Z'); if (zoneSep != -1 && timeStr.length() - zoneSep > 3) { diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp index 2bac28c1e..3021bbdb1 100644 --- a/kabc/vcard/GeoValue.cpp +++ b/kabc/vcard/GeoValue.cpp @@ -84,7 +84,7 @@ GeoValue::clone() void GeoValue::_parse() { - int semiColon = strRep_.find( ";" ); + int semiColon = strRep_.tqfind( ";" ); if ( semiColon == -1 ) // invalid return; diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp index b0e251a87..582a9e1c7 100644 --- a/kabc/vcard/RToken.cpp +++ b/kabc/vcard/RToken.cpp @@ -30,7 +30,7 @@ namespace VCARD { - Q_UINT32 + TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l) { // FIXME no stderr ! diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp index d66d87498..7041acd9e 100644 --- a/kabc/vcard/SourceParam.cpp +++ b/kabc/vcard/SourceParam.cpp @@ -80,7 +80,7 @@ SourceParam::~SourceParam() void SourceParam::_parse() { - int i = strRep_.find('='); + int i = strRep_.tqfind('='); if (i == -1) // Invalid return; diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp index 98f75cb8e..ea598c5f5 100644 --- a/kabc/vcard/URIValue.cpp +++ b/kabc/vcard/URIValue.cpp @@ -89,7 +89,7 @@ URIValue::~URIValue() void URIValue::_parse() { - int split = strRep_.find(':'); + int split = strRep_.tqfind(':'); if (split == -1) return; diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp index 30473661f..445af4fd7 100644 --- a/kabc/vcard/UTCValue.cpp +++ b/kabc/vcard/UTCValue.cpp @@ -93,7 +93,7 @@ UTCValue::_parse() positive_ = ( strRep_[0] == '+' ); - int colon = strRep_.find( ':' ); + int colon = strRep_.tqfind( ':' ); if ( colon == -1 ) // Not valid. return; diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp index 50c25da59..c63e978d4 100644 --- a/kabc/vcard/VCard.cpp +++ b/kabc/vcard/VCard.cpp @@ -113,7 +113,7 @@ VCard::_parse() /////////////////////////////////////////////////////////////// // FIRST LINE - int split = beginLine.find(':'); + int split = beginLine.tqfind(':'); if (split == -1) { // invalid, no BEGIN vDebug("No split"); @@ -123,7 +123,7 @@ VCard::_parse() TQCString firstPart(beginLine.left(split)); TQCString valuePart(beginLine.mid(split + 1)); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); @@ -188,7 +188,7 @@ VCard::_parse() /////////////////////////////////////////////////////////////// // LAST LINE - split = endLine.find(':'); + split = endLine.tqfind(':'); if (split == -1) // invalid, no END return; @@ -196,7 +196,7 @@ VCard::_parse() firstPart = endLine.left(split); valuePart = endLine.right(firstPart.length() - split - 1); - split = firstPart.find('.'); + split = firstPart.tqfind('.'); if (split != -1) { group_ = firstPart.left(split); diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp index 1f8cea5b1..4c987bffe 100644 --- a/kabc/vcard/VCardEntity.cpp +++ b/kabc/vcard/VCardEntity.cpp @@ -76,11 +76,11 @@ VCardEntity::_parse() vDebug("parse"); TQCString s(strRep_); - int i = s.find(TQRegExp("BEGIN:VCARD", false)); + int i = s.tqfind(TQRegExp("BEGIN:VCARD", false)); while (i != -1) { - i = s.find(TQRegExp("BEGIN:VCARD", false), 11); + i = s.tqfind(TQRegExp("BEGIN:VCARD", false), 11); TQCString cardStr(s.left(i)); diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h index 0ea380267..5122ef55c 100644 --- a/kabc/vcard/include/VCardRToken.h +++ b/kabc/vcard/include/VCardRToken.h @@ -32,7 +32,7 @@ namespace VCARD { -KVCARD_EXPORT Q_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l); +KVCARD_EXPORT TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l); } diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp index d7354539b..94ad3b723 100644 --- a/kabc/vcard21parser.cpp +++ b/kabc/vcard21parser.cpp @@ -430,7 +430,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err ) } // split into two tokens - int colon = (*j).find( ':' ); + int colon = (*j).tqfind( ':' ); if ( colon < 0 ) { _err = VC_ERR_INVALID_LINE; break; diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp index 38d95294c..ae70c434d 100644 --- a/kabc/vcardformatimpl.cpp +++ b/kabc/vcardformatimpl.cpp @@ -123,7 +123,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v ) TQCString n = cl->name(); if ( n.left( 2 ) == "X-" ) { n = n.mid( 2 ); - int posDash = n.find( "-" ); + int posDash = n.tqfind( "-" ); addressee.insertCustom( TQString::fromUtf8( n.left( posDash ) ), TQString::fromUtf8( n.mid( posDash + 1 ) ), TQString::fromUtf8( cl->value()->asString() ) ); @@ -351,8 +351,8 @@ void VCardFormatImpl::addCustomValue( VCARD::VCard *v, const TQString &txt ) if ( txt.isEmpty() ) return; ContentLine cl; - cl.setName( "X-" + txt.left( txt.find( ":" ) ).utf8() ); - TQString value = txt.mid( txt.find( ":" ) + 1 ); + cl.setName( "X-" + txt.left( txt.tqfind( ":" ) ).utf8() ); + TQString value = txt.mid( txt.tqfind( ":" ) + 1 ); if ( value.isEmpty() ) return; cl.setValue( new TextValue( value.utf8() ) ); diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp index f6e894f4b..f24f1ad25 100644 --- a/kabc/vcardparser/testwrite.cpp +++ b/kabc/vcardparser/testwrite.cpp @@ -60,7 +60,7 @@ int main( int argc, char **argv ) addressee.setOrganization( "KDE" ); addressee.setNote( "nerver\ntouch a running system" ); addressee.setProductId( "testId" ); - addressee.setRevision( TQDateTime::currentDateTime() ); + addressee.setRevision( TQDateTime::tqcurrentDateTime() ); addressee.setSortString( "koenig" ); addressee.setUrl( KURL( "http://wgess16.dyndns.org") ); addressee.setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) ); diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp index 30a8e1c49..8b6c9570a 100644 --- a/kabc/vcardparser/vcard.cpp +++ b/kabc/vcardparser/vcard.cpp @@ -62,7 +62,7 @@ void VCard::addLine( const VCardLine& line ) VCardLine::List VCard::lines( const TQString& identifier ) const { - LineMap::ConstIterator it = mLineMap.find( identifier ); + LineMap::ConstIterator it = mLineMap.tqfind( identifier ); if ( it == mLineMap.end() ) return VCardLine::List(); @@ -71,7 +71,7 @@ VCardLine::List VCard::lines( const TQString& identifier ) const VCardLine VCard::line( const TQString& identifier ) const { - LineMap::ConstIterator it = mLineMap.find( identifier ); + LineMap::ConstIterator it = mLineMap.tqfind( identifier ); if ( it == mLineMap.end() ) return VCardLine(); @@ -97,7 +97,7 @@ void VCard::setVersion( Version version ) VCard::Version VCard::version() const { - LineMap::ConstIterator versionEntry = mLineMap.find( "VERSION" ); + LineMap::ConstIterator versionEntry = mLineMap.tqfind( "VERSION" ); if ( versionEntry == mLineMap.end() ) return v3_0; diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp index 6680cf7d0..dc43056cd 100644 --- a/kabc/vcardparser/vcardline.cpp +++ b/kabc/vcardparser/vcardline.cpp @@ -130,7 +130,7 @@ void VCardLine::addParameter( const TQString& param, const TQString& value ) TQStringList VCardLine::parameters( const TQString& param ) const { - ParamMap::ConstIterator it = mParamMap.find( param ); + ParamMap::ConstIterator it = mParamMap.tqfind( param ); if ( it == mParamMap.end() ) return TQStringList(); else @@ -139,7 +139,7 @@ TQStringList VCardLine::parameters( const TQString& param ) const TQString VCardLine::parameter( const TQString& param ) const { - ParamMap::ConstIterator it = mParamMap.find( param ); + ParamMap::ConstIterator it = mParamMap.tqfind( param ); if ( it == mParamMap.end() ) return TQString::null; else { diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp index 67b1bc306..5fe6b3154 100644 --- a/kabc/vcardparser/vcardparser.cpp +++ b/kabc/vcardparser/vcardparser.cpp @@ -81,7 +81,7 @@ VCard::List VCardParser::parseVCards( const TQString& text ) continue; } else { if ( inVCard && !currentLine.isEmpty() ) { // now parse the line - int colon = currentLine.find( ':' ); + int colon = currentLine.tqfind( ':' ); if ( colon == -1 ) { // invalid line currentLine = (*it); continue; @@ -94,7 +94,7 @@ VCard::List VCardParser::parseVCards( const TQString& text ) TQStringList params = TQStringList::split( ';', key ); // check for group - if ( params[0].find( '.' ) != -1 ) { + if ( params[0].tqfind( '.' ) != -1 ) { const TQStringList groupList = TQStringList::split( '.', params[0] ); vCardLine.setGroup( groupList[0] ); vCardLine.setIdentifier( groupList[1] ); @@ -118,7 +118,7 @@ VCard::List VCardParser::parseVCards( const TQString& text ) } } // This is pretty much a faster pair[1].contains( ',' )... - if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format + if ( pair[1].tqfind( ',' ) != -1 ) { // parameter in type=x,y,z format const TQStringList args = TQStringList::split( ',', pair[ 1 ] ); TQStringList::ConstIterator argIt; for ( argIt = args.begin(); argIt != args.end(); ++argIt ) diff --git a/kabc/vcardtool.cpp b/kabc/vcardtool.cpp index 6e8dc9acc..4e08915d7 100644 --- a/kabc/vcardtool.cpp +++ b/kabc/vcardtool.cpp @@ -335,8 +335,8 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // X- const TQStringList customs = (*addrIt).customs(); for ( strIt = customs.begin(); strIt != customs.end(); ++strIt ) { - TQString identifier = "X-" + (*strIt).left( (*strIt).find( ":" ) ); - TQString value = (*strIt).mid( (*strIt).find( ":" ) + 1 ); + TQString identifier = "X-" + (*strIt).left( (*strIt).tqfind( ":" ) ); + TQString value = (*strIt).mid( (*strIt).tqfind( ":" ) + 1 ); if ( value.isEmpty() ) continue; @@ -594,7 +594,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard ) // X- else if ( identifier.startsWith( "x-" ) ) { const TQString key = (*lineIt).identifier().mid( 2 ); - int dash = key.find( "-" ); + int dash = key.tqfind( "-" ); addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).value().asString() ); } } @@ -610,11 +610,11 @@ TQDateTime VCardTool::parseDateTime( const TQString &str ) { TQDateTime dateTime; - if ( str.find( '-' ) == -1 ) { // is base format (yyyymmdd) + if ( str.tqfind( '-' ) == -1 ) { // is base format (yyyymmdd) dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 4, 2 ).toInt(), str.mid( 6, 2 ).toInt() ) ); - if ( str.find( 'T' ) ) // has time information yyyymmddThh:mm:ss + if ( str.tqfind( 'T' ) ) // has time information yyyymmddThh:mm:ss dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(), str.mid( 17, 2 ).toInt() ) ); @@ -622,7 +622,7 @@ TQDateTime VCardTool::parseDateTime( const TQString &str ) dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 5, 2 ).toInt(), str.mid( 8, 2 ).toInt() ) ); - if ( str.find( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss + if ( str.tqfind( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(), str.mid( 17, 2 ).toInt() ) ); } @@ -866,7 +866,7 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str ) TQString value( str ); int start = 0; - int pos = value.find( sep, start ); + int pos = value.tqfind( sep, start ); while ( pos != -1 ) { if ( value[ pos - 1 ] != '\\' ) { @@ -876,13 +876,13 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str ) list << TQString::null; start = pos + 1; - pos = value.find( sep, start ); + pos = value.tqfind( sep, start ); } else { if ( pos != 0 ) { value.replace( pos - 1, 2, sep ); - pos = value.find( sep, pos ); + pos = value.tqfind( sep, pos ); } else - pos = value.find( sep, pos + 1 ); + pos = value.tqfind( sep, pos + 1 ); } } diff --git a/kate/interfaces/interfaces.cpp b/kate/interfaces/interfaces.cpp index ad20959b6..59abc37cc 100644 --- a/kate/interfaces/interfaces.cpp +++ b/kate/interfaces/interfaces.cpp @@ -100,7 +100,7 @@ Document *document (KTextEditor::Document *doc) if (!doc) return 0; - return static_cast<Document*>(doc->qt_cast("Kate::Document")); + return static_cast<Document*>(doc->tqqt_cast("Kate::Document")); } DocumentExt *documentExt (KTextEditor::Document *doc) @@ -108,7 +108,7 @@ DocumentExt *documentExt (KTextEditor::Document *doc) if (!doc) return 0; - return static_cast<DocumentExt*>(doc->qt_cast("Kate::DocumentExt")); + return static_cast<DocumentExt*>(doc->tqqt_cast("Kate::DocumentExt")); } Document *createDocument ( TQObject *parent, const char *name ) @@ -121,7 +121,7 @@ View *view (KTextEditor::View *view) if (!view) return 0; - return static_cast<View*>(view->qt_cast("Kate::View")); + return static_cast<View*>(view->tqqt_cast("Kate::View")); } } diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h index 4dd5a362b..10086ec7f 100644 --- a/kate/part/katearbitraryhighlight.h +++ b/kate/part/katearbitraryhighlight.h @@ -57,7 +57,7 @@ public: * - identical highlight for whole list * - signals for view movement */ -class KateArbitraryHighlight : public QObject +class KateArbitraryHighlight : public TQObject { Q_OBJECT diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index ed9a6169b..aed42bbab 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -224,55 +224,55 @@ void KateNormalIndent::updateConfig () for (uint i=0; i<items.count(); i++) { TQString name = items.at(i)->name; - if (name.find("Comment") != -1 && commentAttrib == 255) + if (name.tqfind("Comment") != -1 && commentAttrib == 255) { commentAttrib = i; } - else if (name.find("Region Marker") != -1 && regionAttrib == 255) + else if (name.tqfind("Region Marker") != -1 && regionAttrib == 255) { regionAttrib = i; } - else if (name.find("Symbol") != -1 && symbolAttrib == 255) + else if (name.tqfind("Symbol") != -1 && symbolAttrib == 255) { symbolAttrib = i; } - else if (name.find("Alert") != -1) + else if (name.tqfind("Alert") != -1) { alertAttrib = i; } - else if (name.find("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255) + else if (name.tqfind("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255) { doxyCommentAttrib = i; } - else if (name.find("Tags") != -1 && tagAttrib == 255) + else if (name.tqfind("Tags") != -1 && tagAttrib == 255) { tagAttrib = i; } - else if (name.find("Word") != -1 && wordAttrib == 255) + else if (name.tqfind("Word") != -1 && wordAttrib == 255) { wordAttrib = i; } - else if (name.find("Keyword") != -1 && keywordAttrib == 255) + else if (name.tqfind("Keyword") != -1 && keywordAttrib == 255) { keywordAttrib = i; } - else if (name.find("Normal") != -1 && normalAttrib == 255) + else if (name.tqfind("Normal") != -1 && normalAttrib == 255) { normalAttrib = i; } - else if (name.find("Extensions") != -1 && extensionAttrib == 255) + else if (name.tqfind("Extensions") != -1 && extensionAttrib == 255) { extensionAttrib = i; } - else if (name.find("Preprocessor") != -1 && preprocessorAttrib == 255) + else if (name.tqfind("Preprocessor") != -1 && preprocessorAttrib == 255) { preprocessorAttrib = i; } - else if (name.find("String") != -1 && stringAttrib == 255) + else if (name.tqfind("String") != -1 && stringAttrib == 255) { stringAttrib = i; } - else if (name.find("Char") != -1 && charAttrib == 255) + else if (name.tqfind("Char") != -1 && charAttrib == 255) { charAttrib = i; } @@ -583,7 +583,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin) if (last <= 0 || !(justAfterDoxygen = textLine->stringAtPos(last-1, "*/"))) insideDoxygen = true; if (justAfterDoxygen) - justAfterDoxygen &= textLine->string().find("/**") < 0; + justAfterDoxygen &= textLine->string().tqfind("/**") < 0; while (textLine->attribute(first) != doxyCommentAttrib && first <= textLine->lastChar()) first++; if (textLine->stringAtPos(first, "//")) @@ -700,7 +700,7 @@ static inline bool colonPermitsReindent(const KateNormalIndent &indenter, { const TQString txt = line->string(0,curCol); // do we have any significant preceding colon? - for (int pos = 0; (pos = txt.find(':', pos)) >= 0; pos++) { + for (int pos = 0; (pos = txt.tqfind(':', pos)) >= 0; pos++) { if (line->attribute(pos) == indenter.symbolAttrib) // yes, it has already contributed to this line's indentation, don't // indent again @@ -722,7 +722,7 @@ void KateCSmartIndent::processChar(TQChar c) static const TQString triggers("}{)/:#n"); static const TQString firstTriggers("}{)/:#"); static const TQString lastTriggers(":n"); - if (triggers.find(c) < 0) + if (triggers.tqfind(c) < 0) return; KateView *view = doc->activeView(); @@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c) if (c == 'n') { - if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio")) + if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio")) return; } @@ -775,8 +775,8 @@ void KateCSmartIndent::processChar(TQChar c) // of the line const TQChar lastChar = textLine->getChar(textLine->lastChar()); int pos; - if (((c == firstChar && firstTriggers.find(firstChar) >= 0) - || (c == lastChar && lastTriggers.find(lastChar) >= 0)) + if (((c == firstChar && firstTriggers.tqfind(firstChar) >= 0) + || (c == lastChar && lastTriggers.tqfind(lastChar) >= 0)) && (c != ':' || colonPermitsReindent(*this, textLine, curCol))) processLine(begin); } @@ -1176,7 +1176,7 @@ uint KateCSmartIndent::findOpeningComment(KateDocCursor &start) { KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line()); - int pos = textLine->string().find("/*", false); + int pos = textLine->string().tqfind("/*", false); if (pos >= 0) { KateDocCursor temp(cur.line(), pos, doc); @@ -1359,7 +1359,7 @@ void KateXmlIndent::processChar (TQChar c) // only alter lines that start with a close element KateView *view = doc->activeView(); TQString text = doc->plainKateTextLine(view->cursorLine())->string(); - if(text.find(startsWithCloseTag) == -1) return; + if(text.tqfind(startsWithCloseTag) == -1) return; // process it processLine(view->cursorLine()); @@ -1404,14 +1404,14 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, // <a> // </a> <!-- indentation *already* decreased --> // requires that we discount the </a> from the number of closed tags - if(text.find(startsWithCloseTag) != -1) ++numTags; + if(text.tqfind(startsWithCloseTag) != -1) ++numTags; // count the number of open and close tags int lastCh = 0; uint pos, len = text.length(); bool seenOpen = false; for(pos = 0; pos < len; ++pos) { - int ch = text.at(pos).unicode(); + int ch = text.at(pos).tqunicode(); switch(ch) { case '<': seenOpen = true; @@ -1445,10 +1445,10 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, for(uint backLine = line; backLine; ) { // find first line with an open tag KateTextLine::Ptr x = doc->plainKateTextLine(--backLine); - if(x->string().find('<') == -1) continue; + if(x->string().tqfind('<') == -1) continue; // recalculate the indent - if(x->string().find(unclosedDoctype) != -1) --numTags; + if(x->string().tqfind(unclosedDoctype) != -1) --numTags; getLineInfo(backLine, prevIndent, numTags, attrCol, unclosedTag); break; } @@ -1467,11 +1467,11 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, if(unclosedTag) { // find the start of the next attribute, so we can align with it do { - lastCh = text.at(++attrCol).unicode(); + lastCh = text.at(++attrCol).tqunicode(); }while(lastCh && lastCh != ' ' && lastCh != '\t'); while(lastCh == ' ' || lastCh == '\t') { - lastCh = text.at(++attrCol).unicode(); + lastCh = text.at(++attrCol).tqunicode(); } attrCol = prevLine->cursorX(attrCol, tabWidth); @@ -1499,7 +1499,7 @@ uint KateXmlIndent::processLine (uint line) if(indent < 0) indent = 0; // unindent lines that start with a close tag - if(kateLine->string().find(startsWithCloseTag) != -1) { + if(kateLine->string().tqfind(startsWithCloseTag) != -1) { indent -= indentWidth; } if(indent < 0) indent = 0; @@ -1760,7 +1760,7 @@ int KateCSAndSIndent::lastNonCommentChar( const KateDocCursor &line ) // find a possible start-of-comment int p = -2; // so the first find starts at position 0 - do p = str.find( "//", p + 2 ); + do p = str.tqfind( "//", p + 2 ); while ( p >= 0 && textLine->attribute(p) != commentAttrib && textLine->attribute(p) != doxyCommentAttrib ); // no // found? use whole string @@ -1917,8 +1917,8 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin) // if the line starts with # (but isn't a c# region thingy), no indentation at all. if( currLineFirst >= 0 && currLine->getChar(currLineFirst) == '#' ) { - if( !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("region") ) && - !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) ) + if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) && + !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("endregion") ) ) return TQString::null; } @@ -1974,10 +1974,10 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin) { #define ARRLEN( array ) ( sizeof(array)/sizeof(array[0]) ) for( uint n = 0; n < ARRLEN(scopeKeywords); ++n ) - if( textLine->stringAtPos(pos, TQString::fromLatin1(scopeKeywords[n]) ) ) + if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) ) return calcIndentAfterKeyword( begin, cur, pos, false ); for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n ) - if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) ) + if( textLine->stringAtPos(pos, TQString::tqfromLatin1(blockScopeKeywords[n]) ) ) return calcIndentAfterKeyword( begin, cur, pos, true ); #undef ARRLEN } @@ -2070,7 +2070,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor, // beginning 'namespace'. that's 99% of usage, I'd guess. { if( braceFirst >= 0 && braceLine->attribute(braceFirst) == keywordAttrib && - braceLine->stringAtPos( braceFirst, TQString::fromLatin1( "namespace" ) ) ) + braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "namespace" ) ) ) return continuationIndent(indentCursor) + whitespaceToOpenBrace; if( braceCursor.line() > 0 ) @@ -2078,7 +2078,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor, KateTextLine::Ptr prevLine = doc->plainKateTextLine(braceCursor.line() - 1); int firstPrev = prevLine->firstChar(); if( firstPrev >= 0 && prevLine->attribute(firstPrev) == keywordAttrib && - prevLine->stringAtPos( firstPrev, TQString::fromLatin1( "namespace" ) ) ) + prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) ) return continuationIndent(indentCursor) + whitespaceToOpenBrace; } } @@ -2112,7 +2112,7 @@ void KateCSAndSIndent::processChar(TQChar c) { // 'n' trigger is for c# regions. static const TQString triggers("}{)]/:;#n"); - if (triggers.find(c) == -1) + if (triggers.tqfind(c) == -1) return; // for historic reasons, processChar doesn't get a cursor diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h index 7ff1a93d2..6c0d15d45 100644 --- a/kate/part/kateautoindent.h +++ b/kate/part/kateautoindent.h @@ -41,7 +41,7 @@ class KateDocument; * - Return @p true in @p KateAutoIndent::hasConfigPage() for the * corresponding indenter id. */ -class IndenterConfigPage : public QWidget +class IndenterConfigPage : public TQWidget { Q_OBJECT @@ -67,7 +67,7 @@ class IndenterConfigPage : public QWidget * This baseclass is a real dummy, does nothing beside remembering the document it belongs too, * only to have the object around */ -class KateAutoIndent : public QObject +class KateAutoIndent : public TQObject { Q_OBJECT diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index ac1ee73d9..a6de77841 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -176,7 +176,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu ) { sortArray[i] = (*it)->line; ssort( sortArray, i ); - idx = sortArray.find( (*it)->line ) + 3; + idx = sortArray.tqfind( (*it)->line ) + 3; } menu.insertItem( diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h index 88e90ae4f..63928800e 100644 --- a/kate/part/katebookmarks.h +++ b/kate/part/katebookmarks.h @@ -35,7 +35,7 @@ class KActionCollection; class TQPopupMenu; class TQMenuData; -class KateBookmarks : public QObject +class KateBookmarks : public TQObject { Q_OBJECT diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp index 74a9ba59e..e62efcf39 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -46,7 +46,7 @@ * loader block size, load 256 kb at once per default * if file size is smaller, fall back to file size */ -static const Q_ULONG KATE_FILE_LOADER_BS = 256 * 1024; +static const TQ_ULONG KATE_FILE_LOADER_BS = 256 * 1024; /** * KATE_AVG_BLOCK_SIZE is in characters ! @@ -54,8 +54,8 @@ static const Q_ULONG KATE_FILE_LOADER_BS = 256 * 1024; * block will max contain around BLOCK_SIZE chars or * BLOCK_LINES lines (after load, later that won't be tracked) */ -static const Q_ULONG KATE_AVG_BLOCK_SIZE = 2048 * 80; -static const Q_ULONG KATE_MAX_BLOCK_LINES = 2048; +static const TQ_ULONG KATE_AVG_BLOCK_SIZE = 2048 * 80; +static const TQ_ULONG KATE_MAX_BLOCK_LINES = 2048; /** * hl will look at the next KATE_HL_LOOKAHEAD lines @@ -172,10 +172,10 @@ class KateFileLoader // should spaces be ignored at end of line? inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; } - // internal unicode data array - inline const TQChar *unicode () const { return m_text.unicode(); } + // internal tqunicode data array + inline const TQChar *tqunicode () const { return m_text.tqunicode(); } - // read a line, return length + offset in unicode data + // read a line, return length + offset in tqunicode data void readLine (uint &offset, uint &length) { length = 0; @@ -543,7 +543,7 @@ bool KateBuffer::canEncode () kdDebug(13020) << "ENC NAME: " << codec->name() << endl; - // hardcode some unicode encodings which can encode all chars + // hardcode some tqunicode encodings which can encode all chars if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2")) return true; @@ -849,7 +849,7 @@ void KateBuffer::setTabWidth (uint w) m_tabWidth = w; if (m_highlight && m_highlight->foldingIndentationSensitive()) - invalidateHighlighting(); + tqinvalidateHighlighting(); } } @@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode) // aha, hl will change if (h != m_highlight) { - bool invalidate = !h->noHighlighting(); + bool tqinvalidate = !h->noHighlighting(); if (m_highlight) { m_highlight->release(); - invalidate = true; + tqinvalidate = true; } h->use(); @@ -880,8 +880,8 @@ void KateBuffer::setHighlight(uint hlMode) m_highlight = h; - if (invalidate) - invalidateHighlighting(); + if (tqinvalidate) + tqinvalidateHighlighting(); // inform the document that the hl was really changed // needed to update attributes and more ;) @@ -889,7 +889,7 @@ void KateBuffer::setHighlight(uint hlMode) } } -void KateBuffer::invalidateHighlighting() +void KateBuffer::tqinvalidateHighlighting() { m_lineHighlightedMax = 0; m_lineHighlighted = 0; @@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray<uint> &foldingList, } } -bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate) +bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate) { // no hl around, no stuff to do if (!m_highlight) @@ -971,13 +971,13 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b //kdDebug (13020) << "HL UNTIL LINE: " << m_lineHighlighted << " MAX: " << m_lineHighlightedMax << endl; //kdDebug (13020) << "HL DYN COUNT: " << KateHlManager::self()->countDynamicCtxs() << " MAX: " << m_maxDynamicContexts << endl; - // see if there are too many dynamic contexts; if yes, invalidate HL of all documents + // see if there are too many dynamic contexts; if yes, tqinvalidate HL of all documents if (KateHlManager::self()->countDynamicCtxs() >= m_maxDynamicContexts) { { if (KateHlManager::self()->resetDynamicCtxs()) { - kdDebug (13020) << "HL invalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl; + kdDebug (13020) << "HL tqinvalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl; // avoid recursive invalidation KateHlManager::self()->setForceNoDCReset(true); @@ -1240,7 +1240,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b buf->markDirty (); // tag the changed lines ! - if (invalidate) + if (tqinvalidate) emit tagLines (startLine, current_line + buf->startLine()); // emit that we have changed the folding @@ -1353,14 +1353,14 @@ void KateBufBlock::fillBlock (KateFileLoader *stream) { uint offset = 0, length = 0; stream->readLine(offset, length); - const TQChar *unicodeData = stream->unicode () + offset; + const TQChar *tqunicodeData = stream->tqunicode () + offset; // strip spaces at end of line if ( stream->removeTrailingSpaces() ) { while (length > 0) { - if (unicodeData[length-1].isSpace()) + if (tqunicodeData[length-1].isSpace()) --length; else break; @@ -1391,13 +1391,13 @@ void KateBufBlock::fillBlock (KateFileLoader *stream) memcpy(buf+pos, (char *) &length, sizeof(uint)); pos += sizeof(uint); - memcpy(buf+pos, (char *) unicodeData, sizeof(TQChar)*length); + memcpy(buf+pos, (char *) tqunicodeData, sizeof(TQChar)*length); pos += sizeof(TQChar)*length; } else { KateTextLine::Ptr textLine = new KateTextLine (); - textLine->insertText (0, length, unicodeData); + textLine->insertText (0, length, tqunicodeData); m_stringList.push_back (textLine); } diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h index 602571c53..43430ec2c 100644 --- a/kate/part/katebuffer.h +++ b/kate/part/katebuffer.h @@ -116,7 +116,7 @@ class KateBufBlock void removeLine(uint i); /** - * mark this block as dirty, will invalidate the swap data + * mark this block as dirty, will tqinvalidate the swap data * insert/removeLine will mark the block dirty itself */ void markDirty (); @@ -338,7 +338,7 @@ class KateBufBlockList * @author Waldo Bastian <bastian@kde.org> * @author Christoph Cullmann <cullmann@kde.org> */ -class KateBuffer : public QObject +class KateBuffer : public TQObject { Q_OBJECT @@ -591,7 +591,7 @@ class KateBuffer : public QObject /** * Invalidate highlighting of whole buffer. */ - void invalidateHighlighting(); + void tqinvalidateHighlighting(); KateCodeFoldingTree *foldingTree () { return &m_regionTree; }; @@ -611,7 +611,7 @@ class KateBuffer : public QObject * @returns true when the highlighting in the next block needs to be updated, * false otherwise. */ - bool doHighlight (KateBufBlock *buf, uint from, uint to, bool invalidate); + bool doHighlight (KateBufBlock *buf, uint from, uint to, bool tqinvalidate); signals: /** diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp index b64b5414e..27dd22a82 100644 --- a/kate/part/katecmds.cpp +++ b/kate/part/katecmds.cpp @@ -303,7 +303,7 @@ static void replace(TQString &s, const TQString &needle, const TQString &with) int pos=0; while (1) { - pos=s.find(needle, pos); + pos=s.tqfind(needle, pos); if (pos==-1) break; s.replace(pos, needle.length(), with); pos+=with.length(); @@ -578,7 +578,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt view->insertText(TQString(buf)); } else - { // do the unicode thing + { // do the tqunicode thing TQChar c(number); view->insertText(TQString(&c, 1)); } @@ -593,10 +593,10 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString & if (cmd.left(4) != "date") return false; - if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0) - view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5))); + if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0) + view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5))); else - view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss")); + view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss")); return true; } diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h index 55c8d807b..e55e2ac8b 100644 --- a/kate/part/katecmds.h +++ b/kate/part/katecmds.h @@ -119,7 +119,7 @@ class SedReplace : public Kate::Command }; /** - * insert a unicode or ascii character + * insert a tqunicode or ascii character * base 9+1: 1234 * hex: 0x1234 or x1234 * octal: 01231 diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index cee99f9d4..e7f11b994 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -47,7 +47,7 @@ /** * This class is used as the codecompletion listbox. It can be resized according to its contents, - * therfor the needed size is provided by sizeHint(); + * therfor the needed size is provided by tqsizeHint(); *@short Listbox showing codecompletion *@author Jonas B. Jacobi <j.jacobi@gmx.de> */ @@ -61,7 +61,7 @@ class KateCCListBox : public QListBox { } - TQSize sizeHint() const + TQSize tqsizeHint() const { int count = this->count(); int height = 20; @@ -124,7 +124,7 @@ KateCodeCompletion::KateCodeCompletion( KateView* view ) m_completionListBox->installEventFilter( this ); - m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2)); + m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2)); m_completionPopup->installEventFilter( this ); m_completionPopup->setFocusProxy( m_view->m_viewInternal ); @@ -305,7 +305,7 @@ void KateCodeCompletion::updateBox( bool ) } kdDebug(13035)<<"KateCodeCompletion::updateBox: Resizing widget"<<endl; - m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2)); + m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2)); TQPoint p = m_view->mapToGlobal( m_view->cursorCoordinates() ); int x = p.x(); int y = p.y() ; @@ -384,7 +384,7 @@ void KateCodeCompletion::showComment() m_completionListBox->ensureCurrentVisible(); finalPoint.setY( - m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect( + m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect( m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y()); m_commentLabel->move(finalPoint); diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h index 34d620599..a8c4e5afe 100644 --- a/kate/part/katecodecompletion.h +++ b/kate/part/katecodecompletion.h @@ -44,7 +44,7 @@ class KateCCListBox; class TQLayout; class TQVBox; -class KateCodeCompletionCommentLabel : public QLabel +class KateCodeCompletionCommentLabel : public TQLabel { Q_OBJECT @@ -57,14 +57,14 @@ class KateCodeCompletionCommentLabel : public QLabel setAutoMask( false ); setFrameStyle( TQFrame::Plain | TQFrame::Box ); setLineWidth( 1 ); - setAlignment( AlignAuto | AlignTop ); + tqsetAlignment( AlignAuto | AlignTop ); polish(); setText(text); adjustSize(); } }; -class KateCodeCompletion : public QObject +class KateCodeCompletion : public TQObject { Q_OBJECT @@ -114,7 +114,7 @@ class KateCodeCompletion : public QObject KateCodeCompletionCommentLabel* m_commentLabel; }; -class KateArgHint: public QFrame +class KateArgHint: public TQFrame { Q_OBJECT diff --git a/kate/part/katecodefoldinghelpers.h b/kate/part/katecodefoldinghelpers.h index bea6a096c..7feee384e 100644 --- a/kate/part/katecodefoldinghelpers.h +++ b/kate/part/katecodefoldinghelpers.h @@ -113,7 +113,7 @@ class KateCodeFoldingNode TQMemArray<KateCodeFoldingNode*> m_children; }; -class KateCodeFoldingTree : public QObject +class KateCodeFoldingTree : public TQObject { friend class KateCodeFoldingNode; diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 4b3c2f52b..3158f32db 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec () if (m_encodingSet || isGlobal()) { if (m_encoding.isEmpty() && isGlobal()) - return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding())); + return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding())); else if (m_encoding.isEmpty()) return s_global->codec (); else diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h index c155abba4..1b1a5322a 100644 --- a/kate/part/katecursor.h +++ b/kate/part/katecursor.h @@ -61,7 +61,7 @@ class KateTextCursor } #ifndef Q_WS_WIN //not needed - friend void qSwap(KateTextCursor & c1, KateTextCursor & c2) { + friend void tqSwap(KateTextCursor & c1, KateTextCursor & c2) { KateTextCursor tmp = c1; c1 = c2; c2 = tmp; @@ -200,7 +200,7 @@ class KateTextRange : public KateRange inline void normalize() { if( m_start > m_end ) - qSwap(m_start, m_end); + tqSwap(m_start, m_end); } protected: diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index d3a481856..366085c83 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -712,7 +712,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) "you to set a maximum width of the screen, as a percentage, after which " "dynamically wrapped lines will no longer be vertically aligned. For " "example, at 50%, lines whose indentation levels are deeper than 50% of " - "the width of the screen will not have vertical alignment applied to " + "the width of the screen will not have vertical tqalignment applied to " "subsequent wrapped lines.</p>")); TQWhatsThis::add(m_line,i18n( "If this option is checked, every new view will display line numbers " @@ -1388,10 +1388,10 @@ void KateHlConfigPage::hlChanged(int z) return; } - if ( !hlDataDict.find( z ) ) + if ( !hlDataDict.tqfind( z ) ) hlDataDict.insert( z, hl->getData() ); - hlData = hlDataDict.find( z ); + hlData = hlDataDict.tqfind( z ); wildcards->setText(hlData->wildcards); mimetypes->setText(hlData->mimetypes); priority->setValue(hlData->priority); diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index fe5e22b1d..e32636cb8 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -91,7 +91,7 @@ class KatePartPluginItem // KateDocument Constructor // KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, - bool bReadOnly, TQWidget *parentWidget, + bool bReadOnly, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name) : Kate::Document(parent, name), m_plugins (KateFactory::self()->plugins().count()), @@ -214,7 +214,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, // if single view mode, like in the konqui embedding, create a default view ;) if ( m_bSingleViewMode ) { - KTextEditor::View *view = createView( parentWidget, widgetName ); + KTextEditor::View *view = createView( tqparentWidget, widgetName ); insertChildClient( view ); view->show(); setWidget( view ); @@ -1176,7 +1176,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str ) uint tw = config()->tabWidth(); int pos = 0; uint l = 0; - while ( (pos = s.find('\t')) > -1 ) + while ( (pos = s.tqfind('\t')) > -1 ) { l = tw - ( (col + pos)%tw ); s.replace( pos, 1, TQString().fill( ' ', l ) ); @@ -1187,7 +1187,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str ) editAddUndo (KateUndoGroup::editInsertText, line, col, s.length(), s); - l->insertText (col, s.length(), s.unicode()); + l->insertText (col, s.length(), s.tqunicode()); // removeTrailingSpace(line); // ### nessecary? m_buffer->changeLine(line); @@ -1410,7 +1410,7 @@ bool KateDocument::editInsertLine ( uint line, const TQString &s ) removeTrailingSpace( line ); // old line KateTextLine::Ptr tl = new KateTextLine(); - tl->insertText (0, s.length(), s.unicode(), 0); + tl->insertText (0, s.length(), s.tqunicode(), 0); m_buffer->insertLine(line, tl); m_buffer->changeLine(line); @@ -2050,7 +2050,7 @@ void KateDocument::clearMark( uint line ) emit marksChanged(); delete mark; tagLines( line, line ); - repaintViews(true); + tqrepaintViews(true); } void KateDocument::addMark( uint line, uint markType ) @@ -2087,7 +2087,7 @@ void KateDocument::addMark( uint line, uint markType ) emit marksChanged(); tagLines( line, line ); - repaintViews(true); + tqrepaintViews(true); } void KateDocument::removeMark( uint line, uint markType ) @@ -2119,7 +2119,7 @@ void KateDocument::removeMark( uint line, uint markType ) emit marksChanged(); tagLines( line, line ); - repaintViews(true); + tqrepaintViews(true); } TQPtrList<KTextEditor::Mark> KateDocument::marks() @@ -2146,7 +2146,7 @@ void KateDocument::clearMarks() m_marks.clear(); emit marksChanged(); - repaintViews(true); + tqrepaintViews(true); } void KateDocument::setPixmap( MarkInterface::MarkTypes type, const TQPixmap& pixmap ) @@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url ) w = m_views.first(); if (w) - m_job->setWindow (w->topLevelWidget()); + m_job->setWindow (w->tqtopLevelWidget()); emit started( m_job ); @@ -2395,7 +2395,7 @@ bool KateDocument::openFile(KIO::Job * job) // service type magic to get encoding right // TQString serviceType = m_extension->urlArgs().serviceType.simplifyWhiteSpace(); - int pos = serviceType.find(';'); + int pos = serviceType.tqfind(';'); if (pos != -1) setEncoding (serviceType.mid(pos+1)); @@ -2589,7 +2589,7 @@ bool KateDocument::saveFile() // if (!m_buffer->canEncode () && (KMessageBox::warningContinueCancel(0, - i18n("The selected encoding cannot encode every unicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue)) + i18n("The selected encoding cannot encode every tqunicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue)) { return false; } @@ -2872,7 +2872,7 @@ void KateDocument::makeAttribs(bool needInvalidate) m_views.at(z)->renderer()->updateAttributes (); if (needInvalidate) - m_buffer->invalidateHighlighting(); + m_buffer->tqinvalidateHighlighting(); tagAll (); } @@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c ) if (!textLine) return; - if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" "))) + if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" "))) { // gg: in hard wordwrap mode, backspace must also eat the trailing space removeText (line-1, textLine->length()-1, line, 0); @@ -4112,10 +4112,10 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end) m_views.at(z)->tagLines(start, end, true); } -void KateDocument::repaintViews(bool paintOnlyDirty) +void KateDocument::tqrepaintViews(bool paintOnlyDirty) { for (uint z = 0; z < m_views.count(); z++) - m_views.at(z)->repaintText(paintOnlyDirty); + m_views.at(z)->tqrepaintText(paintOnlyDirty); } void KateDocument::tagAll() @@ -4634,7 +4634,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) { // simple check first, no regex // no kate inside, no vars, simple... - if (t.find("kate") < 0) + if (t.tqfind("kate") < 0) return; // found vars, if any diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h index 46e9e87f8..37d9b24e9 100644 --- a/kate/part/katedocument.h +++ b/kate/part/katedocument.h @@ -91,7 +91,7 @@ class KateDocument : public Kate::Document, public: KateDocument (bool bSingleViewMode=false, bool bBrowserView=false, bool bReadOnly=false, - TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0); + TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0); ~KateDocument (); bool closeURL(); @@ -608,7 +608,7 @@ class KateDocument : public Kate::Document, void setConfigFlags (uint flags); // Repaint all of all of the views - void repaintViews(bool paintOnlyDirty = true); + void tqrepaintViews(bool paintOnlyDirty = true); inline KateHighlighting *highlight () { return m_buffer->highlight(); } diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp index 64bde8718..9bd00bfbc 100644 --- a/kate/part/katefactory.cpp +++ b/kate/part/katefactory.cpp @@ -48,7 +48,7 @@ class KateFactoryPublic : public KParts::Factory public: /** * reimplemented create object method - * @param parentWidget parent widget + * @param tqparentWidget parent widget * @param widgetName widget name * @param parent TQObject parent * @param name object name @@ -56,9 +56,9 @@ class KateFactoryPublic : public KParts::Factory * @param args additional arguments * @return constructed part object */ - KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) + KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { - return KateFactory::self()->createPartObject (parentWidget, widgetName, parent, name, classname, args); + return KateFactory::self()->createPartObject (tqparentWidget, widgetName, parent, name, classname, args); } }; @@ -206,14 +206,14 @@ KateFactory *KateFactory::self () return s_self; } -KParts::Part *KateFactory::createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & ) +KParts::Part *KateFactory::createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & ) { TQCString classname( _classname ); bool bWantSingleView = ( classname != "KTextEditor::Document" && classname != "Kate::Document" ); bool bWantBrowserView = ( classname == "Browser/View" ); bool bWantReadOnly = (bWantBrowserView || ( classname == "KParts::ReadOnlyPart" )); - KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, parentWidget, widgetName, parent, name); + KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, tqparentWidget, widgetName, parent, name); part->setReadWrite( !bWantReadOnly ); return part; diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h index 0fd939ce3..4c1ce0706 100644 --- a/kate/part/katefactory.h +++ b/kate/part/katefactory.h @@ -71,7 +71,7 @@ class KateFactory /** * reimplemented create object method - * @param parentWidget parent widget + * @param tqparentWidget parent widget * @param widgetName widget name * @param parent TQObject parent * @param name object name @@ -79,7 +79,7 @@ class KateFactory * @param args additional arguments * @return constructed part object */ - KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, + KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); diff --git a/kate/part/katefont.h b/kate/part/katefont.h index 1ab3b3463..f9e0c1d83 100644 --- a/kate/part/katefont.h +++ b/kate/part/katefont.h @@ -29,7 +29,7 @@ // KateFontMetrics implementation // -class KateFontMetrics : public QFontMetrics +class KateFontMetrics : public TQFontMetrics { public: KateFontMetrics(const TQFont& f); diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 50c941c15..a18267f3b 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -65,10 +65,10 @@ static const int KATE_DYNAMIC_CONTEXTS_RESET_DELAY = 30 * 1000; inline bool kateInsideString (const TQString &str, TQChar ch) { - const TQChar *unicode = str.unicode(); + const TQChar *tqunicode = str.tqunicode(); const uint len = str.length(); for (uint i=0; i < len; i++) - if (unicode[i] == ch) + if (tqunicode[i] == ch) return true; return false; @@ -661,7 +661,7 @@ int KateHlKeyword::checkHgl(const TQString& text, int offset, int len) if (wordLen < minLen) return 0; - if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.unicode() + offset, wordLen).string()) ) + if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.tqunicode() + offset, wordLen).string()) ) return offset2; return 0; @@ -2088,14 +2088,14 @@ TQString KateHighlighting::hlKeyForAttrib( int i ) const bool KateHighlighting::isInWord( TQChar c, int attrib ) const { - return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.find(c) < 0 + return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.tqfind(c) < 0 && !c.isSpace() && c != '"' && c != '\''; } bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const { static const TQString& sq = KGlobal::staticQString("\"'"); - return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1); + return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.tqfind(c) != -1) && (sq.tqfind(c) == -1); } signed char KateHighlighting::commentRegion(int attr) const { @@ -2367,7 +2367,7 @@ int KateHighlighting::getIdFromString(TQStringList *ContextNameList, TQString tm else if ( tmpLineEndContext.contains("##")) { - int o = tmpLineEndContext.find("##"); + int o = tmpLineEndContext.tqfind("##"); // FIXME at least with 'foo##bar'-style contexts the rules are picked up // but the default attribute is not TQString tmp=tmpLineEndContext.mid(o+2); @@ -2477,7 +2477,7 @@ void KateHighlighting::makeContextList() kdDebug(13010)<<"Looking up context0 for ruleset "<<incCtx<<endl; incCtx = incCtx.left(incCtx.length()-1); //try to find the context0 id for a given unresolvedReference - KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.find(incCtx); + KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.tqfind(incCtx); if (hlIt!=embeddedHls.end()) *(unresIt.key())=hlIt.data().context0; } @@ -2765,7 +2765,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0) // only context refernces of type Name, ##Name, and Subname##Name are allowed if (incCtx.startsWith("##") || (!incCtx.startsWith("#"))) { - int incCtxi = incCtx.find("##"); + int incCtxi = incCtx.tqfind("##"); //#stay, #pop is not interesting here if (incCtxi >= 0) { diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h index b42fccb62..8bdc73b39 100644 --- a/kate/part/katehighlight.h +++ b/kate/part/katehighlight.h @@ -213,7 +213,7 @@ class KateHighlighting inline bool noHighlighting () const { return noHl; }; - // be carefull: all documents hl should be invalidated after calling this method! + // be carefull: all documents hl should be tqinvalidated after calling this method! void dropDynamicContexts(); TQString indentation () { return m_indentation; } @@ -338,7 +338,7 @@ class KateHighlighting inline bool allowsFolding(){return folding;} }; -class KateHlManager : public QObject +class KateHlManager : public TQObject { Q_OBJECT @@ -357,7 +357,7 @@ class KateHlManager : public QObject int detectHighlighting (class KateDocument *doc); - int findHl(KateHighlighting *h) {return hlList.find(h);} + int findHl(KateHighlighting *h) {return hlList.tqfind(h);} TQString identifierForName(const TQString&); // methodes to get the default style count + names @@ -377,7 +377,7 @@ class KateHlManager : public QObject uint countDynamicCtxs() { return dynamicCtxsCount; }; void setForceNoDCReset(bool b) { forceNoDCReset = b; }; - // be carefull: all documents hl should be invalidated after having successfully called this method! + // be carefull: all documents hl should be tqinvalidated after having successfully called this method! bool resetDynamicCtxs(); signals: diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 75f5fc513..a9efac0e9 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -62,7 +62,7 @@ UString::UString(const TQString &d) { unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.unicode(), len * sizeof(UChar)); + memcpy(dat, d.tqunicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index e0dbdc728..f0f73aad0 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -184,7 +184,7 @@ bool KatePrinter::print (KateDocument *doc) // This retrieves all tags, ued or not, but // none of theese operations should be expensive, // and searcing each tag in the format strings is avoided. - TQDateTime dt = TQDateTime::currentDateTime(); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQMap<TQString,TQString> tags; KUser u (KUser::UseRealUserID); @@ -425,7 +425,7 @@ bool KatePrinter::print (KateDocument *doc) for (int i=0; i<3; i++) { s = headerTagList[i]; - if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); + if (s.tqfind("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s); align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); } @@ -453,7 +453,7 @@ bool KatePrinter::print (KateDocument *doc) for (int i=0; i<3; i++) { s = footerTagList[i]; - if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); + if (s.tqfind("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s); align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); } diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp index 265a98282..59b237f57 100644 --- a/kate/part/katerenderer.cpp +++ b/kate/part/katerenderer.cpp @@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i if (isIMSel && !isTab) { // input method selection - fillColor = m_view->colorGroup().color(TQColorGroup::Foreground); + fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground); } else if (isIMEdit && !isTab) { // XIM support // input method edit area - const TQColorGroup& cg = m_view->colorGroup(); + const TQColorGroup& cg = m_view->tqcolorGroup(); int h1, s1, v1, h2, s2, v2; cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 ); @@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i if (isIMSel && paintBackground && !isTab) { paint.save(); - paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) ); + paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) ); } // Draw indentation markers. @@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) KateFontStruct *fs = config()->fontStruct(); - const TQChar *unicode = textLine->text(); + const TQChar *tqunicode = textLine->text(); const TQString &textString = textLine->string(); int x = 0; @@ -763,7 +763,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) x += width; - if (z < len && unicode[z] == TQChar('\t')) + if (z < len && tqunicode[z] == TQChar('\t')) x -= x % width; } @@ -787,7 +787,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u *needWrap = false; const uint len = textLine->length(); - const TQChar *unicode = textLine->text(); + const TQChar *tqunicode = textLine->text(); const TQString &textString = textLine->string(); uint z = startcol; @@ -800,10 +800,10 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u // How should tabs be treated when they word-wrap on a print-out? // if startcol != 0, this messes up (then again, word wrapping messes up anyway) - if (unicode[z] == TQChar('\t')) + if (tqunicode[z] == TQChar('\t')) x -= x % width; - if (unicode[z].isSpace()) + if (tqunicode[z].isSpace()) { lastWhiteSpace = z+1; lastWhiteSpaceX = x; @@ -887,7 +887,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) if (!textLine) return 0; const uint len = textLine->length(); - const TQChar *unicode = textLine->text(); + const TQChar *tqunicode = textLine->text(); const TQString &textString = textLine->string(); x = oldX = 0; @@ -906,7 +906,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) x += width; - if (z < len && unicode[z] == TQChar('\t')) + if (z < len && tqunicode[z] == TQChar('\t')) x -= x % width; z++; diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 6e73a9f75..76e187c8c 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -281,19 +281,19 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Normal text:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_back = new KColorButton(b); b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Selected text:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_selected = new KColorButton(b); b = new TQHBox (gbTextArea); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Current line:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_current = new KColorButton(b); // Markers from kdelibs/interfaces/ktextinterface/markinterface.h @@ -319,31 +319,31 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Left border background:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_iconborder = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Line numbers:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_linenumber = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Bracket highlight:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_bracket = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Word wrap markers:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_wwmarker = new KColorButton(b); b = new TQHBox (gbBorder); b->setSpacing(KDialog::spacingHint()); label = new TQLabel( i18n("Tab markers:"), b); - label->setAlignment( AlignLeft|AlignVCenter); + label->tqsetAlignment( AlignLeft|AlignVCenter); m_tmarker = new KColorButton(b); blay->addWidget(gbBorder); @@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char blay->addStretch(); // connect signal changed(); changed is emitted by a ColorButton change! - connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) ); + connect( this, TQT_SIGNAL( changed() ), parent->tqparentWidget(), TQT_SLOT( slotChanged() ) ); // TQWhatsThis help TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>")); @@ -545,7 +545,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * m_fontchooser->enableColumn(KFontChooser::StyleList, false); grid->addWidget( m_fontchooser, 0, 0); - connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (this, TQT_SIGNAL( changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); m_schema = -1; } @@ -599,7 +599,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co m_defaultStyles = new KateStyleListView( this, false ); grid->addWidget( m_defaultStyles, 0, 0); - connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); TQWhatsThis::add( m_defaultStyles, i18n( "This list displays the default styles for the current schema and " @@ -716,7 +716,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co "to edit from the popup menu.<p>You can unset the Background and Selected " "Background colors from the context menu when appropriate.") ); - connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_styles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged())); } KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab() @@ -783,12 +783,12 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema) // All stylenames have their language mode prefixed, e.g. HTML:Comment // split them and put them into nice substructures. - int c = itemData->name.find(':'); + int c = itemData->name.tqfind(':'); if ( c > 0 ) { TQString prefix = itemData->name.left(c); TQString name = itemData->name.mid(c+1); - KateStyleListCaption *parent = prefixes.find( prefix ); + KateStyleListCaption *parent = prefixes.tqfind( prefix ); if ( ! parent ) { parent = new KateStyleListCaption( m_styles, prefix ); @@ -1088,9 +1088,9 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob TQPixmap scl(16,16); scl.fill( i->style()->selectedTextColor() ); TQPixmap bgcl(16,16); - bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->colorGroup().base() ); + bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() ); TQPixmap sbgcl(16,16); - sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() ); + sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().base() ); if ( showtitle ) m.insertTitle( i->contextName(), KateStyleListItem::ContextName ); @@ -1156,7 +1156,7 @@ void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoi if ( dynamic_cast<KateStyleListItem*>(i) ) { if ( btn == Qt::LeftButton && c > 0 ) { // map pos to item/column and call KateStyleListItem::activate(col, pos) - ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); + ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) ); } } } @@ -1357,7 +1357,7 @@ void KateStyleListItem::toggleDefStyle() delete is; is = new KateAttribute( *ds ); updateStyle(); - repaint(); + tqrepaint(); } } @@ -1441,7 +1441,7 @@ void KateStyleListItem::setColor( int column ) break; } - repaint(); + tqrepaint(); } void KateStyleListItem::unsetColor( int c ) @@ -1465,7 +1465,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int Q_ASSERT( lv ); //### // use a private color group and set the text/highlighted text colors - TQColorGroup mcg = lv->viewport()->colorGroup(); + TQColorGroup mcg = lv->viewport()->tqcolorGroup(); if ( col ) // col 0 is drawn by the superclass method p->fillRect( 0, 0, width, height(), TQBrush( mcg.base() ) ); @@ -1492,7 +1492,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int } TQFont f ( ((KateStyleListView*)lv)->docfont ); p->setFont( is->font(f) ); - // FIXME - repainting when text is cropped, and the column is enlarged is buggy. + // FIXME - tqrepainting when text is cropped, and the column is enlarged is buggy. // Maybe I need painting the string myself :( // (wilbert) it depends on the font used TQListViewItem::paintCell( p, mcg, col, width, align ); @@ -1602,7 +1602,7 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, Q_ASSERT( lv ); //### // use the same colorgroup as the other items in the viewport - TQColorGroup mcg = lv->viewport()->colorGroup(); + TQColorGroup mcg = lv->viewport()->tqcolorGroup(); TQListViewItem::paintCell( p, mcg, col, width, align ); } diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 38b15a054..4afd26255 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -125,7 +125,7 @@ class KateViewSchemaAction : public KActionMenu popup menu and a slot to edit a style using the keyboard. Added by anders, jan 23 2002. */ -class KateStyleListView : public QListView +class KateStyleListView : public TQListView { Q_OBJECT @@ -160,7 +160,7 @@ class KateStyleListView : public QListView TQFont docfont; }; -class KateSchemaConfigColorTab : public QWidget +class KateSchemaConfigColorTab : public TQWidget { Q_OBJECT @@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public QWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged) protected slots: void slotMarkerColorChanged(const TQColor&); @@ -207,7 +207,7 @@ class KateSchemaConfigColorTab : public QWidget typedef TQMap<int,TQFont> FontMap; // ### remove it -class KateSchemaConfigFontTab : public QWidget +class KateSchemaConfigFontTab : public TQWidget { Q_OBJECT @@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public QWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged) private: class KFontChooser *m_fontchooser; @@ -234,7 +234,7 @@ class KateSchemaConfigFontTab : public QWidget void slotFontSelected( const TQFont &font ); }; -class KateSchemaConfigFontColorTab : public QWidget +class KateSchemaConfigFontColorTab : public TQWidget { Q_OBJECT @@ -254,7 +254,7 @@ class KateSchemaConfigFontColorTab : public QWidget TQIntDict<KateAttributeList> m_defaultStyleLists; }; -class KateSchemaConfigHighlightTab : public QWidget +class KateSchemaConfigHighlightTab : public TQWidget { Q_OBJECT diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index 742b57a3f..4a64af975 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -81,7 +81,7 @@ void KateSearch::createActions( KActionCollection* ac ) void KateSearch::addToList( TQStringList& list, const TQString& s ) { if( list.count() > 0 ) { - TQStringList::Iterator it = list.find( s ); + TQStringList::Iterator it = list.tqfind( s ); if( *it != 0L ) list.remove( it ); if( list.count() >= 16 ) @@ -110,7 +110,7 @@ void KateSearch::find() } delete findDialog; - m_view->repaintText (); + m_view->tqrepaintText (); } void KateSearch::find( const TQString &pattern, long flags, bool add, bool shownotfound ) @@ -851,7 +851,7 @@ bool SearchCommand::exec(class Kate::View *view, const TQString &cmd, TQString & // Else, it's just one or two (space separated) words TQRegExp re_rep2("replace(?::([bceprsw]*))?\\s+(\\S+)(.*)"); #define unbackslash(s) p=0;\ -while ( (p = pattern.find( '\\' + delim, p )) > -1 )\ +while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\ {\ if ( !p || pattern[p-1] != '\\' )\ pattern.remove( p, 1 );\ diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h index ebf228dcd..bec9eb51a 100644 --- a/kate/part/katesearch.h +++ b/kate/part/katesearch.h @@ -39,7 +39,7 @@ class KateSuperRangeList; class KActionCollection; -class KateSearch : public QObject +class KateSearch : public TQObject { Q_OBJECT diff --git a/kate/part/katespell.h b/kate/part/katespell.h index f376ece49..870a88194 100644 --- a/kate/part/katespell.h +++ b/kate/part/katespell.h @@ -30,7 +30,7 @@ class KateView; class KAction; class KSpell; -class KateSpell : public QObject +class KateSpell : public TQObject { Q_OBJECT diff --git a/kate/part/katesyntaxdocument.h b/kate/part/katesyntaxdocument.h index 93deb731d..6599c05cd 100644 --- a/kate/part/katesyntaxdocument.h +++ b/kate/part/katesyntaxdocument.h @@ -61,7 +61,7 @@ class KateSyntaxContextData /** * Store and manage the information about Syntax Highlighting. */ -class KateSyntaxDocument : public QDomDocument +class KateSyntaxDocument : public TQDomDocument { public: /** diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp index e64b928c7..1d6fcf452 100644 --- a/kate/part/katetextline.cpp +++ b/kate/part/katetextline.cpp @@ -110,11 +110,11 @@ void KateTextLine::truncate(uint newLen) int KateTextLine::nextNonSpaceChar(uint pos) const { const uint len = m_text.length(); - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for(uint i = pos; i < len; i++) { - if(!unicode[i].isSpace()) + if(!tqunicode[i].isSpace()) return i; } @@ -128,11 +128,11 @@ int KateTextLine::previousNonSpaceChar(uint pos) const if (pos >= (uint)len) pos = len - 1; - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for(int i = pos; i >= 0; i--) { - if(!unicode[i].isSpace()) + if(!tqunicode[i].isSpace()) return i; } @@ -152,20 +152,20 @@ int KateTextLine::lastChar() const const TQChar *KateTextLine::firstNonSpace() const { int first = firstChar(); - return (first > -1) ? ((TQChar*)m_text.unicode())+first : m_text.unicode(); + return (first > -1) ? ((TQChar*)m_text.tqunicode())+first : m_text.tqunicode(); } uint KateTextLine::indentDepth (uint tabwidth) const { uint d = 0; const uint len = m_text.length(); - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for(uint i = 0; i < len; i++) { - if(unicode[i].isSpace()) + if(tqunicode[i].isSpace()) { - if (unicode[i] == TQChar('\t')) + if (tqunicode[i] == TQChar('\t')) d += tabwidth - (d % tabwidth); else d++; @@ -189,11 +189,11 @@ bool KateTextLine::stringAtPos(uint pos, const TQString& match) const // overflow again which (pos+matchlen > len) does not catch; see bugs #129263 and #129580 Q_ASSERT(pos < len); - const TQChar *unicode = m_text.unicode(); - const TQChar *matchUnicode = match.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *matchUnicode = match.tqunicode(); for (uint i=0; i < matchlen; i++) - if (unicode[i+pos] != matchUnicode[i]) + if (tqunicode[i+pos] != matchUnicode[i]) return false; return true; @@ -206,11 +206,11 @@ bool KateTextLine::startingWith(const TQString& match) const if (matchlen > m_text.length()) return false; - const TQChar *unicode = m_text.unicode(); - const TQChar *matchUnicode = match.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *matchUnicode = match.tqunicode(); for (uint i=0; i < matchlen; i++) - if (unicode[i] != matchUnicode[i]) + if (tqunicode[i] != matchUnicode[i]) return false; return true; @@ -223,12 +223,12 @@ bool KateTextLine::endingWith(const TQString& match) const if (matchlen > m_text.length()) return false; - const TQChar *unicode = m_text.unicode(); - const TQChar *matchUnicode = match.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); + const TQChar *matchUnicode = match.tqunicode(); uint start = m_text.length() - matchlen; for (uint i=0; i < matchlen; i++) - if (unicode[start+i] != matchUnicode[i]) + if (tqunicode[start+i] != matchUnicode[i]) return false; return true; @@ -239,11 +239,11 @@ int KateTextLine::cursorX(uint pos, uint tabChars) const uint x = 0; const uint n = kMin (pos, m_text.length()); - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for ( uint z = 0; z < n; z++) { - if (unicode[z] == TQChar('\t')) + if (tqunicode[z] == TQChar('\t')) x += tabChars - (x % tabChars); else x++; @@ -257,11 +257,11 @@ uint KateTextLine::lengthWithTabs (uint tabChars) const { uint x = 0; const uint len = m_text.length(); - const TQChar *unicode = m_text.unicode(); + const TQChar *tqunicode = m_text.tqunicode(); for ( uint z = 0; z < len; z++) { - if (unicode[z] == TQChar('\t')) + if (tqunicode[z] == TQChar('\t')) x += tabChars - (x % tabChars); else x++; @@ -346,7 +346,7 @@ char *KateTextLine::dump (char *buf, bool withHighlighting) const memcpy(buf, &l, sizeof(uint)); buf += sizeof(uint); - memcpy(buf, (char *) m_text.unicode(), sizeof(TQChar)*l); + memcpy(buf, (char *) m_text.tqunicode(), sizeof(TQChar)*l); buf += sizeof(TQChar) * l; if (!withHighlighting) diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h index 3922d04d0..84df82908 100644 --- a/kate/part/katetextline.h +++ b/kate/part/katetextline.h @@ -145,10 +145,10 @@ class KateTextLine : public KShared inline TQChar getChar (uint pos) const { return m_text[pos]; } /** - * Gets the text as a unicode representation + * Gets the text as a tqunicode representation * @return text of this line as TQChar array */ - inline const TQChar *text() const { return m_text.unicode(); } + inline const TQChar *text() const { return m_text.tqunicode(); } /** * Highlighting array @@ -419,7 +419,7 @@ class KateTextLine : public KShared */ private: /** - * text of line as unicode + * text of line as tqunicode */ TQString m_text; diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 7840e79d5..c486a6d82 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -793,7 +793,7 @@ void KateView::contextMenuEvent( TQContextMenuEvent *ev ) if ( !m_doc || !m_doc->browserExtension() ) return; emit m_doc->browserExtension()->popupMenu( /*this, */ev->globalPos(), m_doc->url(), - TQString::fromLatin1( "text/plain" ) ); + TQString::tqfromLatin1( "text/plain" ) ); ev->accept(); } @@ -1233,11 +1233,11 @@ void KateView::updateRendererConfig() // update the text area m_viewInternal->updateView (true); - m_viewInternal->repaint (); + m_viewInternal->tqrepaint (); // update the left border right, for example linenumbers m_viewInternal->leftBorder->updateFont(); - m_viewInternal->leftBorder->repaint (); + m_viewInternal->leftBorder->tqrepaint (); // @@ showIndentLines is not cached anymore. // m_renderer->setShowIndentLines (m_renderer->config()->showIndentationLines()); @@ -1305,7 +1305,7 @@ void KateView::clear () m_viewInternal->clear (); } -void KateView::repaintText (bool paintOnlyDirty) +void KateView::tqrepaintText (bool paintOnlyDirty) { m_viewInternal->paintText(0,0,m_viewInternal->width(),m_viewInternal->height(), paintOnlyDirty); } @@ -1360,7 +1360,7 @@ bool KateView::setSelection( const KateTextCursor& start, const KateTextCursor& tagSelection(oldSelectStart, oldSelectEnd); - repaintText(true); + tqrepaintText(true); emit selectionChanged (); emit m_doc->selectionChanged (); @@ -1405,7 +1405,7 @@ bool KateView::clearSelection(bool redraw, bool finishedChangingSelection) oldSelectEnd = selectEnd; if (redraw) - repaintText(true); + tqrepaintText(true); if (finishedChangingSelection) { @@ -1596,7 +1596,7 @@ void KateView::paste() { m_doc->paste( this ); emit selectionChanged(); - m_viewInternal->repaint(); + m_viewInternal->tqrepaint(); } void KateView::cut() diff --git a/kate/part/kateview.h b/kate/part/kateview.h index aa428096d..0f62fe440 100644 --- a/kate/part/kateview.h +++ b/kate/part/kateview.h @@ -270,7 +270,7 @@ class KateView : public Kate::View, void clear (); - void repaintText (bool paintOnlyDirty = false); + void tqrepaintText (bool paintOnlyDirty = false); void updateView (bool changed = false); //END diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index da88676bc..b379773bf 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -244,7 +244,7 @@ class KateCmdLnWhatsThis : public QWhatsThis Kate::Command *cmd = KateCmd::self()->queryCommand( name ); if ( cmd ) { - if ( cmd->help( (Kate::View*)m_parent->parentWidget(), name, s ) ) + if ( cmd->help( (Kate::View*)m_parent->tqparentWidget(), name, s ) ) return beg + name + mid + s + end; else return beg + name + mid + i18n("No help for '%1'").arg( name ) + end; @@ -380,7 +380,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text ) void KateCmdLine::hideMe () // unless i have focus ;) { - if ( isVisibleTo(parentWidget()) && ! hasFocus() ) { + if ( isVisibleTo(tqparentWidget()) && ! hasFocus() ) { m_view->toggleCmdLine (); } } @@ -697,7 +697,7 @@ KateIconBorder::KateIconBorder ( KateViewInternal* internalView, TQWidget *paren , m_cachedLNWidth( 0 ) , m_maxCharWidth( 0 ) { - setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); setBackgroundMode( NoBackground ); @@ -757,7 +757,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable ) TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); } -TQSize KateIconBorder::sizeHint() const +TQSize KateIconBorder::tqsizeHint() const { int w = 0; @@ -866,7 +866,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height) { // we went from n0 ->n9 lines or vice verca // this causes an extra updateGeometry() first time the line numbers - // are displayed, but sizeHint() is supposed to be const so we can't set + // are displayed, but tqsizeHint() is supposed to be const so we can't set // the cached value there. m_cachedLNWidth = lnWidth; m_oldBackgroundColor = m_view->renderer()->config()->iconBarColor(); diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h index 8e3fa94b3..b17db996e 100644 --- a/kate/part/kateviewhelpers.h +++ b/kate/part/kateviewhelpers.h @@ -45,7 +45,7 @@ namespace Kate { * * Also, it adds some usefull indicators on the scrollbar. */ -class KateScrollBar : public QScrollBar +class KateScrollBar : public TQScrollBar { Q_OBJECT @@ -119,7 +119,7 @@ class KateCmdLine : public KLineEdit class KateCmdLnWhatsThis *m_help; }; -class KateIconBorder : public QWidget +class KateIconBorder : public TQWidget { Q_OBJECT @@ -127,7 +127,7 @@ class KateIconBorder : public QWidget KateIconBorder( KateViewInternal* internalView, TQWidget *parent ); // VERY IMPORTANT ;) - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; void updateFont(); int lineNumberWidth() const; diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 77f98643d..569397f05 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -89,7 +89,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // cursor cursor.setMoveOnInsert (true); - // invalidate selStartCached, or keyb selection is screwed initially + // tqinvalidate selStartCached, or keyb selection is screwed initially selStartCached.setLine( -1 ); // // scrollbar for lines @@ -2759,7 +2759,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e ) } else { - selStartCached.setLine( -1 ); // invalidate + selStartCached.setLine( -1 ); // tqinvalidate } if( !( e->state() & Qt::ShiftButton ) && isTargetSelected( e->pos() ) ) diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h index 9b0a940be..8e7b3a896 100644 --- a/kate/part/kateviewinternal.h +++ b/kate/part/kateviewinternal.h @@ -49,7 +49,7 @@ enum Bias right = 1 }; -class KateViewInternal : public QWidget +class KateViewInternal : public TQWidget { Q_OBJECT @@ -221,7 +221,7 @@ class KateViewInternal : public QWidget int scrollX; int scrollY; - Qt::CursorShape m_mouseCursor; + Qt::tqCursorShape m_mouseCursor; KateSuperCursor cursor; KateTextCursor displayCursor; diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index e3f9f52e6..9fee1654b 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -515,7 +515,7 @@ int main(int argc, char *argv[]) KateDocument *part = new KateDocument(/*bSingleViewMode*/true, /*bBrowserView*/false, /*bReadOnly*/false, - /*parentWidget*/toplevel, + /*tqparentWidget*/toplevel, /*widgetName*/"testkate"); part->readConfig(&cfg); @@ -869,10 +869,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) int pos = 0; do { pos++; - int newpos = absBase.find('/', pos); + int newpos = absBase.tqfind('/', pos); if (newpos == -1) newpos = absBase.length(); - TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos); - TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos); + TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); + TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos); // kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl; // kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl; // kdDebug() << "pos: " << pos << " newpos: " << newpos << endl; @@ -886,8 +886,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) TQString rel; { - TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos); - TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos); + TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos); + TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos); // generate as many .. as there are path elements in relBase if (relBase.string().length() > 0) { for (int i = relBase.string().contains('/'); i > 0; --i) @@ -935,7 +935,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & ResultFailure ) { domDiff += "<pre>"; - FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" ) + FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-result %3/%2-result" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { @@ -1026,7 +1026,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) void RegressionTest::testStaticFile(const TQString & filename, const TQStringList &commands) { - qApp->mainWidget()->resize( 800, 600); // restore size + tqApp->mainWidget()->resize( 800, 600); // restore size // Set arguments KParts::URLArgs args; @@ -1334,7 +1334,7 @@ bool RegressionTest::svnIgnored( const TQString &filename ) void RegressionTest::resizeTopLevelWidget( int w, int h ) { - qApp->mainWidget()->resize( w, h ); + tqApp->mainWidget()->resize( w, h ); // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event TQApplication::sendPostedEvents( 0, TQEvent::Resize ); } diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h index ee4f8fdfa..0bc717714 100644 --- a/kate/part/test_regression.h +++ b/kate/part/test_regression.h @@ -160,7 +160,7 @@ class OutputFunction : public KJS::ObjectImp /** * @internal */ -class RegressionTest : public QObject +class RegressionTest : public TQObject { Q_OBJECT public: diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index c03fcefe0..92fe6086c 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -114,7 +114,7 @@ void AutoBookmarker::slotCompleted() // get the document info KTextEditor::DocumentInfoInterface *di = static_cast<KTextEditor::DocumentInfoInterface*>(document()-> - qt_cast("KTextEditor::DocumentInfoInterface")); + tqqt_cast("KTextEditor::DocumentInfoInterface")); TQString mt; if ( di ) // we can still try match the URL otherwise mt = di->mimeType(); diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index 11cd645b7..41c19b9ee 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -108,7 +108,7 @@ void KDataToolPluginView::aboutToShow() if ( selectionInterface(m_view->document())->hasSelection() ) { word = selectionInterface(m_view->document())->selection(); - if ( word.find(' ') == -1 && word.find('\t') == -1 && word.find('\n') == -1 ) + if ( word.tqfind(' ') == -1 && word.tqfind('\t') == -1 && word.tqfind('\n') == -1 ) m_singleWord = true; else m_singleWord = false; diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index e704ad339..9e4bf14d3 100644 --- a/kcert/kcertpart.cc +++ b/kcert/kcertpart.cc @@ -127,7 +127,7 @@ class KCertPartPrivate { }; -KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName, +KCertPart::KCertPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadWritePart(parent, name) { @@ -149,7 +149,7 @@ _silentImport = false; d = new KCertPartPrivate; d->browserExtension = new KParts::BrowserExtension(this); -_frame = new TQFrame(parentWidget, widgetName); +_frame = new TQFrame(tqparentWidget, widgetName); setWidget(_frame); _baseGrid = new TQGridLayout(_frame, 15, 9, KDialog::marginHint(), @@ -524,7 +524,7 @@ if (whatType == "application/x-pkcs12") { const char *signature = "-----BEGIN CERTIFICATE-----"; theFile[(uint)(qf.size()-1)] = 0; - isPEM = (TQCString(theFile.data()).find(signature) >= 0); + isPEM = (TQCString(theFile.data()).tqfind(signature) >= 0); } fp = fopen(m_file.local8Bit(), "r"); @@ -636,7 +636,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) { // Set the valid period TQPalette cspl = _ca_validFrom->palette(); - if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -645,7 +645,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) { _ca_validFrom->setText(c->getNotBefore()); cspl = _ca_validUntil->palette(); - if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -677,7 +677,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) { // Set the valid period TQPalette cspl = _p12_validFrom->palette(); - if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -686,7 +686,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) { _p12_validFrom->setText(c->getNotBefore()); cspl = _p12_validUntil->palette(); - if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); diff --git a/kcert/kcertpart.h b/kcert/kcertpart.h index ec011c08d..9b5520f30 100644 --- a/kcert/kcertpart.h +++ b/kcert/kcertpart.h @@ -68,7 +68,7 @@ class KPKCS12Item : public KListViewItem { class KCertPart : public KParts::ReadWritePart { Q_OBJECT public: - KCertPart(TQWidget *parentWidget, const char *widgetName, + KCertPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent = 0L, const char *name = 0L, const TQStringList &args = TQStringList() ); virtual ~KCertPart(); diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp index a3a165ab8..ec4447abb 100644 --- a/kconf_update/kconf_update.cpp +++ b/kconf_update/kconf_update.cpp @@ -201,7 +201,7 @@ KonfUpdate::log() } } - (*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " "; + (*m_textStream) << TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ) << " "; return *m_textStream; } @@ -218,7 +218,7 @@ TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly) struct stat buff; if (stat( TQFile::encodeName(file), &buff) == 0) { - int i = file.findRev('/'); + int i = file.tqfindRev('/'); if (i != -1) file = file.mid(i+1); config->setGroup(file); @@ -237,7 +237,7 @@ TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly) bool KonfUpdate::checkFile(const TQString &filename) { currentFilename = filename; - int i = currentFilename.findRev('/'); + int i = currentFilename.tqfindRev('/'); if (i != -1) currentFilename = currentFilename.mid(i+1); skip = true; @@ -268,7 +268,7 @@ bool KonfUpdate::checkFile(const TQString &filename) void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id) { TQString file; - int i = _file.find(','); + int i = _file.tqfind(','); if (i == -1) { file = _file.stripWhiteSpace(); @@ -283,7 +283,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id) KSimpleConfig cfg(file); cfg.setGroup("$Version"); TQStringList ids = cfg.readListEntry("update_info"); - if (ids.contains(id)) + if (ids.tqcontains(id)) return; ids.append(id); cfg.writeEntry("update_info", ids); @@ -311,7 +311,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id) bool KonfUpdate::updateFile(const TQString &filename) { currentFilename = filename; - int i = currentFilename.findRev('/'); + int i = currentFilename.tqfindRev('/'); if (i != -1) currentFilename = currentFilename.mid(i+1); skip = true; @@ -398,7 +398,7 @@ void KonfUpdate::gotId(const TQString &_id) { config->setGroup(currentFilename); TQStringList ids = config->readListEntry("done"); - if (!ids.contains(id)) + if (!ids.tqcontains(id)) { ids.append(id); config->writeEntry("done", ids); @@ -413,7 +413,7 @@ void KonfUpdate::gotId(const TQString &_id) TQStringList ids = config->readListEntry("done"); if (!_id.isEmpty()) { - if (ids.contains(_id)) + if (ids.tqcontains(_id)) { //qDebug("Id '%s' was already in done-list", _id.latin1()); if (!m_bUseConfigInfo) @@ -445,7 +445,7 @@ void KonfUpdate::gotFile(const TQString &_file) oldConfig2->setGroup("$Version"); TQStringList ids = oldConfig2->readListEntry("update_info"); TQString cfg_id = currentFilename + ":" + id; - if (!ids.contains(cfg_id) && !skip) + if (!ids.tqcontains(cfg_id) && !skip) { ids.append(cfg_id); oldConfig2->writeEntry("update_info", ids); @@ -473,7 +473,7 @@ void KonfUpdate::gotFile(const TQString &_file) newConfig->setGroup("$Version"); TQStringList ids = newConfig->readListEntry("update_info"); TQString cfg_id = currentFilename + ":" + id; - if (!ids.contains(cfg_id) && !skip) + if (!ids.tqcontains(cfg_id) && !skip) { ids.append(cfg_id); newConfig->writeEntry("update_info", ids); @@ -486,7 +486,7 @@ void KonfUpdate::gotFile(const TQString &_file) } newConfig = 0; - int i = _file.find(','); + int i = _file.tqfind(','); if (i == -1) { oldFile = _file.stripWhiteSpace(); @@ -505,7 +505,7 @@ void KonfUpdate::gotFile(const TQString &_file) TQString cfg_id = currentFilename + ":" + id; oldConfig2->setGroup("$Version"); TQStringList ids = oldConfig2->readListEntry("update_info"); - if (ids.contains(cfg_id)) + if (ids.tqcontains(cfg_id)) { skip = true; newFile = TQString::null; @@ -517,7 +517,7 @@ void KonfUpdate::gotFile(const TQString &_file) newConfig = new KConfig(newFile, false, false); newConfig->setGroup("$Version"); ids = newConfig->readListEntry("update_info"); - if (ids.contains(cfg_id)) + if (ids.tqcontains(cfg_id)) { skip = true; log() << currentFilename << ": Skipping update '" << id << "'" << endl; @@ -541,7 +541,7 @@ void KonfUpdate::gotFile(const TQString &_file) void KonfUpdate::gotGroup(const TQString &_group) { - int i = _group.find(','); + int i = _group.tqfind(','); if (i == -1) { oldGroup = _group.stripWhiteSpace(); @@ -574,7 +574,7 @@ void KonfUpdate::gotRemoveGroup(const TQString &_group) void KonfUpdate::gotKey(const TQString &_key) { - int i = _key.find(','); + int i = _key.tqfind(','); if (i == -1) { oldKey = _key.stripWhiteSpace(); @@ -724,7 +724,7 @@ void KonfUpdate::gotScriptArguments(const TQString &_arguments) void KonfUpdate::gotScript(const TQString &_script) { TQString script, interpreter; - int i = _script.find(','); + int i = _script.tqfind(','); if (i == -1) { script = _script.stripWhiteSpace(); @@ -860,7 +860,7 @@ void KonfUpdate::gotScript(const TQString &_script) TQString line = ts.readLine(); if (line.startsWith("[")) { - int j = line.find(']')+1; + int j = line.tqfind(']')+1; if (j > 0) group = line.mid(1, j-2); } @@ -869,7 +869,7 @@ void KonfUpdate::gotScript(const TQString &_script) TQString key = line.mid(9); if (key[0] == '[') { - int j = key.find(']')+1; + int j = key.tqfind(']')+1; if (j > 0) { group = key.mid(1,j-2); @@ -888,7 +888,7 @@ void KonfUpdate::gotScript(const TQString &_script) TQString key = line.mid(13).stripWhiteSpace(); if (key[0] == '[') { - int j = key.find(']')+1; + int j = key.tqfind(']')+1; if (j > 0) { group = key.mid(1,j-2); diff --git a/kdecore/fixx11h.h b/kdecore/fixx11h.h index e572335a1..7b8dcb3c3 100644 --- a/kdecore/fixx11h.h +++ b/kdecore/fixx11h.h @@ -182,14 +182,14 @@ typedef XStatus Status; #endif // Affects: Should be without side effects. -#ifdef CursorShape -#ifndef FIXX11H_CursorShape -#define FIXX11H_CursorShape -const int XCursorShape = CursorShape; -#undef CursorShape -const int CursorShape = CursorShape; -#endif -#undef CursorShape +#ifdef tqCursorShape +#ifndef FIXX11H_tqCursorShape +#define FIXX11H_tqCursorShape +const int XtqCursorShape = tqCursorShape; +#undef tqCursorShape +const int tqCursorShape = tqCursorShape; +#endif +#undef tqCursorShape #endif // template ---> diff --git a/kdecore/kaboutdata.cpp b/kdecore/kaboutdata.cpp index 423166c18..e6aa1a68a 100644 --- a/kdecore/kaboutdata.cpp +++ b/kdecore/kaboutdata.cpp @@ -25,13 +25,13 @@ #include <tqfile.h> #include <tqtextstream.h> -QString +TQString KAboutPerson::name() const { return TQString::fromUtf8(mName); } -QString +TQString KAboutPerson::task() const { if (mTask && *mTask) @@ -40,14 +40,14 @@ KAboutPerson::task() const return TQString::null; } -QString +TQString KAboutPerson::emailAddress() const { return TQString::fromUtf8(mEmailAddress); } -QString +TQString KAboutPerson::webAddress() const { return TQString::fromUtf8(mWebAddress); @@ -248,7 +248,7 @@ KAboutData::productName() const return appName(); } -QString +TQString KAboutData::programName() const { if (mProgramName && *mProgramName) @@ -278,7 +278,7 @@ KAboutData::translateInternalProgramName() const d->mTranslatedProgramName = qstrdup( programName().utf8()); } -QImage +TQImage KAboutData::programLogo() const { return d->programLogo ? (*d->programLogo) : TQImage(); @@ -293,13 +293,13 @@ KAboutData::setProgramLogo(const TQImage& image) *d->programLogo = image; } -QString +TQString KAboutData::version() const { - return TQString::fromLatin1(mVersion); + return TQString::tqfromLatin1(mVersion); } -QString +TQString KAboutData::shortDescription() const { if (mShortDescription && *mShortDescription) @@ -308,16 +308,16 @@ KAboutData::shortDescription() const return TQString::null; } -QString +TQString KAboutData::homepage() const { - return TQString::fromLatin1(mHomepageAddress); + return TQString::tqfromLatin1(mHomepageAddress); } -QString +TQString KAboutData::bugAddress() const { - return TQString::fromLatin1(mBugEmailAddress); + return TQString::tqfromLatin1(mBugEmailAddress); } const TQValueList<KAboutPerson> @@ -381,7 +381,7 @@ KAboutData::translators() const return personList; } -QString +TQString KAboutData::aboutTranslationTeam() { return i18n("replace this with information about your translation team", @@ -392,7 +392,7 @@ KAboutData::aboutTranslationTeam() ); } -QString +TQString KAboutData::otherText() const { if (mOtherText && *mOtherText) @@ -402,7 +402,7 @@ KAboutData::otherText() const } -QString +TQString KAboutData::license() const { TQString result; @@ -465,7 +465,7 @@ KAboutData::license() const return result; } -QString +TQString KAboutData::copyrightStatement() const { if (mCopyrightStatement && *mCopyrightStatement) @@ -474,13 +474,13 @@ KAboutData::copyrightStatement() const return TQString::null; } -QString +TQString KAboutData::customAuthorPlainText() const { return d->customAuthorPlainText; } -QString +TQString KAboutData::customAuthorRichText() const { return d->customAuthorRichText; diff --git a/kdecore/kaccel.cpp b/kdecore/kaccel.cpp index 5cd2195cb..81bdf6295 100644 --- a/kdecore/kaccel.cpp +++ b/kdecore/kaccel.cpp @@ -80,7 +80,7 @@ bool kde_g_bKillAccelOverride = false; -class KAccelEventHandler : public QWidget +class KAccelEventHandler : public TQWidget { public: static KAccelEventHandler* self() @@ -111,7 +111,7 @@ KAccelEventHandler::KAccelEventHandler() { # ifdef Q_WS_X11 if ( kapp ) - kapp->installX11EventFilter( this ); + kapp->installX11EventFilter( TQT_TQWIDGET(this) ); # endif } @@ -120,10 +120,10 @@ bool qt_try_modal( TQWidget *, XEvent * ); bool KAccelEventHandler::x11Event( XEvent* pEvent ) { - if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) + if( TQWidget::keyboardGrabber() || !kapp->tqfocusWidget() ) return false; - if ( !qt_try_modal(kapp->focusWidget(), pEvent) ) + if ( !qt_try_modal(kapp->tqfocusWidget(), pEvent) ) return false; if( pEvent->type == XKeyPress ) { @@ -135,16 +135,16 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent ) key.simplify(); int keyCodeQt = key.keyCodeQt(); int state = 0; - if( key.modFlags() & KKey::SHIFT ) state |= Qt::ShiftButton; - if( key.modFlags() & KKey::CTRL ) state |= Qt::ControlButton; - if( key.modFlags() & KKey::ALT ) state |= Qt::AltButton; - if( key.modFlags() & KKey::WIN ) state |= Qt::MetaButton; + if( key.modFlags() & KKey::SHIFT ) state |= TQt::ShiftButton; + if( key.modFlags() & KKey::CTRL ) state |= TQt::ControlButton; + if( key.modFlags() & KKey::ALT ) state |= TQt::AltButton; + if( key.modFlags() & KKey::WIN ) state |= TQt::MetaButton; TQKeyEvent ke( TQEvent::AccelOverride, keyCodeQt, 0, state ); ke.ignore(); g_bAccelActivated = false; - kapp->sendEvent( kapp->focusWidget(), &ke ); + kapp->sendEvent( kapp->tqfocusWidget(), &ke ); // If the Override event was accepted from a non-KAccel widget, // then kill the next AccelOverride in KApplication::notify. @@ -303,7 +303,7 @@ void KAccelPrivate::slotKeyPressed( int id ) { kdDebug(125) << "KAccelPrivate::slotKeyPressed( " << id << " )" << endl; - if( m_mapIDToKey.contains( id ) ) { + if( m_mapIDToKey.tqcontains( id ) ) { KKey key = m_mapIDToKey[id]; KKeySequence seq( key ); TQPopupMenu* pMenu = createPopupMenu( m_pWatch, seq ); @@ -357,7 +357,7 @@ bool KAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent ) if( (*it) == keyCodeQt ) { int nID = it.key(); kdDebug(125) << "shortcut found!" << endl; - if( m_mapIDToAction.contains( nID ) ) { + if( m_mapIDToAction.tqcontains( nID ) ) { // TODO: reduce duplication between here and slotMenuActivated KAccelAction* pAction = m_mapIDToAction[nID]; if( !pAction->isEnabled() ) @@ -608,7 +608,7 @@ void KAccel::changeMenuAccel( TQPopupMenu *menu, int id, const TQString& action if( !pAction || s.isEmpty() ) return; - int i = s.find( '\t' ); + int i = s.tqfind( '\t' ); TQString k = pAction->shortcut().seq(0).toString(); if( k.isEmpty() ) diff --git a/kdecore/kaccelbase.cpp b/kdecore/kaccelbase.cpp index 4ba4c9c3b..7f604b2b6 100644 --- a/kdecore/kaccelbase.cpp +++ b/kdecore/kaccelbase.cpp @@ -77,7 +77,7 @@ const KAccelAction* KAccelBase::actionPtr( const TQString& sAction ) const KAccelAction* KAccelBase::actionPtr( const KKeyServer::Key& key ) { - if( !m_mapKeyToAction.contains( key ) ) + if( !m_mapKeyToAction.tqcontains( key ) ) return 0; // Note: If more than one action is connected to a single key, nil will be returned. return m_mapKeyToAction[key].pAction; @@ -355,7 +355,7 @@ bool KAccelBase::updateConnections() if( bNonUnique ) { // Remove connection to single action if there is one - if( m_mapKeyToAction.contains( key ) ) { + if( m_mapKeyToAction.tqcontains( key ) ) { KAccelAction* pAction = m_mapKeyToAction[key].pAction; if( pAction ) { m_mapKeyToAction.remove( key ); @@ -378,7 +378,7 @@ bool KAccelBase::updateConnections() const KKeyServer::Key& key = it.key(); KAccelAction* pAction = (*it).pAction; // If this key is longer used or it points to a different action now, - if( !mapKeyToAction.contains( key ) || mapKeyToAction[key].pAction != pAction ) { + if( !mapKeyToAction.tqcontains( key ) || mapKeyToAction[key].pAction != pAction ) { if( pAction ) { disconnectKey( *pAction, key ); pAction->decConnections(); @@ -393,7 +393,7 @@ bool KAccelBase::updateConnections() for( KKeyToActionMap::iterator it = mapKeyToAction.begin(); it != mapKeyToAction.end(); ++it ) { const KKeyServer::Key& key = it.key(); KAccelAction* pAction = (*it).pAction; - if( !m_mapKeyToAction.contains( key ) || m_mapKeyToAction[key].pAction != pAction ) { + if( !m_mapKeyToAction.tqcontains( key ) || m_mapKeyToAction[key].pAction != pAction ) { // TODO: Decide what to do if connect fails. // Probably should remove this item from map. if( pAction ) { @@ -470,7 +470,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction ) //if( !key.isNull() ) { if( key.sym() ) { - if( !m_mapKeyToAction.contains( key ) ) { + if( !m_mapKeyToAction.tqcontains( key ) ) { // If this is a single-key shortcut, if( pAction->shortcut().seq(iSeq).count() == 1 ) { m_mapKeyToAction[key] = ActionInfo( pAction, iSeq, iVari ); @@ -481,7 +481,7 @@ bool KAccelBase::insertConnection( KAccelAction* pAction ) else { m_mapKeyToAction[key] = ActionInfo( 0, 0, 0 ); // Insert into non-unique list if it's not already there. - if( m_rgActionsNonUnique.findIndex( pAction ) == -1 ) + if( m_rgActionsNonUnique.tqfindIndex( pAction ) == -1 ) m_rgActionsNonUnique.append( pAction ); if( connectKey( key ) ) pAction->incConnections(); @@ -523,7 +523,7 @@ bool KAccelBase::removeConnection( KAccelAction* pAction ) //for( KKeyToActionMap::iterator it = m_mapKeyToAction.begin(); it != m_mapKeyToAction.end(); ++it ) // kdDebug(125) << "\tKey: " << it.key().toString() << " => '" << (*it)->m_sName << "'" << " " << *it << endl; - if( m_rgActionsNonUnique.findIndex( pAction ) >= 0 ) { + if( m_rgActionsNonUnique.tqfindIndex( pAction ) >= 0 ) { mtemp_pActionRemoving = pAction; bool b = updateConnections(); mtemp_pActionRemoving = 0; @@ -591,7 +591,7 @@ TQPopupMenu* KAccelBase::createPopupMenu( TQWidget* pParent, const KKeySequence& // If an action has already been inserted into the menu // and we have a label instead of an action here, // then indicate that we should insert a separator before the next menu entry. - if( bActionInserted && !pAction->isConfigurable() && pAction->name().contains( ':' ) ) + if( bActionInserted && !pAction->isConfigurable() && pAction->name().tqcontains( ':' ) ) bInsertSeparator = true; for( uint iSeq = 0; iSeq < pAction->shortcut().count(); iSeq++ ) { diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp index 1b5ea4d24..d2f5f81f6 100644 --- a/kdecore/kaccelmanager.cpp +++ b/kdecore/kaccelmanager.cpp @@ -144,7 +144,7 @@ bool KAcceleratorManagerPrivate::standardName(const TQString &str) { if (!kaccmp_sns) kaccmp_sns_d.setObject(kaccmp_sns, new TQStringList(KStdAction::internal_stdNames())); - return kaccmp_sns->contains(str); + return kaccmp_sns->tqcontains(str); } KAcceleratorManagerPrivate::Item::~Item() @@ -223,7 +223,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use { if (it->m_index >= 0) { - TQMenuItem *mitem = menuBar->findItem(menuBar->idAt(it->m_index)); + TQMenuItem *mitem = menuBar->tqfindItem(menuBar->idAt(it->m_index)); if (mitem) { checkChange(contents[cnt]); @@ -239,12 +239,12 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use if ( dynamic_cast<TQLabel*>( it->m_widget ) && it->m_widget->inherits("KURLLabel") ) continue; - int tprop = it->m_widget->metaObject()->findProperty("text", true); + int tprop = it->m_widget->tqmetaObject()->tqfindProperty("text", true); if (tprop != -1) { if (checkChange(contents[cnt])) it->m_widget->setProperty("text", contents[cnt].accelerated()); } else { - tprop = it->m_widget->metaObject()->findProperty("title", true); + tprop = it->m_widget->tqmetaObject()->tqfindProperty("title", true); if (tprop != -1 && checkChange(contents[cnt])) it->m_widget->setProperty("title", contents[cnt].accelerated()); } @@ -265,12 +265,12 @@ void KAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item) TQObjectList *childList = widget->queryList("TQWidget", 0, false, false); for ( TQObject *it = childList->first(); it; it = childList->next() ) { - TQWidget *w = static_cast<TQWidget*>(it); + TQWidget *w = TQT_TQWIDGET(it); if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) ) continue; - if ( KAcceleratorManagerPrivate::ignored_widgets.find( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() ) + if ( KAcceleratorManagerPrivate::ignored_widgets.tqfind( w ) != KAcceleratorManagerPrivate::ignored_widgets.end() ) continue; manageWidget(w, item); @@ -320,7 +320,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if (dynamic_cast<TQComboBox*>(w) || dynamic_cast<TQLineEdit*>(w) || dynamic_cast<TQTextEdit*>(w) || dynamic_cast<TQTextView*>(w) || - dynamic_cast<TQSpinBox*>(w) || w->qt_cast( "KMultiTabBar" )) + dynamic_cast<TQSpinBox*>(w) || w->tqqt_cast( "KMultiTabBar" )) return; // now treat 'ordinary' widgets @@ -340,9 +340,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) { TQString content; TQVariant variant; - int tprop = w->metaObject()->findProperty("text", true); + int tprop = w->tqmetaObject()->tqfindProperty("text", true); if (tprop != -1) { - const TQMetaProperty* p = w->metaObject()->property( tprop, true ); + const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true ); if ( p && p->isValid() ) w->qt_property( tprop, 1, &variant ); else @@ -350,9 +350,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) } if (tprop == -1) { - tprop = w->metaObject()->findProperty("title", true); + tprop = w->tqmetaObject()->tqfindProperty("title", true); if (tprop != -1) { - const TQMetaProperty* p = w->metaObject()->property( tprop, true ); + const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true ); if ( p && p->isValid() ) w->qt_property( tprop, 1, &variant ); } @@ -409,7 +409,7 @@ void KAcceleratorManagerPrivate::manageMenuBar(TQMenuBar *mbar, Item *item) for (uint i=0; i<mbar->count(); ++i) { - mitem = mbar->findItem(mbar->idAt(i)); + mitem = mbar->tqfindItem(mbar->idAt(i)); if (!mitem) continue; @@ -478,18 +478,18 @@ void KAcceleratorManager::last_manage(TQString &added, TQString &changed, TQStr KAccelString::KAccelString(const TQString &input, int initialWeight) : m_pureText(input), m_weight() { - m_orig_accel = m_pureText.find("(!)&"); + m_orig_accel = m_pureText.tqfind("(!)&"); if (m_orig_accel != -1) m_pureText.remove(m_orig_accel, 4); - m_orig_accel = m_pureText.find("(&&)"); + m_orig_accel = m_pureText.tqfind("(&&)"); if (m_orig_accel != -1) m_pureText.replace(m_orig_accel, 4, "&"); m_origText = m_pureText; if (m_pureText.contains('\t')) - m_pureText = m_pureText.left(m_pureText.find('\t')); + m_pureText = m_pureText.left(m_pureText.tqfind('\t')); m_orig_accel = m_accel = stripAccelerator(m_pureText); @@ -598,7 +598,7 @@ int KAccelString::stripAccelerator(TQString &text) while (p >= 0) { - p = text.find('&', p)+1; + p = text.tqfind('&', p)+1; if (p <= 0 || p >= (int)text.length()) return -1; @@ -626,7 +626,7 @@ int KAccelString::maxWeight(int &index, const TQString &used) index = -1; for (uint pos=0; pos<m_pureText.length(); ++pos) - if (used.find(m_pureText[pos], 0, FALSE) == -1 && m_pureText[pos].latin1() != 0) + if (used.tqfind(m_pureText[pos], 0, FALSE) == -1 && m_pureText[pos].latin1() != 0) if (m_weight[pos] > max) { max = m_weight[pos]; @@ -785,7 +785,7 @@ void KPopupAccelManager::findMenuEntries(KAccelStringList &list) // read out the menu entries for (uint i=0; i<m_popup->count(); i++) { - mitem = m_popup->findItem(m_popup->idAt(i)); + mitem = m_popup->tqfindItem(m_popup->idAt(i)); if (mitem->isSeparator()) continue; @@ -812,7 +812,7 @@ void KPopupAccelManager::setMenuEntries(const KAccelStringList &list) uint cnt = 0; for (uint i=0; i<m_popup->count(); i++) { - mitem = m_popup->findItem(m_popup->idAt(i)); + mitem = m_popup->tqfindItem(m_popup->idAt(i)); if (mitem->isSeparator()) continue; @@ -845,8 +845,8 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack) bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e ) { - if ( e->type() == TQEvent::Show && qApp->activeWindow() ) { - KAcceleratorManager::manage( qApp->activeWindow() ); + if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) { + KAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) ); watched->removeEventFilter( this ); } return false; diff --git a/kdecore/kaccelmanager_private.h b/kdecore/kaccelmanager_private.h index fbb5d1857..e931b7e3e 100644 --- a/kdecore/kaccelmanager_private.h +++ b/kdecore/kaccelmanager_private.h @@ -131,7 +131,7 @@ class TQPopupMenu; * @author Matthias Hoelzer-Kluepfel <mhk@kde.org> */ -class KPopupAccelManager : public QObject +class KPopupAccelManager : public TQObject { Q_OBJECT @@ -164,7 +164,7 @@ private: }; -class QWidgetStackAccelManager : public QObject +class QWidgetStackAccelManager : public TQObject { Q_OBJECT diff --git a/kdecore/kallocator.cpp b/kdecore/kallocator.cpp index c02bbf3ff..16c1b3625 100644 --- a/kdecore/kallocator.cpp +++ b/kdecore/kallocator.cpp @@ -183,9 +183,9 @@ void KZoneAllocator::delBlock(MemBlock *b) void * KZoneAllocator::allocate(size_t _size) { - // Use the size of (void *) as alignment - const size_t alignment = sizeof(void *) - 1; - _size = (_size + alignment) & ~alignment; + // Use the size of (void *) as tqalignment + const size_t tqalignment = sizeof(void *) - 1; + _size = (_size + tqalignment) & ~tqalignment; if ((unsigned long) _size + blockOffset > blockSize) { diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp index 3dc8ca77d..bad196482 100644 --- a/kdecore/kapplication.cpp +++ b/kdecore/kapplication.cpp @@ -450,7 +450,7 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event) // Indicate that the accelerator has been overridden. if (t == TQEvent::AccelOverride) { - static_cast<TQKeyEvent *>(event)->accept(); + TQT_TQKEYEVENT(event)->accept(); return true; } else @@ -460,11 +460,11 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event) if ((t == TQEvent::AccelOverride) || (t == TQEvent::KeyPress)) { static const KShortcut& _selectAll = KStdAccel::selectAll(); - TQLineEdit *edit = tqqt_cast<TQLineEdit *>(receiver); + TQLineEdit *edit = ::tqqt_cast<TQLineEdit *>(receiver); if (edit) { // We have a keypress for a lineedit... - TQKeyEvent *kevent = static_cast<TQKeyEvent *>(event); + TQKeyEvent *kevent = TQT_TQKEYEVENT(event); KKey key(kevent); if (_selectAll.contains(key)) { @@ -498,11 +498,11 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event) } } - TQTextEdit *medit = tqqt_cast<TQTextEdit *>(receiver); + TQTextEdit *medit = ::tqqt_cast<TQTextEdit *>(receiver); if (medit) { // We have a keypress for a multilineedit... - TQKeyEvent *kevent = static_cast<TQKeyEvent *>(event); + TQKeyEvent *kevent = TQT_TQKEYEVENT(event); if (_selectAll.contains(KKey(kevent))) { if (t == TQEvent::KeyPress) @@ -519,9 +519,9 @@ bool KApplication::notify(TQObject *receiver, TQEvent *event) } if( t == TQEvent::Show && receiver->isWidgetType()) { - TQWidget* w = static_cast< TQWidget* >( receiver ); + TQWidget* w = TQT_TQWIDGET( receiver ); #if defined Q_WS_X11 - if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader? + if( w->isTopLevel() && !startupId().isEmpty() && !TQT_TQSHOWEVENT(event)->spontaneous()) // TODO better done using window group leader? KStartupInfo::setWindowStartupId( w->winId(), startupId()); #endif if( w->isTopLevel() && !w->testWFlags( WX11BypassWM ) && !w->isPopup() && !event->spontaneous()) @@ -901,7 +901,7 @@ void KApplication::init(bool GUIenabled) TQMimeSourceFactory::addFactory( oldDefaultFactory ); } - d->checkAccelerators = new KCheckAccelerators( this ); + d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) ); } #ifdef Q_WS_MACX @@ -934,7 +934,7 @@ void KApplication::init(bool GUIenabled) // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage, // which makes it impossible to use the -reverse cmdline switch with KDE apps bool rtl = reverseLayout(); - installTranslator(new KDETranslator(this)); + installTranslator(new KDETranslator(TQT_TQOBJECT(this))); setReverseLayout( rtl ); if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in " "left-to-right languages (as english) or to 'RTL' in right-to-left " @@ -943,7 +943,7 @@ void KApplication::init(bool GUIenabled) // install appdata resource type KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data") - + TQString::fromLatin1(name()) + '/'); + + TQString::tqfromLatin1(name()) + '/'); pSessionConfig = 0L; bSessionManagement = true; @@ -1071,12 +1071,12 @@ KSessionManaged::~KSessionManaged() sessionClients()->remove( this ); } -bool KSessionManaged::saveState(QSessionManager&) +bool KSessionManaged::saveState(TQSessionManager&) { return true; } -bool KSessionManaged::commitData(QSessionManager&) +bool KSessionManaged::commitData(TQSessionManager&) { return true; } @@ -1179,9 +1179,9 @@ void KApplication::propagateSessionManager() TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv(DISPLAY); // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); int i; - while( (i = display.find(':')) >= 0) + while( (i = display.tqfind(':')) >= 0) display[i] = '_'; fName += "_"+display; @@ -1189,7 +1189,7 @@ void KApplication::propagateSessionManager() bool check = smEnv.isEmpty(); if ( !check && smModificationTime ) { TQFileInfo info( fName ); - TQTime current = info.lastModified().time(); + TQTime current = TQT_TQTIME_OBJECT(info.lastModified().time()); check = current > *smModificationTime; } if ( check ) { @@ -1198,7 +1198,7 @@ void KApplication::propagateSessionManager() if ( !f.open( IO_ReadOnly ) ) return; TQFileInfo info ( f ); - smModificationTime = new TQTime( info.lastModified().time() ); + smModificationTime = new TQTime( TQT_TQTIME_OBJECT(info.lastModified().time()) ); TQTextStream t(&f); t.setEncoding( TQTextStream::Latin1 ); TQString s = t.readLine(); @@ -1208,7 +1208,7 @@ void KApplication::propagateSessionManager() #endif } -void KApplication::commitData( QSessionManager& sm ) +void KApplication::commitData( TQSessionManager& sm ) { d->session_save = true; bool canceled = false; @@ -1222,7 +1222,7 @@ void KApplication::commitData( QSessionManager& sm ) if ( sm.allowsInteraction() ) { TQWidgetList done; - TQWidgetList *list = TQApplication::topLevelWidgets(); + TQWidgetList *list = TQApplication::tqtopLevelWidgets(); bool canceled = false; TQWidget* w = list->first(); while ( !canceled && w ) { @@ -1233,12 +1233,12 @@ void KApplication::commitData( QSessionManager& sm ) if ( !canceled ) done.append( w ); delete list; // one never knows... - list = TQApplication::topLevelWidgets(); + list = TQApplication::tqtopLevelWidgets(); w = list->first(); } else { w = list->next(); } - while ( w && done.containsRef( w ) ) + while ( w && done.tqcontainsRef( w ) ) w = list->next(); } delete list; @@ -1246,13 +1246,13 @@ void KApplication::commitData( QSessionManager& sm ) if ( !bSessionManagement ) - sm.setRestartHint( QSessionManager::RestartNever ); + sm.setRestartHint( TQSessionManager::RestartNever ); else - sm.setRestartHint( QSessionManager::RestartIfRunning ); + sm.setRestartHint( TQSessionManager::RestartIfRunning ); d->session_save = false; } -static void checkRestartVersion( QSessionManager& sm ) +static void checkRestartVersion( TQSessionManager& sm ) { Display* dpy = qt_xdisplay(); Atom type; @@ -1281,7 +1281,7 @@ static void checkRestartVersion( QSessionManager& sm ) sm.setRestartCommand( restartCommand ); } -void KApplication::saveState( QSessionManager& sm ) +void KApplication::saveState( TQSessionManager& sm ) { d->session_save = true; #ifdef Q_WS_X11 @@ -1289,12 +1289,12 @@ void KApplication::saveState( QSessionManager& sm ) mySmcConnection = (SmcConn) sm.handle(); if ( !bSessionManagement ) { - sm.setRestartHint( QSessionManager::RestartNever ); + sm.setRestartHint( TQSessionManager::RestartNever ); d->session_save = false; return; } else - sm.setRestartHint( QSessionManager::RestartIfRunning ); + sm.setRestartHint( TQSessionManager::RestartIfRunning ); if ( firstTime ) { firstTime = false; @@ -1352,7 +1352,7 @@ void KApplication::saveState( QSessionManager& sm ) discard << "rm" << locateLocal("config", sessionConfigName()); sm.setDiscardCommand( discard ); } else { - sm.setDiscardCommand( QStringList("") ); + sm.setDiscardCommand( TQStringList("") ); } if ( canceled ) @@ -1380,13 +1380,13 @@ void KApplication::startKdeinit() return; // whoever held the lock has already started dcopserver } // Try to launch kdeinit. - TQString srv = KStandardDirs::findExe(TQString::fromLatin1("kdeinit")); + TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit")); if (srv.isEmpty()) - srv = KStandardDirs::findExe(TQString::fromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); + srv = KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir()); if (srv.isEmpty()) return; if (kapp && (Tty != kapp->type())) - setOverrideCursor( Qt::waitCursor ); + setOverrideCursor( tqwaitCursor ); my_system(TQFile::encodeName(srv)+" --suicide"+" --new-startup"); if (kapp && (Tty != kapp->type())) restoreOverrideCursor(); @@ -1521,7 +1521,7 @@ void KApplication::parseCommandLine( ) } if (d->overrideStyle.isEmpty()) - fprintf(stderr, "%s", i18n("The style %1 was not found\n").arg(reqStyle).local8Bit().data()); + fprintf(stderr, "%s", TQString(i18n("The style %1 was not found\n").arg(reqStyle)).local8Bit().data()); } if (args->isSet("caption")) @@ -1883,13 +1883,13 @@ void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned void KApplication::invokeEditSlot( const char *slot ) { - TQObject *object = focusWidget(); + TQObject *object = TQT_TQOBJECT(tqfocusWidget()); if( !object ) return; - TQMetaObject *meta = object->metaObject(); + TQMetaObject *meta = object->tqmetaObject(); - int idx = meta->findSlot( slot + 1, true ); + int idx = meta->tqfindSlot( slot + 1, true ); if( idx < 0 ) return; @@ -2105,7 +2105,7 @@ void KApplication::kdisplaySetPalette() return; } #endif - TQApplication::setPalette( createApplicationPalette(), true); + TQApplication::tqsetPalette( createApplicationPalette(), true); emit kdisplayPaletteChanged(); emit appearanceChanged(); } @@ -2113,10 +2113,10 @@ void KApplication::kdisplaySetPalette() void KApplication::kdisplaySetFont() { - TQApplication::setFont(KGlobalSettings::generalFont(), true); - TQApplication::setFont(KGlobalSettings::menuFont(), true, "TQMenuBar"); - TQApplication::setFont(KGlobalSettings::menuFont(), true, "TQPopupMenu"); - TQApplication::setFont(KGlobalSettings::menuFont(), true, "KPopupTitle"); + TQApplication::tqsetFont(KGlobalSettings::generalFont(), true); + TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "TQMenuBar"); + TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "TQPopupMenu"); + TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "KPopupTitle"); // "patch" standard TQStyleSheet to follow our fonts TQStyleSheet* sheet = TQStyleSheet::defaultSheet(); @@ -2452,10 +2452,10 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const TQString command = config.readPathEntry("EmailClient"); TQString to, cc, bcc; - if (command.isEmpty() || command == TQString::fromLatin1("kmail") + if (command.isEmpty() || command == TQString::tqfromLatin1("kmail") || command.endsWith("/kmail")) { - command = TQString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t"); + command = TQString::tqfromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t"); if ( !_to.isEmpty() ) { // put the whole address lists into RFC2047 encoded blobs; technically @@ -2826,7 +2826,7 @@ TQString KApplication::tempSaveName( const TQString& pFilename ) const } } - aFilename.replace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() ); + aFilename.tqreplace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() ); return aFilename; } @@ -2855,7 +2855,7 @@ TQString KApplication::checkRecoverFile( const TQString& pFilename, } } - aFilename.replace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() ); + aFilename.tqreplace( "/", "\\!" ).prepend( "#" ).append( "#" ).prepend( "/" ).prepend( aAutosaveDir.absPath() ); if( TQFile( aFilename ).exists() ) { @@ -2888,7 +2888,7 @@ bool checkAccess(const TQString& pathname, int mode) //strip the filename (everything until '/' from the end TQString dirName(pathname); - int pos = dirName.findRev('/'); + int pos = dirName.tqfindRev('/'); if ( pos == -1 ) return false; // No path in argument. This is evil, we won't allow this else if ( pos == 0 ) // don't turn e.g. /root into an empty string @@ -3103,18 +3103,18 @@ void KApplication::initUrlActionRestrictions() bool bEnabled = (strEnabled == "true"); if (refPath.startsWith("$HOME")) - refPath.replace(0, 5, TQDir::homeDirPath()); + refPath.tqreplace(0, 5, TQDir::homeDirPath()); else if (refPath.startsWith("~")) - refPath.replace(0, 1, TQDir::homeDirPath()); + refPath.tqreplace(0, 1, TQDir::homeDirPath()); if (urlPath.startsWith("$HOME")) - urlPath.replace(0, 5, TQDir::homeDirPath()); + urlPath.tqreplace(0, 5, TQDir::homeDirPath()); else if (urlPath.startsWith("~")) - urlPath.replace(0, 1, TQDir::homeDirPath()); + urlPath.tqreplace(0, 1, TQDir::homeDirPath()); if (refPath.startsWith("$TMP")) - refPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp")); + refPath.tqreplace(0, 4, KGlobal::dirs()->saveLocation("tmp")); if (urlPath.startsWith("$TMP")) - urlPath.replace(0, 4, KGlobal::dirs()->saveLocation("tmp")); + urlPath.tqreplace(0, 4, KGlobal::dirs()->saveLocation("tmp")); d->urlActionRestrictions.append(new KApplicationPrivate::URLActionRule ( action, refProt, refHost, refPath, urlProt, urlHost, urlPath, bEnabled)); diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h index dd89de131..93820b68d 100644 --- a/kdecore/kapplication.h +++ b/kdecore/kapplication.h @@ -30,6 +30,8 @@ class KCharsets; class DCOPClient; class DCOPObject; +#include <tqtglobaldefines.h> + typedef unsigned long Atom; #if !defined(Q_WS_X11) typedef void Display; @@ -214,7 +216,7 @@ public: /** * Returns the current application object. * - * This is similar to the global TQApplication pointer qApp. It + * This is similar to the global TQApplication pointer tqApp. It * allows access to the single global KApplication object, since * more than one cannot be created in the same application. It * saves you the trouble of having to pass the pointer explicitly @@ -364,14 +366,14 @@ public: * handling of session management with KSessionManaged. * @internal */ - void commitData( QSessionManager& sm ); + void commitData( TQSessionManager& sm ); /** * Reimplemented for internal purposes, mainly the highlevel * handling of session management with KSessionManaged. * @internal */ - void saveState( QSessionManager& sm ); + void saveState( TQSessionManager& sm ); /** * Returns true if the application is currently saving its session @@ -1467,7 +1469,7 @@ public: indicate a problem and to halt the shutdown process (will implicitly call sm.cancel() ). */ - virtual bool saveState( QSessionManager& sm ); + virtual bool saveState( TQSessionManager& sm ); /** See TQApplication::commitData() for documentation. @@ -1477,7 +1479,7 @@ public: indicate a problem and to halt the shutdown process (will implicitly call sm.cancel() ). */ - virtual bool commitData( QSessionManager& sm ); + virtual bool commitData( TQSessionManager& sm ); protected: virtual void virtual_hook( int id, void* data ); diff --git a/kdecore/kasyncio.h b/kdecore/kasyncio.h index a96e30cd8..ad2fe1e30 100644 --- a/kdecore/kasyncio.h +++ b/kdecore/kasyncio.h @@ -25,6 +25,10 @@ #include <tqiodevice.h> #include "kdelibs_export.h" +#ifdef Q_MOC_RUN +#define USE_QT4 +#endif // Q_MOC_RUN + class KAsyncIOPrivate; /** * Asynchronous I/O Support @@ -35,9 +39,15 @@ class KAsyncIOPrivate; * @author Thiago Macieira <thiago.macieira@kdemail.net> * @short Asynchronous I/O support */ -class KDECORE_EXPORT KAsyncIO: public TQObject, public QIODevice +class KDECORE_EXPORT KAsyncIO: +#ifdef USE_QT4 +#else // USE_QT4 +public TQObject, +#endif // USE_QT4 +public TQIODevice { Q_OBJECT + TQ_OBJECT protected: KAsyncIO() // cannot be accessed externally { } diff --git a/kdecore/kbufferedio.h b/kdecore/kbufferedio.h index 234034d87..abdb68f80 100644 --- a/kdecore/kbufferedio.h +++ b/kdecore/kbufferedio.h @@ -56,6 +56,7 @@ class KBufferedIOPrivate; class KDECORE_EXPORT KBufferedIO: public KAsyncIO { Q_OBJECT + TQ_OBJECT protected: // no default public constructor diff --git a/kdecore/kcalendarsystemfactory.h b/kdecore/kcalendarsystemfactory.h index ec68124d7..0ceae43b9 100644 --- a/kdecore/kcalendarsystemfactory.h +++ b/kdecore/kcalendarsystemfactory.h @@ -49,7 +49,7 @@ public: * 0 is specified. * @return a KCalendarSystem object */ - static KCalendarSystem *create (const TQString & calType = TQString::fromLatin1("gregorian"), + static KCalendarSystem *create (const TQString & calType = TQString::tqfromLatin1("gregorian"), const KLocale * locale = 0); /** diff --git a/kdecore/kcalendarsystemgregorian.cpp b/kdecore/kcalendarsystemgregorian.cpp index 26a366fd6..19f9b3dc8 100644 --- a/kdecore/kcalendarsystemgregorian.cpp +++ b/kdecore/kcalendarsystemgregorian.cpp @@ -58,7 +58,7 @@ int KCalendarSystemGregorian::weeksInYear(int year) const // If the last day of the year is in the first week, we have to check the // week before if ( temp.weekNumber() == 1 ) - temp = temp.addDays(-7); + temp = TQT_TQDATE_OBJECT(temp.addDays(-7)); return temp.weekNumber(); } @@ -221,17 +221,17 @@ bool KCalendarSystemGregorian::setYMD(TQDate & date, int y, int m, int d) const TQDate KCalendarSystemGregorian::addYears(const TQDate & date, int nyears) const { - return date.addYears(nyears); + return TQT_TQDATE_OBJECT(date.addYears(nyears)); } TQDate KCalendarSystemGregorian::addMonths(const TQDate & date, int nmonths) const { - return date.addMonths(nmonths); + return TQT_TQDATE_OBJECT(date.addMonths(nmonths)); } TQDate KCalendarSystemGregorian::addDays(const TQDate & date, int ndays) const { - return date.addDays(ndays); + return TQT_TQDATE_OBJECT(date.addDays(ndays)); } TQString KCalendarSystemGregorian::weekDayName(int col, bool shortName) const @@ -295,7 +295,7 @@ int KCalendarSystemGregorian::weekDayOfPray() const TQString KCalendarSystemGregorian::calendarName() const { - return TQString::fromLatin1("gregorian"); + return TQString::tqfromLatin1("gregorian"); } bool KCalendarSystemGregorian::isLunar() const diff --git a/kdecore/kcalendarsystemhebrew.cpp b/kdecore/kcalendarsystemhebrew.cpp index ec39fc9ca..710e027d1 100644 --- a/kdecore/kcalendarsystemhebrew.cpp +++ b/kdecore/kcalendarsystemhebrew.cpp @@ -306,7 +306,7 @@ int KCalendarSystemHebrew::weeksInYear(int year) const int nWeekNumber = weekNumber(temp); if(nWeekNumber == 1) // last week belongs to next year { - temp = temp.addDays(-7); + temp = TQT_TQDATE_OBJECT(temp.addDays(-7)); nWeekNumber = weekNumber(temp); } @@ -574,7 +574,7 @@ int KCalendarSystemHebrew::weekDayOfPray() const // Ok TQDate KCalendarSystemHebrew::addDays( const TQDate & date, int ndays ) const { - return date.addDays( ndays ); + return TQT_TQDATE_OBJECT(date.addDays( ndays )); } // Ok @@ -614,7 +614,7 @@ TQDate KCalendarSystemHebrew::addYears( const TQDate & date, int nyears ) const // Ok TQString KCalendarSystemHebrew::calendarName() const { - return TQString::fromLatin1("hebrew"); + return TQString::tqfromLatin1("hebrew"); } // Ok @@ -640,7 +640,7 @@ TQString KCalendarSystemHebrew::dayString(const TQDate & pDate, bool bShort) con TQString sResult; // Only use hebrew numbers if the hebrew setting is selected - if (locale()->language() == TQString::fromLatin1("he")) + if (locale()->language() == TQString::tqfromLatin1("he")) sResult = num2heb(day(pDate), false); else sResult = KCalendarSystem::dayString(pDate, bShort); @@ -653,7 +653,7 @@ TQString KCalendarSystemHebrew::yearString(const TQDate & pDate, bool bShort) co TQString sResult; // Only use hebrew numbers if the hebrew setting is selected - if (locale()->language() == TQString::fromLatin1("he")) + if (locale()->language() == TQString::tqfromLatin1("he")) sResult = num2heb(year(pDate), !bShort); else sResult = KCalendarSystem::yearString(pDate, bShort); @@ -684,9 +684,9 @@ static int heb2num(const TQString& str, int & iLength) { { if (s.length() > pos && s[pos + 1] >= TQChar(0x05D0) && s[pos + 1] <= TQChar(0x05EA)) - result += (c.unicode() - 0x05D0 + 1) * 1000; + result += (c.tqunicode() - 0x05D0 + 1) * 1000; else - result += c.unicode() - 0x05D0 + 1; + result += c.tqunicode() - 0x05D0 + 1; } else if (c == TQChar(0x05D8)) { @@ -702,11 +702,11 @@ static int heb2num(const TQString& str, int & iLength) { if (s.length() > pos && s[pos + 1] >= TQChar(0x05D9)) return -1; else - result += decadeValues[c.unicode() - 0x05D9]; + result += decadeValues[c.tqunicode() - 0x05D9]; } else if (c >= TQChar(0x05E7) && c <= TQChar(0x05EA)) { - result += (c.unicode() - 0x05E7 + 1) * 100; + result += (c.tqunicode() - 0x05E7 + 1) * 100; } else { diff --git a/kdecore/kcalendarsystemhijri.cpp b/kdecore/kcalendarsystemhijri.cpp index 8eb403685..90faec48e 100644 --- a/kdecore/kcalendarsystemhijri.cpp +++ b/kdecore/kcalendarsystemhijri.cpp @@ -539,7 +539,7 @@ int KCalendarSystemHijri::weekDayOfPray() const TQDate KCalendarSystemHijri::addDays( const TQDate & date, int ndays ) const { - return date.addDays( ndays ); + return TQT_TQDATE_OBJECT(date.addDays( ndays )); } TQDate KCalendarSystemHijri::addMonths( const TQDate & date, int nmonths ) const @@ -577,7 +577,7 @@ TQDate KCalendarSystemHijri::addYears( const TQDate & date, int nyears ) const TQString KCalendarSystemHijri::calendarName() const { - return TQString::fromLatin1("hijri"); + return TQString::tqfromLatin1("hijri"); } bool KCalendarSystemHijri::isLunar() const diff --git a/kdecore/kcalendarsystemjalali.cpp b/kdecore/kcalendarsystemjalali.cpp index 8915c585a..6197ca75f 100644 --- a/kdecore/kcalendarsystemjalali.cpp +++ b/kdecore/kcalendarsystemjalali.cpp @@ -304,7 +304,7 @@ TQDate KCalendarSystemJalali::addMonths( const TQDate & date, int nmonths ) cons TQDate KCalendarSystemJalali::addDays( const TQDate & date, int ndays ) const { - return date.addDays( ndays ); + return TQT_TQDATE_OBJECT(date.addDays( ndays )); } int KCalendarSystemJalali::monthsInYear( const TQDate & date ) const @@ -541,7 +541,7 @@ int KCalendarSystemJalali::weekDayOfPray() const } TQString KCalendarSystemJalali::calendarName() const { - return TQString::fromLatin1("jalali"); + return TQString::tqfromLatin1("jalali"); } bool KCalendarSystemJalali::isLunar() const diff --git a/kdecore/kcatalogue.cpp b/kdecore/kcatalogue.cpp index 3669b40b4..764cd4618 100644 --- a/kdecore/kcatalogue.cpp +++ b/kdecore/kcatalogue.cpp @@ -62,7 +62,7 @@ KCatalogue::KCatalogue(const TQString & name, const TQString & language ) // has to be set after we have the first catalog objects. d->pluralType = -1; - TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo") + TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo") .arg( d->language ) .arg( d->name ); diff --git a/kdecore/kcharsets.cpp b/kdecore/kcharsets.cpp index 52cf87849..027dba367 100644 --- a/kdecore/kcharsets.cpp +++ b/kdecore/kcharsets.cpp @@ -202,7 +202,7 @@ static struct Builtin { "ascii", "iso 8859-1" }, { "x-utf-8", "utf-8" }, { "x-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt - { "unicode-1-1-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt + { "tqunicode-1-1-utf-7", "utf-7" }, // ### FIXME: UTF-7 is not in Qt { "utf-16", "iso-10646-ucs-2" }, { "utf16", "iso-10646-ucs-2" }, { "ucs2", "iso-10646-ucs-2" }, @@ -381,11 +381,11 @@ TQChar KCharsets::fromEntity(const TQString &str) if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') { pos++; // '�', hexadeciaml character reference - TQString tmp(str.unicode()+pos, str.length()-pos); + TQString tmp(str.tqunicode()+pos, str.length()-pos); res = tmp.toInt(&ok, 16); } else { // '�', decimal character reference - TQString tmp(str.unicode()+pos, str.length()-pos); + TQString tmp(str.tqunicode()+pos, str.length()-pos); res = tmp.toInt(&ok, 10); } return res; @@ -422,14 +422,14 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len) TQString KCharsets::toEntity(const TQChar &ch) { TQString ent; - ent.sprintf("�x%x;", ch.unicode()); + ent.sprintf("�x%x;", ch.tqunicode()); return ent; } TQString KCharsets::resolveEntities( const TQString &input ) { TQString text = input; - const TQChar *p = text.unicode(); + const TQChar *p = text.tqunicode(); const TQChar *end = p + text.length(); const TQChar *ampersand = 0; bool scanForSemicolon = false; @@ -460,12 +460,12 @@ TQString KCharsets::resolveEntities( const TQString &input ) if ( entityValue.isNull() ) continue; - const uint ampersandPos = ampersand - text.unicode(); + const uint ampersandPos = ampersand - text.tqunicode(); text[ (int)ampersandPos ] = entityValue; text.remove( ampersandPos + 1, entityLength + 1 ); - p = text.unicode() + ampersandPos; - end = text.unicode() + text.length(); + p = text.tqunicode() + ampersandPos; + end = text.tqunicode() + text.length(); ampersand = 0; } @@ -477,7 +477,7 @@ TQStringList KCharsets::availableEncodingNames() TQStringList available; for ( const char* const* pos = charsets_for_encoding; *pos; ++pos ) { //kdDebug(0) << *charsets << " available" << endl; - available.append( TQString::fromLatin1( *pos )); + available.append( TQString::tqfromLatin1( *pos )); } return available; } @@ -491,14 +491,14 @@ TQString KCharsets::languageForEncoding( const TQString &encoding ) TQString KCharsets::encodingForName( const TQString &descriptiveName ) { - const int left = descriptiveName.findRev( '(' ); + const int left = descriptiveName.tqfindRev( '(' ); if (left<0) // No parenthesis, so assume it is a normal encoding name return descriptiveName.stripWhiteSpace(); TQString name(descriptiveName.mid(left+1)); - const int right = name.findRev( ')' ); + const int right = name.tqfindRev( ')' ); if (right<0) return name; @@ -511,7 +511,7 @@ TQStringList KCharsets::descriptiveEncodingNames() // As we are sorting, we can directly read the array language_for_encoding TQStringList encodings; for ( const LanguageForEncoding* pos = language_for_encoding; pos->index; ++pos ) { - const TQString name = TQString::fromLatin1( pos->index ); + const TQString name = TQString::tqfromLatin1( pos->index ); const TQString description = i18n( language_names[ pos->data ] ); encodings.append( i18n("Descriptive Encoding Name", "%1 ( %2 )"). arg ( description ). arg( name ) ); } @@ -536,7 +536,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const if (n.isEmpty()) { codec = KGlobal::locale()->codecForEncoding(); - d->codecForNameDict.replace("->locale<-", codec); + d->codecForNameDict.tqreplace("->locale<-", codec); return codec; } @@ -553,7 +553,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const codec = TQTextCodec::codecForName(name); if(codec) { - d->codecForNameDict.replace(key, codec); + d->codecForNameDict.tqreplace(key, codec); return codec; } @@ -566,14 +566,14 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const if(codec) { - d->codecForNameDict.replace(key, codec); + d->codecForNameDict.tqreplace(key, codec); return codec; } TQString dir; { KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" ); - dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps")); + dir = KGlobal::config()->readPathEntry("i18ndir", TQString::tqfromLatin1("/usr/share/i18n/charmaps")); } // these are codecs not included in Qt. They can be build up if the corresponding charmap @@ -584,7 +584,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const cname = name; cname = cname.upper(); - const TQString basicName = TQString::fromLatin1(cname); + const TQString basicName = TQString::tqfromLatin1(cname); kdDebug() << k_funcinfo << endl << " Trying to find " << cname << " in " << dir << endl; TQString charMapFileName; @@ -642,7 +642,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const } if(codec) { - d->codecForNameDict.replace(key, codec); + d->codecForNameDict.tqreplace(key, codec); return codec; } @@ -654,7 +654,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const codec = TQTextCodec::codecForName(cname); if(codec) { - d->codecForNameDict.replace(key, codec); + d->codecForNameDict.tqreplace(key, codec); return codec; } diff --git a/kdecore/kcheckaccelerators.cpp b/kdecore/kcheckaccelerators.cpp index 7b1d3621b..06337485c 100644 --- a/kdecore/kcheckaccelerators.cpp +++ b/kdecore/kcheckaccelerators.cpp @@ -99,11 +99,11 @@ bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e) switch ( e->type() ) { // just simplify debuggin case TQEvent::Accel: - if ( key && (static_cast<TQKeyEvent *>(e)->key() == key) ) { + if ( key && (TQT_TQKEYEVENT(e)->key() == key) ) { block = true; checkAccelerators( false ); block = false; - static_cast<TQKeyEvent *>(e)->accept(); + TQT_TQKEYEVENT(e)->accept(); return true; } break; @@ -144,7 +144,7 @@ void KCheckAccelerators::createDialog(TQWidget *actWin, bool automatic) if ( drklash ) return; - drklash = new TQDialog( actWin, "kapp_accel_check_dlg", false, Qt::WDestructiveClose); + drklash = new TQDialog( actWin, "kapp_accel_check_dlg", false, (WFlags)TQt::WDestructiveClose); drklash->setCaption( i18n( "Dr. Klash' Accelerator Diagnosis" )); drklash->resize( 500, 460 ); TQVBoxLayout* layout = new TQVBoxLayout( drklash, 11, 6 ); @@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on) void KCheckAccelerators::checkAccelerators( bool automatic ) { - TQWidget* actWin = qApp->activeWindow(); + TQWidget* actWin = TQT_TQWIDGET(tqApp->activeWindow()); if ( !actWin ) return; diff --git a/kdecore/kcheckaccelerators.h b/kdecore/kcheckaccelerators.h index f6a5b7223..6a9439be6 100644 --- a/kdecore/kcheckaccelerators.h +++ b/kdecore/kcheckaccelerators.h @@ -63,7 +63,7 @@ class TQTextView; there are shown all conflicts grouped by accelerator, and a list of all used accelerators. */ -class KDECORE_EXPORT KCheckAccelerators : public QObject +class KDECORE_EXPORT KCheckAccelerators : public TQObject { Q_OBJECT public: diff --git a/kdecore/kclipboard.cpp b/kdecore/kclipboard.cpp index 50073cc6a..244b43541 100644 --- a/kdecore/kclipboard.cpp +++ b/kdecore/kclipboard.cpp @@ -38,7 +38,7 @@ * especially the second one. */ -class KClipboardSynchronizer::MimeSource : public QMimeSource +class KClipboardSynchronizer::MimeSource : public TQMimeSource { public: MimeSource( const TQMimeSource * src ) @@ -56,7 +56,7 @@ public: while ( (format = src->format( i++ )) ) { byteArray = new TQByteArray(); - *byteArray = src->encodedData( format ).copy(); + *byteArray = src->tqencodedData( format ).copy(); m_data.append( byteArray ); m_formats.append( format ); } @@ -72,11 +72,11 @@ public: return 0L; } virtual bool provides( const char *mimeType ) const { - return ( m_formats.find( mimeType ) > -1 ); + return ( m_formats.tqfind( mimeType ) > -1 ); } - virtual TQByteArray encodedData( const char *format ) const + virtual TQByteArray tqencodedData( const char *format ) const { - int index = m_formats.find( format ); + int index = m_formats.tqfind( format ); if ( index > -1 ) return *(m_data.at( index )); @@ -97,7 +97,7 @@ bool KClipboardSynchronizer::s_blocked = false; KClipboardSynchronizer * KClipboardSynchronizer::self() { if ( !s_self ) - s_self = new KClipboardSynchronizer( kapp, "KDE Clipboard" ); + s_self = new KClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" ); return s_self; } @@ -123,7 +123,7 @@ KClipboardSynchronizer::~KClipboardSynchronizer() void KClipboardSynchronizer::setupSignals() { - QClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); disconnect( clip, NULL, this, NULL ); if( s_sync ) connect( clip, TQT_SIGNAL( selectionChanged() ), @@ -135,43 +135,43 @@ void KClipboardSynchronizer::setupSignals() void KClipboardSynchronizer::slotSelectionChanged() { - QClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); // qDebug("*** sel changed: %i", s_blocked); if ( s_blocked || !clip->ownsSelection() ) return; - setClipboard( new MimeSource( clip->data( QClipboard::Selection) ), - QClipboard::Clipboard ); + setClipboard( new MimeSource( clip->data( TQClipboard::Selection) ), + TQClipboard::Clipboard ); } void KClipboardSynchronizer::slotClipboardChanged() { - QClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); // qDebug("*** clip changed : %i (implicit: %i, ownz: clip: %i, selection: %i)", s_blocked, s_implicitSelection, clip->ownsClipboard(), clip->ownsSelection()); if ( s_blocked || !clip->ownsClipboard() ) return; - setClipboard( new MimeSource( clip->data( QClipboard::Clipboard ) ), - QClipboard::Selection ); + setClipboard( new MimeSource( clip->data( TQClipboard::Clipboard ) ), + TQClipboard::Selection ); } -void KClipboardSynchronizer::setClipboard( TQMimeSource *data, QClipboard::Mode mode ) +void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode mode ) { // qDebug("---> setting clipboard: %p", data); - QClipboard *clip = TQApplication::clipboard(); + TQClipboard *clip = TQApplication::tqclipboard(); s_blocked = true; - if ( mode == QClipboard::Clipboard ) + if ( mode == TQClipboard::Clipboard ) { - clip->setData( data, QClipboard::Clipboard ); + clip->setData( data, TQClipboard::Clipboard ); } - else if ( mode == QClipboard::Selection ) + else if ( mode == TQClipboard::Selection ) { - clip->setData( data, QClipboard::Selection ); + clip->setData( data, TQClipboard::Selection ); } s_blocked = false; diff --git a/kdecore/kclipboard.h b/kdecore/kclipboard.h index 593164f54..aecfccf52 100644 --- a/kdecore/kclipboard.h +++ b/kdecore/kclipboard.h @@ -33,7 +33,7 @@ * @since 3.1 * @internal */ -class KDECORE_EXPORT KClipboardSynchronizer : public QObject +class KDECORE_EXPORT KClipboardSynchronizer : public TQObject { Q_OBJECT diff --git a/kdecore/kcmdlineargs.cpp b/kdecore/kcmdlineargs.cpp index 9600da39c..7219163a8 100644 --- a/kdecore/kcmdlineargs.cpp +++ b/kdecore/kcmdlineargs.cpp @@ -393,7 +393,7 @@ findOption(const KCmdLineOptions *options, TQCString &opt, if (!options->name) return result+0; TQCString nextOption = options->name; - int p = nextOption.find(' '); + int p = nextOption.tqfind(' '); if (p > 0) nextOption = nextOption.left(p); if (nextOption[0] == '!') @@ -432,7 +432,7 @@ KCmdLineArgs::findOption(const char *_opt, TQCString opt, int &i, bool _enabled, const char *opt_name; const char *def; TQCString argument; - int j = opt.find('='); + int j = opt.tqfind('='); if (j != -1) { argument = opt.mid(j+1); @@ -858,7 +858,7 @@ KCmdLineArgs::usage(const char *id) bool hasOptions = false; TQString optionsHeader; if (args->name) - optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::fromLatin1(args->name))); + optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::tqfromLatin1(args->name))); else optionsHeader = i18n("\nOptions:\n"); @@ -1081,9 +1081,9 @@ KCmdLineArgs::setOption(const TQCString &opt, bool enabled) } if (enabled) - parsedOptionList->replace( opt, new TQCString("t") ); + parsedOptionList->tqreplace( opt, new TQCString("t") ); else - parsedOptionList->replace( opt, new TQCString("f") ); + parsedOptionList->tqreplace( opt, new TQCString("f") ); } void @@ -1119,7 +1119,7 @@ KCmdLineArgs::getOption(const char *_opt) const TQCString *value = 0; if (parsedOptionList) { - value = parsedOptionList->find(_opt); + value = parsedOptionList->tqfind(_opt); } if (value) @@ -1199,7 +1199,7 @@ KCmdLineArgs::isSet(const char *_opt) const TQCString *value = 0; if (parsedOptionList) { - value = parsedOptionList->find(opt); + value = parsedOptionList->tqfind(opt); } if (value) diff --git a/kdecore/kcompletion.cpp b/kdecore/kcompletion.cpp index 84a4cfca2..2876e9138 100644 --- a/kdecore/kcompletion.cpp +++ b/kdecore/kcompletion.cpp @@ -150,7 +150,7 @@ void KCompletion::addWeightedItem( const TQString& item ) uint weight = 0; // find out the weighting of this item (appended to the string as ":num") - int index = item.findRev(':'); + int index = item.tqfindRev(':'); if ( index > 0 ) { bool ok; weight = item.mid( index + 1 ).toUInt( &ok ); @@ -274,7 +274,7 @@ TQStringList KCompletion::substringCompletion( const TQString& string ) const for( ; it != list.end(); ++it ) { TQString item = *it; - if ( item.find( string, 0, false ) != -1 ) { // always case insensitive + if ( item.tqfind( string, 0, false ) != -1 ) { // always case insensitive matches.append( item ); } } @@ -463,7 +463,7 @@ TQString KCompletion::findCompletion( const TQString& string ) uint weight = temp_node->weight(); const KCompTreeNode* hit = temp_node; for( int i = 1; i < count; i++ ) { - temp_node = node->childAt(i); + temp_node = node->tqchildAt(i); if( temp_node->weight() > weight ) { hit = temp_node; weight = hit->weight(); @@ -628,19 +628,19 @@ void KCompletion::doBeep( BeepMode mode ) const switch ( mode ) { case Rotation: - event = TQString::fromLatin1("Textcompletion: rotation"); + event = TQString::tqfromLatin1("Textcompletion: rotation"); text = i18n("You reached the end of the list\nof matching items.\n"); break; case PartialMatch: if ( myCompletionMode == KGlobalSettings::CompletionShell || myCompletionMode == KGlobalSettings::CompletionMan ) { - event = TQString::fromLatin1("Textcompletion: partial match"); + event = TQString::tqfromLatin1("Textcompletion: partial match"); text = i18n("The completion is ambiguous, more than one\nmatch is available.\n"); } break; case NoMatch: if ( myCompletionMode == KGlobalSettings::CompletionShell ) { - event = TQString::fromLatin1("Textcompletion: no match"); + event = TQString::tqfromLatin1("Textcompletion: no match"); text = i18n("There is no matching item available.\n"); } break; diff --git a/kdecore/kcompletion.h b/kdecore/kcompletion.h index 95198cdb0..f6c8f0f82 100644 --- a/kdecore/kcompletion.h +++ b/kdecore/kcompletion.h @@ -119,7 +119,7 @@ class TQPopupMenu; * tell the user) where a completion comes from. * * Note: KCompletion does not work with strings that contain 0x0 characters - * (unicode nul), as this is used internally as a delimiter. + * (tqunicode nul), as this is used internally as a delimiter. * * You may inherit from KCompletion and override makeCompletion() in * special cases (like reading directories/urls and then supplying the @@ -129,7 +129,7 @@ class TQPopupMenu; * * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KDECORE_EXPORT KCompletion : public QObject +class KDECORE_EXPORT KCompletion : public TQObject { Q_ENUMS( CompOrder ) Q_PROPERTY( CompOrder order READ order WRITE setOrder ) diff --git a/kdecore/kcompletion_private.h b/kdecore/kcompletion_private.h index 35c846593..f4363ae95 100644 --- a/kdecore/kcompletion_private.h +++ b/kdecore/kcompletion_private.h @@ -81,7 +81,7 @@ typedef KCompTreeNodeList KCompTreeChildren; * @author Carsten Pfeiffer <pfeiffer@kde.org> * @internal */ -class KDECORE_EXPORT KCompTreeNode : public QChar +class KDECORE_EXPORT KCompTreeNode : public TQChar { public: KCompTreeNode() : TQChar(), myWeight(0) {} @@ -118,7 +118,7 @@ public: inline const KCompTreeChildren * children() const { return &myChildren; } - inline const KCompTreeNode * childAt(int index) const { + inline const KCompTreeNode * tqchildAt(int index) const { return myChildren.at(index); } inline const KCompTreeNode * firstChild() const { diff --git a/kdecore/kcompletionbase.cpp b/kdecore/kcompletionbase.cpp index 9e7f6d746..019f4ec6b 100644 --- a/kdecore/kcompletionbase.cpp +++ b/kdecore/kcompletionbase.cpp @@ -123,7 +123,7 @@ bool KCompletionBase::setKeyBinding( KeyBindingType item, const KShortcut& cut ) for( KeyBindingMap::Iterator it = m_keyMap.begin(); it != m_keyMap.end(); ++it ) if( it.data() == cut ) return false; } - m_keyMap.replace( item, cut ); + m_keyMap.tqreplace( item, cut ); return true; } diff --git a/kdecore/kconfig.cpp b/kdecore/kconfig.cpp index 2531034ee..e40f23a19 100644 --- a/kdecore/kconfig.cpp +++ b/kdecore/kconfig.cpp @@ -144,7 +144,7 @@ TQMap<TQString, TQString> KConfig::entryMap(const TQString &pGroup) const KEntryKey groupKey( pGroup_utf, 0 ); TQMap<TQString, TQString> tmpMap; - KEntryMapConstIterator aIt = aEntryMap.find(groupKey); + KEntryMapConstIterator aIt = aEntryMap.tqfind(groupKey); if (aIt == aEntryMap.end()) return tmpMap; ++aIt; // advance past special group entry marker @@ -183,7 +183,7 @@ KEntryMap KConfig::internalEntryMap(const TQString &pGroup) const KEntryKey aKey(pGroup_utf, 0); KEntryMap tmpEntryMap; - aIt = aEntryMap.find(aKey); + aIt = aEntryMap.tqfind(aKey); if (aIt == aEntryMap.end()) { // the special group key is not in the map, // so it must be an invalid group. Return @@ -237,7 +237,7 @@ void KConfig::putData(const KEntryKey &_key, const KEntry &_data, bool _checkGro KEntry KConfig::lookupData(const KEntryKey &_key) const { - KEntryMapConstIterator aIt = aEntryMap.find(_key); + KEntryMapConstIterator aIt = aEntryMap.tqfind(_key); if (aIt != aEntryMap.end()) { const KEntry &entry = *aIt; @@ -255,7 +255,7 @@ bool KConfig::internalHasGroup(const TQCString &group) const { KEntryKey groupKey( group, 0); - KEntryMapConstIterator aIt = aEntryMap.find(groupKey); + KEntryMapConstIterator aIt = aEntryMap.tqfind(groupKey); KEntryMapConstIterator aEnd = aEntryMap.end(); if (aIt == aEnd) @@ -290,7 +290,7 @@ void KConfig::checkUpdate(const TQString &id, const TQString &updateFile) setGroup("$Version"); TQString cfg_id = updateFile+":"+id; TQStringList ids = readListEntry("update_info"); - if (!ids.contains(cfg_id)) + if (!ids.tqcontains(cfg_id)) { TQStringList args; args << "--check" << updateFile; diff --git a/kdecore/kconfig_compiler/kconfig_compiler.cpp b/kdecore/kconfig_compiler/kconfig_compiler.cpp index f11394495..1b1d82860 100644 --- a/kdecore/kconfig_compiler/kconfig_compiler.cpp +++ b/kdecore/kconfig_compiler/kconfig_compiler.cpp @@ -220,7 +220,7 @@ static TQString enumName(const TQString &n) return result; } -static TQString setFunction(const TQString &n, const TQString &className = TQString::null) +static TQString setFunction(const TQString &n, const TQString &className = TQString()) { TQString result = "set"+n; result[3] = result[3].upper(); @@ -231,7 +231,7 @@ static TQString setFunction(const TQString &n, const TQString &className = TQStr } -static TQString getFunction(const TQString &n, const TQString &className = TQString::null) +static TQString getFunction(const TQString &n, const TQString &className = TQString()) { TQString result = n; result[0] = result[0].lower(); @@ -262,10 +262,10 @@ static TQString literalString( const TQString &s ) { bool isAscii = true; for(int i = s.length(); i--;) - if (s[i].unicode() > 127) isAscii = false; + if (s[i].tqunicode() > 127) isAscii = false; if (isAscii) - return "TQString::fromLatin1( " + quoteString(s) + " )"; + return "TQString::tqfromLatin1( " + quoteString(s) + " )"; else return "TQString::fromUtf8( " + quoteString(s) + " )"; } @@ -284,7 +284,7 @@ static TQString dumpNode(const TQDomNode &node) static TQString filenameOnly(TQString path) { - int i = path.findRev('/'); + int i = path.tqfindRev('/'); if (i >= 0) return path.mid(i+1); return path; @@ -480,13 +480,13 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element ) if ( nameIsEmpty ) { name = key; - name.replace( " ", TQString::null ); - } else if ( name.contains( ' ' ) ) { + name.tqreplace( " ", TQString() ); + } else if ( name.tqcontains( ' ' ) ) { kdWarning()<<"Entry '"<<name<<"' contains spaces! <name> elements can't contain speces!"<<endl; name.remove( ' ' ); } - if (name.contains("$(")) + if (name.tqcontains("$(")) { if (param.isEmpty()) { @@ -513,11 +513,11 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element ) { // Adjust name paramName = name; - name.replace("$("+param+")", TQString::null); + name.tqreplace("$("+param+")", TQString()); // Lookup defaults for indexed entries for(int i = 0; i <= paramMax; i++) { - paramDefaultValues.append(TQString::null); + paramDefaultValues.append(TQString()); } TQDomNode n; @@ -534,7 +534,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element ) int i = index.toInt(&ok); if (!ok) { - i = paramValues.findIndex(index); + i = paramValues.tqfindIndex(index); if (i == -1) { kdError() << "Index '" << index << "' for default value is unknown." << endl; @@ -568,7 +568,7 @@ CfgEntry *parseEntry( const TQString &group, const TQDomElement &element ) return 0; } - if (allNames.contains(name)) + if (allNames.tqcontains(name)) { if (nameIsEmpty) kdError() << "The key '" << key << "' can not be used as name for the entry because " @@ -619,8 +619,8 @@ TQString param( const TQString &type ) else if ( type == "Bool" ) return "bool"; else if ( type == "Double" ) return "double"; else if ( type == "DateTime" ) return "const TQDateTime &"; - else if ( type == "Int64" ) return "Q_INT64"; - else if ( type == "UInt64" ) return "Q_UINT64"; + else if ( type == "Int64" ) return "TQ_INT64"; + else if ( type == "UInt64" ) return "TQ_UINT64"; else if ( type == "IntList" ) return "const TQValueList<int> &"; else if ( type == "Enum" ) return "int"; else if ( type == "Path" ) return "const TQString &"; @@ -649,8 +649,8 @@ TQString cppType( const TQString &type ) else if ( type == "Bool" ) return "bool"; else if ( type == "Double" ) return "double"; else if ( type == "DateTime" ) return "TQDateTime"; - else if ( type == "Int64" ) return "Q_INT64"; - else if ( type == "UInt64" ) return "Q_UINT64"; + else if ( type == "Int64" ) return "TQ_INT64"; + else if ( type == "UInt64" ) return "TQ_UINT64"; else if ( type == "IntList" ) return "TQValueList<int>"; else if ( type == "Enum" ) return "int"; else if ( type == "Path" ) return "TQString"; @@ -702,13 +702,13 @@ TQString itemType( const TQString &type ) static TQString itemDeclaration(const CfgEntry *e) { if (itemAccessors) - return TQString::null; + return TQString(); TQString fCap = e->name(); fCap[0] = fCap[0].upper(); return " KConfigSkeleton::Item"+itemType( e->type() ) + " *item" + fCap + - ( (!e->param().isEmpty())?(TQString("[%1]").arg(e->paramMax()+1)) : TQString::null) + + ( (!e->param().isEmpty())?(TQString("[%1]").arg(e->paramMax()+1)) : TQString()) + ";\n"; } @@ -752,7 +752,7 @@ static TQString itemPath(const CfgEntry *e) } TQString newItem( const TQString &type, const TQString &name, const TQString &key, - const TQString &defaultValue, const TQString ¶m = TQString::null) + const TQString &defaultValue, const TQString ¶m = TQString()) { TQString t = "new KConfigSkeleton::Item" + itemType( type ) + "( currentGroup(), " + key + ", " + varPath( name ) + param; @@ -771,7 +771,7 @@ TQString paramString(const TQString &s, const CfgEntry *e, int i) { TQString result = s; TQString needle = "$("+e->param()+")"; - if (result.contains(needle)) + if (result.tqcontains(needle)) { TQString tmp; if (e->paramType() == "Enum") @@ -796,7 +796,7 @@ TQString paramString(const TQString &group, const TQValueList<Param> ¶meters for (TQValueList<Param>::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { - if (paramString.contains("$("+(*it).name+")")) + if (paramString.tqcontains("$("+(*it).name+")")) { TQString tmp; tmp.sprintf("%%%d", i++); @@ -805,13 +805,13 @@ TQString paramString(const TQString &group, const TQValueList<Param> ¶meters } } if (arguments.isEmpty()) - return "TQString::fromLatin1( \""+group+"\" )"; + return "TQString::tqfromLatin1( \""+group+"\" )"; - return "TQString::fromLatin1( \""+paramString+"\" )"+arguments; + return "TQString::tqfromLatin1( \""+paramString+"\" )"+arguments; } /* int i is the value of the parameter */ -TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQString i=TQString::null ) +TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString(), TQString i=TQString() ) { TQString txt; if (itemVarStr.isNull()) itemVarStr=itemPath(e); @@ -883,12 +883,12 @@ TQString memberMutatorBody( CfgEntry *e ) out << "}" << endl << endl; } - out << "if (!" << This << "isImmutable( TQString::fromLatin1( \""; + out << "if (!" << This << "isImmutable( TQString::tqfromLatin1( \""; if (!e->param().isEmpty()) { out << e->paramName().replace("$("+e->param()+")", "%1") << "\" ).arg( "; if ( e->paramType() == "Enum" ) { - out << "TQString::fromLatin1( "; + out << "TQString::tqfromLatin1( "; if (globalEnums) out << enumName(e->param()) << "ToString[i]"; @@ -1249,7 +1249,7 @@ int main( int argc, char **argv ) TQString t = e->type(); // Manipulator - if (allMutators || mutators.contains(n)) + if (allMutators || mutators.tqcontains(n)) { h << " /**" << endl; h << " Set " << e->label() << endl; @@ -1518,7 +1518,7 @@ int main( int argc, char **argv ) cpp << " )" << endl; cpp << " : " << inherits << "("; - if ( !cfgFileName.isEmpty() ) cpp << " TQString::fromLatin1( \"" << cfgFileName << "\" "; + if ( !cfgFileName.isEmpty() ) cpp << " TQString::tqfromLatin1( \"" << cfgFileName << "\" "; if ( cfgFileNameArg ) cpp << " config "; if ( !cfgFileName.isEmpty() ) cpp << ") "; cpp << ")" << endl; @@ -1539,7 +1539,7 @@ int main( int argc, char **argv ) if ( singleton ) cpp << " mSelf = this;" << endl; - group = TQString::null; + group = TQString(); for( e = entries.first(); e; e = entries.next() ) { if ( e->group() != group ) { if ( !group.isEmpty() ) cpp << endl; @@ -1560,7 +1560,7 @@ int main( int argc, char **argv ) for( it = choices.begin(); it != choices.end(); ++it ) { cpp << " {" << endl; cpp << " KConfigSkeleton::ItemEnum::Choice choice;" << endl; - cpp << " choice.name = TQString::fromLatin1( \"" << (*it).name << "\" );" << endl; + cpp << " choice.name = TQString::tqfromLatin1( \"" << (*it).name << "\" );" << endl; if ( setUserTexts ) { if ( !(*it).label.isEmpty() ) cpp << " choice.label = i18n(" << quoteString((*it).label) << ");" << endl; @@ -1592,7 +1592,7 @@ int main( int argc, char **argv ) cpp << " addItem( " << itemPath(e); TQString quotedName = e->name(); addQuotes( quotedName ); - if ( quotedName != key ) cpp << ", TQString::fromLatin1( \"" << e->name() << "\" )"; + if ( quotedName != key ) cpp << ", TQString::tqfromLatin1( \"" << e->name() << "\" )"; cpp << " );" << endl; } else @@ -1621,7 +1621,7 @@ int main( int argc, char **argv ) // param name. The check for isImmutable in the set* functions doesn't have the param // name available, just the corresponding enum value (int), so we need to store the // param names in a separate static list!. - cpp << " addItem( " << itemVarStr << ", TQString::fromLatin1( \""; + cpp << " addItem( " << itemVarStr << ", TQString::tqfromLatin1( \""; if ( e->paramType()=="Enum" ) cpp << e->paramName().replace( "$("+e->param()+")", "%1").arg(e->paramValues()[i] ); else @@ -1642,7 +1642,7 @@ int main( int argc, char **argv ) TQString t = e->type(); // Manipulator - if (allMutators || mutators.contains(n)) + if (allMutators || mutators.tqcontains(n)) { cpp << "void " << setFunction(n, className) << "( "; if (!e->param().isEmpty()) diff --git a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp index 2f8e7eee3..3dd197b34 100644 --- a/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp +++ b/kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp @@ -61,7 +61,7 @@ void KConfigCompiler_Test::testExpectedOutput() // Known to pass test cases while (testCases[ i ]) { - performCompare(TQString::fromLatin1(testCases[ i ])); + performCompare(TQString::tqfromLatin1(testCases[ i ])); ++i; } @@ -69,7 +69,7 @@ void KConfigCompiler_Test::testExpectedOutput() i= 0; while (willFailCases[ i ]) { - performCompare(TQString::fromLatin1(willFailCases[ i ]), true); + performCompare(TQString::tqfromLatin1(willFailCases[ i ]), true); ++i; } } @@ -77,7 +77,7 @@ void KConfigCompiler_Test::testExpectedOutput() void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail) { TQFile file(fileName); - TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref")); + TQFile fileRef(TQString::tqfromLatin1(SRCDIR) + TQString::tqfromLatin1("/") + fileName + TQString::tqfromLatin1(".ref")); if ( file.open(IO_ReadOnly) && fileRef.open(IO_ReadOnly) ) { diff --git a/kdecore/kconfig_compiler/tests/test1.cpp.ref b/kdecore/kconfig_compiler/tests/test1.cpp.ref index b3050921e..f8c4c1189 100644 --- a/kdecore/kconfig_compiler/tests/test1.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test1.cpp.ref @@ -4,66 +4,66 @@ #include "test1.h" Test1::Test1( const TQString & transport, const TQString & folder ) - : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { - setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) ); + setCurrentGroup( TQString::tqfromLatin1( "General-%1" ).arg( mParamfolder ) ); KConfigSkeleton::ItemBool *itemOneOption; - itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true ); - addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) ); + itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "OneOption" ), mOneOption, true ); + addItem( itemOneOption, TQString::tqfromLatin1( "OneOption" ) ); KConfigSkeleton::ItemInt *itemAnotherOption; - itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 ); - addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) ); + itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption, 5 ); + addItem( itemAnotherOption, TQString::tqfromLatin1( "AnotherOption" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "One" ); + choice.name = TQString::tqfromLatin1( "One" ); valuesListOption.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Two" ); + choice.name = TQString::tqfromLatin1( "Two" ); valuesListOption.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Three" ); + choice.name = TQString::tqfromLatin1( "Three" ); valuesListOption.append( choice ); } KConfigSkeleton::ItemEnum *itemListOption; - itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); - addItem( itemListOption, TQString::fromLatin1( "ListOption" ) ); + itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One ); + addItem( itemListOption, TQString::tqfromLatin1( "ListOption" ) ); - setCurrentGroup( TQString::fromLatin1( "MyOptions" ) ); + setCurrentGroup( TQString::tqfromLatin1( "MyOptions" ) ); KConfigSkeleton::ItemString *itemMyString; - itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) ); - addItem( itemMyString, TQString::fromLatin1( "MyString" ) ); + itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "MyString" ), mMyString, TQString::tqfromLatin1( "Default String" ) ); + addItem( itemMyString, TQString::tqfromLatin1( "MyString" ) ); KConfigSkeleton::ItemPath *itemMyPath; - itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") ); - addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) ); + itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::tqfromLatin1(".hidden_file") ); + addItem( itemMyPath, TQString::tqfromLatin1( "MyPath" ) ); KConfigSkeleton::ItemInt *itemAnotherOption2; - itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 ); - addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) ); + itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption2, 10 ); + addItem( itemAnotherOption2, TQString::tqfromLatin1( "AnotherOption2" ) ); TQStringList defaultMyStringList; defaultMyStringList.append( TQString::fromUtf8( "up" ) ); defaultMyStringList.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); - addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) ); + itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); + addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) ); TQStringList defaultMyStringListHidden; defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) ); defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringListHidden; - itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); - addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) ); + itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden ); + addItem( itemMyStringListHidden, TQString::tqfromLatin1( "MyStringListHidden" ) ); KConfigSkeleton::ItemInt *itemMyNumber; - itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); - addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) ); + itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 ); + addItem( itemMyNumber, TQString::tqfromLatin1( "MyNumber" ) ); } Test1::~Test1() diff --git a/kdecore/kconfig_compiler/tests/test1.h.ref b/kdecore/kconfig_compiler/tests/test1.h.ref index cc2d99c69..b5a66b5cd 100644 --- a/kdecore/kconfig_compiler/tests/test1.h.ref +++ b/kdecore/kconfig_compiler/tests/test1.h.ref @@ -24,7 +24,7 @@ class Test1 : public KConfigSkeleton */ void setOneOption( bool v ) { - if (!isImmutable( TQString::fromLatin1( "OneOption" ) )) + if (!isImmutable( TQString::tqfromLatin1( "OneOption" ) )) mOneOption = v; } @@ -41,7 +41,7 @@ class Test1 : public KConfigSkeleton */ void setAnotherOption( int v ) { - if (!isImmutable( TQString::fromLatin1( "AnotherOption" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AnotherOption" ) )) mAnotherOption = v; } @@ -58,7 +58,7 @@ class Test1 : public KConfigSkeleton */ void setListOption( int v ) { - if (!isImmutable( TQString::fromLatin1( "ListOption" ) )) + if (!isImmutable( TQString::tqfromLatin1( "ListOption" ) )) mListOption = v; } @@ -75,7 +75,7 @@ class Test1 : public KConfigSkeleton */ void setMyString( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "MyString" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyString" ) )) mMyString = v; } @@ -92,7 +92,7 @@ class Test1 : public KConfigSkeleton */ void setMyPath( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "MyPath" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyPath" ) )) mMyPath = v; } @@ -109,7 +109,7 @@ class Test1 : public KConfigSkeleton */ void setAnotherOption2( int v ) { - if (!isImmutable( TQString::fromLatin1( "AnotherOption2" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AnotherOption2" ) )) mAnotherOption2 = v; } @@ -126,7 +126,7 @@ class Test1 : public KConfigSkeleton */ void setMyStringList( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyStringList" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) )) mMyStringList = v; } @@ -143,7 +143,7 @@ class Test1 : public KConfigSkeleton */ void setMyStringListHidden( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyStringListHidden" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyStringListHidden" ) )) mMyStringListHidden = v; } @@ -160,7 +160,7 @@ class Test1 : public KConfigSkeleton */ void setMyNumber( int v ) { - if (!isImmutable( TQString::fromLatin1( "MyNumber" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyNumber" ) )) mMyNumber = v; } diff --git a/kdecore/kconfig_compiler/tests/test2.cpp.ref b/kdecore/kconfig_compiler/tests/test2.cpp.ref index 2d56f7545..af8db588d 100644 --- a/kdecore/kconfig_compiler/tests/test2.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test2.cpp.ref @@ -6,90 +6,90 @@ #include <klocale.h> Test2::Test2( ) - : MyPrefs( TQString::fromLatin1( "korganizerrc" ) ) + : MyPrefs( TQString::tqfromLatin1( "korganizerrc" ) ) { - setCurrentGroup( TQString::fromLatin1( "General" ) ); + setCurrentGroup( TQString::tqfromLatin1( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); + mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false ); mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") ); mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") ); - addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) ); - mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 ); + addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) ); + mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 ); mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") ); - addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) ); - mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true ); + addItem( mAutoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) ); + mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), mConfirm, true ); mConfirmItem->setLabel( i18n("Confirm deletes") ); - addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) ); - mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile ); + addItem( mConfirmItem, TQString::tqfromLatin1( "Confirm" ) ); + mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), mArchiveFile ); mArchiveFileItem->setLabel( i18n("Archive File") ); - addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) ); + addItem( mArchiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "standardDestination" ); + choice.name = TQString::tqfromLatin1( "standardDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "askDestination" ); + choice.name = TQString::tqfromLatin1( "askDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl1" ); + choice.name = TQString::tqfromLatin1( "argl1" ); choice.label = i18n("Argl1 Label"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl2" ); + choice.name = TQString::tqfromLatin1( "argl2" ); choice.whatsThis = i18n("Argl2 Whatsthis"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl3" ); + choice.name = TQString::tqfromLatin1( "argl3" ); choice.label = i18n("Argl3 Label"); choice.whatsThis = i18n("Argl3 Whatsthis"); valuesDestination.append( choice ); } - mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination ); + mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination ); mDestinationItem->setLabel( i18n("New Events/Todos Should") ); - addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) ); + addItem( mDestinationItem, TQString::tqfromLatin1( "Destination" ) ); - setCurrentGroup( TQString::fromLatin1( "Views" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Views" ) ); - mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 ); + mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), mHourSize, 10 ); mHourSizeItem->setLabel( i18n("Hour Size") ); - addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) ); - mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); + addItem( mHourSizeItem, TQString::tqfromLatin1( "HourSize" ) ); + mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false ); mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") ); - addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) ); + addItem( mSelectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) ); - setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) ); + setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) ); TQStringList defaultSelectedPlugins; defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) ); - mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); + mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins ); mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") ); - addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) ); + addItem( mSelectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) ); - setCurrentGroup( TQString::fromLatin1( "Colors" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Colors" ) ); - mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) ); + mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) ); mHighlightColorItem->setLabel( i18n("Highlight color") ); - addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) ); - mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) ); + addItem( mHighlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) ); + mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) ); mAgendaBgColorItem->setLabel( i18n("Agenda view background color") ); - addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) ); + addItem( mAgendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) ); - setCurrentGroup( TQString::fromLatin1( "Fonts" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) ); - mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont ); + mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), mTimeBarFont ); mTimeBarFontItem->setLabel( i18n("Time bar") ); - addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) ); + addItem( mTimeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) ); } Test2::~Test2() diff --git a/kdecore/kconfig_compiler/tests/test2.h.ref b/kdecore/kconfig_compiler/tests/test2.h.ref index 6c0a74d66..075f48bde 100644 --- a/kdecore/kconfig_compiler/tests/test2.h.ref +++ b/kdecore/kconfig_compiler/tests/test2.h.ref @@ -21,7 +21,7 @@ class Test2 : public MyPrefs */ void setAutoSave( bool v ) { - if (!isImmutable( TQString::fromLatin1( "AutoSave" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) )) mAutoSave = v; } @@ -46,7 +46,7 @@ class Test2 : public MyPrefs */ void setAutoSaveInterval( int v ) { - if (!isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) )) mAutoSaveInterval = v; } @@ -71,7 +71,7 @@ class Test2 : public MyPrefs */ void setConfirm( bool v ) { - if (!isImmutable( TQString::fromLatin1( "Confirm" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Confirm" ) )) mConfirm = v; } @@ -96,7 +96,7 @@ class Test2 : public MyPrefs */ void setArchiveFile( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "ArchiveFile" ) )) + if (!isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) )) mArchiveFile = v; } @@ -121,7 +121,7 @@ class Test2 : public MyPrefs */ void setDestination( int v ) { - if (!isImmutable( TQString::fromLatin1( "Destination" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Destination" ) )) mDestination = v; } @@ -146,7 +146,7 @@ class Test2 : public MyPrefs */ void setHourSize( int v ) { - if (!isImmutable( TQString::fromLatin1( "HourSize" ) )) + if (!isImmutable( TQString::tqfromLatin1( "HourSize" ) )) mHourSize = v; } @@ -171,7 +171,7 @@ class Test2 : public MyPrefs */ void setSelectionStartsEditor( bool v ) { - if (!isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) )) + if (!isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) )) mSelectionStartsEditor = v; } @@ -196,7 +196,7 @@ class Test2 : public MyPrefs */ void setSelectedPlugins( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "SelectedPlugins" ) )) + if (!isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) )) mSelectedPlugins = v; } @@ -221,7 +221,7 @@ class Test2 : public MyPrefs */ void setHighlightColor( const TQColor & v ) { - if (!isImmutable( TQString::fromLatin1( "HighlightColor" ) )) + if (!isImmutable( TQString::tqfromLatin1( "HighlightColor" ) )) mHighlightColor = v; } @@ -246,7 +246,7 @@ class Test2 : public MyPrefs */ void setAgendaBgColor( const TQColor & v ) { - if (!isImmutable( TQString::fromLatin1( "AgendaBgColor" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) )) mAgendaBgColor = v; } @@ -271,7 +271,7 @@ class Test2 : public MyPrefs */ void setTimeBarFont( const TQFont & v ) { - if (!isImmutable( TQString::fromLatin1( "TimeBarFont" ) )) + if (!isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) )) mTimeBarFont = v; } diff --git a/kdecore/kconfig_compiler/tests/test3.cpp.ref b/kdecore/kconfig_compiler/tests/test3.cpp.ref index 11fe6b38f..a47fd5213 100644 --- a/kdecore/kconfig_compiler/tests/test3.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test3.cpp.ref @@ -6,21 +6,21 @@ using namespace TestNameSpace; Test3::Test3( ) - : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test3rc" ) ) { - setCurrentGroup( TQString::fromLatin1( "General" ) ); + setCurrentGroup( TQString::tqfromLatin1( "General" ) ); - mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false ); - addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) ); + mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false ); + addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) ); - setCurrentGroup( TQString::fromLatin1( "Blah" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Blah" ) ); - mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 ); - addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) ); - mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) ); - addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) ); - mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword ); - addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) ); + mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Blubb" ), mBlubb, 10 ); + addItem( mBlubbItem, TQString::tqfromLatin1( "Blubb" ) ); + mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "BlahBlah" ), mBlahBlah, TQString::tqfromLatin1( "a string" ) ); + addItem( mBlahBlahItem, TQString::tqfromLatin1( "BlahBlah" ) ); + mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::tqfromLatin1( "MyPassword" ), mMyPassword ); + addItem( mMyPasswordItem, TQString::tqfromLatin1( "MyPassword" ) ); } Test3::~Test3() diff --git a/kdecore/kconfig_compiler/tests/test3.h.ref b/kdecore/kconfig_compiler/tests/test3.h.ref index 75b1b0929..8e86d36b0 100644 --- a/kdecore/kconfig_compiler/tests/test3.h.ref +++ b/kdecore/kconfig_compiler/tests/test3.h.ref @@ -20,7 +20,7 @@ class Test3 : public KConfigSkeleton */ void setAutoSave( bool v ) { - if (!isImmutable( TQString::fromLatin1( "AutoSave" ) )) + if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) )) mAutoSave = v; } @@ -45,7 +45,7 @@ class Test3 : public KConfigSkeleton */ void setBlubb( int v ) { - if (!isImmutable( TQString::fromLatin1( "Blubb" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Blubb" ) )) mBlubb = v; } @@ -70,7 +70,7 @@ class Test3 : public KConfigSkeleton */ void setBlahBlah( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "BlahBlah" ) )) + if (!isImmutable( TQString::tqfromLatin1( "BlahBlah" ) )) mBlahBlah = v; } @@ -95,7 +95,7 @@ class Test3 : public KConfigSkeleton */ void setMyPassword( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "MyPassword" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyPassword" ) )) mMyPassword = v; } diff --git a/kdecore/kconfig_compiler/tests/test4.cpp.ref b/kdecore/kconfig_compiler/tests/test4.cpp.ref index 6918a8c8a..0eee21488 100644 --- a/kdecore/kconfig_compiler/tests/test4.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test4.cpp.ref @@ -21,57 +21,57 @@ Test4 *Test4::self() const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" }; Test4::Test4( ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) ) { mSelf = this; - setCurrentGroup( TQString::fromLatin1( "Foo" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; KConfigSkeleton::ItemColor *itemColor[4]; - itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] ); - addItem( itemColor[0], TQString::fromLatin1( "Color0" ) ); - itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] ); - addItem( itemColor[1], TQString::fromLatin1( "Color1" ) ); - itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] ); - addItem( itemColor[2], TQString::fromLatin1( "Color2" ) ); - itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] ); - addItem( itemColor[3], TQString::fromLatin1( "Color3" ) ); + itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] ); + addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) ); + itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] ); + addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) ); + itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] ); + addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) ); + itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] ); + addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Encrypt" ); + choice.name = TQString::tqfromLatin1( "Encrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Decrypt" ); + choice.name = TQString::tqfromLatin1( "Decrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "CrashNBurn" ); + choice.name = TQString::tqfromLatin1( "CrashNBurn" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "PumpNDump" ); + choice.name = TQString::tqfromLatin1( "PumpNDump" ); valuesMouseAction.append( choice ); } KConfigSkeleton::ItemEnum *itemMouseAction[3]; - itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt ); - addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) ); - itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt ); - addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) ); - itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump ); - addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) ); + itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt ); + addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) ); + itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt ); + addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) ); + itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump ); + addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::fromLatin1( "Age" ) ); + addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); } Test4::~Test4() diff --git a/kdecore/kconfig_compiler/tests/test4.h.ref b/kdecore/kconfig_compiler/tests/test4.h.ref index d11dd3aee..dc8691b1f 100644 --- a/kdecore/kconfig_compiler/tests/test4.h.ref +++ b/kdecore/kconfig_compiler/tests/test4.h.ref @@ -30,7 +30,7 @@ class Test4 : public KConfigSkeleton static void setColor( int i, const TQColor & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) )) self()->mColor[i] = v; } @@ -49,7 +49,7 @@ class Test4 : public KConfigSkeleton static void setMouseAction( int i, int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButton::enumToString[i] ) ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButton::enumToString[i] ) ) )) self()->mMouseAction[i] = v; } @@ -68,7 +68,7 @@ class Test4 : public KConfigSkeleton static void setFooBar( const TQString & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) )) self()->mFooBar = v; } @@ -99,7 +99,7 @@ class Test4 : public KConfigSkeleton v = 88; } - if (!self()->isImmutable( TQString::fromLatin1( "Age" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) )) self()->mAge = v; } diff --git a/kdecore/kconfig_compiler/tests/test5.cpp.ref b/kdecore/kconfig_compiler/tests/test5.cpp.ref index 8373eb3f6..0fc90b387 100644 --- a/kdecore/kconfig_compiler/tests/test5.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test5.cpp.ref @@ -21,57 +21,57 @@ Test5 *Test5::self() const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" }; Test5::Test5( ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) ) { mSelf = this; - setCurrentGroup( TQString::fromLatin1( "Foo" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black }; KConfigSkeleton::ItemColor *itemColor[4]; - itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] ); - addItem( itemColor[0], TQString::fromLatin1( "Color0" ) ); - itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] ); - addItem( itemColor[1], TQString::fromLatin1( "Color1" ) ); - itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] ); - addItem( itemColor[2], TQString::fromLatin1( "Color2" ) ); - itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] ); - addItem( itemColor[3], TQString::fromLatin1( "Color3" ) ); + itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] ); + addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) ); + itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] ); + addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) ); + itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] ); + addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) ); + itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] ); + addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Encrypt" ); + choice.name = TQString::tqfromLatin1( "Encrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "Decrypt" ); + choice.name = TQString::tqfromLatin1( "Decrypt" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "CrashNBurn" ); + choice.name = TQString::tqfromLatin1( "CrashNBurn" ); valuesMouseAction.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "PumpNDump" ); + choice.name = TQString::tqfromLatin1( "PumpNDump" ); valuesMouseAction.append( choice ); } KConfigSkeleton::ItemEnum *itemMouseAction[3]; - itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt ); - addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) ); - itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt ); - addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) ); - itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump ); - addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) ); + itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt ); + addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) ); + itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt ); + addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) ); + itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump ); + addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::fromLatin1( "Age" ) ); + addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); } Test5::~Test5() diff --git a/kdecore/kconfig_compiler/tests/test5.h.ref b/kdecore/kconfig_compiler/tests/test5.h.ref index efb9b448a..9fadbd0ec 100644 --- a/kdecore/kconfig_compiler/tests/test5.h.ref +++ b/kdecore/kconfig_compiler/tests/test5.h.ref @@ -22,7 +22,7 @@ class Test5 : public KConfigSkeleton static void setColor( int i, const TQColor & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) )) self()->mColor[i] = v; } @@ -41,7 +41,7 @@ class Test5 : public KConfigSkeleton static void setMouseAction( int i, int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButtonToString[i] ) ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButtonToString[i] ) ) )) self()->mMouseAction[i] = v; } @@ -60,7 +60,7 @@ class Test5 : public KConfigSkeleton static void setFooBar( const TQString & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) )) self()->mFooBar = v; } @@ -91,7 +91,7 @@ class Test5 : public KConfigSkeleton v = 88; } - if (!self()->isImmutable( TQString::fromLatin1( "Age" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) )) self()->mAge = v; } diff --git a/kdecore/kconfig_compiler/tests/test6.cpp.ref b/kdecore/kconfig_compiler/tests/test6.cpp.ref index 51b96d4c4..2b8a71d50 100644 --- a/kdecore/kconfig_compiler/tests/test6.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test6.cpp.ref @@ -4,25 +4,25 @@ #include "test6.h" Test6::Test6( const TQString & Number ) - : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) ) , mParamNumber(Number) { - setCurrentGroup( TQString::fromLatin1( "Foo" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); - addItem( itemColor, TQString::fromLatin1( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); + addItem( itemColor, TQString::tqfromLatin1( "Color" ) ); - setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) ); + setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::fromLatin1( "Age" ) ); + addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); } Test6::~Test6() diff --git a/kdecore/kconfig_compiler/tests/test6.h.ref b/kdecore/kconfig_compiler/tests/test6.h.ref index 6743d6064..18615da38 100644 --- a/kdecore/kconfig_compiler/tests/test6.h.ref +++ b/kdecore/kconfig_compiler/tests/test6.h.ref @@ -18,7 +18,7 @@ class Test6 : public KConfigSkeleton */ void setColor( const TQColor & v ) { - if (!isImmutable( TQString::fromLatin1( "Color" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Color" ) )) mColor = v; } @@ -35,7 +35,7 @@ class Test6 : public KConfigSkeleton */ void setFooBar( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "FooBar" ) )) + if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) )) mFooBar = v; } @@ -64,7 +64,7 @@ class Test6 : public KConfigSkeleton v = 88; } - if (!isImmutable( TQString::fromLatin1( "Age" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Age" ) )) mAge = v; } diff --git a/kdecore/kconfig_compiler/tests/test7.cpp.ref b/kdecore/kconfig_compiler/tests/test7.cpp.ref index 91a22e036..dab0ae27d 100644 --- a/kdecore/kconfig_compiler/tests/test7.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test7.cpp.ref @@ -4,25 +4,25 @@ #include "test7.h" Test7::Test7( int Number ) - : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "test7rc" ) ) , mParamNumber(Number) { - setCurrentGroup( TQString::fromLatin1( "Foo" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Foo" ) ); KConfigSkeleton::ItemColor *itemColor; - itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); - addItem( itemColor, TQString::fromLatin1( "Color" ) ); + itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) ); + addItem( itemColor, TQString::tqfromLatin1( "Color" ) ); - setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) ); + setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) ); KConfigSkeleton::ItemString *itemFooBar; - itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar ); - addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) ); + itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar ); + addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) ); KConfigSkeleton::ItemInt *itemAge; - itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 ); + itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 ); itemAge->setMinValue(8); itemAge->setMaxValue(88); - addItem( itemAge, TQString::fromLatin1( "Age" ) ); + addItem( itemAge, TQString::tqfromLatin1( "Age" ) ); } Test7::~Test7() diff --git a/kdecore/kconfig_compiler/tests/test7.h.ref b/kdecore/kconfig_compiler/tests/test7.h.ref index 8f8808da1..f67bc30cb 100644 --- a/kdecore/kconfig_compiler/tests/test7.h.ref +++ b/kdecore/kconfig_compiler/tests/test7.h.ref @@ -18,7 +18,7 @@ class Test7 : public KConfigSkeleton */ void setColor( const TQColor & v ) { - if (!isImmutable( TQString::fromLatin1( "Color" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Color" ) )) mColor = v; } @@ -35,7 +35,7 @@ class Test7 : public KConfigSkeleton */ void setFooBar( const TQString & v ) { - if (!isImmutable( TQString::fromLatin1( "FooBar" ) )) + if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) )) mFooBar = v; } @@ -64,7 +64,7 @@ class Test7 : public KConfigSkeleton v = 88; } - if (!isImmutable( TQString::fromLatin1( "Age" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Age" ) )) mAge = v; } diff --git a/kdecore/kconfig_compiler/tests/test8a.cpp.ref b/kdecore/kconfig_compiler/tests/test8a.cpp.ref index f89b7c133..8d8925c57 100644 --- a/kdecore/kconfig_compiler/tests/test8a.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test8a.cpp.ref @@ -6,14 +6,14 @@ Test8a::Test8a( KSharedConfig::Ptr config ) : KConfigSkeleton( config ) { - setCurrentGroup( TQString::fromLatin1( "Group" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Group" ) ); KConfigSkeleton::ItemFont *itemFont; - itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() ); - addItem( itemFont, TQString::fromLatin1( "Font" ) ); + itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() ); + addItem( itemFont, TQString::tqfromLatin1( "Font" ) ); KConfigSkeleton::ItemFont *itemTitleFont; - itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() ); - addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) ); + itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() ); + addItem( itemTitleFont, TQString::tqfromLatin1( "TitleFont" ) ); } Test8a::~Test8a() diff --git a/kdecore/kconfig_compiler/tests/test8a.h.ref b/kdecore/kconfig_compiler/tests/test8a.h.ref index 2e947c437..a1ac4de64 100644 --- a/kdecore/kconfig_compiler/tests/test8a.h.ref +++ b/kdecore/kconfig_compiler/tests/test8a.h.ref @@ -19,7 +19,7 @@ class Test8a : public KConfigSkeleton */ void setFont( const TQFont & v ) { - if (!isImmutable( TQString::fromLatin1( "Font" ) )) + if (!isImmutable( TQString::tqfromLatin1( "Font" ) )) mFont = v; } @@ -36,7 +36,7 @@ class Test8a : public KConfigSkeleton */ void setTitleFont( const TQFont & v ) { - if (!isImmutable( TQString::fromLatin1( "TitleFont" ) )) + if (!isImmutable( TQString::tqfromLatin1( "TitleFont" ) )) mTitleFont = v; } diff --git a/kdecore/kconfig_compiler/tests/test8b.cpp.ref b/kdecore/kconfig_compiler/tests/test8b.cpp.ref index e29e3c4e7..566902399 100644 --- a/kdecore/kconfig_compiler/tests/test8b.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test8b.cpp.ref @@ -22,20 +22,20 @@ Test8b::Test8b( ) : Test8a() { mSelf = this; - setCurrentGroup( TQString::fromLatin1( "Group8b1" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Group8b1" ) ); KConfigSkeleton::ItemUInt *itemSomething; - itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 ); - addItem( itemSomething, TQString::fromLatin1( "Something" ) ); + itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Something" ), mSomething, 60 ); + addItem( itemSomething, TQString::tqfromLatin1( "Something" ) ); - setCurrentGroup( TQString::fromLatin1( "Group8b2" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Group8b2" ) ); KConfigSkeleton::ItemBool *itemFooBoo; - itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false ); - addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) ); + itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "FooBoo" ), mFooBoo, false ); + addItem( itemFooBoo, TQString::tqfromLatin1( "FooBoo" ) ); KConfigSkeleton::ItemUInt *itemPort; - itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 ); - addItem( itemPort, TQString::fromLatin1( "Port" ) ); + itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Port" ), mPort, 1000 ); + addItem( itemPort, TQString::tqfromLatin1( "Port" ) ); } Test8b::~Test8b() diff --git a/kdecore/kconfig_compiler/tests/test8b.h.ref b/kdecore/kconfig_compiler/tests/test8b.h.ref index 4ca0d5c7f..dfc9089e3 100644 --- a/kdecore/kconfig_compiler/tests/test8b.h.ref +++ b/kdecore/kconfig_compiler/tests/test8b.h.ref @@ -21,7 +21,7 @@ class Test8b : public Test8a static void setSomething( uint v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Something" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Something" ) )) self()->mSomething = v; } @@ -40,7 +40,7 @@ class Test8b : public Test8a static void setFooBoo( bool v ) { - if (!self()->isImmutable( TQString::fromLatin1( "FooBoo" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "FooBoo" ) )) self()->mFooBoo = v; } @@ -59,7 +59,7 @@ class Test8b : public Test8a static void setPort( uint v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Port" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Port" ) )) self()->mPort = v; } diff --git a/kdecore/kconfig_compiler/tests/test9.cpp.ref b/kdecore/kconfig_compiler/tests/test9.cpp.ref index c5d57e4d1..606f21ed1 100644 --- a/kdecore/kconfig_compiler/tests/test9.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test9.cpp.ref @@ -4,29 +4,29 @@ #include "test9.h" Test9::Test9( const TQString & transport, const TQString & folder ) - : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) ) , mParamtransport(transport) , mParamfolder(folder) { - setCurrentGroup( TQString::fromLatin1( "MyOptionsXX" ) ); + setCurrentGroup( TQString::tqfromLatin1( "MyOptionsXX" ) ); TQStringList defaultMyStringList; defaultMyStringList.append( TQString::fromUtf8( "up" ) ); defaultMyStringList.append( TQString::fromUtf8( "down" ) ); KConfigSkeleton::ItemStringList *itemMyStringList; - itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); - addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) ); + itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList ); + addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) ); TQStringList defaultMyPathList; defaultMyPathList.append( TQString::fromUtf8( "/home" ) ); defaultMyPathList.append( TQString::fromUtf8( "~" ) ); KConfigSkeleton::ItemPathList *itemMyPathList; - itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList ); - addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) ); + itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList ); + addItem( itemMyPathList, TQString::tqfromLatin1( "MyPathList" ) ); KConfigSkeleton::ItemPathList *itemMyPathsList2; - itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() ); - addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) ); + itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::tqfromLatin1("/usr/bin")) += TQDir::homeDirPath() ); + addItem( itemMyPathsList2, TQString::tqfromLatin1( "MyPathsList2" ) ); } Test9::~Test9() diff --git a/kdecore/kconfig_compiler/tests/test9.h.ref b/kdecore/kconfig_compiler/tests/test9.h.ref index 66a629b48..0476c8a19 100644 --- a/kdecore/kconfig_compiler/tests/test9.h.ref +++ b/kdecore/kconfig_compiler/tests/test9.h.ref @@ -19,7 +19,7 @@ class Test9 : public KConfigSkeleton */ void setMyStringList( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyStringList" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) )) mMyStringList = v; } @@ -36,7 +36,7 @@ class Test9 : public KConfigSkeleton */ void setMyPathList( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyPathList" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyPathList" ) )) mMyPathList = v; } @@ -53,7 +53,7 @@ class Test9 : public KConfigSkeleton */ void setMyPathsList2( const TQStringList & v ) { - if (!isImmutable( TQString::fromLatin1( "MyPathsList2" ) )) + if (!isImmutable( TQString::tqfromLatin1( "MyPathsList2" ) )) mMyPathsList2 = v; } diff --git a/kdecore/kconfig_compiler/tests/test9main.cpp b/kdecore/kconfig_compiler/tests/test9main.cpp index 12e16e0d4..796ec0001 100644 --- a/kdecore/kconfig_compiler/tests/test9main.cpp +++ b/kdecore/kconfig_compiler/tests/test9main.cpp @@ -32,7 +32,7 @@ int main( int, char*[] ) kdWarning() << myPathsList2 << endl; // add another path - TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.kde"); + TQStringList newlist = TQDir::homeDirPath() + TQString::tqfromLatin1("/.kde"); myPathsList2 = myPathsList2 + newlist; kdWarning() << myPathsList2 << endl; diff --git a/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref index 7b5f55f03..00e933564 100644 --- a/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref +++ b/kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref @@ -60,97 +60,97 @@ TestDPointer *TestDPointer::self() } TestDPointer::TestDPointer( ) - : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) ) + : KConfigSkeleton( TQString::tqfromLatin1( "korganizerrc" ) ) { d = new TestDPointerPrivate; mSelf = this; - setCurrentGroup( TQString::fromLatin1( "General" ) ); + setCurrentGroup( TQString::tqfromLatin1( "General" ) ); - d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false ); + d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), d->autoSave, false ); d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") ); d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") ); - addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) ); - d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 ); + addItem( d->autoSaveItem, TQString::tqfromLatin1( "AutoSave" ) ); + d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 ); d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") ); - addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) ); - d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true ); + addItem( d->autoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) ); + d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), d->confirm, true ); d->confirmItem->setLabel( i18n("Confirm deletes") ); - addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) ); - d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile ); + addItem( d->confirmItem, TQString::tqfromLatin1( "Confirm" ) ); + d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), d->archiveFile ); d->archiveFileItem->setLabel( i18n("Archive File") ); - addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) ); + addItem( d->archiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) ); TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination; { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "standardDestination" ); + choice.name = TQString::tqfromLatin1( "standardDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "askDestination" ); + choice.name = TQString::tqfromLatin1( "askDestination" ); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl1" ); + choice.name = TQString::tqfromLatin1( "argl1" ); choice.label = i18n("Argl1 Label"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl2" ); + choice.name = TQString::tqfromLatin1( "argl2" ); choice.whatsThis = i18n("Argl2 Whatsthis"); valuesDestination.append( choice ); } { KConfigSkeleton::ItemEnum::Choice choice; - choice.name = TQString::fromLatin1( "argl3" ); + choice.name = TQString::tqfromLatin1( "argl3" ); choice.label = i18n("Argl3 Label"); choice.whatsThis = i18n("Argl3 Whatsthis"); valuesDestination.append( choice ); } - d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); + d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination ); d->destinationItem->setLabel( i18n("New Events/Todos Should") ); - addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) ); + addItem( d->destinationItem, TQString::tqfromLatin1( "Destination" ) ); - setCurrentGroup( TQString::fromLatin1( "Views" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Views" ) ); - d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 ); + d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), d->hourSize, 10 ); d->hourSizeItem->setLabel( i18n("Hour Size") ); - addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) ); - d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); + addItem( d->hourSizeItem, TQString::tqfromLatin1( "HourSize" ) ); + d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false ); d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") ); - addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) ); + addItem( d->selectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) ); - setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) ); + setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) ); TQStringList defaultSelectedPlugins; defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) ); defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) ); - d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); + d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins ); d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") ); - addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) ); + addItem( d->selectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) ); - setCurrentGroup( TQString::fromLatin1( "Colors" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Colors" ) ); - d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) ); + d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) ); d->highlightColorItem->setLabel( i18n("Highlight color") ); - addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) ); - d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) ); + addItem( d->highlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) ); + d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) ); d->agendaBgColorItem->setLabel( i18n("Agenda view background color") ); - addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) ); + addItem( d->agendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) ); - setCurrentGroup( TQString::fromLatin1( "Fonts" ) ); + setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) ); - d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont ); + d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), d->timeBarFont ); d->timeBarFontItem->setLabel( i18n("Time bar") ); - addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) ); + addItem( d->timeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) ); } void TestDPointer::setAutoSave( bool v ) { - if (!self()->isImmutable( TQString::fromLatin1( "AutoSave" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSave" ) )) self()->d->autoSave = v; } @@ -167,7 +167,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem() void TestDPointer::setAutoSaveInterval( int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) )) self()->d->autoSaveInterval = v; } @@ -184,7 +184,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem() void TestDPointer::setConfirm( bool v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Confirm" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Confirm" ) )) self()->d->confirm = v; } @@ -201,7 +201,7 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem() void TestDPointer::setArchiveFile( const TQString & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "ArchiveFile" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) )) self()->d->archiveFile = v; } @@ -218,7 +218,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem() void TestDPointer::setDestination( int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "Destination" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "Destination" ) )) self()->d->destination = v; } @@ -235,7 +235,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem() void TestDPointer::setHourSize( int v ) { - if (!self()->isImmutable( TQString::fromLatin1( "HourSize" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "HourSize" ) )) self()->d->hourSize = v; } @@ -252,7 +252,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem() void TestDPointer::setSelectionStartsEditor( bool v ) { - if (!self()->isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) )) self()->d->selectionStartsEditor = v; } @@ -269,7 +269,7 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem() void TestDPointer::setSelectedPlugins( const TQStringList & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "SelectedPlugins" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) )) self()->d->selectedPlugins = v; } @@ -286,7 +286,7 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem() void TestDPointer::setHighlightColor( const TQColor & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "HighlightColor" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "HighlightColor" ) )) self()->d->highlightColor = v; } @@ -303,7 +303,7 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem() void TestDPointer::setAgendaBgColor( const TQColor & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "AgendaBgColor" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) )) self()->d->agendaBgColor = v; } @@ -320,7 +320,7 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem() void TestDPointer::setTimeBarFont( const TQFont & v ) { - if (!self()->isImmutable( TQString::fromLatin1( "TimeBarFont" ) )) + if (!self()->isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) )) self()->d->timeBarFont = v; } diff --git a/kdecore/kconfigbackend.cpp b/kdecore/kconfigbackend.cpp index 234124820..192ef9b20 100644 --- a/kdecore/kconfigbackend.cpp +++ b/kdecore/kconfigbackend.cpp @@ -114,8 +114,8 @@ static TQCString printableToString(const char *str, int l) static TQCString stringToPrintable(const TQCString& str){ TQCString result(str.length()*2); // Maximum 2x as long as source string - register char *r = result.data(); - register char *s = str.data(); + register char *r = const_cast<TQCString&>(result).data(); + register char *s = const_cast<TQCString&>(str).data(); if (!s) return TQCString(""); @@ -198,8 +198,8 @@ static TQCString encodeGroup(const TQCString &str) { int l = str.length(); TQCString result(l*2+1); - register char *r = result.data(); - register char *s = str.data(); + register char *r = const_cast<TQCString&>(result).data(); + register char *s = const_cast<TQCString&>(str).data(); while(l) { if ((*s == '[') || (*s == ']')) @@ -256,7 +256,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName, if (useKDEGlobals) mGlobalFileName = KGlobal::dirs()->saveLocation("config") + - TQString::fromLatin1("kdeglobals"); + TQString::tqfromLatin1("kdeglobals"); else mGlobalFileName = TQString::null; @@ -347,19 +347,19 @@ bool KConfigINIBackEnd::parseConfigFiles() // Parse the general config files if (useKDEGlobals) { TQStringList kdercs = KGlobal::dirs()-> - findAllResources("config", TQString::fromLatin1("kdeglobals")); + findAllResources("config", TQString::tqfromLatin1("kdeglobals")); #ifdef Q_WS_WIN TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" ); #else - TQString etc_kderc = TQString::fromLatin1("/etc/kderc"); + TQString etc_kderc = TQString::tqfromLatin1("/etc/kderc"); #endif if (checkAccess(etc_kderc, R_OK)) kdercs += etc_kderc; kdercs += KGlobal::dirs()-> - findAllResources("config", TQString::fromLatin1("system.kdeglobals")); + findAllResources("config", TQString::tqfromLatin1("system.kdeglobals")); TQStringList::ConstIterator it; @@ -999,7 +999,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal, const KEntry ¤tEntry = *aIt; if(aIt.key().bDefault) { - aTempMap.replace(aIt.key(), currentEntry); + aTempMap.tqreplace(aIt.key(), currentEntry); continue; } @@ -1017,7 +1017,7 @@ bool KConfigINIBackEnd::getEntryMap(KEntryMap &aTempMap, bool bGlobal, // put this entry from the config object into the // temporary map, possibly replacing an existing entry - KEntryMapIterator aIt2 = aTempMap.find(aIt.key()); + KEntryMapIterator aIt2 = aTempMap.tqfind(aIt.key()); if (aIt2 != aTempMap.end() && (*aIt2).bImmutable) continue; // Bail out if the on-disk entry is immutable diff --git a/kdecore/kconfigbase.cpp b/kdecore/kconfigbase.cpp index 1cbe1f3ab..8319e3aa1 100644 --- a/kdecore/kconfigbase.cpp +++ b/kdecore/kconfigbase.cpp @@ -272,7 +272,7 @@ TQString KConfigBase::readEntry( const char *pKey, if( expand || bExpand ) { // check for environment variables and make necessary translations - int nDollarPos = aValue.find( '$' ); + int nDollarPos = aValue.tqfind( '$' ); while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) { // there is at least one $ @@ -328,7 +328,7 @@ TQString KConfigBase::readEntry( const char *pKey, aValue.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = aValue.find( '$', nDollarPos ); + nDollarPos = aValue.tqfind( '$', nDollarPos ); } } @@ -423,7 +423,7 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey, case TQVariant::DateTime: return TQVariant( readDateTimeEntry( pKey, &tmp.asDateTime() ) ); case TQVariant::Date: - return TQVariant(readDateTimeEntry( pKey, &tmp.asDateTime() ).date()); + return TQVariant(TQT_TQDATE_OBJECT(readDateTimeEntry( pKey, &tmp.asDateTime() ).date())); case TQVariant::Pixmap: case TQVariant::Image: @@ -457,7 +457,7 @@ TQVariant KConfigBase::readPropertyEntry( const char *pKey, case TQVariant::RegExp: case TQVariant::Hash: case TQVariant::TextLength: - case TQVariant::TextFormat: + case QVariant::TextFormat: case TQVariant::Matrix: case TQVariant::Transform: case TQVariant::Matrix4x4: @@ -697,12 +697,12 @@ unsigned long KConfigBase::readUnsignedLongNumEntry( const char *pKey, unsigned } } -Q_INT64 KConfigBase::readNum64Entry( const TQString& pKey, Q_INT64 nDefault) const +TQ_INT64 KConfigBase::readNum64Entry( const TQString& pKey, TQ_INT64 nDefault) const { return readNum64Entry(pKey.utf8().data(), nDefault); } -Q_INT64 KConfigBase::readNum64Entry( const char *pKey, Q_INT64 nDefault) const +TQ_INT64 KConfigBase::readNum64Entry( const char *pKey, TQ_INT64 nDefault) const { // Note that TQCString::toLongLong() is missing, we muse use a TQString instead. TQString aValue = readEntry( pKey ); @@ -711,18 +711,18 @@ Q_INT64 KConfigBase::readNum64Entry( const char *pKey, Q_INT64 nDefault) const else { bool ok; - Q_INT64 rc = aValue.toLongLong( &ok ); + TQ_INT64 rc = aValue.toLongLong( &ok ); return( ok ? rc : nDefault ); } } -Q_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, Q_UINT64 nDefault) const +TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault) const { return readUnsignedNum64Entry(pKey.utf8().data(), nDefault); } -Q_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, Q_UINT64 nDefault) const +TQ_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault) const { // Note that TQCString::toULongLong() is missing, we muse use a TQString instead. TQString aValue = readEntry( pKey ); @@ -731,7 +731,7 @@ Q_UINT64 KConfigBase::readUnsignedNum64Entry( const char *pKey, Q_UINT64 nDefaul else { bool ok; - Q_UINT64 rc = aValue.toULongLong( &ok ); + TQ_UINT64 rc = aValue.toULongLong( &ok ); return( ok ? rc : nDefault ); } } @@ -793,7 +793,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co TQString aValue = readEntry( pKey ); if( !aValue.isNull() ) { - if ( aValue.contains( ',' ) > 5 ) { + if ( aValue.tqcontains( ',' ) > 5 ) { // KDE3 and upwards entry if ( !aRetFont.fromString( aValue ) && pDefault ) aRetFont = *pDefault; @@ -802,7 +802,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co // backward compatibility with older font formats // ### remove KDE 3.1 ? // find first part (font family) - int nIndex = aValue.find( ',' ); + int nIndex = aValue.tqfind( ',' ); if( nIndex == -1 ){ if( pDefault ) aRetFont = *pDefault; @@ -812,7 +812,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co // find second part (point size) int nOldIndex = nIndex; - nIndex = aValue.find( ',', nOldIndex+1 ); + nIndex = aValue.tqfind( ',', nOldIndex+1 ); if( nIndex == -1 ){ if( pDefault ) aRetFont = *pDefault; @@ -824,7 +824,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co // find third part (style hint) nOldIndex = nIndex; - nIndex = aValue.find( ',', nOldIndex+1 ); + nIndex = aValue.tqfind( ',', nOldIndex+1 ); if( nIndex == -1 ){ if( pDefault ) @@ -836,7 +836,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co // find fourth part (char set) nOldIndex = nIndex; - nIndex = aValue.find( ',', nOldIndex+1 ); + nIndex = aValue.tqfind( ',', nOldIndex+1 ); if( nIndex == -1 ){ if( pDefault ) @@ -848,7 +848,7 @@ TQFont KConfigBase::readFontEntry( const char *pKey, const TQFont* pDefault ) co nIndex-nOldIndex-1 ); // find fifth part (weight) nOldIndex = nIndex; - nIndex = aValue.find( ',', nOldIndex+1 ); + nIndex = aValue.tqfind( ',', nOldIndex+1 ); if( nIndex == -1 ){ if( pDefault ) @@ -979,7 +979,7 @@ TQColor KConfigBase::readColorEntry( const char *pKey, bool bOK; // find first part (red) - int nIndex = aValue.find( ',' ); + int nIndex = aValue.tqfind( ',' ); if( nIndex == -1 ){ // return a sensible default -- Bernd @@ -992,7 +992,7 @@ TQColor KConfigBase::readColorEntry( const char *pKey, // find second part (green) int nOldIndex = nIndex; - nIndex = aValue.find( ',', nOldIndex+1 ); + nIndex = aValue.tqfind( ',', nOldIndex+1 ); if( nIndex == -1 ){ // return a sensible default -- Bernd @@ -1025,7 +1025,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey, return readDateTimeEntry(pKey.utf8().data(), pDefault); } -// ### currentDateTime() as fallback ? (Harri) +// ### tqcurrentDateTime() as fallback ? (Harri) TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, const TQDateTime* pDefault ) const { @@ -1034,7 +1034,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, if( pDefault ) return *pDefault; else - return TQDateTime::currentDateTime(); + return TQDateTime::tqcurrentDateTime(); } TQStrList list; @@ -1048,7 +1048,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, return TQDateTime( date, time ); } - return TQDateTime::currentDateTime(); + return TQDateTime::tqcurrentDateTime(); } void KConfigBase::writeEntry( const TQString& pKey, const TQString& value, @@ -1121,7 +1121,7 @@ static bool cleanHomeDirPath( TQString &path, const TQString &homeDir ) unsigned int len = homeDir.length(); // replace by "$HOME" if possible if (len && (path.length() == len || path[len] == '/')) { - path.replace(0, len, TQString::fromLatin1("$HOME")); + path.replace(0, len, TQString::tqfromLatin1("$HOME")); return true; } else return false; @@ -1135,7 +1135,7 @@ static TQString translatePath( TQString path ) // only "our" $HOME should be interpreted path.replace('$', "$$"); - bool startsWithFile = path.startsWith("file:", false); + bool startsWithFile = path.tqstartsWith("file:", false); // return original path, if it refers to another type of URL (e.g. http:/), or // if the path is already relative to another directory @@ -1189,7 +1189,7 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQStringList new_list; @@ -1373,7 +1373,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQVariant &prop, case TQVariant::RegExp: case TQVariant::Hash: case TQVariant::TextLength: - case TQVariant::TextFormat: + case QVariant::TextFormat: case TQVariant::Matrix: case TQVariant::Transform: case TQVariant::Matrix4x4: @@ -1402,7 +1402,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQString str_list; @@ -1449,7 +1449,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, { if( list.isEmpty() ) { - writeEntry( pKey, TQString::fromLatin1(""), bPersistent ); + writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent ); return; } TQString str_list; @@ -1548,14 +1548,14 @@ void KConfigBase::writeEntry( const char *pKey, unsigned long nValue, writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const TQString& pKey, Q_INT64 nValue, +void KConfigBase::writeEntry( const TQString& pKey, TQ_INT64 nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, Q_INT64 nValue, +void KConfigBase::writeEntry( const char *pKey, TQ_INT64 nValue, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1563,14 +1563,14 @@ void KConfigBase::writeEntry( const char *pKey, Q_INT64 nValue, } -void KConfigBase::writeEntry( const TQString& pKey, Q_UINT64 nValue, +void KConfigBase::writeEntry( const TQString& pKey, TQ_UINT64 nValue, bool bPersistent, bool bGlobal, bool bNLS ) { writeEntry( pKey, TQString::number(nValue), bPersistent, bGlobal, bNLS ); } -void KConfigBase::writeEntry( const char *pKey, Q_UINT64 nValue, +void KConfigBase::writeEntry( const char *pKey, TQ_UINT64 nValue, bool bPersistent, bool bGlobal, bool bNLS ) { @@ -1631,7 +1631,7 @@ void KConfigBase::writeEntry( const char *pKey, const TQFont& rFont, bool bPersistent, bool bGlobal, bool bNLS ) { - writeEntry( pKey, rFont.toString(), bPersistent, bGlobal, bNLS ); + writeEntry( pKey, TQString(rFont.toString()), bPersistent, bGlobal, bNLS ); } @@ -1732,8 +1732,8 @@ void KConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime, TQStrList list; TQCString tempstr; - TQTime time = rDateTime.time(); - TQDate date = rDateTime.date(); + TQTime time = TQT_TQTIME_OBJECT(rDateTime.time()); + TQDate date = TQT_TQDATE_OBJECT(rDateTime.date()); list.insert( 0, tempstr.setNum( date.year() ) ); list.insert( 1, tempstr.setNum( date.month() ) ); diff --git a/kdecore/kconfigbase.h b/kdecore/kconfigbase.h index cc7ad8ffe..4f3dd545b 100644 --- a/kdecore/kconfigbase.h +++ b/kdecore/kconfigbase.h @@ -67,9 +67,10 @@ class KConfigGroup; * @see KSimpleConfig * @see KSharedConfig */ -class KDECORE_EXPORT KConfigBase : public QObject +class KDECORE_EXPORT KConfigBase : public TQObject { Q_OBJECT + TQ_OBJECT friend class KConfigBackEnd; friend class KConfigINIBackEnd; @@ -461,7 +462,7 @@ public: * the read value cannot be interpreted. * @return The value for this key. */ - Q_INT64 readNum64Entry( const TQString& pKey, Q_INT64 nDefault = 0 ) const; + TQ_INT64 readNum64Entry( const TQString& pKey, TQ_INT64 nDefault = 0 ) const; /** * Reads a 64-bit numerical value. @@ -474,7 +475,7 @@ public: * the read value cannot be interpreted. * @return The value for this key. */ - Q_INT64 readNum64Entry( const char *pKey, Q_INT64 nDefault = 0 ) const; + TQ_INT64 readNum64Entry( const char *pKey, TQ_INT64 nDefault = 0 ) const; /** * Read an 64-bit unsigned numerical value. @@ -487,7 +488,7 @@ public: * the read value cannot be interpreted. * @return The value for this key. */ - Q_UINT64 readUnsignedNum64Entry( const TQString& pKey, Q_UINT64 nDefault = 0 ) const; + TQ_UINT64 readUnsignedNum64Entry( const TQString& pKey, TQ_UINT64 nDefault = 0 ) const; /** * Read an 64-bit unsigned numerical value. @@ -500,7 +501,7 @@ public: * the read value cannot be interpreted. * @return The value for this key. */ - Q_UINT64 readUnsignedNum64Entry( const char *pKey, Q_UINT64 nDefault = 0 ) const; + TQ_UINT64 readUnsignedNum64Entry( const char *pKey, TQ_UINT64 nDefault = 0 ) const; /** * Reads a floating point value. @@ -692,7 +693,7 @@ public: * and interpret it as a date and time. * * @param pKey The key to search for. - * @param pDefault A default value ( currentDateTime() by default) + * @param pDefault A default value ( tqcurrentDateTime() by default) * returned if the key was not found or if the read value cannot be * interpreted. * @return The value for this key. @@ -706,7 +707,7 @@ public: * and interpret it as a date and time. * * @param pKey The key to search for. - * @param pDefault A default value ( currentDateTime() by default) + * @param pDefault A default value ( tqcurrentDateTime() by default) * returned if the key was not found or if the read value cannot be * interpreted. * @return The value for this key. @@ -978,7 +979,7 @@ public: void writeEntry( const TQString& pKey, const char *pValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ) - { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); } + { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); } /** * Write a (key/value) pair. * @@ -999,7 +1000,7 @@ public: void writeEntry( const char *pKey, const char *pValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ) - { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); } + { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); } /** * Write a (key/value) pair. @@ -1159,7 +1160,7 @@ public: * @param bNLS If @p bNLS is true, the locale tag is added to the key * when writing it back. */ - void writeEntry( const TQString& pKey, Q_INT64 nValue, + void writeEntry( const TQString& pKey, TQ_INT64 nValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ); /** @@ -1176,7 +1177,7 @@ public: * @param bNLS If @p bNLS is true, the locale tag is added to the key * when writing it back. */ - void writeEntry( const char *pKey, Q_INT64 nValue, + void writeEntry( const char *pKey, TQ_INT64 nValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ); @@ -1194,7 +1195,7 @@ public: * @param bNLS If @p bNLS is true, the locale tag is added to the key * when writing it back. */ - void writeEntry( const TQString& pKey, Q_UINT64 nValue, + void writeEntry( const TQString& pKey, TQ_UINT64 nValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ); /** @@ -1211,7 +1212,7 @@ public: * @param bNLS If @p bNLS is true, the locale tag is added to the key * when writing it back. */ - void writeEntry( const char *pKey, Q_UINT64 nValue, + void writeEntry( const char *pKey, TQ_UINT64 nValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ); diff --git a/kdecore/kconfigdialogmanager.cpp b/kdecore/kconfigdialogmanager.cpp index 1d89bf49b..86495dca8 100644 --- a/kdecore/kconfigdialogmanager.cpp +++ b/kdecore/kconfigdialogmanager.cpp @@ -131,13 +131,13 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it TQVariant minValue = item->minValue(); if (minValue.isValid()) { - if (widget->metaObject()->findProperty("minValue", true) != -1) + if (widget->tqmetaObject()->tqfindProperty("minValue", true) != -1) widget->setProperty("minValue", minValue); } TQVariant maxValue = item->maxValue(); if (maxValue.isValid()) { - if (widget->metaObject()->findProperty("maxValue", true) != -1) + if (widget->tqmetaObject()->tqfindProperty("maxValue", true) != -1) widget->setProperty("maxValue", maxValue); } if (TQWhatsThis::textFor( widget ).isEmpty()) @@ -153,12 +153,12 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChanges) { bool valueChanged = false; - const TQObjectList *listOfChildren = widget->children(); - if(!listOfChildren) + const TQObjectList listOfChildren = widget->childrenListObject(); + if(listOfChildren.isEmpty()) return valueChanged; TQObject *object; - for( TQObjectListIterator it( *listOfChildren ); + for( TQObjectListIterator it( listOfChildren ); (object = it.current()); ++it ) { if(!object->isWidgetType()) @@ -181,7 +181,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang setupWidget(childWidget, item); - TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className()); + TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.tqfind(childWidget->className()); if (changedIt == changedMap.end()) { @@ -189,7 +189,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang // it again using the super class name. This fixes a problem with using QtRuby/Korundum // widgets with KConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even // though it was a 'QWidget'. - changedIt = changedMap.find(childWidget->metaObject()->superClassName()); + changedIt = changedMap.tqfind(childWidget->tqmetaObject()->tqsuperClassName()); } if (changedIt == changedMap.end()) @@ -236,7 +236,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang #ifndef NDEBUG else if (widgetName) { - TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className()); + TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.tqfind(childWidget->className()); if (changedIt != changedMap.end()) { if ((!d->insideGroupBox || !childWidget->inherits("QRadioButton")) && @@ -284,7 +284,7 @@ void KConfigDialogManager::updateWidgets() if (item->isImmutable()) { widget->setEnabled(false); - TQWidget *buddy = d->buddyWidget.find(it.currentKey()); + TQWidget *buddy = d->buddyWidget.tqfind(it.currentKey()); if (buddy) buddy->setEnabled(false); } diff --git a/kdecore/kconfigskeleton.cpp b/kdecore/kconfigskeleton.cpp index 9e6070d6a..58b889018 100644 --- a/kdecore/kconfigskeleton.cpp +++ b/kdecore/kconfigskeleton.cpp @@ -223,8 +223,8 @@ void KConfigSkeleton::ItemInt::setMaxValue(int v) KConfigSkeleton::ItemInt64::ItemInt64( const TQString &group, const TQString &key, - Q_INT64 &reference, Q_INT64 defaultValue ) - : KConfigSkeletonGenericItem<Q_INT64>( group, key, reference, defaultValue ) + TQ_INT64 &reference, TQ_INT64 defaultValue ) + : KConfigSkeletonGenericItem<TQ_INT64>( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } @@ -266,13 +266,13 @@ TQVariant KConfigSkeleton::ItemInt64::maxValue() const return TQVariant(); } -void KConfigSkeleton::ItemInt64::setMinValue(Q_INT64 v) +void KConfigSkeleton::ItemInt64::setMinValue(TQ_INT64 v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemInt64::setMaxValue(Q_INT64 v) +void KConfigSkeleton::ItemInt64::setMaxValue(TQ_INT64 v) { mHasMax = true; mMax = v; @@ -394,8 +394,8 @@ void KConfigSkeleton::ItemUInt::setMaxValue(unsigned int v) KConfigSkeleton::ItemUInt64::ItemUInt64( const TQString &group, const TQString &key, - Q_UINT64 &reference, Q_UINT64 defaultValue ) - : KConfigSkeletonGenericItem<Q_UINT64>( group, key, reference, defaultValue ) + TQ_UINT64 &reference, TQ_UINT64 defaultValue ) + : KConfigSkeletonGenericItem<TQ_UINT64>( group, key, reference, defaultValue ) ,mHasMin(false), mHasMax(false) { } @@ -437,13 +437,13 @@ TQVariant KConfigSkeleton::ItemUInt64::maxValue() const return TQVariant(); } -void KConfigSkeleton::ItemUInt64::setMinValue(Q_UINT64 v) +void KConfigSkeleton::ItemUInt64::setMinValue(TQ_UINT64 v) { mHasMin = true; mMin = v; } -void KConfigSkeleton::ItemUInt64::setMaxValue(Q_UINT64 v) +void KConfigSkeleton::ItemUInt64::setMaxValue(TQ_UINT64 v) { mHasMax = true; mMax = v; @@ -476,20 +476,20 @@ void KConfigSkeleton::ItemLong::setProperty(const TQVariant & p) TQVariant KConfigSkeleton::ItemLong::property() const { - return TQVariant((Q_LLONG) mReference); + return TQVariant((TQ_LLONG) mReference); } TQVariant KConfigSkeleton::ItemLong::minValue() const { if (mHasMin) - return TQVariant((Q_LLONG) mMin); + return TQVariant((TQ_LLONG) mMin); return TQVariant(); } TQVariant KConfigSkeleton::ItemLong::maxValue() const { if (mHasMax) - return TQVariant((Q_LLONG) mMax); + return TQVariant((TQ_LLONG) mMax); return TQVariant(); } @@ -534,20 +534,20 @@ void KConfigSkeleton::ItemULong::setProperty(const TQVariant & p) TQVariant KConfigSkeleton::ItemULong::property() const { - return TQVariant((Q_ULLONG) mReference); + return TQVariant((TQ_ULLONG) mReference); } TQVariant KConfigSkeleton::ItemULong::minValue() const { if (mHasMin) - return TQVariant((Q_ULLONG) mMin); + return TQVariant((TQ_ULLONG) mMin); return TQVariant(); } TQVariant KConfigSkeleton::ItemULong::maxValue() const { if (mHasMax) - return TQVariant((Q_ULLONG) mMax); + return TQVariant((TQ_ULLONG) mMax); return TQVariant(); } @@ -1065,8 +1065,8 @@ KConfigSkeleton::ItemUInt *KConfigSkeleton::addItemUInt( const TQString &name, u return item; } -KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, Q_INT64 &reference, - Q_INT64 defaultValue, const TQString &key ) +KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, TQ_INT64 &reference, + TQ_INT64 defaultValue, const TQString &key ) { KConfigSkeleton::ItemInt64 *item; item = new KConfigSkeleton::ItemInt64( mCurrentGroup, key.isNull() ? name : key, @@ -1075,8 +1075,8 @@ KConfigSkeleton::ItemInt64 *KConfigSkeleton::addItemInt64( const TQString &name, return item; } -KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, Q_UINT64 &reference, - Q_UINT64 defaultValue, const TQString &key ) +KConfigSkeleton::ItemUInt64 *KConfigSkeleton::addItemUInt64( const TQString &name, TQ_UINT64 &reference, + TQ_UINT64 defaultValue, const TQString &key ) { KConfigSkeleton::ItemUInt64 *item; item = new KConfigSkeleton::ItemUInt64( mCurrentGroup, key.isNull() ? name : key, @@ -1203,5 +1203,5 @@ bool KConfigSkeleton::isImmutable(const TQString &name) KConfigSkeletonItem *KConfigSkeleton::findItem(const TQString &name) { - return mItemDict.find(name); + return mItemDict.tqfind(name); } diff --git a/kdecore/kconfigskeleton.h b/kdecore/kconfigskeleton.h index 82185c090..c3e9f4a57 100644 --- a/kdecore/kconfigskeleton.h +++ b/kdecore/kconfigskeleton.h @@ -376,7 +376,7 @@ public: ItemString(const TQString & group, const TQString & key, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !! + const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !! Type type = Normal); void writeConfig(KConfig * config); @@ -396,7 +396,7 @@ public: public: ItemPassword(const TQString & group, const TQString & key, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1("")); // NOT TQString::null !! + const TQString & defaultValue = TQString::tqfromLatin1("")); // NOT TQString::null !! }; /** @@ -469,11 +469,11 @@ public: /** * Class for handling an 64-bit integer preferences item. */ - class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < Q_INT64 > + class KDECORE_EXPORT ItemInt64:public KConfigSkeletonGenericItem < TQ_INT64 > { public: - ItemInt64(const TQString & group, const TQString & key, Q_INT64 &reference, - Q_INT64 defaultValue = 0); + ItemInt64(const TQString & group, const TQString & key, TQ_INT64 &reference, + TQ_INT64 defaultValue = 0); void readConfig(KConfig * config); void setProperty(const TQVariant & p); @@ -482,14 +482,14 @@ public: TQVariant minValue() const; TQVariant maxValue() const; - void setMinValue(Q_INT64); - void setMaxValue(Q_INT64); + void setMinValue(TQ_INT64); + void setMaxValue(TQ_INT64); private: bool mHasMin : 1; bool mHasMax : 1; - Q_INT64 mMin; - Q_INT64 mMax; + TQ_INT64 mMin; + TQ_INT64 mMax; }; /** @@ -598,11 +598,11 @@ public: /** * Class for handling unsigned 64-bit integer preferences item. */ - class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < Q_UINT64 > + class KDECORE_EXPORT ItemUInt64:public KConfigSkeletonGenericItem < TQ_UINT64 > { public: - ItemUInt64(const TQString & group, const TQString & key, Q_UINT64 &reference, - Q_UINT64 defaultValue = 0); + ItemUInt64(const TQString & group, const TQString & key, TQ_UINT64 &reference, + TQ_UINT64 defaultValue = 0); void readConfig(KConfig * config); void setProperty(const TQVariant & p); @@ -611,14 +611,14 @@ public: TQVariant minValue() const; TQVariant maxValue() const; - void setMinValue(Q_UINT64); - void setMaxValue(Q_UINT64); + void setMinValue(TQ_UINT64); + void setMaxValue(TQ_UINT64); private: bool mHasMin : 1; bool mHasMax : 1; - Q_UINT64 mMin; - Q_UINT64 mMax; + TQ_UINT64 mMin; + TQ_UINT64 mMax; }; /** @@ -859,7 +859,7 @@ public: * @return The created item */ ItemString *addItemString(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !! + const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !! const TQString & key = TQString::null); /** @@ -876,7 +876,7 @@ public: * @return The created item */ ItemPassword *addItemPassword(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1(""), + const TQString & defaultValue = TQString::tqfromLatin1(""), const TQString & key = TQString::null); /** @@ -893,7 +893,7 @@ public: * @return The created item */ ItemPath *addItemPath(const TQString & name, TQString & reference, - const TQString & defaultValue = TQString::fromLatin1(""), + const TQString & defaultValue = TQString::tqfromLatin1(""), const TQString & key = TQString::null); /** @@ -987,7 +987,7 @@ public: const TQString & key = TQString::null); /** - * Register an item of type Q_INT64. + * Register an item of type TQ_INT64. * * @param name Name used to indentify this setting. Names must be unique. * @param reference Pointer to the variable, which is set by readConfig() @@ -997,12 +997,12 @@ public: * @param key Key used in config file. If key is null, name is used as key. * @return The created item */ - ItemInt64 *addItemInt64(const TQString & name, Q_INT64 &reference, - Q_INT64 defaultValue = 0, + ItemInt64 *addItemInt64(const TQString & name, TQ_INT64 &reference, + TQ_INT64 defaultValue = 0, const TQString & key = TQString::null); /** - * Register an item of type Q_UINT64 + * Register an item of type TQ_UINT64 * * @param name Name used to indentify this setting. Names must be unique. * @param reference Pointer to the variable, which is set by readConfig() @@ -1012,8 +1012,8 @@ public: * @param key Key used in config file. If key is null, name is used as key. * @return The created item */ - ItemUInt64 *addItemUInt64(const TQString & name, Q_UINT64 &reference, - Q_UINT64 defaultValue = 0, + ItemUInt64 *addItemUInt64(const TQString & name, TQ_UINT64 &reference, + TQ_UINT64 defaultValue = 0, const TQString & key = TQString::null); /** diff --git a/kdecore/kdcoppropertyproxy.cpp b/kdecore/kdcoppropertyproxy.cpp index bc720736f..22390a4c4 100644 --- a/kdecore/kdcoppropertyproxy.cpp +++ b/kdecore/kdcoppropertyproxy.cpp @@ -94,12 +94,12 @@ TQValueList<TQCString> KDCOPPropertyProxy::functions( TQObject *object ) res << "bool setProperty(TQCString name,TQVariant property)"; res << "TQValueList<TQCString> propertyNames(bool super)"; - TQMetaObject *metaObj = object->metaObject(); + TQMetaObject *metaObj = object->tqmetaObject(); TQStrList properties = metaObj->propertyNames( true ); TQStrListIterator it( properties ); for (; it.current(); ++it ) { - const TQMetaProperty *metaProp = metaObj->property( metaObj->findProperty( it.current(), true ), true ); + const TQMetaProperty *metaProp = metaObj->property( metaObj->tqfindProperty( it.current(), true ), true ); assert( metaProp ); @@ -146,18 +146,18 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8)object->setProperty( propName, propValue ); + reply << (TQ_INT8)object->setProperty( propName, propValue ); return true; } if ( fun == "propertyNames(bool)" ) { - Q_INT8 b; + TQ_INT8 b; TQDataStream stream( data, IO_ReadOnly ); stream >> b; TQValueList<TQCString> res; - TQStrList props = object->metaObject()->propertyNames( static_cast<bool>( b ) ); + TQStrList props = object->tqmetaObject()->propertyNames( static_cast<bool>( b ) ); TQStrListIterator it( props ); for (; it.current(); ++it ) res.append( it.current() ); @@ -228,7 +228,7 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB DEMARSHAL( UInt, uint ) case TQVariant::Bool: { - Q_INT8 v; + TQ_INT8 v; stream >> v; prop = TQVariant( static_cast<bool>( v ), 1 ); } @@ -283,7 +283,7 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB MARSHAL( Int ) MARSHAL( UInt ) case TQVariant::Bool: - reply << (Q_INT8)prop.toBool(); + reply << (TQ_INT8)prop.toBool(); break; MARSHAL( Double ) default: @@ -314,7 +314,7 @@ bool KDCOPPropertyProxy::decodePropertyRequestInternal( const TQCString &fun, TQ propName.detach(); set = true; propName = propName.mid( 3 ); - int p1 = propName.find( '(' ); + int p1 = propName.tqfind( '(' ); uint len = propName.length(); @@ -328,7 +328,7 @@ bool KDCOPPropertyProxy::decodePropertyRequestInternal( const TQCString &fun, TQ else propName.truncate( propName.length() - 2 ); - if ( !object->metaObject()->propertyNames( true ).contains( propName ) ) + if ( !object->tqmetaObject()->propertyNames( true ).tqcontains( propName ) ) return false; return true; diff --git a/kdecore/kde-config.cpp.in b/kdecore/kde-config.cpp.in index da9d41782..eac5f43cf 100644 --- a/kdecore/kde-config.cpp.in +++ b/kdecore/kde-config.cpp.in @@ -32,67 +32,67 @@ bool _expandvars = false; TQString expandvars(const char *_input) { - TQString result = TQString::fromLatin1(_input); + TQString result = TQString::tqfromLatin1(_input); if (!_expandvars) return result; bool changed = false; - int index = result.find("${prefix}"); + int index = result.tqfind("${prefix}"); if (index >= 0) { result = result.replace(index, 9, "@prefix@"); changed = true; } - index = result.find("$(prefix)"); + index = result.tqfind("$(prefix)"); if (index >= 0) { result = result.replace(index, 9, "@prefix@"); changed = true; } - index = result.find("${datadir}"); + index = result.tqfind("${datadir}"); if (index >= 0) { result = result.replace(index, 10, "@datadir@"); changed = true; } - index = result.find("$(datadir)"); + index = result.tqfind("$(datadir)"); if (index >= 0) { result = result.replace(index, 10, "@datadir@"); changed = true; } - index = result.find("${exec_prefix}"); + index = result.tqfind("${exec_prefix}"); if (index >= 0) { result = result.replace(index, 14, "@exec_prefix@"); changed = true; } - index = result.find("$(exec_prefix)"); + index = result.tqfind("$(exec_prefix)"); if (index >= 0) { result = result.replace(index, 14, "@exec_prefix@"); changed = true; } - index = result.find("${libdir}"); + index = result.tqfind("${libdir}"); if (index >= 0) { result = result.replace(index, 9, "@libdir@"); changed = true; } - index = result.find("$(libdir)"); + index = result.tqfind("$(libdir)"); if (index >= 0) { result = result.replace(index, 9, "@libdir@"); changed = true; } - index = result.find("${includedir}"); + index = result.tqfind("${includedir}"); if (index >= 0) { result = result.replace(index, 20, "@includedir@"); changed = true; } - index = result.find("$(includedir)"); + index = result.tqfind("$(includedir)"); if (index >= 0) { result = result.replace(index, 20, "@includedir@"); changed = true; } - index = result.find("${sysconfdir}"); + index = result.tqfind("${sysconfdir}"); if (index >= 0) { result = result.replace(index, 13, "@sysconfdir@"); changed = true; } - index = result.find("$(sysconfdir)"); + index = result.tqfind("$(sysconfdir)"); if (index >= 0) { result = result.replace(index, 13, "@sysconfdir@"); changed = true; @@ -200,7 +200,7 @@ int main(int argc, char **argv) if (helptexts[index]) { printf("%s - %s\n", helptexts[index], i18n(helptexts[index+1]).local8Bit().data()); } else { - printf("%s", i18n("%1 - unknown type\n").arg(*it).local8Bit().data()); + printf("%s", TQString(i18n("%1 - unknown type\n").arg(*it)).local8Bit().data()); } } return 0; @@ -225,7 +225,7 @@ int main(int argc, char **argv) else if ( type == "document" ) printResult(KGlobalSettings::documentPath()); else - fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").arg(type).local8Bit().data() ); + fprintf(stderr, "%s", TQString(i18n("%1 - unknown type of userpath\n").arg(type)).local8Bit().data() ); return 0; } diff --git a/kdecore/kdebug.cpp b/kdecore/kdebug.cpp index b581b5fdd..b76444b3c 100644 --- a/kdecore/kdebug.cpp +++ b/kdecore/kdebug.cpp @@ -86,7 +86,7 @@ static TQCString getDescrFromNum(unsigned int _num) KDebugCache->setAutoDelete(true); } - KDebugEntry *ent = KDebugCache->find( _num ); + KDebugEntry *ent = KDebugCache->tqfind( _num ); if ( ent ) return ent->descr; @@ -130,7 +130,7 @@ static TQCString getDescrFromNum(unsigned int _num) ch=line[++i]; } while ( ch >= '0' && ch <= '9'); - const Q_ULONG number =line.mid(numStart,i).toULong(); + const TQ_ULONG number =line.mid(numStart,i).toULong(); while (line[i] && line[i] <= ' ') i++; @@ -139,7 +139,7 @@ static TQCString getDescrFromNum(unsigned int _num) } file.close(); - ent = KDebugCache->find( _num ); + ent = KDebugCache->tqfind( _num ); if ( ent ) return ent->descr; @@ -314,7 +314,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char abort(); } -kdbgstream &perror( kdbgstream &s) { return s << TQString::fromLocal8Bit(strerror(errno)); } +kdbgstream &perror( kdbgstream &s) { return s << TQString(TQString::fromLocal8Bit(strerror(errno))); } kdbgstream kdDebug(int area) { return kdbgstream(area, KDEBUG_INFO); } kdbgstream kdDebug(bool cond, int area) { if (cond) return kdbgstream(area, KDEBUG_INFO); else return kdbgstream(0, 0, false); } @@ -373,7 +373,7 @@ kdbgstream& kdbgstream::operator << (TQChar ch) { if (!print) return *this; if (!ch.isPrint()) - output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0'); + output += "\\x" + TQString::number( ch.tqunicode(), 16 ).rightJustify(2, '0'); else { output += ch; if (ch == (QChar)'\n') flush(); @@ -431,12 +431,12 @@ kdbgstream& kdbgstream::operator<<( const TQDateTime& time) { return *this; } kdbgstream& kdbgstream::operator<<( const TQDate& date) { - *this << date.toString(); + *this << TQString(date.toString()); return *this; } kdbgstream& kdbgstream::operator<<( const TQTime& time ) { - *this << time.toString(); + *this << TQString(time.toString()); return *this; } kdbgstream& kdbgstream::operator<<( const TQPoint& p ) { @@ -454,9 +454,9 @@ kdbgstream& kdbgstream::operator<<( const TQRect& r ) { kdbgstream& kdbgstream::operator<<( const TQRegion& reg ) { *this<< "[ "; - TQMemArray<TQRect>rs=reg.rects(); + TQMemArray<TQRect>rs=reg.tqrects(); for (uint i=0;i<rs.size();++i) - *this << TQString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y()).arg(rs[i].width()).arg(rs[i].height() ) ; + *this << TQString(TQString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y()).arg(rs[i].width()).arg(rs[i].height() )) ; *this <<"]"; return *this; @@ -474,7 +474,7 @@ kdbgstream& kdbgstream::operator<<( const TQStringList& l ) { } kdbgstream& kdbgstream::operator<<( const TQColor& c ) { if ( c.isValid() ) - *this <<c.name(); + *this << TQString(c.name()); else *this << "(invalid/default)"; return *this; @@ -491,7 +491,7 @@ kdbgstream& kdbgstream::operator<<( const TQPen& p ) { *this << p.width(); *this << " color:"; if ( p.color().isValid() ) - *this << p.color().name(); + *this << TQString(p.color().name()); else *this <<"(invalid/default)"; if ( p.width() > 0 ) // cap style doesn't matter, otherwise @@ -515,7 +515,7 @@ kdbgstream& kdbgstream::operator<<( const TQBrush& b) { *this <<" color: "; // can't use operator<<(str, b.color()) because that terminates a kdbgstream (flushes) if ( b.color().isValid() ) - *this <<b.color().name() ; + *this << TQString(b.color().name()) ; else *this <<"(invalid/default)"; if ( b.pixmap() ) @@ -567,8 +567,8 @@ TQString kdBacktrace(int levels) for (int i = 0; i < n; ++i) s += TQString::number(i) + - TQString::fromLatin1(": ") + - TQString::fromLatin1(strings[i]) + TQString::fromLatin1("\n"); + TQString::tqfromLatin1(": ") + + TQString::tqfromLatin1(strings[i]) + TQString::tqfromLatin1("\n"); s += "]\n"; if (strings) free (strings); diff --git a/kdecore/kdebug.h b/kdecore/kdebug.h index 7d9dd5957..8e749b24d 100644 --- a/kdecore/kdebug.h +++ b/kdecore/kdebug.h @@ -85,7 +85,7 @@ class KDECORE_EXPORT kdbgstream { kdbgstream(unsigned int _area, unsigned int _level, bool _print = true) : area(_area), level(_level), print(_print) { } kdbgstream(const char * initialString, unsigned int _area, unsigned int _level, bool _print = true) : - output(TQString::fromLatin1(initialString)), area(_area), level(_level), print(_print) { } + output(TQString::tqfromLatin1(initialString)), area(_area), level(_level), print(_print) { } /// Copy constructor kdbgstream(kdbgstream &str); kdbgstream(const kdbgstream &str) : @@ -98,7 +98,7 @@ class KDECORE_EXPORT kdbgstream { */ kdbgstream &operator<<(bool i) { if (!print) return *this; - output += TQString::fromLatin1(i ? "true" : "false"); + output += TQString::tqfromLatin1(i ? "true" : "false"); return *this; } /** @@ -180,7 +180,7 @@ class KDECORE_EXPORT kdbgstream { * @param i the long long to print * @return this stream */ - kdbgstream &operator<<(Q_LLONG i) { + kdbgstream &operator<<(TQ_LLONG i) { if (!print) return *this; TQString tmp; tmp.setNum(i); output += tmp; return *this; @@ -190,7 +190,7 @@ class KDECORE_EXPORT kdbgstream { * @param i the unsigned long long to print * @return this stream */ - kdbgstream &operator<<(Q_ULLONG i) { + kdbgstream &operator<<(TQ_ULLONG i) { if (!print) return *this; TQString tmp; tmp.setNum(i); output += tmp; return *this; @@ -281,7 +281,7 @@ class KDECORE_EXPORT kdbgstream { ; /** Operator to print out basic information about a TQWidget. - * Output of class names only works if the class is moc'ified. + * Output of class names only works if the class is tqmoc'ified. * @param widget the widget to print * @return this stream */ @@ -533,12 +533,12 @@ class KDECORE_EXPORT kndbgstream { * Does nothing. * @return this stream */ - kndbgstream& operator<<(Q_LLONG) { return *this; } + kndbgstream& operator<<(TQ_LLONG) { return *this; } /** * Does nothing. * @return this stream */ - kndbgstream& operator<<(Q_ULLONG) { return *this; } + kndbgstream& operator<<(TQ_ULLONG) { return *this; } /** * Does nothing. * @return this stream diff --git a/kdecore/kdelibs_export.h b/kdecore/kdelibs_export.h index e7faabdcf..5624fcddb 100644 --- a/kdecore/kdelibs_export.h +++ b/kdecore/kdelibs_export.h @@ -67,7 +67,7 @@ #endif /*_KDELIBS_EXPORT_H*/ -/* workaround for kdecore: stupid moc's grammar doesn't accept two macros +/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros between 'class' keyword and <classname>: */ #ifdef KDE_DEPRECATED # ifndef KDECORE_EXPORT_DEPRECATED diff --git a/kdecore/kdemacros.h.in b/kdecore/kdemacros.h.in index 00f49bbd7..2edb4ee3a 100644 --- a/kdecore/kdemacros.h.in +++ b/kdecore/kdemacros.h.in @@ -53,8 +53,8 @@ * cope with symbol visibility. */ #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \ - Q_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ - Q_EXTERN_C KDE_EXPORT QUnknownInterface* ucm_instantiate(); \ + Q_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \ + Q_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \ Q_EXPORT_PLUGIN(PLUGIN) /** @@ -105,11 +105,11 @@ * this is because usually get called by the class which they belong to, * and one'd assume that a class author doesn't use deprecated methods of his * own class. The only exception to this are signals which are connected to - * other signals; they get invoked from moc-generated code. In any case, + * other signals; they get invoked from tqmoc-generated code. In any case, * printing a warning message in either case is not useful. * For slots, it can make sense (since slots can be invoked directly) but be * aware that if the slots get triggered by a signal, the will get called from - * moc code as well and thus the warnings are useless. + * tqmoc code as well and thus the warnings are useless. * * \par * Also note that it is not possible to use KDE_DEPRECATED for classes which diff --git a/kdecore/kdesktopfile.cpp b/kdecore/kdesktopfile.cpp index 09a3f1e9b..3a2acb169 100644 --- a/kdecore/kdesktopfile.cpp +++ b/kdecore/kdesktopfile.cpp @@ -42,7 +42,7 @@ KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly, const char * resType) - : KConfig(TQString::fromLatin1(""), bReadOnly, false) + : KConfig(TQString::tqfromLatin1(""), bReadOnly, false) { // KConfigBackEnd will try to locate the filename that is provided // based on the resource type specified, _only_ if the filename @@ -83,7 +83,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) { // Hm, that didn't work... // What now? Use filename only and hope for the best. - local = path.mid(path.findRev('/')+1); + local = path.mid(path.tqfindRev('/')+1); } local = ::locateLocal("xdgdata-dirs", local); } @@ -102,7 +102,7 @@ TQString KDesktopFile::locateLocal(const TQString &path) if (!TQDir::isRelativePath(local)) { // What now? Use filename only and hope for the best. - local = path.mid(path.findRev('/')+1); + local = path.mid(path.tqfindRev('/')+1); } local = ::locateLocal("xdgdata-apps", local); } @@ -114,9 +114,9 @@ bool KDesktopFile::isDesktopFile(const TQString& path) { int len = path.length(); - if(len > 8 && path.right(8) == TQString::fromLatin1(".desktop")) + if(len > 8 && path.right(8) == TQString::tqfromLatin1(".desktop")) return true; - else if(len > 7 && path.right(7) == TQString::fromLatin1(".kdelnk")) + else if(len > 7 && path.right(7) == TQString::tqfromLatin1(".kdelnk")) return true; else return false; @@ -155,8 +155,8 @@ TQString KDesktopFile::translatedEntry(const char* key) const if (hasKey(key)) { TQString value = readEntryUntranslated(key); TQString fName = fileName(); - fName = fName.mid(fName.findRev('/')+1); - TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value; + fName = fName.mid(fName.tqfindRev('/')+1); + TQString po_lookup_key = TQString::tqfromLatin1(key) + "(" + fName + "): " + value; TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data()); if (po_value == po_lookup_key) @@ -241,33 +241,33 @@ TQStringList KDesktopFile::readActions() const void KDesktopFile::setActionGroup(const TQString &group) { - setGroup(TQString::fromLatin1("Desktop Action ") + group); + setGroup(TQString::tqfromLatin1("Desktop Action ") + group); } bool KDesktopFile::hasActionGroup(const TQString &group) const { - return hasGroup(TQString::fromLatin1("Desktop Action ") + group); + return hasGroup(TQString::tqfromLatin1("Desktop Action ") + group); } bool KDesktopFile::hasLinkType() const { - return readEntry("Type") == TQString::fromLatin1("Link"); + return readEntry("Type") == TQString::tqfromLatin1("Link"); } bool KDesktopFile::hasApplicationType() const { - return readEntry("Type") == TQString::fromLatin1("Application"); + return readEntry("Type") == TQString::tqfromLatin1("Application"); } bool KDesktopFile::hasMimeTypeType() const { - return readEntry("Type") == TQString::fromLatin1("MimeType"); + return readEntry("Type") == TQString::tqfromLatin1("MimeType"); } bool KDesktopFile::hasDeviceType() const { - return readEntry("Type") == TQString::fromLatin1("FSDev") || - readEntry("Type") == TQString::fromLatin1("FSDevice"); + return readEntry("Type") == TQString::tqfromLatin1("FSDev") || + readEntry("Type") == TQString::tqfromLatin1("FSDevice"); } bool KDesktopFile::tryExec() const @@ -330,13 +330,13 @@ bool KDesktopFile::tryExec() const /** * @return the filename as passed to the constructor. */ -QString +TQString KDesktopFile::fileName() const { return backEnd->fileName(); } /** * @return the resource type as passed to the constructor. */ -QString +TQString KDesktopFile::resource() const { return backEnd->resource(); } TQStringList diff --git a/kdecore/kextsock.cpp b/kdecore/kextsock.cpp index 6371bb7eb..826e8a014 100644 --- a/kdecore/kextsock.cpp +++ b/kdecore/kextsock.cpp @@ -248,7 +248,7 @@ void KExtendedSocket::setSocketStatus(int newstatus) void KExtendedSocket::setError(int errorcode, int syserror) { - setStatus(errorcode); + setqStatus(errorcode); d->syserror = syserror; } @@ -1233,7 +1233,7 @@ int KExtendedSocket::startAsyncConnect() // here we have d->status >= lookupDone and <= connecting // we can do our connection d->status = connecting; - TQGuardedPtr<TQObject> p = this; + TQGuardedPtr<TQObject> p = TQT_TQOBJECT(this); connectionEvent(); if (!p) return -1; // We have been deleted. @@ -1436,7 +1436,7 @@ void KExtendedSocket::flush() } -Q_LONG KExtendedSocket::readBlock(char *data, Q_ULONG maxlen) +TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen) { cleanError(); if (d->status < connected || d->flags & passiveSocket) @@ -1481,7 +1481,7 @@ Q_LONG KExtendedSocket::readBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KExtendedSocket::writeBlock(const char *data, Q_ULONG len) +TQ_LONG KExtendedSocket::writeBlock(const char *data, TQ_ULONG len) { cleanError(); if (d->status < connected || d->status >= closing || d->flags & passiveSocket) diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h index 2bfb22bfe..4cf2d29ee 100644 --- a/kdecore/kextsock.h +++ b/kdecore/kextsock.h @@ -22,6 +22,10 @@ #include "kdelibs_export.h" +#ifdef Q_MOC_RUN +#define Q_OS_UNIX +#endif // Q_MOC_RUN + #ifdef Q_OS_UNIX #include <sys/time.h> @@ -91,6 +95,7 @@ class KExtendedSocketPrivate; class KDECORE_EXPORT KExtendedSocket: public KBufferedIO // public TQObject, public QIODevice { Q_OBJECT + TQ_OBJECT public: /** @@ -681,7 +686,7 @@ public: * @return the length of this socket, or 0 if unsupported */ #ifdef USE_QT3 - virtual inline Q_ULONG size() const + virtual inline TQ_ULONG size() const #endif // USE_QT3 #ifdef USE_QT4 virtual inline qint64 size() const @@ -692,7 +697,7 @@ public: * Returns relative position from start. This call is not supported on sockets. * @return the relative position from the start, or 0 if unsupported */ - virtual inline Q_ULONG at() const + virtual inline TQ_ULONG at() const { return 0; } /** @@ -740,7 +745,7 @@ public: * This function returns 0, if the function detected end-of-file condition * (socket was closed) */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * Writes a block of data to the socket. @@ -765,7 +770,7 @@ public: * The return value might be less than @p len if the output buffers cannot * accommodate that many bytes and -1 in the case of an errro. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * Peeks at a block of data from the socket. diff --git a/kdecore/kgenericfactory.h b/kdecore/kgenericfactory.h index 0bdeaa846..e3f04ce66 100644 --- a/kdecore/kgenericfactory.h +++ b/kdecore/kgenericfactory.h @@ -62,7 +62,7 @@ protected: { if ( m_aboutData ) return new KInstance( m_aboutData ); - if ( !m_instanceName ) { + if ( m_instanceName.isEmpty() ) { kdWarning() << "KGenericFactory: instance requested but no instance name or about data passed to the constructor!" << endl; return 0; } @@ -133,7 +133,7 @@ KInstance *KGenericFactoryBase<T>::instance() * const TQStringList &args);</code> * <li>If the class is derived from KParts::Part then it needs to have * a constructor like: - * <code>MyPart( TQWidget *parentWidget, const char *widgetName, + * <code>MyPart( TQWidget *tqparentWidget, const char *widgetName, * TQObject *parent, const char *name, * const TQStringList &args );</code> * </ul> @@ -190,8 +190,8 @@ protected: const char *className, const TQStringList &args ) { KGenericFactoryBase<Product>::initializeMessageCatalogue(); - return KDEPrivate::ConcreteFactory<Product, ParentType> - ::create( 0, 0, parent, name, className, args ); + return TQT_TQOBJECT((KDEPrivate::ConcreteFactory<Product, ParentType> + ::create( 0, 0, parent, name, className, args ))); } }; @@ -216,7 +216,7 @@ protected: * const TQStringList &args);</code> * <li>If the class is derived from KParts::Part then it needs to have * a constructor like: - * <code>MyPart( TQWidget *parentWidget, const char *widgetName, + * <code>MyPart( TQWidget *tqparentWidget, const char *widgetName, * TQObject *parent, const char *name, * const TQStringList &args );</code> * </ul> @@ -253,7 +253,7 @@ protected: * { * Q_ OBJECT * public: - * MyDialogComponent( TQWidget *parentWidget, const char *name, + * MyDialogComponent( TQWidget *tqparentWidget, const char *name, * const TQStringList &args ); * ... * }; @@ -311,7 +311,7 @@ protected: * const TQStringList &args);</code> * <li>If the class is derived from KParts::Part then it needs to have * a constructor like: - * <code>MyPart( TQWidget *parentWidget, const char *widgetName, + * <code>MyPart( TQWidget *tqparentWidget, const char *widgetName, * TQObject *parent, const char *name, * const TQStringList &args );</code> * </ul> @@ -348,7 +348,7 @@ protected: * { * Q_ OBJECT * public: - * MyDialogComponent( TQWidget *parentWidget, const char *name, + * MyDialogComponent( TQWidget *tqparentWidget, const char *name, * const TQStringList &args ); * ... * }; diff --git a/kdecore/kgenericfactory.tcc b/kdecore/kgenericfactory.tcc index 41cd77824..22fbd7371 100644 --- a/kdecore/kgenericfactory.tcc +++ b/kdecore/kgenericfactory.tcc @@ -37,7 +37,7 @@ #ifndef KGENERICFACTORY_TCC #define KGENERICFACTORY_TCC -#include <qmetaobject.h> +#include <tqmetaobject.h> #include <ktypelist.h> namespace KParts @@ -69,11 +69,11 @@ namespace KDEPrivate */ template <class Derived> - struct QWidgetInheritanceTest + struct TQWidgetInheritanceTest { typedef Derived * DerivedPtr; - enum { Result = sizeof( InheritanceDetector<QWidget>::test( DerivedPtr() ) ) == - sizeof( InheritanceDetector<QWidget>::ConversionExists ) }; + enum { Result = sizeof( InheritanceDetector<TQWidget>::test( DerivedPtr() ) ) == + sizeof( InheritanceDetector<TQWidget>::ConversionExists ) }; }; template <class Derived> @@ -112,43 +112,43 @@ namespace KDEPrivate // but not least the standard default constructor of parent/name . // the choice of the right constructor is done using an ordered inheritance // test. - template <class Product, class ParentType = QObject> + template <class Product, class ParentType = TQObject> class ConcreteFactory { public: typedef typename If< PartInheritanceTest< Product >::Result, KParts::Part, - typename If< QWidgetInheritanceTest< Product >::Result, - QWidget, QObject >::Result >::Result BaseType; + typename If< TQWidgetInheritanceTest< Product >::Result, + TQWidget, TQObject >::Result >::Result BaseType; - static inline Product *create( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *className, const QStringList &args ) + static inline Product *create( TQWidget *tqparentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *className, const TQStringList &args ) { - QMetaObject *metaObject = Product::staticMetaObject(); - while ( metaObject ) + TQMetaObject *tqmetaObject = Product::tqstaticMetaObject(); + while ( tqmetaObject ) { - if ( !qstrcmp( className, metaObject->className() ) ) - return create( parentWidget, widgetName, + if ( !qstrcmp( className, tqmetaObject->className() ) ) + return create( tqparentWidget, widgetName, parent, name, args, Type2Type<BaseType>() ); - metaObject = metaObject->superClass(); + tqmetaObject = tqmetaObject->tqsuperClass(); } return 0; } private: - typedef typename If< QWidgetInheritanceTest<ParentType>::Result, - ParentType, QWidget >::Result WidgetParentType; + typedef typename If< TQWidgetInheritanceTest<ParentType>::Result, + ParentType, TQWidget >::Result WidgetParentType; - static inline Product *create( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const QStringList &args, Type2Type<KParts::Part> ) + static inline Product *create( TQWidget *tqparentWidget, const char *widgetName, + TQObject *parent, const char *name, + const TQStringList &args, Type2Type<KParts::Part> ) { - return new Product( parentWidget, widgetName, parent, name, args ); + return new Product( tqparentWidget, widgetName, parent, name, args ); } - static inline Product *create( QWidget* /*parentWidget*/, const char* /*widgetName*/, - QObject *parent, const char *name, - const QStringList &args, Type2Type<QWidget> ) + static inline Product *create( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/, + TQObject *parent, const char *name, + const TQStringList &args, Type2Type<TQWidget> ) { WidgetParentType *p = dynamic_cast<WidgetParentType *>( parent ); @@ -157,9 +157,9 @@ namespace KDEPrivate return new Product( p, name, args ); } - static inline Product *create( QWidget* /*parentWidget*/, const char* /*widgetName*/, - QObject *parent, const char *name, - const QStringList &args, Type2Type<QObject> ) + static inline Product *create( TQWidget* /*tqparentWidget*/, const char* /*widgetName*/, + TQObject *parent, const char *name, + const TQStringList &args, Type2Type<TQObject> ) { ParentType *p = dynamic_cast<ParentType *>( parent ); if ( parent && !p ) @@ -171,16 +171,16 @@ namespace KDEPrivate // this template is used to iterate through the typelist and call the // concrete factory for each type. the specializations of this template // are the ones actually being responsible for iterating, in fact. - template <class Product, class ParentType = QObject> + template <class Product, class ParentType = TQObject> class MultiFactory { public: - inline static QObject *create( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *className, - const QStringList &args ) + inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *className, + const TQStringList &args ) { - return ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName, + return ConcreteFactory<Product, ParentType>::create( tqparentWidget, widgetName, parent, name, className, args ); } @@ -193,9 +193,9 @@ namespace KDEPrivate class MultiFactory<KDE::NullType> { public: - inline static QObject *create( QWidget *, const char *, QObject *, - const char *, const char *, - const QStringList & ) + inline static TQObject *create( TQWidget *, const char *, TQObject *, + const char *, const char *, + const TQStringList & ) { return 0; } }; @@ -205,29 +205,29 @@ namespace KDEPrivate class MultiFactory<KDE::NullType, KDE::NullType> { public: - inline static QObject *create( QWidget *, const char *, QObject *, - const char *, const char *, - const QStringList & ) + inline static TQObject *create( TQWidget *, const char *, TQObject *, + const char *, const char *, + const TQStringList & ) { return 0; } }; template <class Product, class ProductListTail> - class MultiFactory< KTypeList<Product, ProductListTail>, QObject > + class MultiFactory< KTypeList<Product, ProductListTail>, TQObject > { public: - inline static QObject *create( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *className, - const QStringList &args ) + inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *className, + const TQStringList &args ) { // try with the head of the typelist first. the head is always // a concrete type. - QObject *object = MultiFactory<Product>::create( parentWidget, widgetName, - parent, name, className, - args ); + TQObject *object = MultiFactory<Product>::create( tqparentWidget, widgetName, + parent, name, className, + args ); if ( !object ) - object = MultiFactory<ProductListTail>::create( parentWidget, widgetName, + object = MultiFactory<ProductListTail>::create( tqparentWidget, widgetName, parent, name, className, args ); @@ -241,15 +241,15 @@ namespace KDEPrivate KTypeList<ParentType, ParentTypeListTail> > { public: - inline static QObject *create( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *className, - const QStringList &args ) + inline static TQObject *create( TQWidget *tqparentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *className, + const TQStringList &args ) { // try with the head of the typelist first. the head is always // a concrete type. - QObject *object = MultiFactory<Product, ParentType> - ::create( parentWidget, widgetName, + TQObject *object = MultiFactory<Product, ParentType> + ::create( tqparentWidget, widgetName, parent, name, className, args ); // if that failed continue by advancing the typelist, calling this @@ -257,7 +257,7 @@ namespace KDEPrivate // at the end we reach the nulltype specialization. if ( !object ) object = MultiFactory<ProductListTail, ParentTypeListTail> - ::create( parentWidget, widgetName, + ::create( tqparentWidget, widgetName, parent, name, className, args ); return object; diff --git a/kdecore/kglobal.cpp b/kdecore/kglobal.cpp index b886d8d7f..347e8d31c 100644 --- a/kdecore/kglobal.cpp +++ b/kdecore/kglobal.cpp @@ -127,7 +127,7 @@ void KGlobal::setActiveInstance(KInstance *i) const TQString & KGlobal::staticQString(const char *str) { - return staticQString(TQString::fromLatin1(str)); + return staticQString(TQString::tqfromLatin1(str)); } class KStringDict : public TQDict<TQString> @@ -150,7 +150,7 @@ KGlobal::staticQString(const TQString &str) _stringDict->setAutoDelete( true ); kglobal_init(); } - TQString *result = _stringDict->find(str); + TQString *result = _stringDict->tqfind(str); if (!result) { result = new TQString(str); @@ -170,7 +170,7 @@ KGlobal::registerStaticDeleter(KStaticDeleterBase *obj) { if (!_staticDeleters) kglobal_init(); - if (_staticDeleters->find(obj) == -1) + if (_staticDeleters->tqfind(obj) == -1) _staticDeleters->append(obj); } diff --git a/kdecore/kglobalaccel.h b/kdecore/kglobalaccel.h index 33dd5e37b..4eee753dc 100644 --- a/kdecore/kglobalaccel.h +++ b/kdecore/kglobalaccel.h @@ -42,7 +42,7 @@ class KGlobalAccelPrivate; * @see KKeyDialog * @short Configurable global shortcut support */ -class KDECORE_EXPORT KGlobalAccel : public QObject +class KDECORE_EXPORT KGlobalAccel : public TQObject { Q_OBJECT public: diff --git a/kdecore/kglobalaccel_win.cpp b/kdecore/kglobalaccel_win.cpp index 8b0c81f1a..674f09671 100644 --- a/kdecore/kglobalaccel_win.cpp +++ b/kdecore/kglobalaccel_win.cpp @@ -311,14 +311,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) { int n = rexIndex.cap(1).toInt(); kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl; - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { QUObject o[2]; static_QUType_int.set(o+1,n); const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { QUObject o[4]; static_QUType_QString.set(o+1,pAction->name()); @@ -327,7 +327,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); } } else { - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); } diff --git a/kdecore/kglobalaccel_x11.cpp b/kdecore/kglobalaccel_x11.cpp index e9d86e576..010e9ec0c 100644 --- a/kdecore/kglobalaccel_x11.cpp +++ b/kdecore/kglobalaccel_x11.cpp @@ -179,9 +179,9 @@ bool KGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, KAcce #ifndef __osf__ // this crashes under Tru64 so ..... - kdDebug(125) << TQString( "grabKey( key: '%1', bGrab: %2 ): keyCodeX: %3 keyModX: %4\n" ) + kdDebug(125) << TQString(TQString( "grabKey( key: '%1', bGrab: %2 ): keyCodeX: %3 keyModX: %4\n" ) .arg( key.key().toStringInternal() ).arg( bGrab ) - .arg( keyCodeX, 0, 16 ).arg( keyModX, 0, 16 ); + .arg( keyCodeX, 0, 16 ).arg( keyModX, 0, 16 )); #endif if( !keyCodeX ) return false; @@ -278,11 +278,11 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { KKey key = (keyCode, 0); kdDebug(125) << "fakeKeyPressed: seek " << key.toStringInternal() - << TQString( " keyCodeX: %1 keyCode: %2 keyModX: %3" ) - .arg( codemod.code, 0, 16 ).arg( keyCode, 0, 16 ).arg( codemod.mod, 0, 16 ) << endl; + << TQString(TQString( " keyCodeX: %1 keyCode: %2 keyModX: %3" ) + .arg( codemod.code, 0, 16 ).arg( keyCode, 0, 16 ).arg( codemod.mod, 0, 16 )) << endl; // Search for which accelerator activated this event: - if( !m_rgCodeModToAction.contains( codemod ) ) { + if( !m_rgCodeModToAction.tqcontains( codemod ) ) { #ifndef NDEBUG for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { KAccelAction* pAction = *it; @@ -356,11 +356,11 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) KKey key = keyNative; kdDebug(125) << "x11KeyPress: seek " << key.toStringInternal() - << TQString( " keyCodeX: %1 state: %2 keyModX: %3" ) - .arg( codemod.code, 0, 16 ).arg( pEvent->xkey.state, 0, 16 ).arg( codemod.mod, 0, 16 ) << endl; + << TQString(TQString( " keyCodeX: %1 state: %2 keyModX: %3" ) + .arg( codemod.code, 0, 16 ).arg( pEvent->xkey.state, 0, 16 ).arg( codemod.mod, 0, 16 )) << endl; // Search for which accelerator activated this event: - if( !m_rgCodeModToAction.contains( codemod ) ) { + if( !m_rgCodeModToAction.tqcontains( codemod ) ) { #ifndef NDEBUG for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { KAccelAction* pAction = *it; @@ -407,23 +407,23 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) { int n = rexIndex.cap(1).toInt(); kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl; - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { - QUObject o[2]; - static_QUType_int.set(o+1,n); + TQUObject o[2]; + static_TQUType_int.set(o+1,n); const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) { - QUObject o[4]; - static_QUType_QString.set(o+1,pAction->name()); - static_QUType_QString.set(o+2,pAction->label()); - static_QUType_ptr.set(o+3,&seq); + TQUObject o[4]; + static_TQUType_TQString.set(o+1,pAction->name()); + static_TQUType_TQString.set(o+2,pAction->label()); + static_TQUType_ptr.set(o+3,&seq); const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); } } else { - int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); + int slot_id = pAction->objSlotPtr()->tqmetaObject()->tqfindSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); } diff --git a/kdecore/kglobalsettings.cpp b/kdecore/kglobalsettings.cpp index 6dfd92c9b..3595dce4c 100644 --- a/kdecore/kglobalsettings.cpp +++ b/kdecore/kglobalsettings.cpp @@ -35,7 +35,7 @@ #include <win32_utils.h> static QRgb qt_colorref2qrgb(COLORREF col) { - return qRgb(GetRValue(col),GetGValue(col),GetBValue(col)); + return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col)); } #endif @@ -451,7 +451,7 @@ TQFont KGlobalSettings::taskbarFont() TQFont KGlobalSettings::largeFont(const TQString &text) { TQFontDatabase db; - TQStringList fam = db.families(); + TQStringList fam = db.tqfamilies(); // Move a bunch of preferred fonts to the front. if (fam.remove("Arial")) @@ -522,7 +522,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an readXdgUserDirs(s_desktopPath, s_documentPath); if (s_desktopPath->isEmpty() == true) { - *s_desktopPath = QDir::homeDirPath() + "/Desktop/"; + *s_desktopPath = TQDir::homeDirPath() + "/Desktop/"; } *s_desktopPath = TQDir::cleanDirPath( *s_desktopPath ); if ( !s_desktopPath->endsWith("/") ) diff --git a/kdecore/kiconeffect.cpp b/kdecore/kiconeffect.cpp index 8315eab6b..3d5833578 100644 --- a/kdecore/kiconeffect.cpp +++ b/kdecore/kiconeffect.cpp @@ -153,8 +153,8 @@ TQString KIconEffect::fingerprint(int group, int state) const cached += ':'; cached += tmp.setNum(mValue[group][state]); cached += ':'; - cached += mTrans[group][state] ? TQString::fromLatin1("trans") - : TQString::fromLatin1("notrans"); + cached += mTrans[group][state] ? TQString::tqfromLatin1("trans") + : TQString::tqfromLatin1("notrans"); if (mEffect[group][state] == Colorize || mEffect[group][state] == ToMonochrome) { cached += ':'; @@ -287,20 +287,20 @@ void KIconEffect::toGray(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.colorTable(); + : (unsigned int *) img.tqcolorTable(); int rval, gval, bval, val, alpha, i; for (i=0; i<pixels; i++) { - val = qGray(data[i]); - alpha = qAlpha(data[i]); + val = tqGray(data[i]); + alpha = tqAlpha(data[i]); if (value < 1.0) { - rval = static_cast<int>(value*val+(1.0-value)*qRed(data[i])); - gval = static_cast<int>(value*val+(1.0-value)*qGreen(data[i])); - bval = static_cast<int>(value*val+(1.0-value)*qBlue(data[i])); - data[i] = qRgba(rval, gval, bval, alpha); + rval = static_cast<int>(value*val+(1.0-value)*tqRed(data[i])); + gval = static_cast<int>(value*val+(1.0-value)*tqGreen(data[i])); + bval = static_cast<int>(value*val+(1.0-value)*tqBlue(data[i])); + data[i] = tqRgba(rval, gval, bval, alpha); } else - data[i] = qRgba(val, val, val, alpha); + data[i] = tqRgba(val, val, val, alpha); } } @@ -309,12 +309,12 @@ void KIconEffect::colorize(TQImage &img, const TQColor &col, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.colorTable(); + : (unsigned int *) img.tqcolorTable(); int rval, gval, bval, val, alpha, i; float rcol = col.red(), gcol = col.green(), bcol = col.blue(); for (i=0; i<pixels; i++) { - val = qGray(data[i]); + val = tqGray(data[i]); if (val < 128) { rval = static_cast<int>(rcol/128*val); @@ -335,20 +335,20 @@ void KIconEffect::colorize(TQImage &img, const TQColor &col, float value) } if (value < 1.0) { - rval = static_cast<int>(value*rval+(1.0 - value)*qRed(data[i])); - gval = static_cast<int>(value*gval+(1.0 - value)*qGreen(data[i])); - bval = static_cast<int>(value*bval+(1.0 - value)*qBlue(data[i])); + rval = static_cast<int>(value*rval+(1.0 - value)*tqRed(data[i])); + gval = static_cast<int>(value*gval+(1.0 - value)*tqGreen(data[i])); + bval = static_cast<int>(value*bval+(1.0 - value)*tqBlue(data[i])); } - alpha = qAlpha(data[i]); - data[i] = qRgba(rval, gval, bval, alpha); + alpha = tqAlpha(data[i]); + data[i] = tqRgba(rval, gval, bval, alpha); } } void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor &white, float value) { int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.colorTable(); + : (unsigned int *) img.tqcolorTable(); int rval, gval, bval, alpha, i; int rw = white.red(), gw = white.green(), bw = white.blue(); int rb = black.red(), gb = black.green(), bb = black.blue(); @@ -357,9 +357,9 @@ void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor bool grayscale = true; // Step 1: determine the average brightness for (i=0; i<pixels; i++) { - sum += qGray(data[i])*qAlpha(data[i]) + 255*(255-qAlpha(data[i])); + sum += tqGray(data[i])*tqAlpha(data[i]) + 255*(255-tqAlpha(data[i])); values += 255; - if ((qRed(data[i]) != qGreen(data[i]) ) || (qGreen(data[i]) != qBlue(data[i]) )) + if ((tqRed(data[i]) != tqGreen(data[i]) ) || (tqGreen(data[i]) != tqBlue(data[i]) )) grayscale = false; } double medium = sum/values; @@ -367,30 +367,30 @@ void KIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor // Step 2: Modify the image if (grayscale) { for (i=0; i<pixels; i++) { - int v = qRed(data[i]); - rval = static_cast<int>( ((255-v)*rb + v*rw)*value/255 + (1.0-value)*qRed(data[i])); - gval = static_cast<int>( ((255-v)*gb + v*gw)*value/255 + (1.0-value)*qGreen(data[i])); - bval = static_cast<int>( ((255-v)*bb + v*bw)*value/255 + (1.0-value)*qBlue(data[i])); + int v = tqRed(data[i]); + rval = static_cast<int>( ((255-v)*rb + v*rw)*value/255 + (1.0-value)*tqRed(data[i])); + gval = static_cast<int>( ((255-v)*gb + v*gw)*value/255 + (1.0-value)*tqGreen(data[i])); + bval = static_cast<int>( ((255-v)*bb + v*bw)*value/255 + (1.0-value)*tqBlue(data[i])); - alpha = qAlpha(data[i]); - data[i] = qRgba(rval, gval, bval, alpha); + alpha = tqAlpha(data[i]); + data[i] = tqRgba(rval, gval, bval, alpha); } } else { for (i=0; i<pixels; i++) { - if (qGray(data[i]) <= medium) { - rval = static_cast<int>(value*rb+(1.0-value)*qRed(data[i])); - gval = static_cast<int>(value*gb+(1.0-value)*qGreen(data[i])); - bval = static_cast<int>(value*bb+(1.0-value)*qBlue(data[i])); + if (tqGray(data[i]) <= medium) { + rval = static_cast<int>(value*rb+(1.0-value)*tqRed(data[i])); + gval = static_cast<int>(value*gb+(1.0-value)*tqGreen(data[i])); + bval = static_cast<int>(value*bb+(1.0-value)*tqBlue(data[i])); } else { - rval = static_cast<int>(value*rw+(1.0-value)*qRed(data[i])); - gval = static_cast<int>(value*gw+(1.0-value)*qGreen(data[i])); - bval = static_cast<int>(value*bw+(1.0-value)*qBlue(data[i])); + rval = static_cast<int>(value*rw+(1.0-value)*tqRed(data[i])); + gval = static_cast<int>(value*gw+(1.0-value)*tqGreen(data[i])); + bval = static_cast<int>(value*bw+(1.0-value)*tqBlue(data[i])); } - alpha = qAlpha(data[i]); - data[i] = qRgba(rval, gval, bval, alpha); + alpha = tqAlpha(data[i]); + data[i] = tqRgba(rval, gval, bval, alpha); } } } @@ -400,7 +400,7 @@ void KIconEffect::deSaturate(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits() - : (unsigned int *) img.colorTable(); + : (unsigned int *) img.tqcolorTable(); TQColor color; int h, s, v, i; for (i=0; i<pixels; i++) @@ -408,8 +408,8 @@ void KIconEffect::deSaturate(TQImage &img, float value) color.setRgb(data[i]); color.hsv(&h, &s, &v); color.setHsv(h, (int) (s * (1.0 - value) + 0.5), v); - data[i] = qRgba(color.red(), color.green(), color.blue(), - qAlpha(data[i])); + data[i] = tqRgba(color.red(), color.green(), color.blue(), + tqAlpha(data[i])); } } @@ -418,7 +418,7 @@ void KIconEffect::toGamma(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits() - : (unsigned int *) img.colorTable(); + : (unsigned int *) img.tqcolorTable(); TQColor color; int i, rval, gval, bval; float gamma; @@ -431,7 +431,7 @@ void KIconEffect::toGamma(TQImage &img, float value) rval = static_cast<int>(pow(static_cast<float>(rval)/255 , gamma)*255); gval = static_cast<int>(pow(static_cast<float>(gval)/255 , gamma)*255); bval = static_cast<int>(pow(static_cast<float>(bval)/255 , gamma)*255); - data[i] = qRgba(rval, gval, bval, qAlpha(data[i])); + data[i] = tqRgba(rval, gval, bval, tqAlpha(data[i])); } } @@ -476,7 +476,7 @@ void KIconEffect::semiTransparent(TQImage &img) for (x=0; x<img.numColors(); x++) { // try to find already transparent pixel - if (qAlpha(img.color(x)) < 127) + if (tqAlpha(img.color(x)) < 127) { transColor = x; break; @@ -631,7 +631,7 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay) int trans; for (trans=0; trans<overlay.numColors(); trans++) { - if (qAlpha(overlay.color(trans)) == 0) + if (tqAlpha(overlay.color(trans)) == 0) { kdDebug(265) << "transparent pixel found at " << trans << "\n"; break; @@ -680,22 +680,22 @@ void KIconEffect::overlay(TQImage &src, TQImage &overlay) for (j=0; j<src.width(); j++) { - r1 = qRed(oline[j]); - g1 = qGreen(oline[j]); - b1 = qBlue(oline[j]); - a1 = qAlpha(oline[j]); + r1 = tqRed(oline[j]); + g1 = tqGreen(oline[j]); + b1 = tqBlue(oline[j]); + a1 = tqAlpha(oline[j]); - r2 = qRed(sline[j]); - g2 = qGreen(sline[j]); - b2 = qBlue(sline[j]); - a2 = qAlpha(sline[j]); + r2 = tqRed(sline[j]); + g2 = tqGreen(sline[j]); + b2 = tqBlue(sline[j]); + a2 = tqAlpha(sline[j]); r2 = (a1 * r1 + (0xff - a1) * r2) >> 8; g2 = (a1 * g1 + (0xff - a1) * g2) >> 8; b2 = (a1 * b1 + (0xff - a1) * b2) >> 8; a2 = QMAX(a1, a2); - sline[j] = qRgba(r2, g2, b2, a2); + sline[j] = tqRgba(r2, g2, b2, a2); } } } @@ -742,9 +742,9 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect) TQPainter p(widget); - // Use NotROP to avoid having to repaint the pixmap each time. + // Use NotROP to avoid having to tqrepaint the pixmap each time. p.setPen(TQPen(Qt::black, 2, Qt::DotLine)); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); // The spacing between the rects we draw. // Use the minimum of width and height to avoid painting outside the diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp index ff9243ebe..f19b56402 100644 --- a/kdecore/kiconloader.cpp +++ b/kdecore/kiconloader.cpp @@ -221,7 +221,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs ) { if (groups[i] == 0L) break; - config->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); + config->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons"); d->mpGroups[i].size = config->readNumEntry("Size", 0); d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false); if (TQPixmap::defaultDepth()>8) @@ -328,7 +328,7 @@ void KIconLoader::addBaseThemes(KIconThemeNode *node, const TQString &appname) for (it=lst.begin(); it!=lst.end(); ++it) { - if( d->mThemesInTree.contains(*it) && (*it) != "hicolor") + if( d->mThemesInTree.tqcontains(*it) && (*it) != "hicolor") continue; KIconTheme *theme = new KIconTheme(*it,appname); if (!theme->isValid()) { @@ -370,7 +370,7 @@ void KIconLoader::addExtraDesktopThemes() TQDir dir2( buf ); TQString themeName=dir2.dirName(); - if (!list.contains(themeName)) + if (!list.tqcontains(themeName)) list.append(themeName); } } @@ -378,7 +378,7 @@ void KIconLoader::addExtraDesktopThemes() for (it=list.begin(); it!=list.end(); ++it) { - if ( d->mThemesInTree.contains(*it) ) + if ( d->mThemesInTree.tqcontains(*it) ) continue; if ( *it == TQString("default.kde") ) continue; @@ -601,7 +601,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si key = "$kicou_"; key += TQString::number(size); key += '_'; key += name; - bool inCache = TQPixmapCache::find(key, pix); + bool inCache = TQPixmapCache::tqfind(key, pix); if (inCache && (path_store == 0L)) return pix; @@ -684,14 +684,14 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si { key += d->mpEffect.fingerprint(group, state); if (d->mpGroups[group].dblPixels) - key += TQString::fromLatin1(":dblsize"); + key += TQString::tqfromLatin1(":dblsize"); } else - key += TQString::fromLatin1("noeffect"); + key += TQString::tqfromLatin1("noeffect"); key += '_'; key += overlayStr; // Is the icon in the cache? - bool inCache = TQPixmapCache::find(key, pix); + bool inCache = TQPixmapCache::tqfind(key, pix); if (inCache && (path_store == 0L)) return pix; @@ -806,7 +806,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si { QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y)); for (int x = 0; x < img->width(); x++) - line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, qAlpha(line[x])) << 24); + line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, tqAlpha(line[x])) << 24); } } } @@ -848,10 +848,10 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si for( int i = 0; i < favIcon.width(); ++i, ++fpos, ++ipos ) - *ipos = qRgba( ( qRed( *ipos ) * ( 255 - qAlpha( *fpos )) + qRed( *fpos ) * qAlpha( *fpos )) / 255, - ( qGreen( *ipos ) * ( 255 - qAlpha( *fpos )) + qGreen( *fpos ) * qAlpha( *fpos )) / 255, - ( qBlue( *ipos ) * ( 255 - qAlpha( *fpos )) + qBlue( *fpos ) * qAlpha( *fpos )) / 255, - ( qAlpha( *ipos ) * ( 255 - qAlpha( *fpos )) + qAlpha( *fpos ) * qAlpha( *fpos )) / 255 ); + *ipos = tqRgba( ( tqRed( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqRed( *fpos ) * tqAlpha( *fpos )) / 255, + ( tqGreen( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqGreen( *fpos ) * tqAlpha( *fpos )) / 255, + ( tqBlue( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqBlue( *fpos ) * tqAlpha( *fpos )) / 255, + ( tqAlpha( *ipos ) * ( 255 - tqAlpha( *fpos )) + tqAlpha( *fpos ) * tqAlpha( *fpos )) / 255 ); } } @@ -866,7 +866,7 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si TQImage *KIconLoader::loadOverlay(const TQString &name, int size) const { TQString key = name + '_' + TQString::number(size); - TQImage *image = d->imgDict.find(key); + TQImage *image = d->imgDict.tqfind(key); if (image != 0L) return image; @@ -892,7 +892,7 @@ TQMovie KIconLoader::loadMovie(const TQString& name, KIcon::Group group, int siz TQString file = moviePath( name, group, size ); if (file.isEmpty()) return TQMovie(); - int dirLen = file.findRev('/'); + int dirLen = file.tqfindRev('/'); TQString icon = iconPath(name, size ? -size : group, true); if (!icon.isEmpty() && file.left(dirLen) != icon.left(dirLen)) return TQMovie(); @@ -1048,13 +1048,13 @@ TQStringList KIconLoader::queryIconsByContext(int group_or_size, TQStringList::ConstIterator it; for (it=result.begin(); it!=result.end(); ++it) { - int n = (*it).findRev('/'); + int n = (*it).tqfindRev('/'); if (n == -1) name = *it; else name = (*it).mid(n+1); name = removeIconExtension(name); - if (!entries.contains(name)) + if (!entries.tqcontains(name)) { entries += name; res2 += *it; @@ -1088,13 +1088,13 @@ TQStringList KIconLoader::queryIcons(int group_or_size, KIcon::Context context) TQStringList::ConstIterator it; for (it=result.begin(); it!=result.end(); ++it) { - int n = (*it).findRev('/'); + int n = (*it).tqfindRev('/'); if (n == -1) name = *it; else name = (*it).mid(n+1); name = removeIconExtension(name); - if (!entries.contains(name)) + if (!entries.tqcontains(name)) { entries += name; res2 += *it; @@ -1383,7 +1383,7 @@ int IconSize(KIcon::Group group, KInstance *instance) TQPixmap KIconLoader::unknown() { TQPixmap pix; - if ( TQPixmapCache::find("unknown", pix) ) + if ( TQPixmapCache::tqfind("unknown", pix) ) return pix; TQString path = KGlobal::iconLoader()->iconPath("unknown", KIcon::Small, true); diff --git a/kdecore/kiconloader_p.h b/kdecore/kiconloader_p.h index 41083b38c..e6ae13659 100644 --- a/kdecore/kiconloader_p.h +++ b/kdecore/kiconloader_p.h @@ -33,7 +33,7 @@ public: KIconTheme *theme; }; -class KIconLoaderPrivate : public QObject +class KIconLoaderPrivate : public TQObject { Q_OBJECT public: diff --git a/kdecore/kicontheme.cpp b/kdecore/kicontheme.cpp index 6bbeba512..fb25cac21 100644 --- a/kdecore/kicontheme.cpp +++ b/kdecore/kicontheme.cpp @@ -185,7 +185,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) TQMap<int,TQValueList<int> > scIcons; for (KIconThemeDir *dir=mDirs.first(); dir!=0L; dir=mDirs.next()) { - if ((dir->type() == KIcon::Scalable) && !scIcons.contains(dir->size())) + if ((dir->type() == KIcon::Scalable) && !scIcons.tqcontains(dir->size())) { TQValueList<int> lst; for (i=dir->minSize(); i<=dir->maxSize(); i++) @@ -209,7 +209,7 @@ KIconTheme::KIconTheme(const TQString& name, const TQString& appName) TQValueList<int>::ConstIterator it2; for (it2=lst.begin(); it2!=lst.end(); ++it2) { - if (scIcons.contains(*it2)) + if (scIcons.tqcontains(*it2)) exp += scIcons[*it2]; else exp += *it2; @@ -451,13 +451,13 @@ TQString KIconTheme::current() KConfig *config = KGlobal::config(); KConfigGroupSaver saver(config, "Icons"); *_theme = config->readEntry("Theme",defaultThemeName()); - if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName(); + if ( *_theme == TQString::tqfromLatin1("hicolor") ) *_theme = defaultThemeName(); /* if (_theme->isEmpty()) { if (TQPixmap::defaultDepth() > 8) *_theme = defaultThemeName(); else - *_theme = TQString::fromLatin1("locolor"); + *_theme = TQString::tqfromLatin1("locolor"); }*/ return *_theme; } @@ -492,7 +492,7 @@ TQStringList KIconTheme::list() KIconTheme oink(*it2); if (!oink.isValid()) continue; - if (!_theme_list->contains(*it2)) + if (!_theme_list->tqcontains(*it2)) _theme_list->append(*it2); } } @@ -511,7 +511,7 @@ void KIconTheme::reconfigure() // static TQString KIconTheme::defaultThemeName() { - return TQString::fromLatin1("crystalsvg"); + return TQString::tqfromLatin1("crystalsvg"); } /*** KIconThemeDir ***/ diff --git a/kdecore/kidna.cpp b/kdecore/kidna.cpp index ca41fecdf..1ce2c1348 100644 --- a/kdecore/kidna.cpp +++ b/kdecore/kidna.cpp @@ -43,12 +43,12 @@ TQString KIDNA::toAscii(const TQString &idna) { if (idna.length() && (idna[0] == (QChar)'.')) { - TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1))); + TQString host = TQString::tqfromLatin1(toAsciiCString(idna.mid(1))); if (host.isEmpty()) return TQString::null; // Error return idna[0] + host; } - return TQString::fromLatin1(toAsciiCString(idna)); + return TQString::tqfromLatin1(toAsciiCString(idna)); } TQString KIDNA::toUnicode(const TQString &idna) diff --git a/kdecore/kkeyserver_x11.cpp b/kdecore/kkeyserver_x11.cpp index 96411bca5..96bd7d67d 100644 --- a/kdecore/kkeyserver_x11.cpp +++ b/kdecore/kkeyserver_x11.cpp @@ -176,8 +176,8 @@ static const TransKey g_rgQtToSymX[] = { Qt::Key_Up, XK_Up }, { Qt::Key_Right, XK_Right }, { Qt::Key_Down, XK_Down }, - { Qt::Key_Prior, XK_Prior }, - { Qt::Key_Next, XK_Next }, + { TQt::Key_Prior, XK_Prior }, + { TQt::Key_Next, XK_Next }, //{ Qt::Key_Shift, 0 }, //{ Qt::Key_Control, 0 }, //{ Qt::Key_Meta, 0 }, @@ -285,7 +285,7 @@ static const TransKey g_rgQtToSymX[] = { Qt::Key_VolumeUp, XF86XK_AudioRaiseVolume }, { Qt::Key_MediaPlay, XF86XK_AudioPlay }, { Qt::Key_MediaStop, XF86XK_AudioStop }, - { Qt::Key_MediaPrev, XF86XK_AudioPrev }, + { TQt::Key_MediaPrev, XF86XK_AudioPrev }, { Qt::Key_MediaNext, XF86XK_AudioNext }, { Qt::Key_HomePage, XF86XK_HomePage }, { Qt::Key_LaunchMail, XF86XK_Mail }, @@ -406,7 +406,7 @@ bool Sym::initQt( int keyQt ) int symQt = keyQt & 0xffff; if( (keyQt & Qt::UNICODE_ACCEL) || symQt < 0x1000 ) { - m_sym = TQChar(symQt).lower().unicode(); + m_sym = TQChar(symQt).lower().tqunicode(); return true; } @@ -434,9 +434,9 @@ bool Sym::initQt( int keyQt ) bool Sym::init( const TQString& s ) { - // If it's a single character, get unicode value. + // If it's a single character, get tqunicode value. if( s.length() == 1 ) { - m_sym = s[0].lower().unicode(); + m_sym = s[0].lower().tqunicode(); return true; } @@ -498,7 +498,7 @@ TQString Sym::toString( bool bUserSpace ) const if( m_sym == 0 ) return TQString::null; - // If it's a unicode character, + // If it's a tqunicode character, #ifdef Q_WS_WIN else if( m_sym < 0x1000 ) { #else @@ -542,7 +542,7 @@ uint Sym::getModsRequired() const if( m_sym < 0x3000 ) { TQChar c(m_sym); - if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().unicode() ) + if( c.isLetter() && c.lower() != c.upper() && m_sym == c.upper().tqunicode() ) return KKey::SHIFT; } @@ -823,7 +823,7 @@ uint stringUserToMod( const TQString& mod ) // Get code of just the primary key keySymQt = keyCombQt & 0xffff; - // If unicode value beneath 0x1000 (special Qt codes begin thereafter), + // If tqunicode value beneath 0x1000 (special Qt codes begin thereafter), if( keySymQt < 0x1000 ) { // For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'. // So convert it back to lowercase if SHIFT isn't held down. @@ -1041,7 +1041,7 @@ void KKey::simplify() // If this is a letter, don't remove any modifiers. if( m_sym < 0x3000 && TQChar(m_sym).isLetter() ) - m_sym = TQChar(m_sym).lower().unicode(); + m_sym = TQChar(m_sym).lower().tqunicode(); // Remove modifers from modifier list which are implicit in the symbol. // Ex. Shift+Plus => Plus (en) diff --git a/kdecore/klibloader.cpp b/kdecore/klibloader.cpp index e2f55fe67..80c5e6377 100644 --- a/kdecore/klibloader.cpp +++ b/kdecore/klibloader.cpp @@ -209,7 +209,7 @@ void KLibrary::slotObjectCreated( TQObject *obj ) if ( m_timer && m_timer->isActive() ) m_timer->stop(); - if ( m_objs.containsRef( obj ) ) + if ( m_objs.tqcontainsRef( obj ) ) return; // we know this object already connect( obj, TQT_SIGNAL( destroyed() ), @@ -220,7 +220,7 @@ void KLibrary::slotObjectCreated( TQObject *obj ) void KLibrary::slotObjectDestroyed() { - m_objs.removeRef( sender() ); + m_objs.removeRef( TQT_TQOBJECT_CONST(sender()) ); if ( m_objs.count() == 0 ) { @@ -337,10 +337,10 @@ static inline TQCString makeLibName( const char* name ) // only append ".la" if there is no extension // this allows to load non-libtool libraries as well // (mhk, 20000228) - int pos = libname.findRev('/'); + int pos = libname.tqfindRev('/'); if (pos < 0) pos = 0; - if (libname.find('.', pos) < 0) + if (libname.tqfind('.', pos) < 0) libname += ".la"; return libname; } @@ -500,7 +500,7 @@ void KLibLoader::slotLibraryDestroyed() void KLibLoader::close_pending(KLibWrapPrivate *wrap) { - if (wrap && !d->pending_close.containsRef( wrap )) + if (wrap && !d->pending_close.tqcontainsRef( wrap )) d->pending_close.append( wrap ); /* First delete all KLibrary objects in pending_close, but _don't_ unload @@ -534,7 +534,7 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) /* Now ensure, that the libs are only unloaded in the reverse direction they were loaded. */ - if (!d->pending_close.containsRef( wrap )) { + if (!d->pending_close.tqcontainsRef( wrap )) { if (!deleted_one) /* Only diagnose, if we really haven't deleted anything. */ // kdDebug(150) << "try to dlclose " << wrap->name << ": not yet" << endl; diff --git a/kdecore/klibloader.h b/kdecore/klibloader.h index b1a1bc330..c36e82f07 100644 --- a/kdecore/klibloader.h +++ b/kdecore/klibloader.h @@ -47,7 +47,7 @@ class KLibraryPrivate; * @see KLibLoader * @author Torben Weis <weis@kde.org> */ -class KDECORE_EXPORT KLibrary : public QObject +class KDECORE_EXPORT KLibrary : public TQObject { friend class KLibLoader; friend class TQAsciiDict<KLibrary>; @@ -139,7 +139,7 @@ class KLibWrapPrivate; * @see KLibrary * @author Torben Weis <weis@kde.org> */ -class KDECORE_EXPORT KLibLoader : public QObject +class KDECORE_EXPORT KLibLoader : public TQObject { friend class KLibrary; @@ -330,7 +330,7 @@ private: * * @author Torben Weis <weis@kde.org> */ -class KDECORE_EXPORT KLibFactory : public QObject +class KDECORE_EXPORT KLibFactory : public TQObject { Q_OBJECT public: diff --git a/kdecore/klocale.cpp b/kdecore/klocale.cpp index 91fe1c2a1..567c9a7f5 100644 --- a/kdecore/klocale.cpp +++ b/kdecore/klocale.cpp @@ -121,9 +121,9 @@ void KLocale::initMainCatalogues(const TQString & catalog) TQString mainCatalogue = catalog; // don't use main catalogue if we're looking up .desktop translations - if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { + if (mainCatalogue.tqcontains("desktop") == 0 || mainCatalogue.tqcontains("kdesktop") == 1) { if (maincatalogue) { - mainCatalogue = TQString::fromLatin1(maincatalogue); + mainCatalogue = TQString::tqfromLatin1(maincatalogue); } } @@ -135,7 +135,7 @@ void KLocale::initMainCatalogues(const TQString & catalog) else { // do not use insertCatalogue here, that would already trigger updateCatalogs d->catalogNames.append( mainCatalogue ); // application catalog - if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations + if (mainCatalogue.tqcontains("desktop") == 0 || mainCatalogue.tqcontains("kdesktop") == 1) { //don't bother if we're looking up desktop translations d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo d->catalogNames.append( "kio" ); // always include kio.mo d->catalogNames.append( "xdg-user-dirs" ); @@ -312,13 +312,13 @@ void KLocale::initFormat() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig entry(locate("locale", - TQString::fromLatin1("l10n/%1/entry.desktop") + TQString::tqfromLatin1("l10n/%1/entry.desktop") .arg(m_country)), true); entry.setGroup("KCM Locale"); // Numeric #define readConfigEntry(key, default, save) \ - save = entry.readEntry(key, TQString::fromLatin1(default)); \ + save = entry.readEntry(key, TQString::tqfromLatin1(default)); \ save = config->readEntry(key, save); #define readConfigNumEntry(key, default, save, type) \ @@ -331,7 +331,7 @@ void KLocale::initFormat() readConfigEntry("DecimalSymbol", ".", m_decimalSymbol); readConfigEntry("ThousandsSeparator", ",", m_thousandsSeparator); - m_thousandsSeparator.replace( TQString::fromLatin1("$0"), TQString::null ); + m_thousandsSeparator.tqreplace( TQString::tqfromLatin1("$0"), TQString() ); //kdDebug(173) << "m_thousandsSeparator=" << m_thousandsSeparator << endl; readConfigEntry("PositiveSign", "", m_positiveSign); @@ -342,7 +342,7 @@ void KLocale::initFormat() readConfigEntry("MonetaryDecimalSymbol", ".", m_monetaryDecimalSymbol); readConfigEntry("MonetaryThousandsSeparator", ",", m_monetaryThousandsSeparator); - m_monetaryThousandsSeparator.replace(TQString::fromLatin1("$0"), TQString::null); + m_monetaryThousandsSeparator.tqreplace(TQString::tqfromLatin1("$0"), TQString()); readConfigNumEntry("FracDigits", 2, m_fracDigits, int); readConfigBoolEntry("PositivePrefixCurrencySymbol", true, @@ -372,7 +372,7 @@ void KLocale::initFormat() //Grammatical //Precedence here is l10n / i18n / config file KSimpleConfig language(locate("locale", - TQString::fromLatin1("%1/entry.desktop") + TQString::tqfromLatin1("%1/entry.desktop") .arg(m_language)), true); language.setGroup("KCM Locale"); #define read3ConfigBoolEntry(key, default, save) \ @@ -404,7 +404,7 @@ bool KLocale::setCountry(const TQString & country) TQString KLocale::catalogueFileName(const TQString & language, const KCatalogue & catalog) { - TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo") + TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo") .arg( language ) .arg( catalog.name() ); @@ -417,7 +417,7 @@ TQString KLocale::catalogueFileName(const TQString & language, bool KLocale::setLanguage(const TQString & language) { - if ( d->languageList.contains( language ) ) { + if ( d->languageList.tqcontains( language ) ) { d->languageList.remove( language ); } d->languageList.prepend( language ); // let us consider this language to be the most important one @@ -451,7 +451,7 @@ bool KLocale::setLanguage(const TQStringList & languages) { // kdDebug() << "checking " << (*it) << endl; bool bIsTranslated = isApplicationTranslatedInto( *it ); - if ( languageList.contains(*it) > 1 || (*it).isEmpty() || (!bIsTranslated) ) { + if ( languageList.tqcontains(*it) > 1 || (*it).isEmpty() || (!bIsTranslated) ) { // kdDebug() << "removing " << (*it) << endl; it = languageList.remove( it ); } @@ -497,7 +497,7 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language) TQString appName = d->appName; if (maincatalogue) { - appName = TQString::fromLatin1(maincatalogue); + appName = TQString::tqfromLatin1(maincatalogue); } // sorry, catalogueFileName requires catalog object,k which we do not have here // path finding was supposed to be moved completely to KCatalogue. The interface cannot @@ -505,7 +505,7 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language) // duplicated code for file path evaluation. Cleanup will follow later. We could have e.g. // a static method in KCataloge that can translate between these file names. // a stat - TQString sFileName = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo") + TQString sFileName = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo") .arg( language ) .arg( appName ); // kdDebug() << "isApplicationTranslatedInto: filename " << sFileName << endl; @@ -526,7 +526,7 @@ void KLocale::splitLocale(const TQString & aStr, TQString str = aStr; // just in case, there is another language appended - int f = str.find(':'); + int f = str.tqfind(':'); if (f >= 0) str.truncate(f); @@ -534,14 +534,14 @@ void KLocale::splitLocale(const TQString & aStr, chrset = TQString::null; language = TQString::null; - f = str.find('.'); + f = str.tqfind('.'); if (f >= 0) { chrset = str.mid(f + 1); str.truncate(f); } - f = str.find('_'); + f = str.tqfind('_'); if (f >= 0) { country = str.mid(f + 1); @@ -644,7 +644,7 @@ TQString KLocale::weekDayName (int i, bool shortName) const void KLocale::insertCatalogue( const TQString & catalog ) { - if ( !d->catalogNames.contains( catalog) ) { + if ( !d->catalogNames.tqcontains( catalog) ) { d->catalogNames.append( catalog ); } updateCatalogues( ); // evaluate the changed list and generate the neccessary KCatalog objects @@ -693,7 +693,7 @@ void KLocale::updateCatalogues( ) void KLocale::removeCatalogue(const TQString &catalog) { - if ( d->catalogNames.contains( catalog )) { + if ( d->catalogNames.tqcontains( catalog )) { d->catalogNames.remove( catalog ); if (KGlobal::_instance) updateCatalogues(); // walk through the KCatalogue instances and weed out everything we no longer need @@ -702,7 +702,7 @@ void KLocale::removeCatalogue(const TQString &catalog) void KLocale::setActiveCatalogue(const TQString &catalog) { - if ( d->catalogNames.contains( catalog ) ) { + if ( d->catalogNames.tqcontains( catalog ) ) { d->catalogNames.remove( catalog ); d->catalogNames.prepend( catalog ); updateCatalogues(); // walk through the KCatalogue instances and adapt to the new order @@ -795,10 +795,10 @@ TQString KLocale::translate( const char *index, const char *fallback) const static TQString put_n_in(const TQString &orig, unsigned long n) { TQString ret = orig; - int index = ret.find("%n"); + int index = ret.tqfind("%n"); if (index == -1) return ret; - ret.replace(index, 2, TQString::number(n)); + ret.tqreplace(index, 2, TQString::number(n)); return ret; } @@ -830,7 +830,7 @@ TQString KLocale::translate( const char *singular, const char *plural, } else { TQString tmp = TQString::fromUtf8( plural ); #ifndef NDEBUG - if (tmp.find("%n") == -1) { + if (tmp.tqfind("%n") == -1) { kdDebug() << "the message for i18n should contain a '%n'! " << plural << endl; } #endif @@ -1142,7 +1142,7 @@ TQString KLocale::formatMoney(double num, TQString res = TQString::number(neg?-num:num, 'f', precision); // Replace dot with locale decimal separator - res.replace(TQChar('.'), monetaryDecimalSymbol()); + res.tqreplace(TQChar('.'), monetaryDecimalSymbol()); // Insert the thousand separators _insertSeparator(res, monetaryThousandsSeparator(), monetaryDecimalSymbol()); @@ -1259,7 +1259,7 @@ static void _inc_by_one(TQString &str, int position) // Cut off if more digits in fractional part than 'precision' static void _round(TQString &str, int precision) { - int decimalSymbolPos = str.find('.'); + int decimalSymbolPos = str.tqfind('.'); if (decimalSymbolPos == -1) if (precision == 0) return; @@ -1294,7 +1294,7 @@ static void _round(TQString &str, int precision) break; } - decimalSymbolPos = str.find('.'); + decimalSymbolPos = str.tqfind('.'); str.truncate(decimalSymbolPos + precision + 1); // if precision == 0 delete also '.' @@ -1324,7 +1324,7 @@ TQString KLocale::formatNumber(const TQString &numStr, bool round, if (round) _round(mantString, precision); // Replace dot with locale decimal separator - mantString.replace(TQChar('.'), decimalSymbol()); + mantString.tqreplace(TQChar('.'), decimalSymbol()); // Insert the thousand separators _insertSeparator(mantString, thousandsSeparator(), decimalSymbol()); @@ -1352,14 +1352,14 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const { if ( !escape ) { - if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'%' ) + if ( (TQChar(rst.at( format_index )).tqunicode()) == '%' ) escape = true; else buffer.append(rst.at(format_index)); } else { - switch ( rst.at( format_index ).unicode() ) + switch ( TQChar(rst.at( format_index )).tqunicode() ) { case '%': buffer.append('%'); @@ -1418,7 +1418,7 @@ void KLocale::setMainCatalogue(const char *catalog) double KLocale::readNumber(const TQString &_str, bool * ok) const { TQString str = _str.stripWhiteSpace(); - bool neg = str.find(negativeSign()) == 0; + bool neg = str.tqfind(negativeSign()) == 0; if (neg) str.remove( 0, negativeSign().length() ); @@ -1428,7 +1428,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const TQString exponentialPart; int EPos; - EPos = str.find('E', 0, false); + EPos = str.tqfind('E', 0, false); if (EPos != -1) { @@ -1436,7 +1436,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const str = str.left(EPos); } - int pos = str.find(decimalSymbol()); + int pos = str.tqfind(decimalSymbol()); TQString major; TQString minor; if ( pos == -1 ) @@ -1450,7 +1450,7 @@ double KLocale::readNumber(const TQString &_str, bool * ok) const // Remove thousand separators int thlen = thousandsSeparator().length(); int lastpos = 0; - while ( ( pos = major.find( thousandsSeparator() ) ) > 0 ) + while ( ( pos = major.tqfind( thousandsSeparator() ) ) > 0 ) { // e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N int fromEnd = major.length() - pos; @@ -1487,7 +1487,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const bool currencyFound = false; TQString symbol = currencySymbol(); // First try removing currency symbol from either end - int pos = str.find(symbol); + int pos = str.tqfind(symbol); if ( pos == 0 || pos == (int) str.length()-symbol.length() ) { str.remove(pos,symbol.length()); @@ -1512,7 +1512,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const } else { - int i1 = str.find(negativeSign()); + int i1 = str.tqfind(negativeSign()); if ( i1 == 0 || i1 == (int) str.length()-1 ) { neg = true; @@ -1525,7 +1525,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const // it already (because of the negative sign being in the way). if ( !currencyFound ) { - pos = str.find(symbol); + pos = str.tqfind(symbol); if ( pos == 0 || pos == (int) str.length()-symbol.length() ) { str.remove(pos,symbol.length()); @@ -1534,7 +1534,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const } // And parse the rest as a number - pos = str.find(monetaryDecimalSymbol()); + pos = str.tqfind(monetaryDecimalSymbol()); TQString major; TQString minior; if (pos == -1) @@ -1548,7 +1548,7 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const // Remove thousand separators int thlen = monetaryThousandsSeparator().length(); int lastpos = 0; - while ( ( pos = major.find( monetaryThousandsSeparator() ) ) > 0 ) + while ( ( pos = major.tqfind( monetaryThousandsSeparator() ) ) > 0 ) { // e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N int fromEnd = major.length() - pos; @@ -1866,7 +1866,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat // only "pm/am" here can grow, the rest shrinks, but // I'm rather safe than sorry - TQChar *buffer = new QChar[rst.length() * 3 / 2 + 30]; + TQChar *buffer = new TQChar[rst.length() * 3 / 2 + 30]; uint index = 0; bool escape = false; @@ -1876,14 +1876,14 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat { if ( !escape ) { - if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'%' ) + if ( (TQChar(rst.at( format_index )).tqunicode()) == '%' ) escape = true; else buffer[index++] = rst.at( format_index ); } else { - switch ( rst.at( format_index ).unicode() ) + switch ( TQChar(rst.at( format_index )).tqunicode() ) { case '%': buffer[index++] = (QChar)'%'; @@ -1915,7 +1915,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat number = pTime.hour(); case 'l': // to share the code - if ( (QChar)(rst.at( format_index ).unicode()) == (QChar)'l' ) + if ( (TQChar(rst.at( format_index )).tqunicode()) == 'l' ) number = isDuration ? pTime.hour() : (pTime.hour() + 11) % 12 + 1; if ( number / 10 ) buffer[index++] = number / 10 + '0'; @@ -1948,8 +1948,8 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat bool KLocale::use12Clock() const { - if ((timeFormat().contains(TQString::fromLatin1("%I")) > 0) || - (timeFormat().contains(TQString::fromLatin1("%l")) > 0)) + if ((timeFormat().tqcontains(TQString::tqfromLatin1("%I")) > 0) || + (timeFormat().tqcontains(TQString::tqfromLatin1("%l")) > 0)) return true; else return false; @@ -1957,7 +1957,7 @@ bool KLocale::use12Clock() const TQString KLocale::languages() const { - return d->languageList.join( TQString::fromLatin1(":") ); + return d->languageList.join( TQString::tqfromLatin1(":") ); } TQStringList KLocale::languageList() const @@ -1970,8 +1970,8 @@ TQString KLocale::formatDateTime(const TQDateTime &pDateTime, bool includeSeconds) const { return translate("concatenation of dates and time", "%1 %2") - .arg( formatDate( pDateTime.date(), shortFormat ) ) - .arg( formatTime( pDateTime.time(), includeSeconds ) ); + .arg( formatDate( TQT_TQDATE_OBJECT(pDateTime.date()), shortFormat ) ) + .arg( formatTime( TQT_TQTIME_OBJECT(pDateTime.time()), includeSeconds ) ); } TQString i18n(const char* text) @@ -2008,7 +2008,7 @@ void KLocale::initInstance() KInstance *app = KGlobal::instance(); if (app) { - KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName())); + KGlobal::_locale = new KLocale(TQString::tqfromLatin1(app->instanceName())); // only do this for the global instance TQTextCodec::setCodecForLocale(KGlobal::_locale->codecForEncoding()); @@ -2088,17 +2088,17 @@ void KLocale::initFileNameEncoding(KConfig *) TQCString KLocale::encodeFileNameUTF8( const TQString & fileName ) #endif // USE_QT3 #ifdef USE_QT4 -TQByteArray KLocale::encodeFileNameUTF8( const TQString & fileName ) +QByteArray KLocale::encodeFileNameUTF8( const QString & fileName ) #endif // USE_QT4 { - return fileName.utf8(); + return TQString(fileName).utf8(); } #ifdef USE_QT3 TQString KLocale::decodeFileNameUTF8( const TQCString & localFileName ) #endif // USE_QT3 #ifdef USE_QT4 -TQString KLocale::decodeFileNameUTF8( const TQByteArray & localFileName ) +QString KLocale::decodeFileNameUTF8( const QByteArray & localFileName ) #endif // USE_QT4 { return TQString::fromUtf8(localFileName); @@ -2265,12 +2265,12 @@ void KLocale::setMeasureSystem(MeasureSystem value) TQString KLocale::defaultLanguage() { - return TQString::fromLatin1("en_US"); + return TQString::tqfromLatin1("en_US"); } TQString KLocale::defaultCountry() { - return TQString::fromLatin1("C"); + return TQString::tqfromLatin1("C"); } const char * KLocale::encoding() const @@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const TQStringList result; - KConfig config(TQString::fromLatin1("language.codes"), true, false); + KConfig config(TQString::tqfromLatin1("language.codes"), true, false); config.setGroup("TwoLetterCodes"); for ( TQStringList::ConstIterator it = origList.begin(); @@ -2338,7 +2338,7 @@ TQStringList KLocale::languagesTwoAlpha() const langLst = config.readListEntry( lang ); else { - int i = lang.find('_'); + int i = lang.tqfind('_'); if (i >= 0) lang.truncate(i); langLst << lang; @@ -2348,7 +2348,7 @@ TQStringList KLocale::languagesTwoAlpha() const langIt != langLst.end(); ++langIt ) { - if ( !(*langIt).isEmpty() && !result.contains( *langIt ) ) + if ( !(*langIt).isEmpty() && !result.tqcontains( *langIt ) ) result += *langIt; } } @@ -2370,8 +2370,8 @@ TQString KLocale::twoAlphaToLanguageName(const TQString &code) const d->languages = new KConfig("all_languages", true, false, "locale"); TQString groupName = code; - const int i = groupName.find('_'); - groupName.replace(0, i, groupName.left(i).lower()); + const int i = groupName.tqfind('_'); + groupName.tqreplace(0, i, groupName.left(i).lower()); d->languages->setGroup(groupName); return d->languages->readEntry("Name"); @@ -2466,7 +2466,7 @@ KLocale & KLocale::operator=(const KLocale & rhs) } bool KLocale::setCharset(const TQString & ) { return true; } -TQString KLocale::charset() const { return TQString::fromLatin1("UTF-8"); } +TQString KLocale::charset() const { return TQString::tqfromLatin1("UTF-8"); } // KDE4: remove #if 0 diff --git a/kdecore/klocale.h b/kdecore/klocale.h index 5f8be8f7c..9bca02077 100644 --- a/kdecore/klocale.h +++ b/kdecore/klocale.h @@ -1225,7 +1225,7 @@ private: static TQCString encodeFileNameUTF8( const TQString & fileName ); #endif // USE_QT3 #ifdef USE_QT4 - static TQByteArray encodeFileNameUTF8( const TQString & fileName ); + static QByteArray encodeFileNameUTF8( const QString & fileName ); #endif // USE_QT4 /** @@ -1235,7 +1235,7 @@ private: static TQString decodeFileNameUTF8( const TQCString & localFileName ); #endif // USE_QT3 #ifdef USE_QT4 - static TQString decodeFileNameUTF8( const TQByteArray & localFileName ); + static QString decodeFileNameUTF8( const QByteArray & localFileName ); #endif // USE_QT4 /** diff --git a/kdecore/kmacroexpander.cpp b/kdecore/kmacroexpander.cpp index 5516c1b61..89eb5c72f 100644 --- a/kdecore/kmacroexpander.cpp +++ b/kdecore/kmacroexpander.cpp @@ -40,7 +40,7 @@ KMacroExpanderBase::setEscapeChar( TQChar c ) escapechar = c; } -QChar +TQChar KMacroExpanderBase::escapeChar() const { return escapechar; @@ -56,7 +56,7 @@ void KMacroExpanderBase::expandMacros( TQString &str ) for (pos = 0; pos < str.length(); ) { if (ec != (QChar)0) { - if (str.unicode()[pos] != ec) + if (str.tqunicode()[pos] != ec) goto nohit; if (!(len = expandEscapedMacro( str, pos, rst ))) goto nohit; @@ -109,7 +109,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) TQString rsts; while (pos < str.length()) { - TQChar cc( str.unicode()[pos] ); + TQChar cc( str.tqunicode()[pos] ); if (ec != (QChar)0) { if (cc != ec) goto nohit; @@ -205,7 +205,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) pos = pos2; return false; } - cc = str.unicode()[pos2]; + cc = str.tqunicode()[pos2]; if (cc == (QChar)'`') break; if (cc == (QChar)'\\') { @@ -339,7 +339,7 @@ template<class VT> int KMacroMapExpander<TQChar,VT>::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret ) { - TQMapConstIterator<TQChar,VT> it = macromap.find(str[pos]); + TQMapConstIterator<TQChar,VT> it = macromap.tqfind(str[pos]); if (it != macromap.end()) { ret += it.data(); return 1; @@ -355,7 +355,7 @@ KMacroMapExpander<TQChar,VT>::expandEscapedMacro( const TQString &str, uint pos, ret += TQString( escapeChar() ); return 2; } - TQMapConstIterator<TQChar,VT> it = macromap.find(str[pos+1]); + TQMapConstIterator<TQChar,VT> it = macromap.tqfind(str[pos+1]); if (it != macromap.end()) { ret += it.data(); return 2; @@ -383,14 +383,14 @@ template<class VT> int KMacroMapExpander<TQString,VT>::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret ) { - if (isIdentifier( str[pos - 1].unicode() )) + if (isIdentifier( str[pos - 1].tqunicode() )) return 0; uint sl; - for (sl = 0; isIdentifier( str[pos + sl].unicode() ); sl++); + for (sl = 0; isIdentifier( str[pos + sl].tqunicode() ); sl++); if (!sl) return 0; TQMapConstIterator<TQString,VT> it = - macromap.find( TQConstString( str.unicode() + pos, sl ).string() ); + macromap.tqfind( TQConstString( str.tqunicode() + pos, sl ).string() ); if (it != macromap.end()) { ret += it.data(); return sl; @@ -415,13 +415,13 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po rsl = sl + 3; } else { rpos = pos + 1; - for (sl = 0; isIdentifier( str[rpos + sl].unicode() ); sl++); + for (sl = 0; isIdentifier( str[rpos + sl].tqunicode() ); sl++); rsl = sl + 1; } if (!sl) return 0; TQMapConstIterator<TQString,VT> it = - macromap.find( TQConstString( str.unicode() + rpos, sl ).string() ); + macromap.tqfind( TQConstString( str.tqunicode() + rpos, sl ).string() ); if (it != macromap.end()) { ret += it.data(); return rsl; @@ -454,13 +454,13 @@ KCharMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL int KWordMacroExpander::expandPlainMacro( const TQString &str, uint pos, TQStringList &ret ) { - if (isIdentifier( str[pos - 1].unicode() )) + if (isIdentifier( str[pos - 1].tqunicode() )) return 0; uint sl; - for (sl = 0; isIdentifier( str[pos + sl].unicode() ); sl++); + for (sl = 0; isIdentifier( str[pos + sl].tqunicode() ); sl++); if (!sl) return 0; - if (expandMacro( TQConstString( str.unicode() + pos, sl ).string(), ret )) + if (expandMacro( TQConstString( str.tqunicode() + pos, sl ).string(), ret )) return sl; return 0; } @@ -481,12 +481,12 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL rsl = sl + 3; } else { rpos = pos + 1; - for (sl = 0; isIdentifier( str[rpos + sl].unicode() ); sl++); + for (sl = 0; isIdentifier( str[rpos + sl].tqunicode() ); sl++); rsl = sl + 1; } if (!sl) return 0; - if (expandMacro( TQConstString( str.unicode() + rpos, sl ).string(), ret )) + if (expandMacro( TQConstString( str.tqunicode() + rpos, sl ).string(), ret )) return rsl; return 0; } @@ -510,7 +510,7 @@ TexpandMacrosShellQuote( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c TQString str( ostr ); KMacroMapExpander<KT,VT> kmx( map, c ); if (!kmx.expandMacrosShellQuote( str )) - return TQString::null; + return TQString(); return str; } diff --git a/kdecore/kmanagerselection.cpp b/kdecore/kmanagerselection.cpp index b88990dbf..feabf630d 100644 --- a/kdecore/kmanagerselection.cpp +++ b/kdecore/kmanagerselection.cpp @@ -65,7 +65,7 @@ class KSelectionOwnerPrivate KSelectionOwnerPrivate::KSelectionOwnerPrivate( KSelectionOwner* owner_P ) : owner( owner_P ) { - kapp->installX11EventFilter( this ); + kapp->installX11EventFilter( TQT_TQWIDGET(this) ); } bool KSelectionOwnerPrivate::x11Event( XEvent* ev_P ) @@ -380,7 +380,7 @@ class KSelectionWatcherPrivate KSelectionWatcherPrivate::KSelectionWatcherPrivate( KSelectionWatcher* watcher_P ) : watcher( watcher_P ) { - kapp->installX11EventFilter( this ); + kapp->installX11EventFilter( TQT_TQWIDGET(this) ); } bool KSelectionWatcherPrivate::x11Event( XEvent* ev_P ) diff --git a/kdecore/kmanagerselection.h b/kdecore/kmanagerselection.h index b6aefd9db..384f5d23f 100644 --- a/kdecore/kmanagerselection.h +++ b/kdecore/kmanagerselection.h @@ -28,6 +28,10 @@ DEALINGS IN THE SOFTWARE. #include <tqobject.h> #include <kdelibs_export.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 // FIXME(E) #include <X11/Xlib.h> @@ -44,7 +48,7 @@ class KSelectionOwnerPrivate; @short ICCCM manager selection owner */ class KDECORE_EXPORT KSelectionOwner - : public QObject + : public TQObject { Q_OBJECT public: @@ -167,7 +171,7 @@ class KSelectionWatcherPrivate; @short ICCCM manager selection watching */ class KDECORE_EXPORT KSelectionWatcher - : public QObject + : public TQObject { Q_OBJECT public: diff --git a/kdecore/kmdcodec.cpp b/kdecore/kmdcodec.cpp index 76c80d329..4fe968361 100644 --- a/kdecore/kmdcodec.cpp +++ b/kdecore/kmdcodec.cpp @@ -787,7 +787,7 @@ void KMD5::update(const TQCString& in) void KMD5::update(const unsigned char* in, int len) { if (len < 0) - len = qstrlen(reinterpret_cast<const char*>(in)); + len = tqstrlen(reinterpret_cast<const char*>(in)); if (!len) return; @@ -797,12 +797,12 @@ void KMD5::update(const unsigned char* in, int len) return; } - Q_UINT32 in_index; - Q_UINT32 buffer_index; - Q_UINT32 buffer_space; - Q_UINT32 in_length = static_cast<Q_UINT32>( len ); + TQ_UINT32 in_index; + TQ_UINT32 buffer_index; + TQ_UINT32 buffer_space; + TQ_UINT32 in_length = static_cast<TQ_UINT32>( len ); - buffer_index = static_cast<Q_UINT32>((m_count[0] >> 3) & 0x3F); + buffer_index = static_cast<TQ_UINT32>((m_count[0] >> 3) & 0x3F); if ( (m_count[0] += (in_length << 3))<(in_length << 3) ) m_count[1]++; @@ -842,8 +842,8 @@ void KMD5::finalize () { if (m_finalized) return; - Q_UINT8 bits[8]; - Q_UINT32 index, padLen; + TQ_UINT8 bits[8]; + TQ_UINT32 index, padLen; static const unsigned char PADDING[64]= { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -856,7 +856,7 @@ void KMD5::finalize () //memcpy( bits, m_count, 8 ); // Pad out to 56 mod 64. - index = static_cast<Q_UINT32>((m_count[0] >> 3) & 0x3f); + index = static_cast<TQ_UINT32>((m_count[0] >> 3) & 0x3f); padLen = (index < 56) ? (56 - index) : (120 - index); update (reinterpret_cast<const char*>(PADDING), padLen); @@ -957,7 +957,7 @@ void KMD5::reset() void KMD5::transform( const unsigned char block[64] ) { - Q_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16]; + TQ_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16]; decode (x, block, 64); //memcpy( x, block, 64 ); @@ -1044,91 +1044,91 @@ void KMD5::transform( const unsigned char block[64] ) memset ( static_cast<void *>(x), 0, sizeof(x) ); } -inline Q_UINT32 KMD5::rotate_left (Q_UINT32 x, Q_UINT32 n) +inline TQ_UINT32 KMD5::rotate_left (TQ_UINT32 x, TQ_UINT32 n) { return (x << n) | (x >> (32-n)) ; } -inline Q_UINT32 KMD5::F (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) +inline TQ_UINT32 KMD5::F (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) { return (x & y) | (~x & z); } -inline Q_UINT32 KMD5::G (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) +inline TQ_UINT32 KMD5::G (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) { return (x & z) | (y & ~z); } -inline Q_UINT32 KMD5::H (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) +inline TQ_UINT32 KMD5::H (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) { return x ^ y ^ z; } -inline Q_UINT32 KMD5::I (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) +inline TQ_UINT32 KMD5::I (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) { return y ^ (x | ~z); } -void KMD5::FF ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, - Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac ) +void KMD5::FF ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, + TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac ) { a += F(b, c, d) + x + ac; a = rotate_left (a, s) +b; } -void KMD5::GG ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, - Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac) +void KMD5::GG ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, + TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac) { a += G(b, c, d) + x + ac; a = rotate_left (a, s) +b; } -void KMD5::HH ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, - Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac ) +void KMD5::HH ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, + TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac ) { a += H(b, c, d) + x + ac; a = rotate_left (a, s) +b; } -void KMD5::II ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, - Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac ) +void KMD5::II ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, + TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac ) { a += I(b, c, d) + x + ac; a = rotate_left (a, s) +b; } -void KMD5::encode ( unsigned char* output, Q_UINT32 *in, Q_UINT32 len ) +void KMD5::encode ( unsigned char* output, TQ_UINT32 *in, TQ_UINT32 len ) { #if !defined(WORDS_BIGENDIAN) memcpy(output, in, len); #else - Q_UINT32 i, j; + TQ_UINT32 i, j; for (i = 0, j = 0; j < len; i++, j += 4) { - output[j] = static_cast<Q_UINT8>((in[i] & 0xff)); - output[j+1] = static_cast<Q_UINT8>(((in[i] >> 8) & 0xff)); - output[j+2] = static_cast<Q_UINT8>(((in[i] >> 16) & 0xff)); - output[j+3] = static_cast<Q_UINT8>(((in[i] >> 24) & 0xff)); + output[j] = static_cast<TQ_UINT8>((in[i] & 0xff)); + output[j+1] = static_cast<TQ_UINT8>(((in[i] >> 8) & 0xff)); + output[j+2] = static_cast<TQ_UINT8>(((in[i] >> 16) & 0xff)); + output[j+3] = static_cast<TQ_UINT8>(((in[i] >> 24) & 0xff)); } #endif } -// Decodes in (Q_UINT8) into output (Q_UINT32). Assumes len is a +// Decodes in (TQ_UINT8) into output (TQ_UINT32). Assumes len is a // multiple of 4. -void KMD5::decode (Q_UINT32 *output, const unsigned char* in, Q_UINT32 len) +void KMD5::decode (TQ_UINT32 *output, const unsigned char* in, TQ_UINT32 len) { #if !defined(WORDS_BIGENDIAN) memcpy(output, in, len); #else - Q_UINT32 i, j; + TQ_UINT32 i, j; for (i = 0, j = 0; j < len; i++, j += 4) - output[i] = static_cast<Q_UINT32>(in[j]) | - (static_cast<Q_UINT32>(in[j+1]) << 8) | - (static_cast<Q_UINT32>(in[j+2]) << 16) | - (static_cast<Q_UINT32>(in[j+3]) << 24); + output[i] = static_cast<TQ_UINT32>(in[j]) | + (static_cast<TQ_UINT32>(in[j+1]) << 8) | + (static_cast<TQ_UINT32>(in[j+2]) << 16) | + (static_cast<TQ_UINT32>(in[j+3]) << 24); #endif } @@ -1180,7 +1180,7 @@ void KMD4::update(const TQCString& in) void KMD4::update(const unsigned char *in, int len) { if (len < 0) - len = qstrlen(reinterpret_cast<const char*>(in)); + len = tqstrlen(reinterpret_cast<const char*>(in)); if (!len) return; @@ -1190,12 +1190,12 @@ void KMD4::update(const unsigned char *in, int len) return; } - Q_UINT32 t; + TQ_UINT32 t; /* Update bitcount */ t = m_count[0]; - if ((m_count[0] = t + ((Q_UINT32) len << 3)) < t) + if ((m_count[0] = t + ((TQ_UINT32) len << 3)) < t) m_count[1]++; /* Carry from low to high */ m_count[1] += len >> 29; @@ -1205,17 +1205,17 @@ void KMD4::update(const unsigned char *in, int len) if (t) { - Q_UINT8 *p = &m_buffer[ t ]; + TQ_UINT8 *p = &m_buffer[ t ]; t = 64 - t; - if ((Q_UINT32)len < t) + if ((TQ_UINT32)len < t) { memcpy (p, in, len); return; } memcpy (p, in, t); byteReverse (m_buffer, 16); - transform (m_state, (Q_UINT32*) m_buffer); + transform (m_state, (TQ_UINT32*) m_buffer); in += t; len -= t; } @@ -1225,7 +1225,7 @@ void KMD4::update(const unsigned char *in, int len) { memcpy (m_buffer, in, 64); byteReverse (m_buffer, 16); - transform (m_state, (Q_UINT32 *) m_buffer); + transform (m_state, (TQ_UINT32 *) m_buffer); in += 64; len -= 64; } @@ -1272,7 +1272,7 @@ void KMD4::finalize() /* Two lots of padding: Pad the first block to 64 bytes */ memset (p, 0, count); byteReverse (m_buffer, 16); - transform (m_state, (Q_UINT32*) m_buffer); + transform (m_state, (TQ_UINT32*) m_buffer); /* Now fill the next block with 56 bytes */ memset (m_buffer, 0, 56); @@ -1285,10 +1285,10 @@ void KMD4::finalize() byteReverse (m_buffer, 14); /* Append length in bits and transform */ - ((Q_UINT32 *) m_buffer)[14] = m_count[0]; - ((Q_UINT32 *) m_buffer)[15] = m_count[1]; + ((TQ_UINT32 *) m_buffer)[14] = m_count[0]; + ((TQ_UINT32 *) m_buffer)[15] = m_count[1]; - transform (m_state, (Q_UINT32 *) m_buffer); + transform (m_state, (TQ_UINT32 *) m_buffer); byteReverse ((unsigned char *) m_state, 4); memcpy (m_digest, m_state, 16); @@ -1380,53 +1380,53 @@ void KMD4::reset() memset ( m_digest, 0, sizeof(*m_digest)); } -//#define rotl32(x,n) (((x) << ((Q_UINT32)(n))) | ((x) >> (32 - (Q_UINT32)(n)))) +//#define rotl32(x,n) (((x) << ((TQ_UINT32)(n))) | ((x) >> (32 - (TQ_UINT32)(n)))) -inline Q_UINT32 KMD4::rotate_left (Q_UINT32 x, Q_UINT32 n) +inline TQ_UINT32 KMD4::rotate_left (TQ_UINT32 x, TQ_UINT32 n) { return (x << n) | (x >> (32-n)) ; } -inline Q_UINT32 KMD4::F (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) +inline TQ_UINT32 KMD4::F (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) { return (x & y) | (~x & z); } -inline Q_UINT32 KMD4::G (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) +inline TQ_UINT32 KMD4::G (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) { return ((x) & (y)) | ((x) & (z)) | ((y) & (z)); } -inline Q_UINT32 KMD4::H (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) +inline TQ_UINT32 KMD4::H (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) { return x ^ y ^ z; } -inline void KMD4::FF ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, - Q_UINT32 x, Q_UINT32 s ) +inline void KMD4::FF ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, + TQ_UINT32 x, TQ_UINT32 s ) { a += F(b, c, d) + x; a = rotate_left (a, s); } -inline void KMD4::GG ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, - Q_UINT32 x, Q_UINT32 s) +inline void KMD4::GG ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, + TQ_UINT32 x, TQ_UINT32 s) { - a += G(b, c, d) + x + (Q_UINT32)0x5a827999; + a += G(b, c, d) + x + (TQ_UINT32)0x5a827999; a = rotate_left (a, s); } -inline void KMD4::HH ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, - Q_UINT32 x, Q_UINT32 s ) +inline void KMD4::HH ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, + TQ_UINT32 x, TQ_UINT32 s ) { - a += H(b, c, d) + x + (Q_UINT32)0x6ed9eba1; + a += H(b, c, d) + x + (TQ_UINT32)0x6ed9eba1; a = rotate_left (a, s); } -void KMD4::byteReverse( unsigned char *buf, Q_UINT32 len ) +void KMD4::byteReverse( unsigned char *buf, TQ_UINT32 len ) { #ifdef WORDS_BIGENDIAN - Q_UINT32 *b = (Q_UINT32*) buf; + TQ_UINT32 *b = (TQ_UINT32*) buf; while ( len > 0 ) { *b = ((((*b) & 0xff000000) >> 24) | (((*b) & 0x00ff0000) >> 8) | (((*b) & 0x0000ff00) << 8) | (((*b) & 0x000000ff) << 24)); @@ -1442,9 +1442,9 @@ void KMD4::byteReverse( unsigned char *buf, Q_UINT32 len ) /* * The core of the MD4 algorithm */ -void KMD4::transform( Q_UINT32 buf[4], Q_UINT32 const in[16] ) +void KMD4::transform( TQ_UINT32 buf[4], TQ_UINT32 const in[16] ) { - Q_UINT32 a, b, c, d; + TQ_UINT32 a, b, c, d; a = buf[0]; b = buf[1]; diff --git a/kdecore/kmdcodec.h b/kdecore/kmdcodec.h index ef1d49d1e..d4bd8dfb0 100644 --- a/kdecore/kmdcodec.h +++ b/kdecore/kmdcodec.h @@ -541,27 +541,27 @@ private: KMD5& operator=(const KMD5& md); void init(); - void encode( unsigned char* output, Q_UINT32 *in, Q_UINT32 len ); - void decode( Q_UINT32 *output, const unsigned char* in, Q_UINT32 len ); - - Q_UINT32 rotate_left( Q_UINT32 x, Q_UINT32 n ); - Q_UINT32 F( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z ); - Q_UINT32 G( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z ); - Q_UINT32 H( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z ); - Q_UINT32 I( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z ); - void FF( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x, - Q_UINT32 s, Q_UINT32 ac ); - void GG( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x, - Q_UINT32 s, Q_UINT32 ac ); - void HH( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x, - Q_UINT32 s, Q_UINT32 ac ); - void II( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x, - Q_UINT32 s, Q_UINT32 ac ); + void encode( unsigned char* output, TQ_UINT32 *in, TQ_UINT32 len ); + void decode( TQ_UINT32 *output, const unsigned char* in, TQ_UINT32 len ); + + TQ_UINT32 rotate_left( TQ_UINT32 x, TQ_UINT32 n ); + TQ_UINT32 F( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z ); + TQ_UINT32 G( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z ); + TQ_UINT32 H( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z ); + TQ_UINT32 I( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z ); + void FF( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x, + TQ_UINT32 s, TQ_UINT32 ac ); + void GG( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x, + TQ_UINT32 s, TQ_UINT32 ac ); + void HH( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x, + TQ_UINT32 s, TQ_UINT32 ac ); + void II( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x, + TQ_UINT32 s, TQ_UINT32 ac ); private: - Q_UINT32 m_state[4]; - Q_UINT32 m_count[2]; - Q_UINT8 m_buffer[64]; + TQ_UINT32 m_state[4]; + TQ_UINT32 m_count[2]; + TQ_UINT8 m_buffer[64]; Digest m_digest; bool m_finalized; @@ -704,7 +704,7 @@ protected: * Performs the real update work. Note * that length is implied to be 64. */ - void transform( Q_UINT32 buf[4], Q_UINT32 const in[16] ); + void transform( TQ_UINT32 buf[4], TQ_UINT32 const in[16] ); /** * finalizes the digest @@ -717,23 +717,23 @@ private: void init(); - void byteReverse( unsigned char *buf, Q_UINT32 len ); + void byteReverse( unsigned char *buf, TQ_UINT32 len ); - Q_UINT32 rotate_left( Q_UINT32 x, Q_UINT32 n ); - Q_UINT32 F( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z ); - Q_UINT32 G( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z ); - Q_UINT32 H( Q_UINT32 x, Q_UINT32 y, Q_UINT32 z ); - void FF( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x, - Q_UINT32 s ); - void GG( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x, - Q_UINT32 s ); - void HH( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, Q_UINT32 x, - Q_UINT32 s ); + TQ_UINT32 rotate_left( TQ_UINT32 x, TQ_UINT32 n ); + TQ_UINT32 F( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z ); + TQ_UINT32 G( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z ); + TQ_UINT32 H( TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z ); + void FF( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x, + TQ_UINT32 s ); + void GG( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x, + TQ_UINT32 s ); + void HH( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, TQ_UINT32 x, + TQ_UINT32 s ); private: - Q_UINT32 m_state[4]; - Q_UINT32 m_count[2]; - Q_UINT8 m_buffer[64]; + TQ_UINT32 m_state[4]; + TQ_UINT32 m_count[2]; + TQ_UINT8 m_buffer[64]; Digest m_digest; bool m_finalized; diff --git a/kdecore/kmimesourcefactory.cpp b/kdecore/kmimesourcefactory.cpp index 37745d398..0123f3465 100644 --- a/kdecore/kmimesourcefactory.cpp +++ b/kdecore/kmimesourcefactory.cpp @@ -60,7 +60,7 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T TQString myName; TQString myContext; - const int pos = absOrRelName.find ('|'); + const int pos = absOrRelName.tqfind ('|'); if (pos > -1) { myContext = absOrRelName.left (pos); diff --git a/kdecore/kmultipledrag.cpp b/kdecore/kmultipledrag.cpp index 29d56bd85..94abe689e 100644 --- a/kdecore/kmultipledrag.cpp +++ b/kdecore/kmultipledrag.cpp @@ -39,9 +39,9 @@ void KMultipleDrag::addDragObject( TQDragObject *dragObject ) m_numberFormats.append( i ); // e.g. if it supports two formats, 0 and 1, store 2. } -TQByteArray KMultipleDrag::encodedData( const char *mime ) const +TQByteArray KMultipleDrag::tqencodedData( const char *mime ) const { - //kdDebug() << "KMultipleDrag::encodedData " << mime << endl; + //kdDebug() << "KMultipleDrag::tqencodedData " << mime << endl; // Iterate over the drag objects, and find the format in the right one TQPtrListIterator<TQDragObject> it( m_dragObjects ); for ( ; it.current(); ++it ) @@ -49,7 +49,7 @@ TQByteArray KMultipleDrag::encodedData( const char *mime ) const for ( int i = 0; it.current()->format( i ); ++i ) { if ( ::qstrcmp( it.current()->format( i ), mime ) == 0 ) - return it.current()->encodedData( mime ); + return it.current()->tqencodedData( mime ); } } return TQByteArray(); diff --git a/kdecore/kmultipledrag.h b/kdecore/kmultipledrag.h index 47bfbd378..5dc6e2972 100644 --- a/kdecore/kmultipledrag.h +++ b/kdecore/kmultipledrag.h @@ -40,7 +40,7 @@ class KMultipleDragPrivate; * Sample code for this: * * \code - * KMultipleDrag *drag = new KMultipleDrag( parentWidget ); + * KMultipleDrag *drag = new KMultipleDrag( tqparentWidget ); * drag->addDragObject( new TQImageDrag( someQImage, 0 ) ); * drag->addDragObject( new KURLDrag( someKURL, 0 ) ); * drag->drag(); @@ -80,7 +80,7 @@ public: * @return the data, or a null byte array if not found * @reimp */ - virtual TQByteArray encodedData( const char *mime ) const; + virtual TQByteArray tqencodedData( const char *mime ) const; /** * Returns the @p i'th supported format, or 0. diff --git a/kdecore/knotifyclient.cpp b/kdecore/knotifyclient.cpp index bce90d86a..185639f11 100644 --- a/kdecore/knotifyclient.cpp +++ b/kdecore/knotifyclient.cpp @@ -84,9 +84,9 @@ static int sendNotifyEvent(const TQString &message, const TQString &text, int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure! // knotify daemon needs toplevel window - TQWidget* widget = TQWidget::find( (WId)winId ); + TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId )); if( widget ) - winId = (int)widget->topLevelWidget()->winId(); + winId = (int)widget->tqtopLevelWidget()->winId(); TQByteArray data; TQDataStream ds(data, IO_WriteOnly); @@ -126,20 +126,20 @@ int KNotifyClient::event( int winId, StandardEvent type, const TQString& text ) TQString message; switch ( type ) { case cannotOpenFile: - message = TQString::fromLatin1("cannotopenfile"); + message = TQString::tqfromLatin1("cannotopenfile"); break; case warning: - message = TQString::fromLatin1("warning"); + message = TQString::tqfromLatin1("warning"); break; case fatalError: - message = TQString::fromLatin1("fatalerror"); + message = TQString::tqfromLatin1("fatalerror"); break; case catastrophe: - message = TQString::fromLatin1("catastrophe"); + message = TQString::tqfromLatin1("catastrophe"); break; case notification: // fall through default: - message = TQString::fromLatin1("notification"); + message = TQString::tqfromLatin1("notification"); break; } diff --git a/kdecore/kpalette.cpp b/kdecore/kpalette.cpp index 777340ea6..1a828fe4d 100644 --- a/kdecore/kpalette.cpp +++ b/kdecore/kpalette.cpp @@ -66,7 +66,7 @@ KPalette::KPalette(const TQString &name) // Read first line // Expected "GIMP Palette" if (paletteFile.readLine(line, maxLength) == -1) return; - if (line.find(" Palette") == -1) return; + if (line.tqfind(" Palette") == -1) return; while( paletteFile.readLine(line, maxLength) != -1) { @@ -170,7 +170,7 @@ KPalette::operator=( const KPalette &p) return *this; } -QColor +TQColor KPalette::color(int index) { if ((index < 0) || (index >= nrColors())) @@ -196,7 +196,7 @@ KPalette::findColor(const TQColor &color) const return -1; } -QString +TQString KPalette::colorName(int index) { if ((index < 0) || (index >= nrColors())) diff --git a/kdecore/kprocctrl.cpp b/kdecore/kprocctrl.cpp index d8170c0a8..6774eee5f 100644 --- a/kdecore/kprocctrl.cpp +++ b/kdecore/kprocctrl.cpp @@ -214,7 +214,7 @@ void KProcessController::slotDoHousekeeping() if( waitpid( *uit, 0, WNOHANG ) > 0 ) { uit = unixProcessList.remove( uit ); - deref(); // counterpart to addProcess, can invalidate 'this' + deref(); // counterpart to addProcess, can tqinvalidate 'this' } else ++uit; } diff --git a/kdecore/kprocctrl.h b/kdecore/kprocctrl.h index 69182a344..0e534f4ad 100644 --- a/kdecore/kprocctrl.h +++ b/kdecore/kprocctrl.h @@ -36,7 +36,7 @@ class TQSocketNotifier; * * This class takes care of the actual (UN*X) signal handling. */ -class KDECORE_EXPORT KProcessController : public QObject +class KDECORE_EXPORT KProcessController : public TQObject { Q_OBJECT diff --git a/kdecore/kprocess.h b/kdecore/kprocess.h index 51366e3e4..a07df060e 100644 --- a/kdecore/kprocess.h +++ b/kdecore/kprocess.h @@ -127,7 +127,7 @@ class KPty; * @author Christian Czezatke e9025461@student.tuwien.ac.at * **/ -class KDECORE_EXPORT KProcess : public QObject +class KDECORE_EXPORT KProcess : public TQObject { Q_OBJECT @@ -606,7 +606,7 @@ signals: * data structures before returning from the slot. * Example: * \code - * TQString myBuf = TQString::fromLatin1(buffer, buflen); + * TQString myBuf = TQString::tqfromLatin1(buffer, buflen); * \endcode **/ void receivedStdout(KProcess *proc, char *buffer, int buflen); @@ -752,7 +752,7 @@ protected: * will usually do some communications cleanup, like closing in[0], * out[1] and out[1]. * - * Furthermore, it must also create the QSocketNotifiers innot, + * Furthermore, it must also create the TQSocketNotifiers innot, * outnot and errnot and connect their Qt signals to the respective * KProcess slots. * diff --git a/kdecore/kprocio.cpp b/kdecore/kprocio.cpp index 9159edab5..91c28024f 100644 --- a/kdecore/kprocio.cpp +++ b/kdecore/kprocio.cpp @@ -231,7 +231,7 @@ int KProcIO::readln (TQString &line, bool autoAck, bool *partial) //need to reduce the size of recvbuffer at some point... - len=recvbuffer.find ('\n',rbi)-rbi; + len=recvbuffer.tqfind ('\n',rbi)-rbi; //kdDebug(174) << "KPIO::readln" << endl; diff --git a/kdecore/kprocio.h b/kdecore/kprocio.h index 8661699a7..89c69008e 100644 --- a/kdecore/kprocio.h +++ b/kdecore/kprocio.h @@ -35,7 +35,7 @@ class TQTextCodec; * buffer and maintained/freed appropriately. There is no need * to be concerned with wroteStdin() signals _at_all_. * @li readln() reads a line of data and buffers any leftovers. - * @li Conversion from/to unicode. + * @li Conversion from/to tqunicode. * * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs(). * diff --git a/kdecore/kprotocolinfo_kdecore.cpp b/kdecore/kprotocolinfo_kdecore.cpp index 203f455a1..66ce97760 100644 --- a/kdecore/kprotocolinfo_kdecore.cpp +++ b/kdecore/kprotocolinfo_kdecore.cpp @@ -151,8 +151,8 @@ KProtocolInfo::load( TQDataStream& _str) { // You may add new fields at the end. Make sure to update the version // number in ksycoca.h - Q_INT32 i_inputType, i_outputType; - Q_INT8 i_isSourceProtocol, i_isHelperProtocol, + TQ_INT32 i_inputType, i_outputType; + TQ_INT8 i_isSourceProtocol, i_isHelperProtocol, i_supportsListing, i_supportsReading, i_supportsWriting, i_supportsMakeDir, i_supportsDeleting, i_supportsLinking, @@ -206,8 +206,8 @@ KProtocolInfo::save( TQDataStream& _str) // You may add new fields at the end. Make sure to update the version // number in ksycoca.h - Q_INT32 i_inputType, i_outputType; - Q_INT8 i_isSourceProtocol, i_isHelperProtocol, + TQ_INT32 i_inputType, i_outputType; + TQ_INT8 i_isSourceProtocol, i_isHelperProtocol, i_supportsListing, i_supportsReading, i_supportsWriting, i_supportsMakeDir, i_supportsDeleting, i_supportsLinking, @@ -216,8 +216,8 @@ KProtocolInfo::save( TQDataStream& _str) i_uriMode, i_canRenameFromFile, i_canRenameToFile, i_canDeleteRecursive, i_fileNameUsedForCopying; - i_inputType = (Q_INT32) m_inputType; - i_outputType = (Q_INT32) m_outputType; + i_inputType = (TQ_INT32) m_inputType; + i_outputType = (TQ_INT32) m_outputType; i_isSourceProtocol = m_isSourceProtocol ? 1 : 0; i_isHelperProtocol = m_isHelperProtocol ? 1 : 0; i_supportsListing = m_supportsListing ? 1 : 0; @@ -392,7 +392,7 @@ TQString KProtocolInfo::icon( const TQString& _protocol ) { KProtocolInfo::Ptr prot = KProtocolInfoFactory::self()->findProtocol(_protocol); if ( !prot ) - return TQString::fromLatin1("unknown"); + return TQString::tqfromLatin1("unknown"); return prot->m_icon; } diff --git a/kdecore/kprotocolinfofactory.cpp b/kdecore/kprotocolinfofactory.cpp index e47cbb881..6d61c2d8c 100644 --- a/kdecore/kprotocolinfofactory.cpp +++ b/kdecore/kprotocolinfofactory.cpp @@ -86,7 +86,7 @@ KProtocolInfoFactory::findProtocol(const TQString &protocol) { if (!m_sycocaDict) return 0; // Error! - TQMap<TQString,KProtocolInfo::Ptr>::iterator it = m_cache.find(protocol); + TQMap<TQString,KProtocolInfo::Ptr>::iterator it = m_cache.tqfind(protocol); if (it != m_cache.end()) return (*it); diff --git a/kdecore/kqiodevicegzip_p.cpp b/kdecore/kqiodevicegzip_p.cpp index 2f949b9ee..8439eb26e 100644 --- a/kdecore/kqiodevicegzip_p.cpp +++ b/kdecore/kqiodevicegzip_p.cpp @@ -78,7 +78,11 @@ void KQIODeviceGZip::flush(void) } } +#ifdef USE_QT4 +qint64 KQIODeviceGZip::size(void) const +#else // USE_QT4 TQIODevice::Offset KQIODeviceGZip::size(void) const +#endif // USE_QT4 { return 0; // You cannot determine size! } @@ -111,9 +115,9 @@ bool KQIODeviceGZip::reset(void) return (gzrewind(m_gzfile)>=0); } -Q_LONG KQIODeviceGZip::readBlock( char *data, Q_ULONG maxlen ) +TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen ) { - Q_LONG result=0; + TQ_LONG result=0; if (m_gzfile) { result=gzread(m_gzfile,data,maxlen); @@ -122,9 +126,9 @@ Q_LONG KQIODeviceGZip::readBlock( char *data, Q_ULONG maxlen ) return result; } -Q_LONG KQIODeviceGZip::writeBlock( const char *data, Q_ULONG len ) +TQ_LONG KQIODeviceGZip::writeBlock( const char *data, TQ_ULONG len ) { - Q_ULONG result=0; + TQ_ULONG result=0; if (m_gzfile) { result=gzwrite(m_gzfile,(char*)data,len); diff --git a/kdecore/kqiodevicegzip_p.h b/kdecore/kqiodevicegzip_p.h index 02c3fe039..73da2281d 100644 --- a/kdecore/kqiodevicegzip_p.h +++ b/kdecore/kqiodevicegzip_p.h @@ -32,7 +32,7 @@ * \internal This class is internal to KDE. * The class KFilterDev should be used instead. */ -class KQIODeviceGZip : public QIODevice +class KQIODeviceGZip : public TQIODevice { public: KQIODeviceGZip(const TQString& filename); @@ -42,14 +42,18 @@ public: void close(void); void flush(void); +#ifdef USE_QT4 + qint64 size(void) const; +#else // USE_QT4 Offset size(void) const; +#endif // USE_QT4 Offset at(void) const; bool at(Offset pos); bool atEnd(void) const; bool reset (void); - Q_LONG readBlock( char *data, Q_ULONG maxlen ); - Q_LONG writeBlock( const char *data, Q_ULONG len ); + TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + TQ_LONG writeBlock( const char *data, TQ_ULONG len ); int getch(void); int putch(int ch); diff --git a/kdecore/kregexp.h b/kdecore/kregexp.h index c3ed8ff3d..88d16a3c7 100644 --- a/kdecore/kregexp.h +++ b/kdecore/kregexp.h @@ -30,7 +30,7 @@ class KRegExpPrivate; * * This was implemented * because TQRegExp did not support back-references. It now does and - * is recommended over KRegExp because of the unicode support and the + * is recommended over KRegExp because of the tqunicode support and the * more powerful API. * * Back-references are parts of a regexp grouped with parentheses. If a @@ -53,7 +53,7 @@ class KRegExpPrivate; * Weis * \endcode * - * Please notice that KRegExp does @em not support unicode. + * Please notice that KRegExp does @em not support tqunicode. * * @author Torben Weis <weis@kde.org> */ diff --git a/kdecore/krfcdate.cpp b/kdecore/krfcdate.cpp index d9a374d0c..ebb12aa62 100644 --- a/kdecore/krfcdate.cpp +++ b/kdecore/krfcdate.cpp @@ -363,12 +363,12 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) TQString input = input_; // First find the 'T' separator, if any. - int tPos = input.find('T'); + int tPos = input.tqfind('T'); // If there is no time, no month or no day specified, fill those missing // fields so that 'input' matches YYYY-MM-DDTHH:MM:SS if (-1 == tPos) { - const int dashes = input.contains('-'); + const int dashes = input.tqcontains('-'); if (0 == dashes) { input += "-01-01"; } else if (1 == dashes) { @@ -400,7 +400,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) // +zone or -zone suffix (offset from UTC). - int plusPos = timeString.findRev('+'); + int plusPos = timeString.tqfindRev('+'); if (-1 != plusPos) { TQString offsetString = timeString.mid(plusPos + 1); @@ -409,7 +409,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) timeString = timeString.left(plusPos); } else { - int minusPos = timeString.findRev('-'); + int minusPos = timeString.tqfindRev('-'); if (-1 != minusPos) { TQString offsetString = timeString.mid(minusPos + 1); @@ -421,7 +421,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) } // secfrac suffix. - int dotPos = timeString.findRev('.'); + int dotPos = timeString.tqfindRev('.'); if (-1 != dotPos) { timeString = timeString.left(dotPos); diff --git a/kdecore/krootprop.cpp b/kdecore/krootprop.cpp index 2d545f30b..88f82b7d3 100644 --- a/kdecore/krootprop.cpp +++ b/kdecore/krootprop.cpp @@ -118,7 +118,7 @@ void KRootProp::setProp( const TQString& rProp ) { // parse the string for first key-value pair separator '\n' - i = s.find("\n"); + i = s.tqfind("\n"); if(i == -1) i = s.length(); @@ -131,7 +131,7 @@ void KRootProp::setProp( const TQString& rProp ) keypair.simplifyWhiteSpace(); - i = keypair.find( "=" ); + i = keypair.tqfind( "=" ); if( i != -1 ) { key = keypair.left( i ); @@ -160,7 +160,7 @@ void KRootProp::destroy() TQString KRootProp::readEntry( const TQString& rKey, const TQString& pDefault ) const { - if( propDict.contains( rKey ) ) + if( propDict.tqcontains( rKey ) ) return propDict[ rKey ]; else return pDefault; @@ -217,18 +217,18 @@ TQColor KRootProp::readColorEntry( const TQString& rKey, // Support #ffffff style color naming. // Help ease transistion from legacy KDE setups - if( aValue.find("#") == 0 ) { + if( aValue.tqfind("#") == 0 ) { aRetColor.setNamedColor( aValue ); return aRetColor; } // Parse "red,green,blue" // find first comma - int nIndex1 = aValue.find( ',' ); + int nIndex1 = aValue.tqfind( ',' ); if( nIndex1 == -1 ) return aRetColor; // find second comma - int nIndex2 = aValue.find( ',', nIndex1+1 ); + int nIndex2 = aValue.tqfind( ',', nIndex1+1 ); if( nIndex2 == -1 ) return aRetColor; @@ -246,9 +246,9 @@ TQColor KRootProp::readColorEntry( const TQString& rKey, TQString KRootProp::writeEntry( const TQString& rKey, const TQString& rValue ) { dirty = true; - if ( propDict.contains( rKey ) ) { + if ( propDict.tqcontains( rKey ) ) { TQString aValue = propDict[ rKey ]; - propDict.replace( rKey, rValue ); + propDict.tqreplace( rKey, rValue ); return aValue; } else { @@ -268,7 +268,7 @@ TQString KRootProp::writeEntry( const TQString& rKey, int nValue ) TQString KRootProp::writeEntry( const TQString& rKey, const TQFont& rFont ) { - return writeEntry( rKey, rFont.toString() ); + return writeEntry( rKey, TQString(rFont.toString()) ); } TQString KRootProp::writeEntry( const TQString& rKey, const TQColor& rColor ) @@ -280,7 +280,7 @@ TQString KRootProp::writeEntry( const TQString& rKey, const TQColor& rColor ) TQString KRootProp::removeEntry(const TQString& rKey) { - if (propDict.contains(rKey)) { + if (propDict.tqcontains(rKey)) { dirty = true; TQString aValue = propDict[rKey]; propDict.remove(rKey); diff --git a/kdecore/ksavefile.cpp b/kdecore/ksavefile.cpp index 16887a677..1f1f28d23 100644 --- a/kdecore/ksavefile.cpp +++ b/kdecore/ksavefile.cpp @@ -55,7 +55,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode) return; } - if (mTempFile.create(real_filename, TQString::fromLatin1(".new"), mode)) + if (mTempFile.create(real_filename, TQString::tqfromLatin1(".new"), mode)) { mFileName = real_filename; // Set filename upon success @@ -90,7 +90,7 @@ KSaveFile::~KSaveFile() close(); // Close if we were still open } -QString +TQString KSaveFile::name() const { return mFileName; @@ -165,7 +165,7 @@ bool KSaveFile::backupFile( const TQString& qFilename, const TQString& backupDir else { TQCString nameOnly; - int slash = cFilename.findRev('/'); + int slash = cFilename.tqfindRev('/'); if (slash < 0) nameOnly = cFilename; else diff --git a/kdecore/ksavefile.h b/kdecore/ksavefile.h index ae68b2d1f..448c9ca1a 100644 --- a/kdecore/ksavefile.h +++ b/kdecore/ksavefile.h @@ -140,7 +140,7 @@ public: */ static bool backupFile( const TQString& filename, const TQString& backupDir = TQString::null, - const TQString& backupExtension = TQString::fromLatin1( "~" ) ); + const TQString& backupExtension = TQString::tqfromLatin1( "~" ) ); private: TQString mFileName; diff --git a/kdecore/kshell.cpp b/kdecore/kshell.cpp index 5b92b1d5e..9ca5dc9b7 100644 --- a/kdecore/kshell.cpp +++ b/kdecore/kshell.cpp @@ -29,12 +29,12 @@ static int fromHex( TQChar c ) { - if (c >= (QChar)'0' && c <= (QChar)'9') - return c - (QChar)'0'; - else if (c >= (QChar)'A' && c <= (QChar)'F') - return c - (QChar)'A' + 10; - else if (c >= (QChar)'a' && c <= (QChar)'f') - return c - (QChar)'a' + 10; + if (c >= (TQChar)'0' && c <= (TQChar)'9') + return c - (TQChar)'0'; + else if (c >= (TQChar)'A' && c <= (TQChar)'F') + return c - (TQChar)'A' + 10; + else if (c >= (TQChar)'a' && c <= (TQChar)'f') + return c - (TQChar)'a' + 10; return -1; } @@ -72,7 +72,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) do { if (pos >= args.length()) goto okret; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; } while (c.isSpace()); TQString cret; if ((flags & TildeExpand) && c == (QChar)'~') { @@ -80,7 +80,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) for (; ; pos++) { if (pos >= args.length()) break; - c = args.unicode()[pos]; + c = args.tqunicode()[pos]; if (c == (QChar)'/' || c.isSpace()) break; if (isQuoteMeta( c )) { @@ -91,7 +91,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) if ((flags & AbortOnMeta) && isMeta( c )) goto metaerr; } - TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() ); + TQString ccret = homeDir( TQConstString( args.tqunicode() + opos, pos - opos ).string() ); if (ccret.isEmpty()) { pos = opos; c = (QChar)'~'; @@ -129,20 +129,20 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) do { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; } while (c != (QChar)'\''); - cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string(); + cret += TQConstString( args.tqunicode() + spos, pos - spos - 1 ).string(); } else if (c == (QChar)'"') { for (;;) { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; if (c == (QChar)'"') break; if (c == (QChar)'\\') { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; if (c != (QChar)'"' && c != (QChar)'\\' && !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`'))) cret += (QChar)'\\'; @@ -155,13 +155,13 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) for (;;) { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; if (c == (QChar)'\'') break; if (c == (QChar)'\\') { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; switch (c) { case 'a': cret += (QChar)'\a'; break; case 'b': cret += (QChar)'\b'; break; @@ -212,7 +212,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) if (c == (QChar)'\\') { if (pos >= args.length()) goto quoteerr; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; if (!c.isSpace() && !((flags & AbortOnMeta) ? isMeta( c ) : isQuoteMeta( c ))) cret += '\\'; @@ -222,7 +222,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) } if (pos >= args.length()) break; - c = args.unicode()[pos++]; + c = args.tqunicode()[pos++]; } while (!c.isSpace()); ret += cret; firstword = false; @@ -265,7 +265,7 @@ TQString KShell::joinArgs( const TQStringList &args ) ret.append( q ).append( q ); else { for (uint i = 0; i < (*it).length(); i++) - if (isSpecial((*it).unicode()[i])) { + if (isSpecial((*it).tqunicode()[i])) { TQString tmp(*it); tmp.replace( q, "'\\''" ); ret += q; @@ -294,7 +294,7 @@ TQString KShell::joinArgs( const char * const *args, int nargs ) else { TQString tmp( TQFile::decodeName( *argp ) ); for (uint i = 0; i < tmp.length(); i++) - if (isSpecial(tmp.unicode()[i])) { + if (isSpecial(tmp.tqunicode()[i])) { tmp.replace( q, "'\\''" ); ret += q; tmp += q; @@ -319,10 +319,10 @@ TQString KShell::joinArgsDQ( const TQStringList &args ) ret.append( q ).append( q ); else { for (uint i = 0; i < (*it).length(); i++) - if (isSpecial((*it).unicode()[i])) { + if (isSpecial((*it).tqunicode()[i])) { ret.append( '$' ).append( q ); for (uint pos = 0; pos < (*it).length(); pos++) { - int c = (*it).unicode()[pos]; + int c = (*it).tqunicode()[pos]; if (c < 32) { ret += bs; switch (c) { @@ -355,12 +355,12 @@ TQString KShell::joinArgsDQ( const TQStringList &args ) TQString KShell::tildeExpand( const TQString &fname ) { if (fname[0] == (QChar)'~') { - int pos = fname.find( '/' ); + int pos = fname.tqfind( '/' ); if (pos < 0) - return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() ); - TQString ret = homeDir( TQConstString( fname.unicode() + 1, pos - 1 ).string() ); + return homeDir( TQConstString( fname.tqunicode() + 1, fname.length() - 1 ).string() ); + TQString ret = homeDir( TQConstString( fname.tqunicode() + 1, pos - 1 ).string() ); if (!ret.isNull()) - ret += TQConstString( fname.unicode() + pos, fname.length() - pos ).string(); + ret += TQConstString( fname.tqunicode() + pos, fname.length() - pos ).string(); return ret; } return fname; diff --git a/kdecore/kshortcut.cpp b/kdecore/kshortcut.cpp index 4847b8742..10c6c31fa 100644 --- a/kdecore/kshortcut.cpp +++ b/kdecore/kshortcut.cpp @@ -88,10 +88,10 @@ bool KKey::init( const TQKeySequence& key ) bool KKey::init( const TQKeyEvent* pEvent ) { int keyQt = pEvent->key(); - if( pEvent->state() & Qt::ShiftButton ) keyQt |= Qt::SHIFT; - if( pEvent->state() & Qt::ControlButton ) keyQt |= Qt::CTRL; - if( pEvent->state() & Qt::AltButton ) keyQt |= Qt::ALT; - if( pEvent->state() & Qt::MetaButton ) keyQt |= Qt::META; + if( pEvent->state() & TQt::ShiftButton ) keyQt |= Qt::SHIFT; + if( pEvent->state() & TQt::ControlButton ) keyQt |= Qt::CTRL; + if( pEvent->state() & TQt::AltButton ) keyQt |= Qt::ALT; + if( pEvent->state() & TQt::MetaButton ) keyQt |= Qt::META; return init( keyQt ); } diff --git a/kdecore/kshortcutmenu.cpp b/kdecore/kshortcutmenu.cpp index 3df389f07..930095c84 100644 --- a/kdecore/kshortcutmenu.cpp +++ b/kdecore/kshortcutmenu.cpp @@ -123,7 +123,7 @@ int KShortcutMenu::searchForKey( KKey key ) uint iKey = m_seq.count(); for( uint iItem = 1; iItem < count(); iItem++ ) { - if( m_seqs.contains( iItem ) ) { + if( m_seqs.tqcontains( iItem ) ) { KKey keyItem = m_seqs[iItem].key( iKey ); //kdDebug(125) << "iItem = " << iItem << " key = " << key.toStringInternal() << " keyItem = " << keyItem.toStringInternal() << endl; if( key == keyItem ) { @@ -146,7 +146,7 @@ void KShortcutMenu::keepItemsMatching( KKey key ) m_seq.setKey( iKey, key ); for( uint iItem = 1; iItem < count(); iItem++ ) { - if( m_seqs.contains( iItem ) ) { + if( m_seqs.tqcontains( iItem ) ) { KKey keyItem = m_seqs[iItem].key( iKey ); if( key != keyItem ) { m_seqs.remove( iItem ); diff --git a/kdecore/ksimpleconfig.cpp b/kdecore/ksimpleconfig.cpp index 6b4e13a14..15597826d 100644 --- a/kdecore/ksimpleconfig.cpp +++ b/kdecore/ksimpleconfig.cpp @@ -38,7 +38,7 @@ #include "ksimpleconfig.h" KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) - : KConfig(TQString::fromLatin1(""), bReadOnly, false) + : KConfig(TQString::tqfromLatin1(""), bReadOnly, false) { // the difference between KConfig and KSimpleConfig is just that // for KSimpleConfig an absolute filename is guaranteed diff --git a/kdecore/ksock.h b/kdecore/ksock.h index 8f2c9280c..67de00dc3 100644 --- a/kdecore/ksock.h +++ b/kdecore/ksock.h @@ -22,6 +22,10 @@ #include "kdelibs_export.h" +#ifdef Q_MOC_RUN +#define Q_OS_UNIX +#endif // Q_MOC_RUN + #ifdef Q_OS_UNIX #include <tqobject.h> @@ -84,7 +88,7 @@ class KServerSocketPrivate; * @author Torben Weis <weis@uni-frankfurt.de> * @short A TCP/IP client socket. */ -class KDECORE_EXPORT KSocket : public QObject +class KDECORE_EXPORT KSocket : public TQObject { Q_OBJECT public: @@ -247,7 +251,7 @@ private: * * @author Torben Weis <weis@stud.uni-frankfurt.de> */ -class KDECORE_EXPORT KServerSocket : public QObject +class KDECORE_EXPORT KServerSocket : public TQObject { Q_OBJECT public: diff --git a/kdecore/ksockaddr.cpp b/kdecore/ksockaddr.cpp index 82bed0d5c..bc9c03059 100644 --- a/kdecore/ksockaddr.cpp +++ b/kdecore/ksockaddr.cpp @@ -421,7 +421,7 @@ bool KInetSocketAddress::setHost(const TQString& addr, int family) #ifdef AF_INET6 // IPv6 addresses MUST contain colons (:) and IPv4 addresses must not - if (addr.find(':') != -1) + if (addr.tqfind(':') != -1) family = AF_INET6; else family = AF_INET; @@ -485,7 +485,7 @@ bool KInetSocketAddress::setFamily(int _family) return true; } -bool KInetSocketAddress::setFlowinfo(Q_UINT32 flowinfo) +bool KInetSocketAddress::setFlowinfo(TQ_UINT32 flowinfo) { #ifdef AF_INET6 if (d->sockfamily == AF_INET6) @@ -587,7 +587,7 @@ TQString KInetSocketAddress::nodeName() const return i18n("<empty>"); } - return TQString::fromLatin1(buf); // FIXME! What's the encoding? + return TQString::tqfromLatin1(buf); // FIXME! What's the encoding? } TQString KInetSocketAddress::serviceName() const @@ -605,11 +605,11 @@ unsigned short KInetSocketAddress::port() const #endif } -Q_UINT32 KInetSocketAddress::flowinfo() const +TQ_UINT32 KInetSocketAddress::flowinfo() const { #ifdef AF_INET6 if (d->sockfamily == AF_INET6) - return (Q_UINT32)d->sin6.sin6_flowinfo; + return (TQ_UINT32)d->sin6.sin6_flowinfo; #endif return 0; } @@ -677,9 +677,9 @@ void KInetSocketAddress::fromV4() d->sin6.sin6_port = d->sin.sin_port; // Make this a v4-mapped address - ((Q_UINT32*)&d->sin6.sin6_addr)[0] = ((Q_UINT32*)&d->sin6.sin6_addr)[1] = 0; - ((Q_UINT32*)&d->sin6.sin6_addr)[2] = htonl(0xffff); - ((Q_UINT32*)&d->sin6.sin6_addr)[3] = *(Q_UINT32*)&d->sin.sin_addr; + ((TQ_UINT32*)&d->sin6.sin6_addr)[0] = ((TQ_UINT32*)&d->sin6.sin6_addr)[1] = 0; + ((TQ_UINT32*)&d->sin6.sin6_addr)[2] = htonl(0xffff); + ((TQ_UINT32*)&d->sin6.sin6_addr)[3] = *(TQ_UINT32*)&d->sin.sin_addr; // Clear flowinfo and scopeid d->sin6.sin6_flowinfo = 0; @@ -700,7 +700,7 @@ void KInetSocketAddress::fromV6() if (V6_CAN_CONVERT_TO_V4(&d->sin6.sin6_addr)) { d->sin.sin_port = d->sin6.sin6_port; - *(Q_UINT32*)&d->sin.sin_addr = ((Q_UINT32*)&d->sin6.sin6_addr)[3]; + *(TQ_UINT32*)&d->sin.sin_addr = ((TQ_UINT32*)&d->sin6.sin6_addr)[3]; } else { @@ -717,7 +717,7 @@ TQString KInetSocketAddress::addrToString(int family, const void* addr) { char buf[INET6_ADDRSTRLEN+1]; - return TQString::fromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN)); + return TQString::tqfromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN)); } bool KInetSocketAddress::stringToAddr(int family, const char *text, void *dest) diff --git a/kdecore/ksockaddr.h b/kdecore/ksockaddr.h index 8b62f7da9..04ae350aa 100644 --- a/kdecore/ksockaddr.h +++ b/kdecore/ksockaddr.h @@ -43,7 +43,7 @@ class KSocketAddressPrivate; * @author Thiago Macieira <thiago.macieira@kdemail.net> * @short a socket address. */ -class KDECORE_EXPORT KSocketAddress: public QObject +class KDECORE_EXPORT KSocketAddress: public TQObject { Q_OBJECT protected: @@ -391,7 +391,7 @@ public: * @param flowinfo flowinfo * @return true if successful, false otherwise */ - bool setFlowinfo(Q_UINT32 flowinfo); + bool setFlowinfo(TQ_UINT32 flowinfo); /** * Sets the scope id for this socket if this is IPv6. @@ -461,7 +461,7 @@ public: * Returns flowinfo for IPv6 socket. * @return the flowinfo, 0 if unsupported */ - Q_UINT32 flowinfo() const; + TQ_UINT32 flowinfo() const; /** * Returns the scope id for this IPv6 socket. diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp index f8b7bd307..91a178a53 100644 --- a/kdecore/kstandarddirs.cpp +++ b/kdecore/kstandarddirs.cpp @@ -144,7 +144,7 @@ bool KStandardDirs::isRestrictedResource(const char *type, const TQString& relPa void KStandardDirs::applyDataRestrictions(const TQString &relPath) const { TQString key; - int i = relPath.find(QChar('/')); + int i = relPath.tqfind(QChar('/')); if (i != -1) key = "data_"+relPath.left(i); else @@ -159,7 +159,7 @@ TQStringList KStandardDirs::allTypes() const { TQStringList list; for (int i = 0; types[i] != 0; ++i) - list.append(TQString::fromLatin1(types[i])); + list.append(TQString::tqfromLatin1(types[i])); return list; } @@ -192,7 +192,7 @@ void KStandardDirs::addPrefix( const TQString& _dir, bool priority ) if (dir.at(dir.length() - 1) != QChar('/')) dir += QChar('/'); - if (!prefixes.contains(dir)) { + if (!prefixes.tqcontains(dir)) { priorityAdd(prefixes, dir, priority); dircache.clear(); } @@ -212,7 +212,7 @@ void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority ) if (dir.at(dir.length() - 1) != QChar('/')) dir += QChar('/'); - if (!d->xdgconf_prefixes.contains(dir)) { + if (!d->xdgconf_prefixes.tqcontains(dir)) { priorityAdd(d->xdgconf_prefixes, dir, priority); dircache.clear(); } @@ -232,7 +232,7 @@ void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority ) if (dir.at(dir.length() - 1) != QChar('/')) dir += QChar('/'); - if (!d->xdgdata_prefixes.contains(dir)) { + if (!d->xdgdata_prefixes.tqcontains(dir)) { priorityAdd(d->xdgdata_prefixes, dir, priority); dircache.clear(); } @@ -265,7 +265,7 @@ bool KStandardDirs::addResourceType( const char *type, if (relativename.isEmpty()) return false; - TQStringList *rels = relatives.find(type); + TQStringList *rels = relatives.tqfind(type); if (!rels) { rels = new TQStringList(); relatives.insert(type, rels); @@ -273,7 +273,7 @@ bool KStandardDirs::addResourceType( const char *type, TQString copy = relativename; if (copy.at(copy.length() - 1) != QChar('/')) copy += QChar('/'); - if (!rels->contains(copy)) { + if (!rels->tqcontains(copy)) { if (priority) rels->prepend(copy); else @@ -295,7 +295,7 @@ bool KStandardDirs::addResourceDir( const char *type, const TQString& absdir, bool priority) { - TQStringList *paths = absolutes.find(type); + TQStringList *paths = absolutes.tqfind(type); if (!paths) { paths = new TQStringList(); absolutes.insert(type, paths); @@ -304,7 +304,7 @@ bool KStandardDirs::addResourceDir( const char *type, if (copy.at(copy.length() - 1) != QChar('/')) copy += QChar('/'); - if (!paths->contains(copy)) { + if (!paths->tqcontains(copy)) { if (priority) paths->prepend(copy); else @@ -337,7 +337,7 @@ for (TQStringList::ConstIterator pit = prefixes.begin(); else return dir + filename; } -static Q_UINT32 updateHash(const TQString &file, Q_UINT32 hash) +static TQ_UINT32 updateHash(const TQString &file, TQ_UINT32 hash) { TQCString cFile = TQFile::encodeName(file); KDE_struct_stat buff; @@ -345,15 +345,15 @@ static Q_UINT32 updateHash(const TQString &file, Q_UINT32 hash) (KDE_stat( cFile, &buff ) == 0) && (S_ISREG( buff.st_mode ))) { - hash = hash + (Q_UINT32) buff.st_ctime; + hash = hash + (TQ_UINT32) buff.st_ctime; } return hash; } -Q_UINT32 KStandardDirs::calcResourceHash( const char *type, +TQ_UINT32 KStandardDirs::calcResourceHash( const char *type, const TQString& filename, bool deep) const { - Q_UINT32 hash = 0; + TQ_UINT32 hash = 0; if (!TQDir::isRelativePath(filename)) { @@ -492,7 +492,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1).latin1() == QChar('~').latin1()) + if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == TQChar('~').latin1()) continue; if (!recursive && !regexp.exactMatch(fn)) @@ -512,7 +512,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, } if ( S_ISREG( buff.st_mode)) { - if (!unique || !relList.contains(relPart + fn)) + if (!unique || !relList.tqcontains(relPart + fn)) { list.append( pathfn ); relList.append( relPart + fn ); @@ -531,7 +531,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, return; // File not found if ( S_ISREG( buff.st_mode)) { - if (!unique || !relList.contains(relPart + fn)) + if (!unique || !relList.tqcontains(relPart + fn)) { list.append( pathfn ); relList.append( relPart + fn ); @@ -557,7 +557,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, if (relpath.length()) { - int slash = relpath.find(QChar('/')); + int slash = relpath.tqfind(QChar('/')); if (slash < 0) rest = relpath.left(relpath.length() - 1); else { @@ -629,7 +629,7 @@ KStandardDirs::findAllResources( const char *type, if (filter.length()) { - int slash = filter.findRev('/'); + int slash = filter.tqfindRev('/'); if (slash < 0) filterFile = filter; else { @@ -682,7 +682,7 @@ KStandardDirs::findAllResources( const char *type, return findAllResources(type, filter, recursive, unique, relList); } -QString +TQString KStandardDirs::realPath(const TQString &dirname) { char realpath_buffer[MAXPATHLEN + 1]; @@ -692,7 +692,7 @@ KStandardDirs::realPath(const TQString &dirname) if (realpath( TQFile::encodeName(dirname).data(), realpath_buffer) != 0) { // success, use result from realpath int len = strlen(realpath_buffer); - realpath_buffer[len] = QChar('/'); + realpath_buffer[len] = TQChar('/'); realpath_buffer[len+1] = 0; return TQFile::decodeName(realpath_buffer); } @@ -700,7 +700,7 @@ KStandardDirs::realPath(const TQString &dirname) return dirname; } -QString +TQString KStandardDirs::realFilePath(const TQString &filename) { char realpath_buffer[MAXPATHLEN + 1]; @@ -762,9 +762,9 @@ void KStandardDirs::createSpecialResource(const char *type) #else //UNIX if (relink) { - TQString srv = findExe(TQString::fromLatin1("lnusertemp"), kfsstnd_defaultbindir()); + TQString srv = findExe(TQString::tqfromLatin1("lnusertemp"), kfsstnd_defaultbindir()); if (srv.isEmpty()) - srv = findExe(TQString::fromLatin1("lnusertemp")); + srv = findExe(TQString::tqfromLatin1("lnusertemp")); if (!srv.isEmpty()) { system(TQFile::encodeName(srv)+" "+type); @@ -774,7 +774,7 @@ void KStandardDirs::createSpecialResource(const char *type) if (result > 0) { link[result] = 0; - if (link[0] == QChar('/').latin1()) + if (link[0] == TQChar('/').latin1()) dir = TQFile::decodeName(link); else dir = TQDir::cleanDirPath(dir+TQFile::decodeName(link)); @@ -785,7 +785,7 @@ void KStandardDirs::createSpecialResource(const char *type) TQStringList KStandardDirs::resourceDirs(const char *type) const { - TQStringList *candidates = dircache.find(type); + TQStringList *candidates = dircache.tqfind(type); if (!candidates) { // filling cache if (strcmp(type, "socket") == 0) @@ -812,7 +812,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const d->dataRestrictionActive = false; // Reset } - dirs = relatives.find(type); + dirs = relatives.tqfind(type); if (dirs) { bool local = true; @@ -834,7 +834,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const testdir.setPath(path); if (local && restrictionActive) continue; - if ((local || testdir.exists()) && !candidates->contains(path)) + if ((local || testdir.exists()) && !candidates->tqcontains(path)) candidates->append(path); } // UGLY HACK - Chris CHeney @@ -844,7 +844,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const local = false; } } - dirs = absolutes.find(type); + dirs = absolutes.tqfind(type); if (dirs) for (TQStringList::ConstIterator it = dirs->begin(); it != dirs->end(); ++it) @@ -853,7 +853,7 @@ TQStringList KStandardDirs::resourceDirs(const char *type) const if (testdir.exists()) { TQString filename = realPath(*it); - if (!candidates->contains(filename)) + if (!candidates->tqcontains(filename)) candidates->append(filename); } } @@ -897,7 +897,7 @@ TQStringList KStandardDirs::systemPaths( const TQString& pstr ) if ( p[ 0 ] == QChar('~') ) { - int len = p.find( QChar('/') ); + int len = p.tqfind( QChar('/') ); if ( len == -1 ) len = p.length(); if ( len == 1 ) @@ -931,7 +931,7 @@ TQString KStandardDirs::findExe( const TQString& appname, TQFileInfo info; // absolute or relative path given - if (real_appname.find(TQDir::separator()) >= 0) + if (real_appname.tqfind(TQDir::separator()) >= 0) { info.setFile( real_appname ); if( info.exists() && ( ignore || info.isExecutable() ) @@ -1006,7 +1006,7 @@ static int tokenize( TQStringList& tokens, const TQString& str, for( int index = 0; index < len; index++) { - if ( delim.find( str[ index ] ) >= 0 ) + if ( delim.tqfind( str[ index ] ) >= 0 ) { tokens.append( token ); token = ""; @@ -1093,17 +1093,17 @@ TQString KStandardDirs::saveLocation(const char *type, { checkConfig(); - TQString *pPath = savelocations.find(type); + TQString *pPath = savelocations.tqfind(type); if (!pPath) { - TQStringList *dirs = relatives.find(type); + TQStringList *dirs = relatives.tqfind(type); if (!dirs && ( (strcmp(type, "socket") == 0) || (strcmp(type, "tmp") == 0) || (strcmp(type, "cache") == 0) )) { (void) resourceDirs(type); // Generate socket|tmp|cache resource. - dirs = relatives.find(type); // Search again. + dirs = relatives.tqfind(type); // Search again. } if (dirs) { @@ -1116,7 +1116,7 @@ TQString KStandardDirs::saveLocation(const char *type, pPath = new TQString(realPath(localkdedir() + dirs->last())); } else { - dirs = absolutes.find(type); + dirs = absolutes.tqfind(type); if (!dirs) qFatal("KStandardDirs: The resource type %s is not registered", type); pPath = new TQString(realPath(dirs->last())); @@ -1147,7 +1147,7 @@ TQString KStandardDirs::saveLocation(const char *type, TQString KStandardDirs::relativeLocation(const char *type, const TQString &absPath) { TQString fullPath = absPath; - int i = absPath.findRev('/'); + int i = absPath.tqfindRev('/'); if (i != -1) { fullPath = realPath(absPath.left(i+1))+absPath.mid(i+1); // Normalize @@ -1185,7 +1185,7 @@ bool KStandardDirs::makeDir(const TQString& dir, int mode) while( i < len ) { KDE_struct_stat st; - int pos = target.find(QChar('/'), i); + int pos = target.tqfind(QChar('/'), i); base += target.mid(i - 1, pos - i + 1); TQCString baseEncoded = TQFile::encodeName(base); // bail out if we encountered a problem @@ -1229,17 +1229,17 @@ static TQString executablePrefix() if (length == -1) return TQString::null; - path_buffer[length] = QChar('\0'); + path_buffer[length] = TQChar('\0'); TQString path = TQFile::decodeName(path_buffer); if(path.isEmpty()) return TQString::null; - int pos = path.findRev('/'); // Skip filename + int pos = path.tqfindRev('/'); // Skip filename if(pos <= 0) return TQString::null; - pos = path.findRev(QChar('/'), pos - 1); // Skip last directory + pos = path.tqfindRev(TQChar('/'), pos - 1); // Skip last directory if(pos <= 0) return TQString::null; @@ -1272,11 +1272,11 @@ TQString KStandardDirs::kfsstnd_defaultbindir() if (!s->defaultbindir.isEmpty()) return s->defaultbindir; #ifdef Q_WS_WIN - s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin"); + s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin"); #else //UNIX s->defaultbindir = __KDE_BINDIR; if (s->defaultbindir.isEmpty()) - s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin"); + s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin"); #endif if (s->defaultbindir.isEmpty()) kdWarning() << "KStandardDirs::kfsstnd_defaultbindir(): default binary KDE dir not found!" << endl; @@ -1543,21 +1543,21 @@ bool KStandardDirs::addCustomized(KConfig *config) addedCustoms = true; // reading the prefixes in - TQString group = TQString::fromLatin1("Directories"); + TQString group = TQString::tqfromLatin1("Directories"); config->setGroup(group); TQString kioskAdmin = config->readEntry("kioskAdmin"); if (!kioskAdmin.isEmpty() && !kde_kiosk_admin) { - int i = kioskAdmin.find(':'); + int i = kioskAdmin.tqfind(':'); TQString user = kioskAdmin.left(i); TQString host = kioskAdmin.mid(i+1); KUser thisUser; char hostname[ 256 ]; - hostname[ 0 ] = QChar('\0'); + hostname[ 0 ] = TQChar('\0'); if (!gethostname( hostname, 255 )) - hostname[sizeof(hostname)-1] = QChar('\0'); + hostname[sizeof(hostname)-1] = TQChar('\0'); if ((user == thisUser.loginName()) && (host.isEmpty() || (host == hostname))) @@ -1623,7 +1623,7 @@ bool KStandardDirs::addCustomized(KConfig *config) if (profiles.isEmpty()) break; profile = profiles.back(); - group = TQString::fromLatin1("Directories-%1").arg(profile); + group = TQString::tqfromLatin1("Directories-%1").arg(profile); profiles.pop_back(); priority = true; } @@ -1694,7 +1694,7 @@ TQString locateLocal( const char *type, { // try to find slashes. If there are some, we have to // create the subdir first - int slash = filename.findRev('/')+1; + int slash = filename.tqfindRev('/')+1; if (!slash) // only one filename return inst->dirs()->saveLocation(type, TQString::null, createDir) + filename; diff --git a/kdecore/kstandarddirs.h b/kdecore/kstandarddirs.h index ded472d1d..16bfd1847 100644 --- a/kdecore/kstandarddirs.h +++ b/kdecore/kstandarddirs.h @@ -255,7 +255,7 @@ public: * @return A number identifying the current version of the * resource. */ - Q_UINT32 calcResourceHash( const char *type, + TQ_UINT32 calcResourceHash( const char *type, const TQString& filename, bool deep) const; /** diff --git a/kdecore/kstartupinfo.cpp b/kdecore/kstartupinfo.cpp index 673e5e6ab..a55c82f55 100644 --- a/kdecore/kstartupinfo.cpp +++ b/kdecore/kstartupinfo.cpp @@ -177,7 +177,7 @@ void KStartupInfo::got_message( const TQString& msg_P ) namespace { class DelayedWindowEvent - : public QCustomEvent + : public TQCustomEvent { public: DelayedWindowEvent( WId w_P ) @@ -234,7 +234,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P, return; if( id_P.none()) return; - if( d->startups.contains( id_P )) + if( d->startups.tqcontains( id_P )) { // already reported, update d->startups[ id_P ].update( data_P ); d->startups[ id_P ].age = 0; // CHECKME @@ -250,7 +250,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P, emit gotStartupChange( id_P, d->startups[ id_P ] ); return; } - if( d->silent_startups.contains( id_P )) + if( d->silent_startups.tqcontains( id_P )) { // already reported, update d->silent_startups[ id_P ].update( data_P ); d->silent_startups[ id_P ].age = 0; // CHECKME @@ -265,7 +265,7 @@ void KStartupInfo::new_startup_info_internal( const KStartupInfoId& id_P, emit gotStartupChange( id_P, d->silent_startups[ id_P ] ); return; } - if( d->uninited_startups.contains( id_P )) + if( d->uninited_startups.tqcontains( id_P )) { d->uninited_startups[ id_P ].update( data_P ); kdDebug( 172 ) << "updating uninited" << endl; @@ -317,18 +317,18 @@ void KStartupInfo::remove_startup_info_internal( const KStartupInfoId& id_P ) { if( d == NULL ) return; - if( d->startups.contains( id_P )) + if( d->startups.tqcontains( id_P )) { kdDebug( 172 ) << "removing" << endl; emit gotRemoveStartup( id_P, d->startups[ id_P ]); d->startups.remove( id_P ); } - else if( d->silent_startups.contains( id_P )) + else if( d->silent_startups.tqcontains( id_P )) { kdDebug( 172 ) << "removing silent" << endl; d->silent_startups.remove( id_P ); } - else if( d->uninited_startups.contains( id_P )) + else if( d->uninited_startups.tqcontains( id_P )) { kdDebug( 172 ) << "removing uninited" << endl; d->uninited_startups.remove( id_P ); @@ -360,11 +360,11 @@ void KStartupInfo::remove_startup_pids( const KStartupInfoId& id_P, return; kdFatal( data_P.pids().count() == 0, 172 ); Data* data = NULL; - if( d->startups.contains( id_P )) + if( d->startups.tqcontains( id_P )) data = &d->startups[ id_P ]; - else if( d->silent_startups.contains( id_P )) + else if( d->silent_startups.tqcontains( id_P )) data = &d->silent_startups[ id_P ]; - else if( d->uninited_startups.contains( id_P )) + else if( d->uninited_startups.tqcontains( id_P )) data = &d->uninited_startups[ id_P ]; else return; @@ -381,7 +381,7 @@ bool KStartupInfo::sendStartup( const KStartupInfoId& id_P, const KStartupInfoDa if( id_P.none()) return false; KXMessages msgs; - TQString msg = TQString::fromLatin1( "new: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "new: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); msg = check_required_startup_fields( msg, data_P, qt_xscreen()); kdDebug( 172 ) << "sending " << msg << endl; @@ -394,7 +394,7 @@ bool KStartupInfo::sendStartupX( Display* disp_P, const KStartupInfoId& id_P, { if( id_P.none()) return false; - TQString msg = TQString::fromLatin1( "new: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "new: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); msg = check_required_startup_fields( msg, data_P, DefaultScreen( disp_P )); #ifdef KSTARTUPINFO_ALL_DEBUG @@ -425,7 +425,7 @@ bool KStartupInfo::sendChange( const KStartupInfoId& id_P, const KStartupInfoDat if( id_P.none()) return false; KXMessages msgs; - TQString msg = TQString::fromLatin1( "change: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "change: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); kdDebug( 172 ) << "sending " << msg << endl; msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false ); @@ -437,7 +437,7 @@ bool KStartupInfo::sendChangeX( Display* disp_P, const KStartupInfoId& id_P, { if( id_P.none()) return false; - TQString msg = TQString::fromLatin1( "change: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "change: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); #ifdef KSTARTUPINFO_ALL_DEBUG kdDebug( 172 ) << "sending " << msg << endl; @@ -450,7 +450,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P ) if( id_P.none()) return false; KXMessages msgs; - TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text()); + TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text()); kdDebug( 172 ) << "sending " << msg << endl; msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false ); return true; @@ -460,7 +460,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P ) { if( id_P.none()) return false; - TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text()); + TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text()); #ifdef KSTARTUPINFO_ALL_DEBUG kdDebug( 172 ) << "sending " << msg << endl; #endif @@ -472,7 +472,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P, const KStartupInfoDat // if( id_P.none()) // id may be none, the pids and hostname matter then // return false; KXMessages msgs; - TQString msg = TQString::fromLatin1( "remove: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "remove: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); kdDebug( 172 ) << "sending " << msg << endl; msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false ); @@ -484,7 +484,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P, { // if( id_P.none()) // id may be none, the pids and hostname matter then // return false; - TQString msg = TQString::fromLatin1( "remove: %1 %2" ) + TQString msg = TQString::tqfromLatin1( "remove: %1 %2" ) .arg( id_P.to_text()).arg( data_P.to_text()); #ifdef KSTARTUPINFO_ALL_DEBUG kdDebug( 172 ) << "sending " << msg << endl; @@ -669,7 +669,7 @@ bool KStartupInfo::find_id( const TQCString& id_P, KStartupInfoId* id_O, kdDebug( 172 ) << "find_id:" << id_P << endl; KStartupInfoId id; id.initId( id_P ); - if( d->startups.contains( id )) + if( d->startups.tqcontains( id )) { if( id_O != NULL ) *id_O = id; @@ -790,7 +790,7 @@ void KStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P ) if( utf8_string_atom == None ) utf8_string_atom = XInternAtom( qt_xdisplay(), "UTF8_STRING", False ); XChangeProperty( qt_xdisplay(), w_P, net_startup_atom, utf8_string_atom, 8, - PropModeReplace, reinterpret_cast< unsigned char* >( id_P.data()), id_P.length()); + PropModeReplace, reinterpret_cast< unsigned char* >( const_cast<TQCString&>(id_P).data()), id_P.length()); #endif } @@ -939,9 +939,9 @@ TQCString KStartupInfo::createNewStartupId() #else unsigned long qt_x_user_time = 0; #endif - TQCString id = TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec ) - .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8(); - kdDebug( 172 ) << "creating: " << id << ":" << qAppName() << endl; + TQCString id = TQString(TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec ) + .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time )).utf8(); + kdDebug( 172 ) << "creating: " << id << ":" << tqAppName() << endl; return id; } @@ -960,14 +960,14 @@ const TQCString& KStartupInfoId::id() const TQString KStartupInfoId::to_text() const { - return TQString::fromLatin1( " ID=\"%1\" " ).arg( escape_str( id())); + return TQString::tqfromLatin1( " ID=\"%1\" " ).arg( escape_str( id())); } KStartupInfoId::KStartupInfoId( const TQString& txt_P ) { d = new KStartupInfoIdPrivate; TQStringList items = get_fields( txt_P ); - const TQString id_str = TQString::fromLatin1( "ID=" ); + const TQString id_str = TQString::tqfromLatin1( "ID=" ); for( TQStringList::Iterator it = items.begin(); it != items.end(); ++it ) @@ -1074,7 +1074,7 @@ unsigned long KStartupInfoId::timestamp() const { if( none()) return 0; - int pos = d->id.findRev( "_TIME" ); + int pos = d->id.tqfindRev( "_TIME" ); if( pos >= 0 ) { bool ok; @@ -1088,10 +1088,10 @@ unsigned long KStartupInfoId::timestamp() const // snprintf (s, len, "%s/%s/%lu/%d-%d-%s", // canonicalized_launcher, canonicalized_launchee, (unsigned long) timestamp, // (int) getpid (), (int) sequence_number, hostbuf); - int pos1 = d->id.findRev( '/' ); + int pos1 = d->id.tqfindRev( '/' ); if( pos1 > 0 ) { - int pos2 = d->id.findRev( '/', pos1 - 1 ); + int pos2 = d->id.tqfindRev( '/', pos1 - 1 ); if( pos2 >= 0 ) { bool ok; @@ -1129,34 +1129,34 @@ TQString KStartupInfoData::to_text() const { TQString ret = ""; if( !d->bin.isEmpty()) - ret += TQString::fromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin )); + ret += TQString::tqfromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin )); if( !d->name.isEmpty()) - ret += TQString::fromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name )); + ret += TQString::tqfromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name )); if( !d->description.isEmpty()) - ret += TQString::fromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description )); + ret += TQString::tqfromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description )); if( !d->icon.isEmpty()) - ret += TQString::fromLatin1( " ICON=%1" ).arg( d->icon ); + ret += TQString::tqfromLatin1( " ICON=%1" ).arg( d->icon ); if( d->desktop != 0 ) - ret += TQString::fromLatin1( " DESKTOP=%1" ) + ret += TQString::tqfromLatin1( " DESKTOP=%1" ) .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0 if( !d->wmclass.isEmpty()) - ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) ); + ret += TQString::tqfromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) ); if( !d->hostname.isEmpty()) - ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) ); + ret += TQString::tqfromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) ); for( TQValueList< pid_t >::ConstIterator it = d->pids.begin(); it != d->pids.end(); ++it ) - ret += TQString::fromLatin1( " PID=%1" ).arg( *it ); + ret += TQString::tqfromLatin1( " PID=%1" ).arg( *it ); if( d->silent != Unknown ) - ret += TQString::fromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 ); + ret += TQString::tqfromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 ); if( d->timestamp != -1U ) - ret += TQString::fromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp ); + ret += TQString::tqfromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp ); if( d->screen != -1 ) - ret += TQString::fromLatin1( " SCREEN=%1" ).arg( d->screen ); + ret += TQString::tqfromLatin1( " SCREEN=%1" ).arg( d->screen ); if( d->xinerama != -1 ) - ret += TQString::fromLatin1( " XINERAMA=%1" ).arg( d->xinerama ); + ret += TQString::tqfromLatin1( " XINERAMA=%1" ).arg( d->xinerama ); if( d->launched_by != 0 ) - ret += TQString::fromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by ); + ret += TQString::tqfromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by ); return ret; } @@ -1164,19 +1164,19 @@ KStartupInfoData::KStartupInfoData( const TQString& txt_P ) { d = new KStartupInfoDataPrivate; TQStringList items = get_fields( txt_P ); - const TQString bin_str = TQString::fromLatin1( "BIN=" ); - const TQString name_str = TQString::fromLatin1( "NAME=" ); - const TQString description_str = TQString::fromLatin1( "DESCRIPTION=" ); - const TQString icon_str = TQString::fromLatin1( "ICON=" ); - const TQString desktop_str = TQString::fromLatin1( "DESKTOP=" ); - const TQString wmclass_str = TQString::fromLatin1( "WMCLASS=" ); - const TQString hostname_str = TQString::fromLatin1( "HOSTNAME=" ); // SELI nonstd - const TQString pid_str = TQString::fromLatin1( "PID=" ); // SELI nonstd - const TQString silent_str = TQString::fromLatin1( "SILENT=" ); - const TQString timestamp_str = TQString::fromLatin1( "TIMESTAMP=" ); - const TQString screen_str = TQString::fromLatin1( "SCREEN=" ); - const TQString xinerama_str = TQString::fromLatin1( "XINERAMA=" ); - const TQString launched_by_str = TQString::fromLatin1( "LAUNCHED_BY=" ); + const TQString bin_str = TQString::tqfromLatin1( "BIN=" ); + const TQString name_str = TQString::tqfromLatin1( "NAME=" ); + const TQString description_str = TQString::tqfromLatin1( "DESCRIPTION=" ); + const TQString icon_str = TQString::tqfromLatin1( "ICON=" ); + const TQString desktop_str = TQString::tqfromLatin1( "DESKTOP=" ); + const TQString wmclass_str = TQString::tqfromLatin1( "WMCLASS=" ); + const TQString hostname_str = TQString::tqfromLatin1( "HOSTNAME=" ); // SELI nonstd + const TQString pid_str = TQString::tqfromLatin1( "PID=" ); // SELI nonstd + const TQString silent_str = TQString::tqfromLatin1( "SILENT=" ); + const TQString timestamp_str = TQString::tqfromLatin1( "TIMESTAMP=" ); + const TQString screen_str = TQString::tqfromLatin1( "SCREEN=" ); + const TQString xinerama_str = TQString::tqfromLatin1( "XINERAMA=" ); + const TQString launched_by_str = TQString::tqfromLatin1( "LAUNCHED_BY=" ); for( TQStringList::Iterator it = items.begin(); it != items.end(); ++it ) @@ -1379,7 +1379,7 @@ const TQCString& KStartupInfoData::hostname() const void KStartupInfoData::addPid( pid_t pid_P ) { - if( !d->pids.contains( pid_P )) + if( !d->pids.tqcontains( pid_P )) d->pids.append( pid_P ); } @@ -1395,7 +1395,7 @@ const TQValueList< pid_t >& KStartupInfoData::pids() const bool KStartupInfoData::is_pid( pid_t pid_P ) const { - return d->pids.contains( pid_P ); + return d->pids.tqcontains( pid_P ); } void KStartupInfoData::setSilent( TriState state_P ) @@ -1451,24 +1451,24 @@ WId KStartupInfoData::launchedBy() const static long get_num( const TQString& item_P ) { - unsigned int pos = item_P.find( '=' ); + unsigned int pos = item_P.tqfind( '=' ); return item_P.mid( pos + 1 ).toLong(); } static unsigned long get_unum( const TQString& item_P ) { - unsigned int pos = item_P.find( '=' ); + unsigned int pos = item_P.tqfind( '=' ); return item_P.mid( pos + 1 ).toULong(); } static TQString get_str( const TQString& item_P ) { - unsigned int pos = item_P.find( '=' ); + unsigned int pos = item_P.tqfind( '=' ); if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (QChar)'\"' ) { - int pos2 = item_P.left( pos + 2 ).find( '\"' ); + int pos2 = item_P.left( pos + 2 ).tqfind( '\"' ); if( pos2 < 0 ) return TQString::null; // 01234 return item_P.mid( pos + 2, pos2 - 2 - pos ); // A="C" diff --git a/kdecore/kstartupinfo.h b/kdecore/kstartupinfo.h index e35bdba56..da3018d8c 100644 --- a/kdecore/kstartupinfo.h +++ b/kdecore/kstartupinfo.h @@ -28,6 +28,10 @@ DEALINGS IN THE SOFTWARE. #include <sys/types.h> #include <tqobject.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 // FIXME(E): Redo in a less X11-specific way #include <tqcstring.h> @@ -61,9 +65,10 @@ class KStartupInfoPrivate; * @author Lubos Lunak <l.lunak@kde.org> */ class KDECORE_EXPORT KStartupInfo - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * By default, the startup notification is ended for the application diff --git a/kdecore/kstdaccel.cpp b/kdecore/kstdaccel.cpp index 8e1819735..85f8dda20 100644 --- a/kdecore/kstdaccel.cpp +++ b/kdecore/kstdaccel.cpp @@ -76,8 +76,8 @@ static KStdAccelInfo g_infoStdAccel[] = { End, I18N_NOOP("End"), 0, Qt::CTRL+Qt::Key_End, 0, 0, 0, KShortcut(), false }, { BeginningOfLine, "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, KShortcut(), false}, { EndOfLine, "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, KShortcut(), false}, - { Prior, I18N_NOOP("Prior"), 0, Qt::Key_Prior, 0, 0, 0, KShortcut(), false }, - { Next, I18N_NOOP2("Opposite to Prior","Next"), 0, Qt::Key_Next, 0, 0, 0, KShortcut(), false }, + { Prior, I18N_NOOP("Prior"), 0, TQt::Key_Prior, 0, 0, 0, KShortcut(), false }, + { Next, I18N_NOOP2("Opposite to Prior","Next"), 0, TQt::Key_Next, 0, 0, 0, KShortcut(), false }, { GotoLine, "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, KShortcut(), false }, { AddBookmark, "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, KShortcut(), false }, { ZoomIn, "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, KShortcut(), false }, diff --git a/kdecore/kstringhandler.cpp b/kdecore/kstringhandler.cpp index 8b5ca1a7d..e37d1a3ce 100644 --- a/kdecore/kstringhandler.cpp +++ b/kdecore/kstringhandler.cpp @@ -22,7 +22,7 @@ static void parsePythonRange( const TQCString &range, uint &start, uint &end ) { - const int colon = range.find( ':' ); + const int colon = range.tqfind( ':' ); if ( colon == -1 ) { start = range.toUInt(); end = start; @@ -178,7 +178,7 @@ TQString KStringHandler::remword( const TQString &text , const TQString &word ) // Split words and add into list TQStringList list = TQStringList::split( " ", text, true ); - TQStringList::Iterator it = list.find(word); + TQStringList::Iterator it = list.tqfind(word); if (it != list.end()) list.remove( it ); @@ -422,11 +422,11 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa if ( pattern[ pattern_len - 1 ] == (QChar)'*' && len + 1 >= pattern_len ) { if ( pattern[ 0 ] == (QChar)'*' ) { - return filename.find(pattern.mid(1, pattern_len - 2)) != -1; + return filename.tqfind(pattern.mid(1, pattern_len - 2)) != -1; } - const TQChar *c1 = pattern.unicode(); - const TQChar *c2 = filename.unicode(); + const TQChar *c1 = pattern.tqunicode(); + const TQChar *c2 = filename.tqunicode(); int cnt = 1; while ( cnt < pattern_len && *c1++ == *c2++ ) ++cnt; @@ -436,8 +436,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa // Patterns like "*~", "*.extension" if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len ) { - const TQChar *c1 = pattern.unicode() + pattern_len - 1; - const TQChar *c2 = filename.unicode() + len - 1; + const TQChar *c1 = pattern.tqunicode() + pattern_len - 1; + const TQChar *c2 = filename.tqunicode() + len - 1; int cnt = 1; while ( cnt < pattern_len && *c1-- == *c2-- ) ++cnt; @@ -457,7 +457,7 @@ KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max) int searchStart = 0; - int tokenStart = s.find(sep, searchStart); + int tokenStart = s.tqfind(sep, searchStart); while (-1 != tokenStart && (ignoreMax || l.count() < max - 1)) { @@ -465,7 +465,7 @@ KStringHandler::perlSplit(const TQString & sep, const TQString & s, uint max) l << s.mid(searchStart, tokenStart - searchStart); searchStart = tokenStart + sep.length(); - tokenStart = s.find(sep, searchStart); + tokenStart = s.tqfind(sep, searchStart); } if (!s.mid(searchStart, s.length() - searchStart).isEmpty()) @@ -483,7 +483,7 @@ KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max) int searchStart = 0; - int tokenStart = s.find(sep, searchStart); + int tokenStart = s.tqfind(sep, searchStart); while (-1 != tokenStart && (ignoreMax || l.count() < max - 1)) { @@ -491,7 +491,7 @@ KStringHandler::perlSplit(const TQChar & sep, const TQString & s, uint max) l << s.mid(searchStart, tokenStart - searchStart); searchStart = tokenStart + 1; - tokenStart = s.find(sep, searchStart); + tokenStart = s.tqfind(sep, searchStart); } if (!s.mid(searchStart, s.length() - searchStart).isEmpty()) @@ -527,7 +527,7 @@ KStringHandler::perlSplit(const TQRegExp & sep, const TQString & s, uint max) return l; } - QString +TQString KStringHandler::tagURLs( const TQString& text ) { /*static*/ TQRegExp urlEx("(www\\.(?!\\.)|(fish|(f|ht)tp(|s))://)[\\d\\w\\./,:_~\\?=&;#@\\-\\+\\%\\$]+[\\d\\w/]"); @@ -556,10 +556,10 @@ KStringHandler::tagURLs( const TQString& text ) TQString KStringHandler::obscure( const TQString &str ) { TQString result; - const TQChar *unicode = str.unicode(); + const TQChar *tqunicode = str.tqunicode(); for ( uint i = 0; i < str.length(); ++i ) - result += ( unicode[ i ].unicode() < 0x21 ) ? unicode[ i ] : - TQChar( 0x1001F - unicode[ i ].unicode() ); + result += ( tqunicode[ i ].tqunicode() < 0x21 ) ? tqunicode[ i ] : + TQChar( 0x1001F - tqunicode[ i ].tqunicode() ); return result; } diff --git a/kdecore/ksycoca.cpp b/kdecore/ksycoca.cpp index fd4d9aa95..a3d017f9a 100644 --- a/kdecore/ksycoca.cpp +++ b/kdecore/ksycoca.cpp @@ -76,7 +76,7 @@ public: TQString language; bool readError; bool autoRebuild; - Q_UINT32 updateSig; + TQ_UINT32 updateSig; TQStringList allResourceDirs; }; @@ -179,8 +179,8 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound ) TQBuffer *buffer = new TQBuffer( TQByteArray() ); buffer->open(IO_ReadWrite); m_str = new TQDataStream( buffer); - (*m_str) << (Q_INT32) KSYCOCA_VERSION; - (*m_str) << (Q_INT32) 0; + (*m_str) << (TQ_INT32) KSYCOCA_VERSION; + (*m_str) << (TQ_INT32) 0; } else { @@ -228,12 +228,15 @@ void KSycoca::closeDatabase() { TQIODevice *device = 0; if (m_str) - device = m_str->device(); + device = m_str->tqdevice(); #ifdef HAVE_MMAP if (device && m_sycoca_mmap) { TQBuffer *buf = (TQBuffer *) device; - buf->buffer().resetRawData(m_sycoca_mmap, m_sycoca_size); +#ifdef USE_QT4 + static_cast<TQByteArray&> +#endif // USE_QT4 + (buf->buffer()).resetRawData(m_sycoca_mmap, m_sycoca_size); // Solaris has munmap(char*, size_t) and everything else should // be happy with a char* for munmap(void*, size_t) munmap((char*) m_sycoca_mmap, m_sycoca_size); @@ -244,7 +247,7 @@ void KSycoca::closeDatabase() delete m_str; m_str = 0; delete device; - if (d->database != device) + if (TQT_TQIODEVICE(d->database) != device) delete d->database; device = 0; d->database = 0; @@ -262,7 +265,7 @@ void KSycoca::addFactory( KSycocaFactory *factory ) bool KSycoca::isChanged(const char *type) { - return self()->d->changeList.contains(type); + return self()->d->changeList.tqcontains(type); } void KSycoca::notifyDatabaseChanged(const TQStringList &changeList) @@ -284,8 +287,8 @@ TQDataStream * KSycoca::findEntry(int offset, KSycocaType &type) if ( !m_str ) openDatabase(); //kdDebug(7011) << TQString("KSycoca::_findEntry(offset=%1)").arg(offset,8,16) << endl; - m_str->device()->at(offset); - Q_INT32 aType; + m_str->tqdevice()->at(offset); + TQ_INT32 aType; (*m_str) >> aType; type = (KSycocaType) aType; //kdDebug(7011) << TQString("KSycoca::found type %1").arg(aType) << endl; @@ -302,8 +305,8 @@ bool KSycoca::checkVersion(bool abortOnError) // We should never get here... if a database was found then m_str shouldn't be 0L. assert(m_str); } - m_str->device()->at(0); - Q_INT32 aVersion; + m_str->tqdevice()->at(0); + TQ_INT32 aVersion; (*m_str) >> aVersion; if ( aVersion < KSYCOCA_VERSION ) { @@ -342,8 +345,8 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id) kdWarning(7011) << "Outdated database found" << endl; return 0L; } - Q_INT32 aId; - Q_INT32 aOffset; + TQ_INT32 aId; + TQ_INT32 aOffset; while(true) { (*m_str) >> aId; @@ -357,7 +360,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id) if (aId == id) { //kdDebug(7011) << TQString("KSycoca::findFactory(%1) offset %2").arg((int)id).arg(aOffset) << endl; - m_str->device()->at(aOffset); + m_str->tqdevice()->at(aOffset); return m_str; } } @@ -368,8 +371,8 @@ TQString KSycoca::kfsstnd_prefixes() { if (bNoDatabase) return ""; if (!checkVersion(false)) return ""; - Q_INT32 aId; - Q_INT32 aOffset; + TQ_INT32 aId; + TQ_INT32 aOffset; // skip factories offsets while(true) { @@ -389,14 +392,14 @@ TQString KSycoca::kfsstnd_prefixes() return prefixes; } -Q_UINT32 KSycoca::timeStamp() +TQ_UINT32 KSycoca::timeStamp() { if (!m_timeStamp) (void) kfsstnd_prefixes(); return m_timeStamp; } -Q_UINT32 KSycoca::updateSignature() +TQ_UINT32 KSycoca::updateSignature() { if (!m_timeStamp) (void) kfsstnd_prefixes(); @@ -424,11 +427,11 @@ TQString KSycoca::determineRelativePath( const TQString & _fullpath, const char TQStringList::ConstIterator dirsit = dirs.begin(); for ( ; dirsit != dirs.end() && sRelativeFilePath.isEmpty(); ++dirsit ) { // might need canonicalPath() ... - if ( _fullpath.find( *dirsit ) == 0 ) // path is dirs + relativePath + if ( _fullpath.tqfind( *dirsit ) == 0 ) // path is dirs + relativePath sRelativeFilePath = _fullpath.mid( (*dirsit).length() ); // skip appsdirs } if ( sRelativeFilePath.isEmpty() ) - kdFatal(7011) << TQString("Couldn't find %1 in any %2 dir !!!").arg( _fullpath ).arg( _resource) << endl; + kdFatal(7011) << TQString(TQString("Couldn't find %1 in any %2 dir !!!").arg( _fullpath ).arg( _resource)) << endl; //else // debug code //kdDebug(7011) << sRelativeFilePath << endl; @@ -469,7 +472,7 @@ bool KSycoca::readError() void KSycocaEntry::read( TQDataStream &s, TQString &str ) { - Q_UINT32 bytes; + TQ_UINT32 bytes; s >> bytes; // read size of string if ( bytes > 8192 ) { // null string or too big if (bytes != 0xffffffff) @@ -479,7 +482,7 @@ void KSycocaEntry::read( TQDataStream &s, TQString &str ) else if ( bytes > 0 ) { // not empty int bt = bytes/2; str.setLength( bt ); - TQChar* ch = (TQChar *) str.unicode(); + TQChar* ch = (TQChar *) str.tqunicode(); char t[8192]; char *b = t; s.readRawBytes( b, bytes ); @@ -495,14 +498,14 @@ void KSycocaEntry::read( TQDataStream &s, TQString &str ) void KSycocaEntry::read( TQDataStream &s, TQStringList &list ) { list.clear(); - Q_UINT32 count; + TQ_UINT32 count; s >> count; // read size of list if (count >= 1024) { KSycoca::flagError(); return; } - for(Q_UINT32 i = 0; i < count; i++) + for(TQ_UINT32 i = 0; i < count; i++) { TQString str; read(s, str); diff --git a/kdecore/ksycoca.h b/kdecore/ksycoca.h index 8cbe6eb67..6b8fcd0f3 100644 --- a/kdecore/ksycoca.h +++ b/kdecore/ksycoca.h @@ -93,7 +93,7 @@ public: * The database contains all changes made _before_ this time and * _might_ contain changes made after that. */ - Q_UINT32 timeStamp(); + TQ_UINT32 timeStamp(); /** * @internal - returns update signature of database @@ -104,7 +104,7 @@ public: * Touching this file causes the database to be recreated * from scratch. */ - Q_UINT32 updateSignature(); + TQ_UINT32 updateSignature(); /** * @internal - returns all directories with information @@ -172,7 +172,7 @@ protected: bool bNoDatabase; size_t m_sycoca_size; const char *m_sycoca_mmap; - Q_UINT32 m_timeStamp; + TQ_UINT32 m_timeStamp; public: static KSycoca *_self; // Internal use only. diff --git a/kdecore/ksycocadict.cpp b/kdecore/ksycocadict.cpp index ce7529682..76124e76a 100644 --- a/kdecore/ksycocadict.cpp +++ b/kdecore/ksycocadict.cpp @@ -29,7 +29,7 @@ namespace { struct string_entry { string_entry(TQString _key, KSycocaEntry *_payload) - { keyStr = _key; key = keyStr.unicode(); length = keyStr.length(); payload = _payload; hash = 0; } + { keyStr = _key; key = keyStr.tqunicode(); length = keyStr.length(); payload = _payload; hash = 0; } uint hash; int length; const TQChar *key; @@ -59,8 +59,8 @@ KSycocaDict::KSycocaDict() KSycocaDict::KSycocaDict(TQDataStream *str, int offset) : d(0), mStr(str), mOffset(offset) { - Q_UINT32 test1, test2; - str->device()->at(offset); + TQ_UINT32 test1, test2; + str->tqdevice()->at(offset); (*str) >> test1 >> test2; if ((test1 > 0x000fffff) || (test2 > 1024)) { @@ -70,10 +70,10 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset) return; } - str->device()->at(offset); + str->tqdevice()->at(offset); (*str) >> mHashTableSize; (*str) >> mHashList; - mOffset = str->device()->at(); // Start of hashtable + mOffset = str->tqdevice()->at(); // Start of hashtable } KSycocaDict::~KSycocaDict() @@ -129,11 +129,11 @@ KSycocaDict::find_string(const TQString &key ) uint hash = hashKey(key) % mHashTableSize; //kdDebug(7011) << TQString("hash is %1").arg(hash) << endl; - uint off = mOffset+sizeof(Q_INT32)*hash; + uint off = mOffset+sizeof(TQ_INT32)*hash; //kdDebug(7011) << TQString("off is %1").arg(off,8,16) << endl; - mStr->device()->at( off ); + mStr->tqdevice()->at( off ); - Q_INT32 offset; + TQ_INT32 offset; (*mStr) >> offset; //kdDebug(7011) << TQString("offset is %1").arg(offset,8,16) << endl; @@ -146,7 +146,7 @@ KSycocaDict::find_string(const TQString &key ) // Lookup duplicate list. offset = -offset; - mStr->device()->at(offset); + mStr->tqdevice()->at(offset); //kdDebug(7011) << TQString("Looking up duplicate list at %1").arg(offset,8,16) << endl; while(true) @@ -286,7 +286,7 @@ KSycocaDict::save(TQDataStream &str) return; } - mOffset = str.device()->at(); + mOffset = str.tqdevice()->at(); //kdDebug(7011) << TQString("KSycocaDict: %1 entries.").arg(count()) << endl; @@ -402,26 +402,26 @@ KSycocaDict::save(TQDataStream &str) str << mHashTableSize; str << mHashList; - mOffset = str.device()->at(); // mOffset points to start of hashTable + mOffset = str.tqdevice()->at(); // mOffset points to start of hashTable //kdDebug(7011) << TQString("Start of Hash Table, offset = %1").arg(mOffset,8,16) << endl; for(int pass = 1; pass <= 2; pass++) { - str.device()->at(mOffset); + str.tqdevice()->at(mOffset); //kdDebug(7011) << TQString("Writing hash table (pass #%1)").arg(pass) << endl; for(uint i=0; i < mHashTableSize; i++) { - Q_INT32 tmpid; + TQ_INT32 tmpid; if (!hashTable[i].entry) - tmpid = (Q_INT32) 0; + tmpid = (TQ_INT32) 0; else if (!hashTable[i].duplicates) - tmpid = (Q_INT32) hashTable[i].entry->payload->offset(); // Positive ID + tmpid = (TQ_INT32) hashTable[i].entry->payload->offset(); // Positive ID else - tmpid = (Q_INT32) -hashTable[i].duplicate_offset; // Negative ID + tmpid = (TQ_INT32) -hashTable[i].duplicate_offset; // Negative ID str << tmpid; //kdDebug(7011) << TQString("Hash table : %1").arg(tmpid,8,16) << endl; } - //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.device()->at(),8,16) << endl; + //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.tqdevice()->at(),8,16) << endl; //kdDebug(7011) << TQString("Writing duplicate lists (pass #%1)").arg(pass) << endl; for(uint i=0; i < mHashTableSize; i++) @@ -429,19 +429,19 @@ KSycocaDict::save(TQDataStream &str) if (hashTable[i].duplicates) { TQPtrList<string_entry> *dups = hashTable[i].duplicates; - hashTable[i].duplicate_offset = str.device()->at(); + hashTable[i].duplicate_offset = str.tqdevice()->at(); /*kdDebug(7011) << TQString("Duplicate lists: Offset = %1 list_size = %2") .arg(hashTable[i].duplicate_offset,8,16).arg(dups->count()) << endl; */ for(string_entry *dup = dups->first(); dup; dup=dups->next()) { - str << (Q_INT32) dup->payload->offset(); // Positive ID + str << (TQ_INT32) dup->payload->offset(); // Positive ID str << dup->keyStr; // Key (TQString) } - str << (Q_INT32) 0; // End of list marker (0) + str << (TQ_INT32) 0; // End of list marker (0) } } - //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.device()->at(),8,16) << endl; + //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.tqdevice()->at(),8,16) << endl; } //kdDebug(7011) << "Cleaning up hash table." << endl; diff --git a/kdecore/ksycocadict.h b/kdecore/ksycocadict.h index 94a2bc646..0cf5eb257 100644 --- a/kdecore/ksycocadict.h +++ b/kdecore/ksycocadict.h @@ -111,13 +111,13 @@ public: void save(TQDataStream &str); protected: - Q_UINT32 hashKey( const TQString &); + TQ_UINT32 hashKey( const TQString &); private: KSycocaDictStringList *d; TQDataStream *mStr; - Q_INT32 mOffset; - Q_UINT32 mHashTableSize; - TQValueList<Q_INT32> mHashList; + TQ_INT32 mOffset; + TQ_UINT32 mHashTableSize; + TQValueList<TQ_INT32> mHashList; }; #endif diff --git a/kdecore/ksycocaentry.h b/kdecore/ksycocaentry.h index 5f6f11bbd..2b4611cc2 100644 --- a/kdecore/ksycocaentry.h +++ b/kdecore/ksycocaentry.h @@ -101,8 +101,8 @@ public: // KDoc seems to barf on those typedefs and generates no docs after them */ virtual void save(TQDataStream &s) { - mOffset = s.device()->at(); // store position in member variable - s << (Q_INT32) sycocaType() << mPath; + mOffset = s.tqdevice()->at(); // store position in member variable + s << (TQ_INT32) sycocaType() << mPath; } /** diff --git a/kdecore/ksycocafactory.cpp b/kdecore/ksycocafactory.cpp index e5816dc23..122dd9405 100644 --- a/kdecore/ksycocafactory.cpp +++ b/kdecore/ksycocafactory.cpp @@ -38,7 +38,7 @@ KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id) if (m_str) // Can be 0 in case of errors { // Read position of index tables.... - Q_INT32 i; + TQ_INT32 i; (*m_str) >> i; m_sycocaDictOffset = i; (*m_str) >> i; @@ -46,10 +46,10 @@ KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id) (*m_str) >> i; m_endEntryOffset = i; - int saveOffset = m_str->device()->at(); + int saveOffset = m_str->tqdevice()->at(); // Init index tables m_sycocaDict = new KSycocaDict(m_str, m_sycocaDictOffset); - saveOffset = m_str->device()->at(saveOffset); + saveOffset = m_str->tqdevice()->at(saveOffset); } } else @@ -78,10 +78,10 @@ void KSycocaFactory::saveHeader(TQDataStream &str) { // Write header - str.device()->at(mOffset); - str << (Q_INT32) m_sycocaDictOffset; - str << (Q_INT32) m_beginEntryOffset; - str << (Q_INT32) m_endEntryOffset; + str.tqdevice()->at(mOffset); + str << (TQ_INT32) m_sycocaDictOffset; + str << (TQ_INT32) m_beginEntryOffset; + str << (TQ_INT32) m_endEntryOffset; } void @@ -91,13 +91,13 @@ KSycocaFactory::save(TQDataStream &str) // building database if (!m_sycocaDict) return; // Error! - mOffset = str.device()->at(); // store position in member variable + mOffset = str.tqdevice()->at(); // store position in member variable m_sycocaDictOffset = 0; // Write header (pass #1) saveHeader(str); - m_beginEntryOffset = str.device()->at(); + m_beginEntryOffset = str.tqdevice()->at(); // Write all entries. int entryCount = 0; @@ -110,30 +110,30 @@ KSycocaFactory::save(TQDataStream &str) entryCount++; } - m_endEntryOffset = str.device()->at(); + m_endEntryOffset = str.tqdevice()->at(); // Write indices... // Linear index - str << (Q_INT32) entryCount; + str << (TQ_INT32) entryCount; for(TQDictIterator<KSycocaEntry::Ptr> it ( *m_entryDict ); it.current(); ++it) { KSycocaEntry *entry = (*it.current()); - str << (Q_INT32) entry->offset(); + str << (TQ_INT32) entry->offset(); } // Dictionary index - m_sycocaDictOffset = str.device()->at(); + m_sycocaDictOffset = str.tqdevice()->at(); m_sycocaDict->save(str); - int endOfFactoryData = str.device()->at(); + int endOfFactoryData = str.tqdevice()->at(); // Update header (pass #2) saveHeader(str); // Seek to end. - str.device()->at(endOfFactoryData); + str.tqdevice()->at(endOfFactoryData); } void @@ -169,8 +169,8 @@ KSycocaEntry::List KSycocaFactory::allEntries() // Assume we're NOT building a database - m_str->device()->at(m_endEntryOffset); - Q_INT32 entryCount; + m_str->tqdevice()->at(m_endEntryOffset); + TQ_INT32 entryCount; (*m_str) >> entryCount; if (entryCount > 8192) @@ -179,7 +179,7 @@ KSycocaEntry::List KSycocaFactory::allEntries() return list; } - Q_INT32 *offsetList = new Q_INT32[entryCount]; + TQ_INT32 *offsetList = new TQ_INT32[entryCount]; for(int i = 0; i < entryCount; i++) { (*m_str) >> offsetList[i]; diff --git a/kdecore/ktempdir.cpp b/kdecore/ktempdir.cpp index 70a442730..3a68e304e 100644 --- a/kdecore/ktempdir.cpp +++ b/kdecore/ktempdir.cpp @@ -118,7 +118,7 @@ KTempDir::status() const return mError; } -QString +TQString KTempDir::name() const { return mTmpName; @@ -177,7 +177,7 @@ rmtree(const TQCString& name) * * Potential problems: * - opendir/readdir/closedir is not re-entrant - * - unlink and rmdir invalidates a opendir/readdir/closedir + * - unlink and rmdir tqinvalidates a opendir/readdir/closedir * - limited number of file descriptors for opendir/readdir/closedir */ if ( ::closedir( dp ) ) diff --git a/kdecore/ktempfile.cpp b/kdecore/ktempfile.cpp index c04f725fe..f439b55ef 100644 --- a/kdecore/ktempfile.cpp +++ b/kdecore/ktempfile.cpp @@ -139,7 +139,7 @@ KTempFile::status() const return mError; } -QString +TQString KTempFile::name() const { return mTmpName; diff --git a/kdecore/ktimezones.cpp b/kdecore/ktimezones.cpp index 5ebf9bd4a..dbd589d85 100644 --- a/kdecore/ktimezones.cpp +++ b/kdecore/ktimezones.cpp @@ -285,12 +285,12 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const char *originalZone = ::getenv("TZ"); // Get the time in the current timezone. - TQDateTime basisTime = TQDateTime::currentDateTime(basisSpec); + TQDateTime basisTime = TQDateTime::tqcurrentDateTime(basisSpec); // Set the timezone and find out what time it is there compared to the basis. ::setenv("TZ", m_name.utf8(), 1); tzset(); - TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime); + TQDateTime remoteTime = TQDateTime::tqcurrentDateTime(Qt::LocalTime); int offset = remoteTime.secsTo(basisTime); // Now restore things @@ -507,7 +507,7 @@ const KTimezone *KTimezones::local() // Compute the MD5 sum of /etc/localtime. KMD5 context(""); context.reset(); - context.update(f); + context.update(TQT_TQIODEVICE_OBJECT(f)); TQIODevice::Offset referenceSize = f.size(); TQString referenceMd5Sum = context.hexDigest(); f.close(); @@ -526,7 +526,7 @@ const KTimezone *KTimezones::local() { // Only do the heavy lifting for file sizes which match. context.reset(); - context.update(f); + context.update(TQT_TQIODEVICE_OBJECT(f)); candidateMd5Sum = context.hexDigest(); } f.close(); @@ -695,28 +695,28 @@ bool KTimezoneSource::parse(const TQString &zone, KTimezoneDetails &dataReceiver } // Structures that represent the zoneinfo file. - Q_UINT8 T, z, i_, f_; + TQ_UINT8 T, z, i_, f_; struct { - Q_UINT32 ttisgmtcnt; - Q_UINT32 ttisstdcnt; - Q_UINT32 leapcnt; - Q_UINT32 timecnt; - Q_UINT32 typecnt; - Q_UINT32 charcnt; + TQ_UINT32 ttisgmtcnt; + TQ_UINT32 ttisstdcnt; + TQ_UINT32 leapcnt; + TQ_UINT32 timecnt; + TQ_UINT32 typecnt; + TQ_UINT32 charcnt; } tzh; - Q_UINT32 transitionTime; - Q_UINT8 localTimeIndex; + TQ_UINT32 transitionTime; + TQ_UINT8 localTimeIndex; struct { - Q_INT32 gmtoff; - Q_INT8 isdst; - Q_UINT8 abbrind; + TQ_INT32 gmtoff; + TQ_INT8 isdst; + TQ_UINT8 abbrind; } tt; - Q_UINT32 leapTime; - Q_UINT32 leapSeconds; - Q_UINT8 isStandard; - Q_UINT8 isUTC; + TQ_UINT32 leapTime; + TQ_UINT32 leapSeconds; + TQ_UINT8 isStandard; + TQ_UINT8 isUTC; TQDataStream str(&f); str >> T >> z >> i_ >> f_; diff --git a/kdecore/kurl.cpp b/kdecore/kurl.cpp index cb396c3a5..047f18dee 100644 --- a/kdecore/kurl.cpp +++ b/kdecore/kurl.cpp @@ -87,7 +87,7 @@ static TQString encode( const TQString& segment, int encoding_offset, int encodi return segment.isNull() ? TQString::null : TQString(""); // differentiate null and empty // a worst case approximation - TQChar *new_segment = new QChar[ old_length * 3 + 1 ]; + TQChar *new_segment = new TQChar[ old_length * 3 + 1 ]; int new_length = 0; for ( int i = 0; i < old_length; i++ ) @@ -167,19 +167,19 @@ static TQString lazy_encode( const TQString& segment, bool encodeAt=true ) return TQString::null; // a worst case approximation - TQChar *new_segment = new QChar[ old_length * 3 + 1 ]; + TQChar *new_segment = new TQChar[ old_length * 3 + 1 ]; int new_length = 0; for ( int i = 0; i < old_length; i++ ) { - unsigned int character = segment[i].unicode(); // Don't use latin1() + unsigned int character = segment[i].tqunicode(); // Don't use latin1() // It returns 0 for non-latin1 values // Small set of really ambiguous chars if ((character < 32) || // Low ASCII ((character == '%') && // The escape character itself (i+2 < old_length) && // But only if part of a valid escape sequence! - (hex2int(segment[i+1].unicode())!= -1) && - (hex2int(segment[i+2].unicode())!= -1)) || + (hex2int(segment[i+1].tqunicode())!= -1) && + (hex2int(segment[i+2].tqunicode())!= -1)) || (character == '?') || // Start of query delimiter ((character == '@') && encodeAt) || // Username delimiter (character == '#') || // Start of reference delimiter @@ -235,7 +235,7 @@ static void decode( const TQString& segment, TQString &decoded, TQString &encode // make a copy of the old one char *new_segment = new char[ old_length + 1 ]; - TQChar *new_usegment = new QChar[ old_length * 3 + 1 ]; + TQChar *new_usegment = new TQChar[ old_length * 3 + 1 ]; int i = 0; while( i < old_length ) @@ -291,12 +291,12 @@ static void decode( const TQString& segment, TQString &decoded, TQString &encode { decoded = textCodec->toUnicode( new_segment ); if ( isRawURI ) { - int length = qstrlen( new_segment ); + int length = tqstrlen( new_segment ); while ( length < new_length ) { decoded += TQChar::null; length += 1; decoded += textCodec->toUnicode( new_segment + length ); - length += qstrlen( new_segment + length ); + length += tqstrlen( new_segment + length ); } } @@ -338,7 +338,7 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de #else TQString encodedDot("%2e"); #endif - if (path.find(encodedDot, 0, false) != -1) + if (path.tqfind(encodedDot, 0, false) != -1) { #ifndef KDE_QT_ONLY static const TQString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase! @@ -365,7 +365,7 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de cdUp = 0; pos = orig_pos = len; - while ( pos && (pos = path.findRev('/',--pos)) != -1 ) + while ( pos && (pos = path.tqfindRev('/',--pos)) != -1 ) { len = orig_pos - pos - 1; if ( len == 2 && path[pos+1] == '.' && path[pos+2] == '.' ) @@ -404,7 +404,7 @@ bool KURL::isRelativeURL(const TQString &_url) { int len = _url.length(); if (!len) return true; // Very short relative URL. - const TQChar *str = _url.unicode(); + const TQChar *str = _url.tqunicode(); // Absolute URL must start with alpha-character if (!isalpha(str[0].latin1())) @@ -471,13 +471,13 @@ KURL::KURL( const TQString &url, int encoding_hint ) KURL::KURL( const char * url, int encoding_hint ) { reset(); - parse( TQString::fromLatin1(url), encoding_hint ); + parse( TQString::tqfromLatin1(url), encoding_hint ); } KURL::KURL( const TQCString& url, int encoding_hint ) { reset(); - parse( TQString::fromLatin1(url), encoding_hint ); + parse( TQString::tqfromLatin1(url), encoding_hint ); } KURL::KURL( const KURL& _u ) @@ -493,13 +493,13 @@ TQDataStream & operator<< (TQDataStream & s, const KURL & a) s << a.m_strProtocol << a.m_strUser << a.m_strPass << a.m_strHost << a.m_strPath << a.m_strPath_encoded << QueryForWire << a.m_strRef_encoded - << Q_INT8(a.m_bIsMalformed ? 1 : 0) << a.m_iPort; + << TQ_INT8(a.m_bIsMalformed ? 1 : 0) << a.m_iPort; return s; } TQDataStream & operator>> (TQDataStream & s, KURL & a) { - Q_INT8 malf; + TQ_INT8 malf; TQString QueryFromWire; s >> a.m_strProtocol >> a.m_strUser >> a.m_strPass >> a.m_strHost >> a.m_strPath >> a.m_strPath_encoded >> QueryFromWire >> a.m_strRef_encoded @@ -542,11 +542,11 @@ KURL::KURL( const KURL& _u, const TQString& _rel_url, int encoding_hint ) TQString rUrl = _rel_url; int len = _u.m_strProtocol.length(); if ( !_u.m_strHost.isEmpty() && !rUrl.isEmpty() && - rUrl.find( _u.m_strProtocol, 0, false ) == 0 && + rUrl.tqfind( _u.m_strProtocol, 0, false ) == 0 && rUrl[len] == ':' && (rUrl[len+1] != '/' || (rUrl[len+1] == '/' && rUrl[len+2] != '/')) ) { - rUrl.remove( 0, rUrl.find( ':' ) + 1 ); + rUrl.remove( 0, rUrl.tqfind( ':' ) + 1 ); } if ( rUrl.isEmpty() ) @@ -579,13 +579,13 @@ KURL::KURL( const KURL& _u, const TQString& _rel_url, int encoding_hint ) } else if ( rUrl[0] != '?' ) { - int pos = m_strPath.findRev( '/' ); + int pos = m_strPath.tqfindRev( '/' ); if (pos >= 0) m_strPath.truncate(pos); m_strPath += '/'; if (!m_strPath_encoded.isEmpty()) { - pos = m_strPath_encoded.findRev( '/' ); + pos = m_strPath_encoded.tqfindRev( '/' ); if (pos >= 0) m_strPath_encoded.truncate(pos); m_strPath_encoded += '/'; @@ -643,7 +643,7 @@ void KURL::parse( const TQString& _url, int encoding_hint ) return; } - const TQChar* buf = _url.unicode(); + const TQChar* buf = _url.tqunicode(); const TQChar* orig = buf; uint len = _url.length(); uint pos = 0; @@ -707,7 +707,7 @@ NodeErr: void KURL::parseRawURI( const TQString& _url, int encoding_hint ) { uint len = _url.length(); - const TQChar* buf = _url.unicode(); + const TQChar* buf = _url.tqunicode(); uint pos = 0; @@ -748,9 +748,9 @@ void KURL::parseMailto( const TQString& _url, int encoding_hint ) #ifndef KDE_QT_ONLY TQString host = KIDNA::toUnicode( mailre.cap( 2 ) ); if (host.isEmpty()) - host = mailre.cap( 2 ).lower(); + host = TQString(mailre.cap( 2 )).lower(); #else - TQString host = mailre.cap( 2 ).lower(); + TQString host = TQString(mailre.cap( 2 )).lower(); #endif m_strPath = mailre.cap( 1 ) + host; } @@ -762,7 +762,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint ) bool badHostName = false; int start = 0; uint len = _url.length(); - const TQChar* buf = _url.unicode(); + const TQChar* buf = _url.tqunicode(); TQChar delim; TQString tmp; @@ -1040,7 +1040,7 @@ KURL& KURL::operator=( const TQString& _url ) KURL& KURL::operator=( const char * _url ) { reset(); - parse( TQString::fromLatin1(_url) ); + parse( TQString::tqfromLatin1(_url) ); return *this; } @@ -1231,7 +1231,7 @@ void KURL::setFileName( const TQString& _txt ) path = "/"; else { - int lastSlash = path.findRev( '/' ); + int lastSlash = path.tqfindRev( '/' ); if ( lastSlash == -1) { // The first character is not a '/' ??? @@ -1347,7 +1347,7 @@ void KURL::setEncodedPath( const TQString& _txt, int encoding_hint ) void KURL::setEncodedPathAndQuery( const TQString& _txt, int encoding_hint ) { - int pos = _txt.find( '?' ); + int pos = _txt.tqfind( '?' ); if ( pos == -1 ) { setEncodedPath(_txt, encoding_hint); @@ -1490,7 +1490,7 @@ TQString KURL::url( int _trailing, int encoding_hint ) const } if ( m_iUriMode == URL ) { - bool IPv6 = (m_strHost.find(':') != -1); + bool IPv6 = (m_strHost.tqfind(':') != -1); if (IPv6) u += '[' + m_strHost + ']'; else @@ -1546,7 +1546,7 @@ TQString KURL::prettyURL( int _trailing ) const } if ( m_iUriMode == URL ) { - bool IPv6 = (m_strHost.find(':') != -1); + bool IPv6 = (m_strHost.tqfind(':') != -1); if (IPv6) { u += '[' + m_strHost + ']'; @@ -1704,13 +1704,13 @@ TQString KURL::fileName( bool _strip_trailing_slash ) const // This is hairy, we need the last unencoded slash. // Count in the encoded string how many encoded slashes follow the last // unencoded one. - int i = m_strPath_encoded.findRev( (QChar)'/', len - 1 ); + int i = m_strPath_encoded.tqfindRev( (QChar)'/', len - 1 ); TQString fileName_encoded = m_strPath_encoded.mid(i+1); - n += fileName_encoded.contains("%2f", false); + n += fileName_encoded.tqcontains("%2f", false); } int i = len; do { - i = path.findRev( (QChar)'/', i - 1 ); + i = path.tqfindRev( (QChar)'/', i - 1 ); } while (--n && (i > 0)); @@ -1773,7 +1773,7 @@ TQString KURL::directory( bool _strip_trailing_slash_from_result, if ( result.isEmpty() || result == "/" ) return result; - int i = result.findRev( "/" ); + int i = result.tqfindRev( "/" ); // If ( i == -1 ) => the first character is not a '/' // So it's some URL like file:blah.tgz, with no path if ( i == -1 ) @@ -2143,14 +2143,14 @@ TQMap< TQString, TQString > KURL::queryItems( int options, int encoding_hint ) c TQMap< TQString, TQString > result; TQStringList items = TQStringList::split( '&', m_strQuery_encoded ); for ( TQStringList::const_iterator it = items.begin() ; it != items.end() ; ++it ) { - int equal_pos = (*it).find( '=' ); + int equal_pos = (*it).tqfind( '=' ); if ( equal_pos > 0 ) { // = is not the first char... TQString name = (*it).left( equal_pos ); if ( options & CaseInsensitiveKeys ) name = name.lower(); TQString value = (*it).mid( equal_pos + 1 ); if ( value.isEmpty() ) - result.insert( name, TQString::fromLatin1("") ); + result.insert( name, TQString::tqfromLatin1("") ); else { // ### why is decoding name not necessary? value.replace( '+', ' ' ); // + in queries means space @@ -2191,7 +2191,7 @@ TQString KURL::queryItem( const TQString& _item, int encoding_hint ) const return decode_string( str, encoding_hint ); } else // empty value - return TQString::fromLatin1(""); + return TQString::tqfromLatin1(""); } } diff --git a/kdecore/kurl.h b/kdecore/kurl.h index 86c7aa169..eaa0291b9 100644 --- a/kdecore/kurl.h +++ b/kdecore/kurl.h @@ -281,7 +281,7 @@ public: * See TQTextCodec::mibEnum() * * @see fromPathOrURL() - * @see TQString::fromLatin1() + * @see TQString::tqfromLatin1() */ KURL( const char * url, int encoding_hint = 0 ); /** @@ -307,7 +307,7 @@ public: * See TQTextCodec::mibEnum() * * @see fromPathOrURL() - * @see TQString::fromLatin1() + * @see TQString::tqfromLatin1() */ KURL( const TQCString& url, int encoding_hint = 0 ); @@ -1586,7 +1586,7 @@ public: * * Convenience function. * - * Convert unicoded string to local encoding and use %%-style + * Convert tqunicoded string to local encoding and use %%-style * encoding for all common delimiters / non-ascii characters. * * @param str the string to encode (can be @c TQString::null) @@ -1605,7 +1605,7 @@ public: * * Convenience function. * - * Convert unicoded string to local encoding and use %%-style + * Convert tqunicoded string to local encoding and use %%-style * encoding for all common delimiters and non-ascii characters * as well as the slash @c '/'. * @@ -1623,7 +1623,7 @@ public: * * Convenience function. * - * Decode %-style encoding and convert from local encoding to unicode. + * Decode %-style encoding and convert from local encoding to tqunicode. * * Reverse of encode_string() * diff --git a/kdecore/kurldrag.cpp b/kdecore/kurldrag.cpp index 7147f7a74..089d2fadb 100644 --- a/kdecore/kurldrag.cpp +++ b/kdecore/kurldrag.cpp @@ -87,7 +87,7 @@ KURLDrag * KURLDrag::newDrag( const KURL::List &urls, const TQMap<TQString, TQSt bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris ) { if ( e->provides( "application/x-kde-urilist" ) ) { - TQByteArray payload = e->encodedData( "application/x-kde-urilist" ); + TQByteArray payload = e->tqencodedData( "application/x-kde-urilist" ); if ( payload.size() ) { uint c=0; const char* d = payload.data(); @@ -128,7 +128,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T { if ( decode( e, uris ) ) // first decode the URLs (see above) { - TQByteArray ba = e->encodedData( "application/x-kio-metadata" ); + TQByteArray ba = e->tqencodedData( "application/x-kio-metadata" ); if ( ba.size() ) { TQString s = ba.data(); @@ -140,7 +140,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T if ( readingKey ) key = *it; else - metaData.replace( key, *it ); + metaData.tqreplace( key, *it ); readingKey = !readingKey; } Q_ASSERT( readingKey ); // an odd number of items would be, well, odd ;-) @@ -187,12 +187,12 @@ const char * KURLDrag::format( int i ) const else return 0; } -TQByteArray KURLDrag::encodedData( const char* mime ) const +TQByteArray KURLDrag::tqencodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "text/uri-list" ) - return TQUriDrag::encodedData( mime ); + return TQUriDrag::tqencodedData( mime ); else if ( mimetype == "text/plain" ) { TQStringList uris; diff --git a/kdecore/kurldrag.h b/kdecore/kurldrag.h index eb1f9522a..019119600 100644 --- a/kdecore/kurldrag.h +++ b/kdecore/kurldrag.h @@ -30,7 +30,7 @@ class KURLDragPrivate; /** * This class is to be used instead of TQUriDrag when using KURL. * The reason is: TQUriDrag (and the XDND/W3C standards) expect URLs to - * be encoded in UTF-8 (unicode), but KURL uses the current locale + * be encoded in UTF-8 (tqunicode), but KURL uses the current locale * by default. * The other reasons for using this class are: * @li it exports text/plain (for dropping/pasting into lineedits, mails etc.) @@ -145,7 +145,7 @@ public: /// @reimp virtual const char * format( int i ) const; /// @reimp - virtual TQByteArray encodedData( const char* mime ) const; + virtual TQByteArray tqencodedData( const char* mime ) const; protected: /** diff --git a/kdecore/kuser.cpp b/kdecore/kuser.cpp index 3fffddf4f..ca74700fe 100644 --- a/kdecore/kuser.cpp +++ b/kdecore/kuser.cpp @@ -219,7 +219,7 @@ TQValueList<KUserGroup> KUser::groups() const { TQValueList<KUserGroup>::const_iterator it; for ( it = allGroups.begin(); it != allGroups.end(); ++it ) { TQValueList<KUser> users = (*it).users(); - if ( users.find( *this ) != users.end()) { + if ( users.tqfind( *this ) != users.end()) { result.append(*it); } } @@ -232,7 +232,7 @@ TQStringList KUser::groupNames() const { TQValueList<KUserGroup>::const_iterator it; for ( it = allGroups.begin(); it != allGroups.end(); ++it ) { TQValueList<KUser> users = (*it).users(); - if ( users.find( *this ) != users.end()) { + if ( users.tqfind( *this ) != users.end()) { result.append((*it).name()); } } diff --git a/kdecore/kvmallocator.cpp b/kdecore/kvmallocator.cpp index 996d55791..031dd4304 100644 --- a/kdecore/kvmallocator.cpp +++ b/kdecore/kvmallocator.cpp @@ -106,7 +106,7 @@ KVMAllocator::allocate(size_t _size) free_block.start += block.size; if (!free_block.size) d->free_blocks.remove(it); - it = d->used_blocks.replace(block.start, block); + it = d->used_blocks.tqreplace(block.start, block); return &(it.data()); } ++it; @@ -120,7 +120,7 @@ KVMAllocator::allocate(size_t _size) block.size = (_size + KVM_ALIGN) & ~KVM_ALIGN; block.mmap = 0; kdDebug(180)<<"VM alloc: using new block "<<(long)block.start<<" size ="<<(long)block.size<<" request = "<<_size<< endl; - it = d->used_blocks.replace(block.start, block); + it = d->used_blocks.tqreplace(block.start, block); d->max_length += block.size; return &(it.data()); } @@ -138,14 +138,14 @@ KVMAllocator::free(Block *block_p) return; } TQMap<off_t,KVMAllocator::Block>::iterator it; - it = d->used_blocks.find(block.start); + it = d->used_blocks.tqfind(block.start); if (it == d->used_blocks.end()) { kdDebug(180)<<"VM free: Block "<<(long)block.start<<" is not allocated."<<endl; return; } d->used_blocks.remove(it); - it = d->free_blocks.replace(block.start, block); + it = d->free_blocks.tqreplace(block.start, block); TQMap<off_t,KVMAllocator::Block>::iterator before = it; --before; if (before != d->free_blocks.end()) diff --git a/kdecore/kwin.cpp b/kdecore/kwin.cpp index bc9a9761b..706b985fb 100644 --- a/kdecore/kwin.cpp +++ b/kdecore/kwin.cpp @@ -158,7 +158,7 @@ bool KWin::compositingActive() #ifdef Q_WS_X11 namespace { -class ContextWidget : public QWidget +class ContextWidget : public TQWidget { public: ContextWidget(); @@ -179,7 +179,7 @@ ContextWidget::ContextWidget() LeaveWindowMask ), GrabModeAsync, GrabModeAsync, None, c.handle(), CurrentTime ); - qApp->enter_loop(); + tqApp->enter_loop(); } @@ -205,7 +205,7 @@ bool ContextWidget::x11Event( XEvent * ev) e.xbutton.x = lx; e.xbutton.y = ly; XSendEvent( qt_xdisplay(), w, true, ButtonPressMask, &e ); - qApp->exit_loop(); + tqApp->exit_loop(); return true; } return false; @@ -313,7 +313,7 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow ) Grmbl. See TQDialog::show(). That should get fixed in Qt somehow. */ if( tqqt_cast< TQDialog* >( subwindow ) != NULL - && subwindow->parentWidget() == NULL + && subwindow->tqparentWidget() == NULL && kapp->mainWidget() != NULL ) { kdWarning() << "KWin::setMainWindow(): There either mustn't be kapp->mainWidget()," @@ -412,7 +412,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) TQImage img( (uchar*) ni.data, (int) ni.size.width, (int) ni.size.height, 32, 0, 0, TQImage::IgnoreEndian ); img.setAlphaBuffer( true ); if ( scale && width > 0 && height > 0 &&img.size() != TQSize( width, height ) && !img.isNull() ) - img = img.smoothScale( width, height ); + img = TQImage(img).smoothScale( width, height ); if ( !img.isNull() ) result.convertFromImage( img ); return result; @@ -457,7 +457,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) } if ( scale && width > 0 && height > 0 && !pm.isNull() && ( (int) w != width || (int) h != height) ){ - result.convertFromImage( pm.convertToImage().smoothScale( width, height ) ); + result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); } else { result = pm; } @@ -488,7 +488,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( className.lower(), KIcon::Small, iconWidth, KIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) - result.convertFromImage( pm.convertToImage().smoothScale( width, height ) ); + result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); else result = pm; @@ -505,7 +505,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags ) TQPixmap pm = KGlobal::instance()->iconLoader()->loadIcon( "xapp", KIcon::Small, iconWidth, KIcon::DefaultState, 0, true ); if( scale && !pm.isNull() ) - result.convertFromImage( pm.convertToImage().smoothScale( width, height ) ); + result.convertFromImage( TQImage(pm.convertToImage()).smoothScale( width, height ) ); else result = pm; } @@ -520,7 +520,7 @@ void KWin::setIcons( WId win, const TQPixmap& icon, const TQPixmap& miniIcon ) if ( icon.isNull() ) return; NETWinInfo info( qt_xdisplay(), win, qt_xrootwin(), 0 ); - TQImage img = icon.convertToImage().convertDepth( 32 ); + TQImage img = TQImage(icon.convertToImage()).convertDepth( 32 ); NETIcon ni; ni.size.width = img.size().width(); ni.size.height = img.size().height(); @@ -528,7 +528,7 @@ void KWin::setIcons( WId win, const TQPixmap& icon, const TQPixmap& miniIcon ) info.setIcon( ni, true ); if ( miniIcon.isNull() ) return; - img = miniIcon.convertToImage().convertDepth( 32 ); + img = TQImage(miniIcon.convertToImage()).convertDepth( 32 ); ni.size.width = img.size().width(); ni.size.height = img.size().height(); ni.data = (unsigned char *) img.bits(); diff --git a/kdecore/kwinmodule.cpp b/kdecore/kwinmodule.cpp index f113570db..5e7b77333 100644 --- a/kdecore/kwinmodule.cpp +++ b/kdecore/kwinmodule.cpp @@ -172,7 +172,7 @@ const TQValueList<WId>& KWinModule::stackingOrder() const bool KWinModule::hasWId(WId w) const { - return d->windows.findIndex( w ) != -1; + return d->windows.tqfindIndex( w ) != -1; } const TQValueList<WId>& KWinModule::systemTrayWindows() const @@ -243,7 +243,7 @@ bool KWinModulePrivate::x11Event( XEvent * ev ) for ( TQPtrListIterator<KWinModule> mit( modules ); mit.current(); ++mit ) emit (*mit)->showingDesktopChanged( showingDesktop()); } - } else if ( windows.findIndex( ev->xany.window ) != -1 ){ + } else if ( windows.tqfindIndex( ev->xany.window ) != -1 ){ NETWinInfo ni( qt_xdisplay(), ev->xany.window, qt_xrootwin(), 0 ); unsigned long dirty[ 2 ]; ni.event( ev, dirty, 2 ); @@ -257,7 +257,7 @@ bool KWinModulePrivate::x11Event( XEvent * ev ) } if ( (dirty[ NETWinInfo::PROTOCOLS ] & NET::WMStrut) != 0 ) { removeStrutWindow( ev->xany.window ); - if ( possibleStrutWindows.findIndex( ev->xany.window ) == -1 ) + if ( possibleStrutWindows.tqfindIndex( ev->xany.window ) == -1 ) possibleStrutWindows.append( ev->xany.window ); } if ( dirty[ NETWinInfo::PROTOCOLS ] || dirty[ NETWinInfo::PROTOCOLS2 ] ) { @@ -318,7 +318,7 @@ void KWinModulePrivate::addClient(Window w) void KWinModulePrivate::removeClient(Window w) { bool emit_strutChanged = removeStrutWindow( w ); - if( strutSignalConnected && possibleStrutWindows.findIndex( w ) != -1 && modules.count() > 0 ) { + if( strutSignalConnected && possibleStrutWindows.tqfindIndex( w ) != -1 && modules.count() > 0 ) { NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(), NET::WMStrut ); NETStrut strut = info.strut(); if ( strut.left || strut.top || strut.right || strut.bottom ) { @@ -400,7 +400,7 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons TQValueList<WId>::ConstIterator it1; for( it1 = d->windows.begin(); it1 != d->windows.end(); ++it1 ) { - if(exclude.findIndex(*it1) != -1) continue; + if(exclude.tqfindIndex(*it1) != -1) continue; // Kicker (very) extensively calls this function, causing hundreds of roundtrips just // to repeatedly find out struts of all windows. Therefore strut values for strut @@ -416,7 +416,7 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons if(!((*it2).desktop == desktop || (*it2).desktop == NETWinInfo::OnAllDesktops )) continue; strut = (*it2).strut; - } else if( d->possibleStrutWindows.findIndex( *it1 ) != -1 ) { + } else if( d->possibleStrutWindows.tqfindIndex( *it1 ) != -1 ) { NETWinInfo info( qt_xdisplay(), (*it1), qt_xrootwin(), NET::WMStrut | NET::WMDesktop); strut = info.strut(); d->possibleStrutWindows.remove( *it1 ); diff --git a/kdecore/kwinmodule.h b/kdecore/kwinmodule.h index f680d561d..6083d9b85 100644 --- a/kdecore/kwinmodule.h +++ b/kdecore/kwinmodule.h @@ -27,6 +27,10 @@ #include <tqvaluelist.h> #include "kdelibs_export.h" +#ifdef Q_MOC_RUN +#define Q_OS_UNIX +#endif // Q_MOC_RUN + #ifdef Q_OS_UNIX class KWinModulePrivate; @@ -49,7 +53,7 @@ class KWinModulePrivate; * @short Base class for KDE Window Manager modules. * @author Matthias Ettrich (ettrich@kde.org) */ -class KDECORE_EXPORT KWinModule : public QObject +class KDECORE_EXPORT KWinModule : public TQObject { Q_OBJECT diff --git a/kdecore/kxmessages.cpp b/kdecore/kxmessages.cpp index 6b6f971a2..02af07b0f 100644 --- a/kdecore/kxmessages.cpp +++ b/kdecore/kxmessages.cpp @@ -189,7 +189,7 @@ bool KXMessages::x11Event( XEvent* ev_P ) ++i ) buf[ i ] = ev_P->xclient.data.b[ i ]; buf[ i ] = '\0'; - if( incoming_messages.contains( ev_P->xclient.window )) + if( incoming_messages.tqcontains( ev_P->xclient.window )) { if( ev_P->xclient.message_type == accept_atom1 && accept_atom1 != accept_atom2 ) // two different messages on the same window at the same time shouldn't happen anyway diff --git a/kdecore/kxmessages.h b/kdecore/kxmessages.h index 256b69f91..a5604c817 100644 --- a/kdecore/kxmessages.h +++ b/kdecore/kxmessages.h @@ -29,6 +29,11 @@ DEALINGS IN THE SOFTWARE. #include <tqcstring.h> #include <tqmap.h> #include <kdelibs_export.h> + +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 #include <X11/X.h> @@ -45,7 +50,7 @@ class KXMessagesPrivate; */ // KDE4 - make this internal for KStartupInfo only? class KDECORE_EXPORT KXMessages - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/kdecore/libintl.cpp b/kdecore/libintl.cpp index aadfcd821..83e2d3711 100644 --- a/kdecore/libintl.cpp +++ b/kdecore/libintl.cpp @@ -77,7 +77,7 @@ Boston, MA 02110-1301, USA. */ # define W(flag, data) ((flag) ? SWAP (data) : (data)) #endif -typedef Q_UINT32 nls_uint32; +typedef TQ_UINT32 nls_uint32; struct loaded_domain { diff --git a/kdecore/malloc/malloc.c b/kdecore/malloc/malloc.c index dba0fdef0..56d0b7324 100644 --- a/kdecore/malloc/malloc.c +++ b/kdecore/malloc/malloc.c @@ -85,7 +85,7 @@ int kde_malloc_is_used = 0; calloc(size_t n_elements, size_t element_size); free(Void_t* p); realloc(Void_t* p, size_t n); - memalign(size_t alignment, size_t n); + memalign(size_t tqalignment, size_t n); valloc(size_t n); mallinfo() mallopt(int parameter_number, int parameter_value) @@ -107,7 +107,7 @@ int kde_malloc_is_used = 0; You can adjust this by defining INTERNAL_SIZE_T Alignment: 2 * sizeof(size_t) (default) - (i.e., 8 byte alignment with 4byte size_t). This suffices for + (i.e., 8 byte tqalignment with 4byte size_t). This suffices for nearly all current machines and C compilers. However, you can define MALLOC_ALIGNMENT to be wider than this if necessary. @@ -146,7 +146,7 @@ int kde_malloc_is_used = 0; default used to obtain memory from system) accepts signed arguments, and may not be able to handle size_t-wide arguments with negative sign bit. Generally, values that would - appear as negative after accounting for overhead and alignment + appear as negative after accounting for overhead and tqalignment are supported only via mmap(), which does not have this limitation. @@ -393,8 +393,8 @@ extern "C" { defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' at the expense of not being able to handle more than 2^32 of malloced space. If this limitation is acceptable, you are encouraged to set - this unless you are on a platform requiring 16byte alignments. In - this case the alignment requirements turn out to negate any + this unless you are on a platform requiring 16byte tqalignments. In + this case the tqalignment requirements turn out to negate any potential advantages of decreasing size_t word size. Implementors: Beware of the possible combinations of: @@ -419,11 +419,11 @@ extern "C" { /* - MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks. + MALLOC_ALIGNMENT is the minimum tqalignment for malloc'ed chunks. It must be a power of two at least 2 * SIZE_SZ, even on machines - for which smaller alignments would suffice. It may be defined as + for which smaller tqalignments would suffice. It may be defined as larger than this though. Note however that code and data structures - are optimized for the case of 8-byte alignment. + are optimized for the case of 8-byte tqalignment. */ @@ -957,13 +957,13 @@ Void_t* public_rEALLOc(); #endif /* - memalign(size_t alignment, size_t n); + memalign(size_t tqalignment, size_t n); Returns a pointer to a newly allocated chunk of n bytes, aligned - in accord with the alignment argument. + in accord with the tqalignment argument. - The alignment argument should be a power of two. If the argument is + The tqalignment argument should be a power of two. If the argument is not a power of two, the nearest greater power is used. - 8-byte alignment is guaranteed by normal malloc calls, so don't + 8-byte tqalignment is guaranteed by normal malloc calls, so don't bother calling memalign with an argument of 8 or less. Overreliance on memalign is a sure way to fragment space. @@ -1228,7 +1228,7 @@ int public_mTRIm(); Returns the number of bytes you can actually use in an allocated chunk, which may be more than you requested (although - often not) due to alignment and minimum size constraints. + often not) due to tqalignment and minimum size constraints. You can use this many bytes without worrying about overwriting other allocated objects. This is not a particularly great programming practice. malloc_usable_size can be more useful in @@ -1252,8 +1252,8 @@ size_t public_mUSABLe(); number of bytes allocated via malloc (or realloc, etc) but not yet freed. Note that this is the number of bytes allocated, not the number requested. It will be larger than the number requested - because of alignment and bookkeeping overhead. Because it includes - alignment wastage as being in use, this figure may be greater than + because of tqalignment and bookkeeping overhead. Because it includes + tqalignment wastage as being in use, this figure may be greater than zero even when no user-level chunks are allocated. The reported current and maximum system memory can be inaccurate if @@ -1290,7 +1290,7 @@ void public_mSTATs(); fragmentation without improving speed. M_MXFAST is set in REQUEST size units. It is internally used in - chunksize units, which adds padding and alignment. You can reduce + chunksize units, which adds padding and tqalignment. You can reduce M_MXFAST to 0 to disable all use of fastbins. This causes the malloc algorithm to be a closer approximation of fifo-best-fit in all cases, not just for larger requests, but will generally cause it to be @@ -1434,7 +1434,7 @@ void public_mSTATs(); 1. The space cannot be reclaimed, consolidated, and then used to service later requests, as happens with normal chunks. - 2. It can lead to more wastage because of mmap page alignment + 2. It can lead to more wastage because of mmap page tqalignment requirements 3. It causes malloc performance to be more dependent on host system memory management support routines which may vary in @@ -1614,12 +1614,12 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) { return m; } -Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { +Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) { Void_t* m; if (MALLOC_PREACTION != 0) { return 0; } - m = mEMALIGn(alignment, bytes); + m = mEMALIGn(tqalignment, bytes); if (MALLOC_POSTACTION != 0) { } return m; @@ -1938,7 +1938,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ Note that the `foot' of the current chunk is actually represented as the prev_size of the NEXT chunk. This makes it easier to - deal with alignments etc but can be very confusing when trying + deal with tqalignments etc but can be very confusing when trying to extend or adapt this code. The two exceptions to all this are @@ -1956,7 +1956,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ /* - ---------- Size and alignment checks and conversions ---------- + ---------- Size and tqalignment checks and conversions ---------- */ /* conversion from malloc headers to user pointers, and back */ @@ -1972,7 +1972,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ #define MINSIZE \ (unsigned long)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK)) -/* Check if m has acceptable alignment */ +/* Check if m has acceptable tqalignment */ #define aligned_OK(m) (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0) @@ -2641,7 +2641,7 @@ static void do_check_remalloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s; /* Legal size ... */ assert((sz & MALLOC_ALIGN_MASK) == 0); assert((unsigned long)(sz) >= MINSIZE); - /* ... and alignment */ + /* ... and tqalignment */ assert(aligned_OK(chunk2mem(p))); /* chunk is less than MINSIZE more than request */ assert((long)(sz) - (long)(s) >= 0); @@ -2704,7 +2704,7 @@ static void do_check_malloc_state() /* internal size_t must be no wider than pointer type */ assert(sizeof(INTERNAL_SIZE_T) <= sizeof(char*)); - /* alignment is a power of 2 */ + /* tqalignment is a power of 2 */ assert((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-1)) == 0); /* cannot run remaining checks until fully initialized */ @@ -3209,7 +3209,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; /* The offset to the start of the mmapped region is stored in the prev_size field of the chunk. This allows us to adjust - returned start address to meet alignment requirements here + returned start address to meet tqalignment requirements here and in memalign(), and still be able to compute proper address argument for later munmap in free() and realloc(). */ @@ -3288,7 +3288,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; Round to a multiple of page size. If MORECORE is not contiguous, this ensures that we only call it with whole-page arguments. And if MORECORE is contiguous and - this is not first time through, this preserves page-alignment of + this is not first time through, this preserves page-tqalignment of previous calls. Otherwise, we correct to page-align below. */ @@ -3384,7 +3384,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; /* handle contiguous cases */ if (contiguous(av)) { - /* Guarantee alignment of first new chunk made from this space */ + /* Guarantee tqalignment of first new chunk made from this space */ front_misalign = (INTERNAL_SIZE_T)chunk2mem(brk) & MALLOC_ALIGN_MASK; if (front_misalign > 0) { @@ -3454,7 +3454,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; double fencepost at old_top to prevent consolidation with space we don't own. These fenceposts are artificial chunks that are marked as inuse and are in any case too small to use. We need - two to make sizes and alignments work out. + two to make sizes and tqalignments work out. */ if (old_size != 0) { @@ -3554,7 +3554,7 @@ Void_t* mALLOc(size_t bytes) /* Convert request size to internal form by adding SIZE_SZ bytes - overhead plus possibly more to obtain necessary alignment and/or + overhead plus possibly more to obtain necessary tqalignment and/or to obtain a size of at least MINSIZE, the smallest allocatable size. Also, checked_request2size traps (returning 0) request sizes that are so large that they wrap around zero when padded and @@ -4127,54 +4127,54 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes; INLINE #if __STD_C -Void_t* mEMALIGn(size_t alignment, size_t bytes) +Void_t* mEMALIGn(size_t tqalignment, size_t bytes) #else -Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; +Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes; #endif { INTERNAL_SIZE_T nb; /* padded request size */ char* m; /* memory returned by malloc call */ mchunkptr p; /* corresponding chunk */ - char* brk; /* alignment point within p */ + char* brk; /* tqalignment point within p */ mchunkptr newp; /* chunk to return */ INTERNAL_SIZE_T newsize; /* its size */ - INTERNAL_SIZE_T leadsize; /* leading space before alignment point */ + INTERNAL_SIZE_T leadsize; /* leading space before tqalignment point */ mchunkptr remainder; /* spare room at end to split off */ unsigned long remainder_size; /* its size */ INTERNAL_SIZE_T size; - /* If need less alignment than we give anyway, just relay to malloc */ + /* If need less tqalignment than we give anyway, just relay to malloc */ - if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes); + if (tqalignment <= MALLOC_ALIGNMENT) return mALLOc(bytes); /* Otherwise, ensure that it is at least a minimum chunk size */ - if (alignment < MINSIZE) alignment = MINSIZE; + if (tqalignment < MINSIZE) tqalignment = MINSIZE; - /* Make sure alignment is power of 2 (in case MINSIZE is not). */ - if ((alignment & (alignment - 1)) != 0) { + /* Make sure tqalignment is power of 2 (in case MINSIZE is not). */ + if ((tqalignment & (tqalignment - 1)) != 0) { size_t a = MALLOC_ALIGNMENT * 2; - while ((unsigned long)a < (unsigned long)alignment) a <<= 1; - alignment = a; + while ((unsigned long)a < (unsigned long)tqalignment) a <<= 1; + tqalignment = a; } checked_request2size(bytes, nb); /* - Strategy: find a spot within that chunk that meets the alignment + Strategy: find a spot within that chunk that meets the tqalignment request, and then possibly free the leading and trailing space. */ - /* Call malloc with worst case padding to hit alignment. */ + /* Call malloc with worst case padding to hit tqalignment. */ - m = (char*)(mALLOc(nb + alignment + MINSIZE)); + m = (char*)(mALLOc(nb + tqalignment + MINSIZE)); if (m == 0) return 0; /* propagate failure */ p = mem2chunk(m); - if ((((unsigned long)(m)) % alignment) != 0) { /* misaligned */ + if ((((unsigned long)(m)) % tqalignment) != 0) { /* misaligned */ /* Find an aligned spot inside chunk. Since we need to give back @@ -4184,10 +4184,10 @@ Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; total room so that this is always possible. */ - brk = (char*)mem2chunk(((unsigned long)(m + alignment - 1)) & - -((signed long) alignment)); + brk = (char*)mem2chunk(((unsigned long)(m + tqalignment - 1)) & + -((signed long) tqalignment)); if ((unsigned long)(brk - (char*)(p)) < MINSIZE) - brk += alignment; + brk += tqalignment; newp = (mchunkptr)brk; leadsize = brk - (char*)(p); @@ -4208,7 +4208,7 @@ Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; p = newp; assert (newsize >= nb && - (((unsigned long)(chunk2mem(p))) % alignment) == 0); + (((unsigned long)(chunk2mem(p))) % tqalignment) == 0); } /* Also give back spare room at the end */ @@ -4375,7 +4375,7 @@ static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_ contents_size += request2size(sizes[i]); } - /* subtract out alignment bytes from total to minimize overallocation */ + /* subtract out tqalignment bytes from total to minimize overallocation */ size = contents_size + array_size - MALLOC_ALIGN_MASK; /* @@ -5356,7 +5356,7 @@ History: and Anonymous. * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for helping test this.) - * memalign: check alignment arg + * memalign: check tqalignment arg * realloc: don't try to shift chunks backwards, since this leads to more fragmentation in some programs and doesn't seem to help in any others. @@ -5409,7 +5409,7 @@ History: * Support another case of realloc via move into top * Fix error occurring when initial sbrk_base not word-aligned. * Rely on page size for units instead of SBRK_UNIT to - avoid surprises about sbrk alignment conventions. + avoid surprises about sbrk tqalignment conventions. * Add mallinfo, mallopt. Thanks to Raymond Nijssen (raymond@es.ele.tue.nl) for the suggestion. * Add `pad' argument to malloc_trim and top_pad mallopt parameter. @@ -5569,7 +5569,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) { #endif } -Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { +Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) { #ifndef KDE_MALLOC_FULL if( malloc_type == 1 ) { @@ -5578,16 +5578,16 @@ Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { if (MALLOC_PREACTION != 0) { return 0; } - m = mEMALIGn(alignment, bytes); + m = mEMALIGn(tqalignment, bytes); if (MALLOC_POSTACTION != 0) { } return m; #ifndef KDE_MALLOC_FULL } if( malloc_type == 2 ) - return libc_memalign( alignment, bytes ); + return libc_memalign( tqalignment, bytes ); init_malloc_type(); - return public_mEMALIGn( alignment, bytes ); + return public_mEMALIGn( tqalignment, bytes ); #endif } @@ -5728,7 +5728,7 @@ int public_mALLOPt(int p, int v) { #endif int -posix_memalign (void **memptr, size_t alignment, size_t size) +posix_memalign (void **memptr, size_t tqalignment, size_t size) { void *mem; @@ -5737,7 +5737,7 @@ posix_memalign (void **memptr, size_t alignment, size_t size) if (size % sizeof (void *) != 0 || (size & (size - 1)) != 0) return EINVAL; - mem = memalign (alignment, size); + mem = memalign (tqalignment, size); if (mem != NULL) { *memptr = mem; diff --git a/kdecore/netsupp.cpp b/kdecore/netsupp.cpp index 6d56e147d..83aec8bc0 100644 --- a/kdecore/netsupp.cpp +++ b/kdecore/netsupp.cpp @@ -715,9 +715,9 @@ static int make_inet(const char *name, int portnum, int protonum, struct addrinf # endif sin->sin_port = portnum; if (hint->ai_flags & AI_PASSIVE) - *(Q_UINT32*)&sin->sin_addr = INADDR_ANY; + *(TQ_UINT32*)&sin->sin_addr = INADDR_ANY; else - *(Q_UINT32*)&sin->sin_addr = htonl(INADDR_LOOPBACK); + *(TQ_UINT32*)&sin->sin_addr = htonl(INADDR_LOOPBACK); q->ai_flags = 0; q->ai_family = AF_INET; q->ai_socktype = hint->ai_socktype; @@ -1016,7 +1016,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen, #define KRF_inet_ntop KRF_USING_OWN_INET_NTOP -static void add_dwords(char *buf, Q_UINT16 *dw, int count) +static void add_dwords(char *buf, TQ_UINT16 *dw, int count) { int i = 1; sprintf(buf + strlen(buf), "%x", ntohs(dw[0])); @@ -1027,7 +1027,7 @@ static void add_dwords(char *buf, Q_UINT16 *dw, int count) const char* inet_ntop(int af, const void *cp, char *buf, size_t len) { char buf2[sizeof "1234:5678:9abc:def0:1234:5678:255.255.255.255" + 1]; - Q_UINT8 *data = (Q_UINT8*)cp; + TQ_UINT8 *data = (TQ_UINT8*)cp; if (af == AF_INET) { @@ -1046,8 +1046,8 @@ const char* inet_ntop(int af, const void *cp, char *buf, size_t len) # ifdef AF_INET6 if (af == AF_INET6) { - Q_UINT16 *p = (Q_UINT16*)data; - Q_UINT16 *longest = NULL, *cur = NULL; + TQ_UINT16 *p = (TQ_UINT16*)data; + TQ_UINT16 *longest = NULL, *cur = NULL; int longest_length = 0, cur_length; int i; @@ -1150,7 +1150,7 @@ int inet_pton(int af, const char *cp, void *buf) # ifdef AF_INET6 else if (af == AF_INET6) { - Q_UINT16 addr[8]; + TQ_UINT16 addr[8]; const char *p = cp; int n = 0, start = 8; bool has_v4 = strchr(p, '.') != NULL; @@ -1200,8 +1200,8 @@ int inet_pton(int af, const char *cp, void *buf) // n < 8 means that we have to move n - start words 8 - n words to the right if (start == 8 && n != 8) return 0; // bad conversion - memmove(addr + start + (8 - n), addr + start, (n - start) * sizeof(Q_UINT16)); - memset(addr + start, 0, (8 - n) * sizeof(Q_UINT16)); + memmove(addr + start + (8 - n), addr + start, (n - start) * sizeof(TQ_UINT16)); + memset(addr + start, 0, (8 - n) * sizeof(TQ_UINT16)); // check the byte order // The compiler should optimise this out in big endian machines diff --git a/kdecore/netsupp.h b/kdecore/netsupp.h index 4dba3f6cc..a94040d44 100644 --- a/kdecore/netsupp.h +++ b/kdecore/netsupp.h @@ -66,63 +66,63 @@ struct kde_in6_addr struct kde_sockaddr_in6 { #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN - Q_UINT8 sin6_len; - Q_UINT8 sin6_family; + TQ_UINT8 sin6_len; + TQ_UINT8 sin6_family; #else //HAVE_STRUCT_SOCKADDR_SA_LEN - Q_UINT16 sin6_family; + TQ_UINT16 sin6_family; #endif unsigned short sin6_port; /* RFC says in_port_t */ - Q_UINT32 sin6_flowinfo; + TQ_UINT32 sin6_flowinfo; struct kde_in6_addr sin6_addr; - Q_UINT32 sin6_scope_id; + TQ_UINT32 sin6_scope_id; }; /* IPv6 test macros that could be missing from some implementations */ #define KDE_IN6_IS_ADDR_UNSPECIFIED(a) \ - (((Q_UINT32 *) (a))[0] == 0 && ((Q_UINT32 *) (a))[1] == 0 && \ - ((Q_UINT32 *) (a))[2] == 0 && ((Q_UINT32 *) (a))[3] == 0) + (((TQ_UINT32 *) (a))[0] == 0 && ((TQ_UINT32 *) (a))[1] == 0 && \ + ((TQ_UINT32 *) (a))[2] == 0 && ((TQ_UINT32 *) (a))[3] == 0) #define KDE_IN6_IS_ADDR_LOOPBACK(a) \ - (((Q_UINT32 *) (a))[0] == 0 && ((Q_UINT32 *) (a))[1] == 0 && \ - ((Q_UINT32 *) (a))[2] == 0 && ((Q_UINT32 *) (a))[3] == htonl (1)) + (((TQ_UINT32 *) (a))[0] == 0 && ((TQ_UINT32 *) (a))[1] == 0 && \ + ((TQ_UINT32 *) (a))[2] == 0 && ((TQ_UINT32 *) (a))[3] == htonl (1)) #define KDE_IN6_IS_ADDR_MULTICAST(a) (((u_int8_t *) (a))[0] == 0xff) #define KDE_IN6_IS_ADDR_LINKLOCAL(a) \ - ((((Q_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfe800000)) + ((((TQ_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfe800000)) #define KDE_IN6_IS_ADDR_SITELOCAL(a) \ - ((((Q_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfec00000)) + ((((TQ_UINT32 *) (a))[0] & htonl (0xffc00000)) == htonl (0xfec00000)) #define KDE_IN6_IS_ADDR_V4MAPPED(a) \ - ((((Q_UINT32 *) (a))[0] == 0) && (((Q_UINT32 *) (a))[1] == 0) && \ - (((Q_UINT32 *) (a))[2] == htonl (0xffff))) + ((((TQ_UINT32 *) (a))[0] == 0) && (((TQ_UINT32 *) (a))[1] == 0) && \ + (((TQ_UINT32 *) (a))[2] == htonl (0xffff))) #define KDE_IN6_IS_ADDR_V4COMPAT(a) \ - ((((Q_UINT32 *) (a))[0] == 0) && (((Q_UINT32 *) (a))[1] == 0) && \ - (((Q_UINT32 *) (a))[2] == 0) && (ntohl (((Q_UINT32 *) (a))[3]) > 1)) + ((((TQ_UINT32 *) (a))[0] == 0) && (((TQ_UINT32 *) (a))[1] == 0) && \ + (((TQ_UINT32 *) (a))[2] == 0) && (ntohl (((TQ_UINT32 *) (a))[3]) > 1)) #define KDE_IN6_ARE_ADDR_EQUAL(a,b) \ - ((((Q_UINT32 *) (a))[0] == ((Q_UINT32 *) (b))[0]) && \ - (((Q_UINT32 *) (a))[1] == ((Q_UINT32 *) (b))[1]) && \ - (((Q_UINT32 *) (a))[2] == ((Q_UINT32 *) (b))[2]) && \ - (((Q_UINT32 *) (a))[3] == ((Q_UINT32 *) (b))[3])) + ((((TQ_UINT32 *) (a))[0] == ((TQ_UINT32 *) (b))[0]) && \ + (((TQ_UINT32 *) (a))[1] == ((TQ_UINT32 *) (b))[1]) && \ + (((TQ_UINT32 *) (a))[2] == ((TQ_UINT32 *) (b))[2]) && \ + (((TQ_UINT32 *) (a))[3] == ((TQ_UINT32 *) (b))[3])) #define KDE_IN6_IS_ADDR_MC_NODELOCAL(a) \ - (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x1)) + (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x1)) #define KDE_IN6_IS_ADDR_MC_LINKLOCAL(a) \ - (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x2)) + (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x2)) #define KDE_IN6_IS_ADDR_MC_SITELOCAL(a) \ - (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x5)) + (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x5)) #define KDE_IN6_IS_ADDR_MC_ORGLOCAL(a) \ - (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0x8)) + (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0x8)) #define KDE_IN6_IS_ADDR_MC_GLOBAL(a) \ - (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((Q_UINT8 *) (a))[1] & 0xf) == 0xe)) + (KDE_IN6_IS_ADDR_MULTICAST(a) && ((((TQ_UINT8 *) (a))[1] & 0xf) == 0xe)) #ifdef NEED_IN6_TESTS # define IN6_IS_ADDR_UNSPECIFIED KDE_IN6_IS_ADDR_UNSPECIFIED diff --git a/kdecore/netwm.cpp b/kdecore/netwm.cpp index 9c8bd1283..64c6aab2b 100644 --- a/kdecore/netwm.cpp +++ b/kdecore/netwm.cpp @@ -4626,18 +4626,18 @@ Time NET::timestampDiff( Time time1, Time time2 ) // returns time2 - time1 #else int NET::timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp() { - Q_UINT32 time1 = time1_; - Q_UINT32 time2 = time2_; + TQ_UINT32 time1 = time1_; + TQ_UINT32 time2 = time2_; if( time1 == time2 ) return 0; - return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping + return TQ_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping } int NET::timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1 { // no need to handle wrapping? - Q_UINT32 time1 = time1_; - Q_UINT32 time2 = time2_; - return Q_UINT32( time2 - time1 ); + TQ_UINT32 time1 = time1_; + TQ_UINT32 time2 = time2_; + return TQ_UINT32( time2 - time1 ); } #endif diff --git a/kdecore/network/kbufferedsocket.cpp b/kdecore/network/kbufferedsocket.cpp index 04115c051..85b433193 100644 --- a/kdecore/network/kbufferedsocket.cpp +++ b/kdecore/network/kbufferedsocket.cpp @@ -94,7 +94,7 @@ void KBufferedSocket::close() } #ifdef USE_QT3 -Q_LONG KBufferedSocket::bytesAvailable() const +TQ_LONG KBufferedSocket::bytesAvailable() const #endif #ifdef USE_QT4 qint64 KBufferedSocket::bytesAvailable() const @@ -106,9 +106,9 @@ qint64 KBufferedSocket::bytesAvailable() const return d->input->length(); } -Q_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) +TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) { - Q_LONG retval = KStreamSocket::waitForMore(msecs, timeout); + TQ_LONG retval = KStreamSocket::waitForMore(msecs, timeout); if (d->input) { resetError(); @@ -118,7 +118,7 @@ Q_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout) return retval; } -Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen) +TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen) { if (d->input) { @@ -134,13 +134,13 @@ Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen) return KStreamSocket::readBlock(data, maxlen); } -Q_LONG KBufferedSocket::readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) +TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) { from = peerAddress(); return readBlock(data, maxlen); } -Q_LONG KBufferedSocket::peekBlock(char *data, Q_ULONG maxlen) +TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen) { if (d->input) { @@ -156,13 +156,13 @@ Q_LONG KBufferedSocket::peekBlock(char *data, Q_ULONG maxlen) return KStreamSocket::peekBlock(data, maxlen); } -Q_LONG KBufferedSocket::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) +TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) { from = peerAddress(); return peekBlock(data, maxlen); } -Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG len) +TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len) { if (state() != Connected) { @@ -192,7 +192,7 @@ Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG len) return KStreamSocket::writeBlock(data, len); } -Q_LONG KBufferedSocket::writeBlock(const char *data, Q_ULONG maxlen, +TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen, const KSocketAddress&) { // ignore the third parameter @@ -285,7 +285,7 @@ KIOBufferBase* KBufferedSocket::outputBuffer() } #ifdef USE_QT3 -Q_ULONG KBufferedSocket::bytesToWrite() const +TQ_ULONG KBufferedSocket::bytesToWrite() const #endif #ifdef USE_QT4 qint64 KBufferedSocket::bytesToWrite() const @@ -332,7 +332,7 @@ void KBufferedSocket::slotReadActivity() if (d->input && state() == Connected) { mutex()->lock(); - Q_LONG len = d->input->receiveFrom(socketDevice()); + TQ_LONG len = d->input->receiveFrom(socketDevice()); if (len == -1) { @@ -380,7 +380,7 @@ void KBufferedSocket::slotWriteActivity() (state() == Connected || state() == Closing)) { mutex()->lock(); - Q_LONG len = d->output->sendTo(socketDevice()); + TQ_LONG len = d->output->sendTo(socketDevice()); if (len == -1) { diff --git a/kdecore/network/kbufferedsocket.h b/kdecore/network/kbufferedsocket.h index bca034002..0982a88d3 100644 --- a/kdecore/network/kbufferedsocket.h +++ b/kdecore/network/kbufferedsocket.h @@ -58,6 +58,7 @@ class KBufferedSocketPrivate; class KDECORE_EXPORT KBufferedSocket: public KStreamSocket { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. @@ -99,7 +100,7 @@ public: * Make use of the buffers. */ #ifdef USE_QT3 - virtual Q_LONG bytesAvailable() const; + virtual TQ_LONG bytesAvailable() const; #endif #ifdef USE_QT4 virtual qint64 bytesAvailable() const; @@ -108,12 +109,12 @@ public: /** * Make use of buffers. */ - virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L); + virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L); /** * Reads data from the socket. Make use of buffers. */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * @overload @@ -121,12 +122,12 @@ public: * * The @p from parameter is always set to @ref peerAddress() */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); /** * Peeks data from the socket. */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen); /** * @overload @@ -134,12 +135,12 @@ public: * * The @p from parameter is always set to @ref peerAddress() */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress &from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from); /** * Writes data to the socket. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * @overload @@ -147,7 +148,7 @@ public: * * The @p to parameter is discarded. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to); /** * Catch changes. @@ -183,7 +184,7 @@ public: * Returns the length of the output buffer. */ #ifdef USE_QT3 - virtual Q_ULONG bytesToWrite() const; + virtual TQ_ULONG bytesToWrite() const; #endif #ifdef USE_QT4 virtual qint64 bytesToWrite() const; diff --git a/kdecore/network/kclientsocketbase.cpp b/kdecore/network/kclientsocketbase.cpp index 7ac3ca3b1..46f7a1942 100644 --- a/kdecore/network/kclientsocketbase.cpp +++ b/kdecore/network/kclientsocketbase.cpp @@ -47,9 +47,17 @@ public: bool enableRead : 1, enableWrite : 1; }; -KClientSocketBase::KClientSocketBase(TQObject *parent, const char *name) - : TQObject(parent, name), d(new KClientSocketBasePrivate) +KClientSocketBase::KClientSocketBase(TQObject *parent, const char *name) : +#ifdef USE_QT4 +#else // USE_QT4 + TQObject(parent, name), +#endif // USE_QT4 + d(new KClientSocketBasePrivate) { +#ifdef USE_QT4 + setParent(parent); + setObjectName(name); +#endif // USE_QT4 d->state = Idle; d->enableRead = true; d->enableWrite = false; @@ -140,7 +148,7 @@ bool KClientSocketBase::lookup() { if (d->localResolver.serviceName().isNull() && !d->localResolver.nodeName().isNull()) - d->localResolver.setServiceName(TQString::fromLatin1("")); + d->localResolver.setServiceName(TQString::tqfromLatin1("")); // don't restart the lookups if they had succeeded and // the input values weren't changed @@ -279,7 +287,7 @@ void KClientSocketBase::close() // This function is unlike all the others because it is const #ifdef USE_QT3 -Q_LONG KClientSocketBase::bytesAvailable() const +TQ_LONG KClientSocketBase::bytesAvailable() const #endif #ifdef USE_QT4 qint64 KClientSocketBase::bytesAvailable() const @@ -291,10 +299,10 @@ qint64 KClientSocketBase::bytesAvailable() const // All the functions below look really alike // Should I use a macro to define them? -Q_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout) +TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout) { resetError(); - Q_LONG retval = socketDevice()->waitForMore(msecs, timeout); + TQ_LONG retval = socketDevice()->waitForMore(msecs, timeout); if (retval == -1) { copyError(); @@ -303,10 +311,10 @@ Q_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout) return retval; } -Q_LONG KClientSocketBase::readBlock(char *data, Q_ULONG maxlen) +TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen) { resetError(); - Q_LONG retval = socketDevice()->readBlock(data, maxlen); + TQ_LONG retval = socketDevice()->readBlock(data, maxlen); if (retval == -1) { copyError(); @@ -315,10 +323,10 @@ Q_LONG KClientSocketBase::readBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KClientSocketBase::readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) +TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) { resetError(); - Q_LONG retval = socketDevice()->readBlock(data, maxlen, from); + TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from); if (retval == -1) { copyError(); @@ -327,10 +335,10 @@ Q_LONG KClientSocketBase::readBlock(char *data, Q_ULONG maxlen, KSocketAddress& return retval; } -Q_LONG KClientSocketBase::peekBlock(char *data, Q_ULONG maxlen) +TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen) { resetError(); - Q_LONG retval = socketDevice()->peekBlock(data, maxlen); + TQ_LONG retval = socketDevice()->peekBlock(data, maxlen); if (retval == -1) { copyError(); @@ -339,10 +347,10 @@ Q_LONG KClientSocketBase::peekBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KClientSocketBase::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) +TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) { resetError(); - Q_LONG retval = socketDevice()->peekBlock(data, maxlen, from); + TQ_LONG retval = socketDevice()->peekBlock(data, maxlen, from); if (retval == -1) { copyError(); @@ -351,10 +359,10 @@ Q_LONG KClientSocketBase::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& return retval; } -Q_LONG KClientSocketBase::writeBlock(const char *data, Q_ULONG len) +TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len) { resetError(); - Q_LONG retval = socketDevice()->writeBlock(data, len); + TQ_LONG retval = socketDevice()->writeBlock(data, len); if (retval == -1) { copyError(); @@ -363,10 +371,10 @@ Q_LONG KClientSocketBase::writeBlock(const char *data, Q_ULONG len) return retval; } -Q_LONG KClientSocketBase::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to) +TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) { resetError(); - Q_LONG retval = socketDevice()->writeBlock(data, len, to); + TQ_LONG retval = socketDevice()->writeBlock(data, len, to); if (retval == -1) { copyError(); diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h index d4e31b6b3..63ddc3aa3 100644 --- a/kdecore/network/kclientsocketbase.h +++ b/kdecore/network/kclientsocketbase.h @@ -32,6 +32,10 @@ #include "kresolver.h" #include <kdelibs_export.h> +#ifdef Q_MOC_RUN +#define USE_QT4 +#endif // Q_MOC_RUN + namespace KNetwork { class KClientSocketBasePrivate; @@ -46,9 +50,15 @@ class KClientSocketBasePrivate; * * @author Thiago Macieira <thiago.macieira@kdemail.net> */ -class KDECORE_EXPORT KClientSocketBase : public TQObject, public KActiveSocketBase +class KDECORE_EXPORT KClientSocketBase : +#ifdef USE_QT4 +#else // USE_QT4 +public TQObject, +#endif // USE_QT4 +public KActiveSocketBase { Q_OBJECT + TQ_OBJECT public: /** @@ -257,7 +267,7 @@ public: * This is a convenience function provided to ease migrating from * Qt 3.x's TQSocket class. */ - inline void connectToHost(const TQString& host, Q_UINT16 port) + inline void connectToHost(const TQString& host, TQ_UINT16 port) { connect(host, TQString::number(port)); } /** @@ -293,7 +303,7 @@ public: * Reimplemented from KSocketBase. */ #ifdef USE_QT3 - virtual Q_LONG bytesAvailable() const; + virtual TQ_LONG bytesAvailable() const; #endif #ifdef USE_QT4 virtual qint64 bytesAvailable() const; @@ -302,40 +312,40 @@ public: /** * Waits for more data. Reimplemented from KSocketBase. */ - virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L); + virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L); /** * Reads data from a socket. Reimplemented from KSocketBase. */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * @overload * Reads data from a socket. Reimplemented from KSocketBase. */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); /** * Peeks data from the socket. Reimplemented from KSocketBase. */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen); /** * @overload * Peeks data from the socket. Reimplemented from KSocketBase. */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress &from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from); /** * Writes data to the socket. Reimplemented from KSocketBase. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * @overload * Writes data to the socket. Reimplemented from KSocketBase. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to); /** * Returns the local socket address. Reimplemented from KSocketBase. diff --git a/kdecore/network/kdatagramsocket.cpp b/kdecore/network/kdatagramsocket.cpp index d598d2d14..ff6ea04b3 100644 --- a/kdecore/network/kdatagramsocket.cpp +++ b/kdecore/network/kdatagramsocket.cpp @@ -133,7 +133,7 @@ bool KDatagramSocket::connect(const TQString& node, const TQString& service) KDatagramPacket KDatagramSocket::receive() { - Q_LONG size = bytesAvailable(); + TQ_LONG size = bytesAvailable(); if (size == 0) { // nothing available yet to read @@ -165,12 +165,12 @@ KDatagramPacket KDatagramSocket::receive() return KDatagramPacket(data, address); } -Q_LONG KDatagramSocket::send(const KDatagramPacket& packet) +TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet) { return writeBlock(packet.data(), packet.size(), packet.address()); } -Q_LONG KDatagramSocket::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to) +TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) { if (to.family() != AF_UNSPEC) { diff --git a/kdecore/network/kdatagramsocket.h b/kdecore/network/kdatagramsocket.h index 6b94c1d42..7ecbada09 100644 --- a/kdecore/network/kdatagramsocket.h +++ b/kdecore/network/kdatagramsocket.h @@ -180,6 +180,7 @@ class KDatagramSocketPrivate; class KDECORE_EXPORT KDatagramSocket: public KClientSocketBase { Q_OBJECT + TQ_OBJECT public: /** @@ -222,7 +223,7 @@ public: * * Connecting means only to designate the given address as the default * destination address for datagrams sent without destination addresses - * ( writeBlock(const char *, Q_ULONG) ). + * ( writeBlock(const char *, TQ_ULONG) ). * * @note Calling connect will not cause the socket to be bound. You have * to call @ref bind explicitly. @@ -240,7 +241,7 @@ public: /** * Writes data to the socket. Reimplemented from KClientSocketBase. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to); /** * Receives one datagram from the stream. The reading process is guaranteed @@ -260,7 +261,7 @@ public: * * @returns the number of bytes written or -1 in case of error. */ - virtual Q_LONG send(const KDatagramPacket& packet); + virtual TQ_LONG send(const KDatagramPacket& packet); private slots: void lookupFinishedLocal(); diff --git a/kdecore/network/khttpproxysocketdevice.cpp b/kdecore/network/khttpproxysocketdevice.cpp index 09d8dd7a5..f4ef01564 100644 --- a/kdecore/network/khttpproxysocketdevice.cpp +++ b/kdecore/network/khttpproxysocketdevice.cpp @@ -153,7 +153,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi setState(0); // unset open flag // prepare the request - TQString request = TQString::fromLatin1("CONNECT %1:%2 HTTP/1.1\r\n" + TQString request = TQString::tqfromLatin1("CONNECT %1:%2 HTTP/1.1\r\n" "Cache-Control: no-cache\r\n" "Host: \r\n" "\r\n"); @@ -161,7 +161,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi if (node.contains(':')) node2 = '[' + node + ']'; - d->request = request.arg(node2).arg(service).latin1(); + d->request = TQString(request.arg(node2).arg(service)).latin1(); } return parseServerReply(); @@ -179,7 +179,7 @@ bool KHttpProxySocketDevice::parseServerReply() if (!d->request.isEmpty()) { // send request - Q_LONG written = writeBlock(d->request, d->request.length()); + TQ_LONG written = writeBlock(d->request, d->request.length()); if (written < 0) { qDebug("KHttpProxySocketDevice: would block writing request!"); @@ -205,7 +205,7 @@ bool KHttpProxySocketDevice::parseServerReply() int index; if (!blocking()) { - Q_LONG avail = bytesAvailable(); + TQ_LONG avail = bytesAvailable(); qDebug("KHttpProxySocketDevice: %ld bytes available", avail); setState(0); if (avail == 0) @@ -222,7 +222,7 @@ bool KHttpProxySocketDevice::parseServerReply() TQCString fullHeaders = d->reply + buf.data(); // search for the end of the headers - index = fullHeaders.find("\r\n\r\n"); + index = fullHeaders.tqfind("\r\n\r\n"); if (index == -1) { // no, headers not yet finished... @@ -265,9 +265,9 @@ bool KHttpProxySocketDevice::parseServerReply() // now really parse the reply qDebug("KHttpProxySocketDevice: get reply: %s\n", - d->reply.left(d->reply.find('\r')).data()); + d->reply.left(d->reply.tqfind('\r')).data()); if (d->reply.left(7) != "HTTP/1." || - (index = d->reply.find(' ')) == -1 || + (index = d->reply.tqfind(' ')) == -1 || d->reply[index + 1] != '2') { setError(IO_ConnectError, NetFailure); diff --git a/kdecore/network/kiobuffer.h b/kdecore/network/kiobuffer.h index 839899b18..02f75a420 100644 --- a/kdecore/network/kiobuffer.h +++ b/kdecore/network/kiobuffer.h @@ -85,7 +85,7 @@ public: * * @sa size */ - virtual Q_LONG length() const = 0; + virtual TQ_LONG length() const = 0; /** * Returns true if the buffer is empty of data. @@ -99,7 +99,7 @@ public: * * @sa length for the length of the data stored */ - virtual Q_LONG size() const = 0; + virtual TQ_LONG size() const = 0; /** * Returns true if the buffer is full (i.e., cannot receive more data) @@ -114,7 +114,7 @@ public: * @returns true on success, false if an error occurred. * @note if the new size is less than length(), the buffer will be truncated */ - virtual bool setSize(Q_LONG size) = 0; + virtual bool setSize(TQ_LONG size) = 0; /** * Adds data to the end of the buffer. @@ -123,7 +123,7 @@ public: * @param len the data length, in bytes * @returns the number of bytes added to the end of the buffer. */ - virtual Q_LONG feedBuffer(const char *data, Q_LONG len) = 0; + virtual TQ_LONG feedBuffer(const char *data, TQ_LONG len) = 0; /** * Consumes data from the beginning of the buffer. @@ -133,7 +133,7 @@ public: * @param discard if true, the bytes copied will be discarded * @returns the number of bytes copied from the buffer */ - virtual Q_LONG consumeBuffer(char *data, Q_LONG maxlen, bool discard = true) = 0; + virtual TQ_LONG consumeBuffer(char *data, TQ_LONG maxlen, bool discard = true) = 0; /** * Clears the buffer. diff --git a/kdecore/network/kresolver.cpp b/kdecore/network/kresolver.cpp index cfb87e3ef..d58d02cb0 100644 --- a/kdecore/network/kresolver.cpp +++ b/kdecore/network/kresolver.cpp @@ -105,7 +105,7 @@ KResolverEntry::KResolverEntry(const KSocketAddress& addr, int socktype, int pro } // constructor with even more stuff -KResolverEntry::KResolverEntry(const struct sockaddr* sa, Q_UINT16 salen, int socktype, +KResolverEntry::KResolverEntry(const struct sockaddr* sa, TQ_UINT16 salen, int socktype, int protocol, const TQString& canonName, const TQCString& encodedName) : d(new KResolverEntryPrivate) @@ -141,7 +141,7 @@ KSocketAddress KResolverEntry::address() const } // returns the length -Q_UINT16 KResolverEntry::length() const +TQ_UINT16 KResolverEntry::length() const { return d ? d->addr.length() : 0; } @@ -587,7 +587,7 @@ KResolverResults KResolver::resolve(const TQString& host, const TQString& service, int flags, int families) { - KResolver qres(host, service, qApp, "synchronous KResolver"); + KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver"); qres.setFlags(flags); qres.setFamily(families); qres.start(); @@ -599,7 +599,7 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot, const TQString& host, const TQString& service, int flags, int families) { - KResolver* qres = new KResolver(host, service, qApp, "asynchronous KResolver"); + KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver"); TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot); qres->setFlags(flags); qres->setFamily(families); @@ -915,16 +915,16 @@ TQString KResolver::localHostName() } if (name.isEmpty()) - return TQString::fromLatin1("localhost"); + return TQString::tqfromLatin1("localhost"); - if (name.find('.') == -1) + if (name.tqfind('.') == -1) { // not fully qualified // must resolve KResolverResults results = resolve(name, "0", CanonName); if (results.isEmpty()) // cannot find a valid hostname! - return TQString::fromLatin1("localhost"); + return TQString::tqfromLatin1("localhost"); else return results.first().canonicalName(); } @@ -934,7 +934,7 @@ TQString KResolver::localHostName() // forward declaration -static TQStringList splitLabels(const TQString& unicodeDomain); +static TQStringList splitLabels(const TQString& tqunicodeDomain); static TQCString ToASCII(const TQString& label); static TQString ToUnicode(const TQString& label); @@ -943,11 +943,11 @@ static TQStringList *KResolver_initIdnDomains() const char *kde_use_idn = getenv("KDE_USE_IDN"); if (!kde_use_idn) kde_use_idn = "ac:at:br:cat:ch:cl:cn:de:dk:fi:gr:hu:info:io:is:jp:kr:li:lt:museum:org:no:se:sh:th:tm:tw:vn"; - return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower())); + return new TQStringList(TQStringList::split(':', TQString::tqfromLatin1(kde_use_idn).lower())); } // implement the ToAscii function, as described by IDN documents -TQCString KResolver::domainToAscii(const TQString& unicodeDomain) +TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain) { if (!idnDomains) idnDomains = KResolver_initIdnDomains(); @@ -958,10 +958,10 @@ TQCString KResolver::domainToAscii(const TQString& unicodeDomain) // 2) split the domain into individual labels, without // separators. - TQStringList input = splitLabels(unicodeDomain); + TQStringList input = splitLabels(tqunicodeDomain); // Do we allow IDN names for this TLD? - if (input.count() && !idnDomains->contains(input[input.count()-1].lower())) + if (input.count() && !idnDomains->tqcontains(input[input.count()-1].lower())) return input.join(".").lower().latin1(); // No IDN allowed for this TLD // 3) decide whether to enforce the STD3 rules for chars < 0x7F @@ -987,7 +987,7 @@ TQCString KResolver::domainToAscii(const TQString& unicodeDomain) TQString KResolver::domainToUnicode(const TQCString& asciiDomain) { - return domainToUnicode(TQString::fromLatin1(asciiDomain)); + return domainToUnicode(TQString::tqfromLatin1(asciiDomain)); } // implement the ToUnicode function, as described by IDN documents @@ -1009,7 +1009,7 @@ TQString KResolver::domainToUnicode(const TQString& asciiDomain) TQStringList input = splitLabels(asciiDomain); // Do we allow IDN names for this TLD? - if (input.count() && !idnDomains->contains(input[input.count()-1].lower())) + if (input.count() && !idnDomains->tqcontains(input[input.count()-1].lower())) return asciiDomain.lower(); // No TLDs allowed // 3) decide whether to enforce the STD3 rules for chars < 0x7F @@ -1048,7 +1048,7 @@ void KResolver::virtual_hook( int, void* ) // RFC 3492 - Punycode: A Bootstring encoding of Unicode // for Internationalized Domain Names in Applications (IDNA) -static TQStringList splitLabels(const TQString& unicodeDomain) +static TQStringList splitLabels(const TQString& tqunicodeDomain) { // From RFC 3490 section 3.1: // "Whenever dots are used as label separators, the following characters @@ -1060,9 +1060,9 @@ static TQStringList splitLabels(const TQString& unicodeDomain) TQStringList lst; int start = 0; uint i; - for (i = 0; i < unicodeDomain.length(); i++) + for (i = 0; i < tqunicodeDomain.length(); i++) { - unsigned int c = unicodeDomain[i].unicode(); + unsigned int c = tqunicodeDomain[i].tqunicode(); if (c == separators[0] || c == separators[1] || @@ -1070,13 +1070,13 @@ static TQStringList splitLabels(const TQString& unicodeDomain) c == separators[3]) { // found a separator! - lst << unicodeDomain.mid(start, i - start); + lst << tqunicodeDomain.mid(start, i - start); start = i + 1; } } if ((long)i >= start) // there is still one left - lst << unicodeDomain.mid(start, i - start); + lst << tqunicodeDomain.mid(start, i - start); return lst; } @@ -1097,11 +1097,11 @@ static TQCString ToASCII(const TQString& label) TQCString retval; char buf[65]; - Q_UINT32* ucs4 = new Q_UINT32[label.length() + 1]; + TQ_UINT32* ucs4 = new TQ_UINT32[label.length() + 1]; uint i; for (i = 0; i < label.length(); i++) - ucs4[i] = (unsigned long)label[i].unicode(); + ucs4[i] = (unsigned long)label[i].tqunicode(); ucs4[i] = 0; // terminate with NUL, just to be on the safe side if (idna_to_ascii_4i(ucs4, label.length(), buf, 0) == IDNA_SUCCESS) @@ -1118,18 +1118,18 @@ static TQCString ToASCII(const TQString& label) static TQString ToUnicode(const TQString& label) { #ifdef HAVE_IDNA_H - // We have idna.h, so we can use the idna_to_unicode + // We have idna.h, so we can use the idna_to_tqunicode // function :) - Q_UINT32 *ucs4_input, *ucs4_output; + TQ_UINT32 *ucs4_input, *ucs4_output; size_t outlen; - ucs4_input = new Q_UINT32[label.length() + 1]; + ucs4_input = new TQ_UINT32[label.length() + 1]; for (uint i = 0; i < label.length(); i++) - ucs4_input[i] = (unsigned long)label[i].unicode(); + ucs4_input[i] = (unsigned long)label[i].tqunicode(); // try the same length for output - ucs4_output = new Q_UINT32[outlen = label.length()]; + ucs4_output = new TQ_UINT32[outlen = label.length()]; idna_to_unicode_44i(ucs4_input, label.length(), ucs4_output, &outlen, @@ -1139,7 +1139,7 @@ static TQString ToUnicode(const TQString& label) { // it must have failed delete [] ucs4_output; - ucs4_output = new Q_UINT32[outlen]; + ucs4_output = new TQ_UINT32[outlen]; idna_to_unicode_44i(ucs4_input, label.length(), ucs4_output, &outlen, diff --git a/kdecore/network/kresolver.h b/kdecore/network/kresolver.h index 5b66f362c..069428904 100644 --- a/kdecore/network/kresolver.h +++ b/kdecore/network/kresolver.h @@ -101,7 +101,7 @@ public: * @param canonName the canonical name of the resolved hostname * @param encodedName the ASCII-compatible encoding of the hostname */ - KResolverEntry(const struct sockaddr *sa, Q_UINT16 salen, int socktype, + KResolverEntry(const struct sockaddr *sa, TQ_UINT16 salen, int socktype, int protocol, const TQString& canonName = TQString::null, const TQCString& encodedName = TQCString()); @@ -128,7 +128,7 @@ public: /** * Retrieves the length of the socket address structure. */ - Q_UINT16 length() const; + TQ_UINT16 length() const; /** * Retrieves the family associated with this socket address. @@ -292,9 +292,10 @@ class KResolverPrivate; * * @author Thiago Macieira <thiago.macieira@kdemail.net> */ -class KDECORE_EXPORT KResolver: public QObject +class KDECORE_EXPORT KResolver: public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -795,11 +796,11 @@ public: * Note that the encoding is illegible and, thus, should not be presented * to the user, except if requested. * - * @param unicodeDomain the domain name to be encoded + * @param tqunicodeDomain the domain name to be encoded * @return the ACE-encoded suitable for DNS queries if successful, a null * TQCString if failure. */ - static TQCString domainToAscii(const TQString& unicodeDomain); + static TQCString domainToAscii(const TQString& tqunicodeDomain); /** * Does the inverse of @ref domainToAscii and return an Unicode domain diff --git a/kdecore/network/kresolver_p.h b/kdecore/network/kresolver_p.h index e29304383..7f74c6fe6 100644 --- a/kdecore/network/kresolver_p.h +++ b/kdecore/network/kresolver_p.h @@ -326,7 +326,7 @@ namespace KNetwork * This class is a worker thread in the resolver system. * This class must be thread-safe. */ - class KResolverThread: public QThread + class KResolverThread: public TQThread { private: // private constructor. Only the manager can create worker threads diff --git a/kdecore/network/kresolverstandardworkers.cpp b/kdecore/network/kresolverstandardworkers.cpp index f64803ced..08bd57121 100644 --- a/kdecore/network/kresolverstandardworkers.cpp +++ b/kdecore/network/kresolverstandardworkers.cpp @@ -140,7 +140,7 @@ bool KBlacklistWorker::isBlacklisted(const TQString& host) return false; // KDE4: QLatin1String - TQString ascii = TQString::fromLatin1(KResolver::domainToAscii(host)); + TQString ascii = TQString::tqfromLatin1(KResolver::domainToAscii(host)); TQMutexLocker locker(&blacklistMutex); @@ -208,12 +208,12 @@ namespace { public: TQCString m_hostname; // might be different! - Q_UINT16 m_port; + TQ_UINT16 m_port; int m_scopeid; int m_af; KResolverResults& results; - GetHostByNameThread(const char * hostname, Q_UINT16 port, + GetHostByNameThread(const char * hostname, TQ_UINT16 port, int scopeid, int af, KResolverResults* res) : m_hostname(hostname), m_port(port), m_scopeid(scopeid), m_af(af), results(*res) @@ -251,7 +251,7 @@ namespace // check blacklist if (m_af != AF_INET && - KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_hostname))) + KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_hostname))) break; # ifdef USE_GETHOSTBYNAME2_R @@ -358,7 +358,7 @@ namespace if (socktype == 0) socktype = SOCK_STREAM; // default - TQString canon = KResolver::domainToUnicode(TQString::fromLatin1(he->h_name)); + TQString canon = KResolver::domainToUnicode(TQString::tqfromLatin1(he->h_name)); KInetSocketAddress sa; sa.setPort(m_port); if (he->h_addrtype != AF_INET) @@ -404,7 +404,7 @@ namespace { // check blacklist if ((m_af != AF_INET && m_af != AF_UNSPEC) && - KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_node))) + KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_node))) { results.setError(KResolver::NoName); finished(); @@ -547,11 +547,11 @@ bool KStandardWorker::sanityCheck() if (!nodeName().isEmpty()) { TQString node = nodeName(); - if (node.find('%') != -1) - node.truncate(node.find('%')); + if (node.tqfind('%') != -1) + node.truncate(node.tqfind('%')); - if (node.isEmpty() || node == TQString::fromLatin1("*") || - node == TQString::fromLatin1("localhost")) + if (node.isEmpty() || node == TQString::tqfromLatin1("*") || + node == TQString::tqfromLatin1("localhost")) m_encodedName.truncate(0); else { @@ -584,7 +584,7 @@ bool KStandardWorker::resolveScopeId() { // we must test the original name, not the encoded one scopeid = 0; - int pos = nodeName().findRev('%'); + int pos = nodeName().tqfindRev('%'); if (pos == -1) return true; @@ -616,7 +616,7 @@ bool KStandardWorker::resolveService() // service name does not contain a port number // must be a name - if (serviceName().isEmpty() || serviceName().compare(TQString::fromLatin1("*")) == 0) + if (serviceName().isEmpty() || serviceName().compare(TQString::tqfromLatin1("*")) == 0) port = 0; else { @@ -648,7 +648,7 @@ bool KStandardWorker::resolveService() } // it worked, we have a port number - port = (Q_UINT16)result; + port = (TQ_UINT16)result; } } @@ -667,7 +667,7 @@ KResolver::ErrorCodes KStandardWorker::addUnix() if (!m_encodedName.isEmpty()) return KResolver::AddrFamily; // non local hostname - if (protocol() || protocolName()) + if (protocol() || static_cast<const char *>(protocolName())) return KResolver::BadFlags; // cannot have Unix sockets with protocols TQString pathname = serviceName(); @@ -712,7 +712,7 @@ bool KStandardWorker::resolveNumerically() // now try to resolve the hostname numerically KInetSocketAddress sa; setError(KResolver::NoError); - sa.setHost(KIpAddress(TQString::fromLatin1(m_encodedName))); + sa.setHost(KIpAddress(TQString::tqfromLatin1(m_encodedName))); // if it failed, the length was reset to 0 bool ok = sa.length() != 0; diff --git a/kdecore/network/kresolverstandardworkers_p.h b/kdecore/network/kresolverstandardworkers_p.h index 310849bf3..2db460bef 100644 --- a/kdecore/network/kresolverstandardworkers_p.h +++ b/kdecore/network/kresolverstandardworkers_p.h @@ -66,7 +66,7 @@ namespace KNetwork { namespace Internal { protected: mutable TQCString m_encodedName; - Q_UINT16 port; + TQ_UINT16 port; int scopeid; TQPtrList<KNetwork::KResolverResults> resultList; diff --git a/kdecore/network/kreverseresolver.cpp b/kdecore/network/kreverseresolver.cpp index 639f6dbe4..00ef7f81d 100644 --- a/kdecore/network/kreverseresolver.cpp +++ b/kdecore/network/kreverseresolver.cpp @@ -78,7 +78,7 @@ namespace bool success; }; - class KReverseResolverEvent: public QEvent + class KReverseResolverEvent: public TQEvent { public: static const int myType = TQEvent::User + 63; // arbitrary value @@ -203,7 +203,7 @@ bool KReverseResolver::resolve(const KSocketAddress& addr, TQString& node, return false; } -bool KReverseResolver::resolve(const struct sockaddr* sa, Q_UINT16 salen, +bool KReverseResolver::resolve(const struct sockaddr* sa, TQ_UINT16 salen, TQString& node, TQString& serv, int flags) { return resolve(KSocketAddress(sa, salen), node, serv, flags); @@ -238,8 +238,8 @@ bool ReverseThread::run() if (err == 0) { - node = KResolver::domainToUnicode(TQString::fromLatin1(h)); - service = TQString::fromLatin1(s); + node = KResolver::domainToUnicode(TQString::tqfromLatin1(h)); + service = TQString::tqfromLatin1(s); success = true; } else diff --git a/kdecore/network/kreverseresolver.h b/kdecore/network/kreverseresolver.h index 26274e586..1f26f4a2a 100644 --- a/kdecore/network/kreverseresolver.h +++ b/kdecore/network/kreverseresolver.h @@ -47,9 +47,10 @@ class KReverseResolverPrivate; * * @author Thiago Macieira <thiago.macieira@kdemail.net> */ -class KDECORE_EXPORT KReverseResolver: public QObject +class KDECORE_EXPORT KReverseResolver: public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -183,7 +184,7 @@ public: * @return true if the resolution succeeded, false if not * @see ReverseFlags for the possible values for @p flags */ - static bool resolve(const struct sockaddr* sa, Q_UINT16 salen, + static bool resolve(const struct sockaddr* sa, TQ_UINT16 salen, TQString& node, TQString& serv, int flags = 0); private: diff --git a/kdecore/network/kserversocket.cpp b/kdecore/network/kserversocket.cpp index 49facb12c..bd63d6306 100644 --- a/kdecore/network/kserversocket.cpp +++ b/kdecore/network/kserversocket.cpp @@ -155,7 +155,7 @@ bool KServerSocket::lookup() // make sure we have at least one parameter for lookup if (d->resolver.serviceName().isNull() && !d->resolver.nodeName().isNull()) - d->resolver.setServiceName(TQString::fromLatin1("")); + d->resolver.setServiceName(TQString::tqfromLatin1("")); // don't restart the lookups if they had succeeded and // the input values weren't changed diff --git a/kdecore/network/kserversocket.h b/kdecore/network/kserversocket.h index 30d8b40b0..a07ed54a1 100644 --- a/kdecore/network/kserversocket.h +++ b/kdecore/network/kserversocket.h @@ -107,6 +107,7 @@ class KServerSocketPrivate; class KDECORE_EXPORT KServerSocket: public TQObject, public KPassiveSocketBase { Q_OBJECT + TQ_OBJECT public: /** * Default constructor. diff --git a/kdecore/network/ksocketaddress.cpp b/kdecore/network/ksocketaddress.cpp index adfc76b06..a6fd14cf5 100644 --- a/kdecore/network/ksocketaddress.cpp +++ b/kdecore/network/ksocketaddress.cpp @@ -74,7 +74,7 @@ const KIpAddress KIpAddress::anyhostV4(0L, 4); const KIpAddress KIpAddress::anyhostV6(0L, 6); // helper function to test if an IPv6 v4-mapped address is equal to its IPv4 counterpart -static bool check_v4mapped(const Q_UINT32* v6addr, Q_UINT32 v4addr) +static bool check_v4mapped(const TQ_UINT32* v6addr, TQ_UINT32 v4addr) { // check that the v6 is a v4-mapped address if (!(v6addr[0] == 0 && v6addr[1] == 0 && v6addr[2] == htonl(0x0000ffff))) @@ -131,12 +131,12 @@ bool KIpAddress::setAddress(const TQString& address) m_version = 0; // try to guess the address version - if (address.find(':') != -1) + if (address.tqfind(':') != -1) { #ifdef AF_INET6 // guessing IPv6 - Q_UINT32 buf[4]; + TQ_UINT32 buf[4]; if (inet_pton(AF_INET6, address.latin1(), buf)) { memcpy(m_data, buf, sizeof(m_data)); @@ -149,7 +149,7 @@ bool KIpAddress::setAddress(const TQString& address) } else { - Q_UINT32 buf; + TQ_UINT32 buf; if (inet_pton(AF_INET, address.latin1(), &buf)) { *m_data = buf; @@ -165,7 +165,7 @@ bool KIpAddress::setAddress(const TQString& address) bool KIpAddress::setAddress(const char* address) { - return setAddress(TQString::fromLatin1(address)); + return setAddress(TQString::tqfromLatin1(address)); } // set from binary data @@ -194,21 +194,21 @@ TQString KIpAddress::toString() const { case 4: inet_ntop(AF_INET, m_data, buf, sizeof(buf) - 1); - return TQString::fromLatin1(buf); + return TQString::tqfromLatin1(buf); case 6: #ifdef AF_INET6 inet_ntop(AF_INET6, m_data, buf, sizeof(buf) - 1); #endif - return TQString::fromLatin1(buf); + return TQString::tqfromLatin1(buf); } return TQString::null; } -Q_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const +TQ_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const { - Q_UINT32 addr = IPv4Addr(convertMapped); + TQ_UINT32 addr = IPv4Addr(convertMapped); return ntohl(addr); } @@ -219,23 +219,23 @@ Q_UINT32 KIpAddress::hostIPv4Addr(bool convertMapped) const struct our_sockaddr_in6 { # ifdef HAVE_STRUCT_SOCKADDR_SA_LEN - Q_UINT8 sin6_len; - Q_UINT8 sin6_family; + TQ_UINT8 sin6_len; + TQ_UINT8 sin6_family; # else //!HAVE_STRUCT_SOCKADDR_SA_LEN - Q_UINT16 sin6_family; + TQ_UINT16 sin6_family; # endif - Q_UINT16 sin6_port; /* RFC says in_port_t */ - Q_UINT32 sin6_flowinfo; - Q_UINT8 sin6_addr[16]; // 24 bytes up to here - Q_UINT32 sin6_scope_id; // 28 bytes total + TQ_UINT16 sin6_port; /* RFC says in_port_t */ + TQ_UINT32 sin6_flowinfo; + TQ_UINT8 sin6_addr[16]; // 24 bytes up to here + TQ_UINT32 sin6_scope_id; // 28 bytes total }; // useful definitions -#define MIN_SOCKADDR_LEN sizeof(Q_UINT16) +#define MIN_SOCKADDR_LEN sizeof(TQ_UINT16) #define SOCKADDR_IN_LEN sizeof(sockaddr_in) #define MIN_SOCKADDR_IN6_LEN ((unsigned long) &(((our_sockaddr_in6*)0)->sin6_scope_id)) #define SOCKADDR_IN6_LEN sizeof(our_sockaddr_in6) -#define MIN_SOCKADDR_UN_LEN (sizeof(Q_UINT16) + sizeof(char)) +#define MIN_SOCKADDR_UN_LEN (sizeof(TQ_UINT16) + sizeof(char)) class KNetwork::KSocketAddressData @@ -263,14 +263,14 @@ public: struct our_sockaddr_in6 *in6; struct sockaddr_un *un; } addr; - Q_UINT16 curlen, reallen; + TQ_UINT16 curlen, reallen; KSocketAddressData() : ref(this) { addr.generic = 0L; curlen = 0; - invalidate(); + tqinvalidate(); } ~KSocketAddressData() @@ -282,10 +282,10 @@ public: inline bool invalid() const { return reallen == 0; } - inline void invalidate() + inline void tqinvalidate() { reallen = 0; } - void dup(const sockaddr* sa, Q_UINT16 len, bool clear = true); + void dup(const sockaddr* sa, TQ_UINT16 len, bool clear = true); void makeipv4() { @@ -343,12 +343,12 @@ public: }; // create duplicates of -void KSocketAddressData::dup(const sockaddr* sa, Q_UINT16 len, bool clear) +void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear) { if (len < MIN_SOCKADDR_LEN) { // certainly invalid - invalidate(); + tqinvalidate(); return; } @@ -359,7 +359,7 @@ void KSocketAddressData::dup(const sockaddr* sa, Q_UINT16 len, bool clear) (sa->sa_family == AF_UNIX && len < MIN_SOCKADDR_UN_LEN))) { // also invalid - invalidate(); + tqinvalidate(); return; } @@ -411,7 +411,7 @@ KSocketAddress::KSocketAddress() } // constructor from binary data -KSocketAddress::KSocketAddress(const sockaddr *sa, Q_UINT16 len) +KSocketAddress::KSocketAddress(const sockaddr *sa, TQ_UINT16 len) : d(new KSocketAddressData) { setAddress(sa, len); @@ -444,7 +444,7 @@ KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other) if (other.d && !other.d->invalid()) d->dup(other.d->addr.generic, other.d->reallen); else - d->invalidate(); + d->tqinvalidate(); return *this; } @@ -462,24 +462,24 @@ sockaddr* KSocketAddress::address() return d->addr.generic; } -KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, Q_UINT16 len) +KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len) { if (sa != 0L && len >= MIN_SOCKADDR_LEN) d->dup(sa, len); else - d->invalidate(); + d->tqinvalidate(); return *this; } -Q_UINT16 KSocketAddress::length() const +TQ_UINT16 KSocketAddress::length() const { if (d->invalid()) return 0; return d->reallen; } -KSocketAddress& KSocketAddress::setLength(Q_UINT16 len) +KSocketAddress& KSocketAddress::setLength(TQ_UINT16 len) { d->dup((sockaddr*)0L, len, false); @@ -619,7 +619,7 @@ TQString KSocketAddress::toString() const fmt = "[%1]:%2"; #endif else if (d->addr.generic->sa_family == AF_UNIX) - return TQString::fromLatin1("unix:%1").arg(serviceName()); + return TQString::tqfromLatin1("unix:%1").arg(serviceName()); else return i18n("1: the unknown socket address family number", "Unknown family %1").arg(d->addr.generic->sa_family); @@ -687,7 +687,7 @@ KInetSocketAddress::KInetSocketAddress() } // binary data constructor -KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, Q_UINT16 len) +KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len) : KSocketAddress(sa, len) { if (!d->invalid()) @@ -695,7 +695,7 @@ KInetSocketAddress::KInetSocketAddress(const sockaddr* sa, Q_UINT16 len) } // create from IP and port -KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, Q_UINT16 port) +KInetSocketAddress::KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port) { setHost(host); setPort(port); @@ -788,14 +788,14 @@ KInetSocketAddress& KInetSocketAddress::setHost(const KIpAddress& ip) default: // empty - d->invalidate(); + d->tqinvalidate(); } return *this; } // returns the port -Q_UINT16 KInetSocketAddress::port() const +TQ_UINT16 KInetSocketAddress::port() const { if (d->invalid()) return 0; @@ -814,7 +814,7 @@ Q_UINT16 KInetSocketAddress::port() const return 0; } -KInetSocketAddress& KInetSocketAddress::setPort(Q_UINT16 port) +KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port) { if (d->invalid()) makeIPv4(); @@ -832,7 +832,7 @@ KInetSocketAddress& KInetSocketAddress::setPort(Q_UINT16 port) #endif default: - d->invalidate(); // setting the port on something else + d->tqinvalidate(); // setting the port on something else } return *this; @@ -850,7 +850,7 @@ KInetSocketAddress& KInetSocketAddress::makeIPv6() return *this; } -Q_UINT32 KInetSocketAddress::flowinfo() const +TQ_UINT32 KInetSocketAddress::flowinfo() const { #ifndef AF_INET6 return 0; @@ -862,7 +862,7 @@ Q_UINT32 KInetSocketAddress::flowinfo() const #endif } -KInetSocketAddress& KInetSocketAddress::setFlowinfo(Q_UINT32 flowinfo) +KInetSocketAddress& KInetSocketAddress::setFlowinfo(TQ_UINT32 flowinfo) { makeIPv6(); // must set here d->addr.in6->sin6_flowinfo = flowinfo; @@ -897,18 +897,18 @@ void KInetSocketAddress::update() return; #endif else - d->invalidate(); + d->tqinvalidate(); } KUnixSocketAddress::KUnixSocketAddress() { } -KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, Q_UINT16 len) +KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len) : KSocketAddress(sa, len) { if (!d->invalid() && d->addr.un->sun_family != AF_UNIX) - d->invalidate(); + d->tqinvalidate(); } KUnixSocketAddress::KUnixSocketAddress(const KUnixSocketAddress& other) diff --git a/kdecore/network/ksocketaddress.h b/kdecore/network/ksocketaddress.h index 6889527e3..75deb60ae 100644 --- a/kdecore/network/ksocketaddress.h +++ b/kdecore/network/ksocketaddress.h @@ -119,7 +119,7 @@ public: * * @param ip4addr the IPv4 address */ - inline KIpAddress(Q_UINT32 ip4addr) + inline KIpAddress(TQ_UINT32 ip4addr) { setAddress(&ip4addr, 4); } /** @@ -232,7 +232,7 @@ public: * system's in_addr type. * */ - inline Q_UINT32 IPv4Addr(bool convertMapped = true) const + inline TQ_UINT32 IPv4Addr(bool convertMapped = true) const { return (convertMapped && isV4Mapped()) ? m_data[3] : m_data[0]; } @@ -245,7 +245,7 @@ public: * valid. The address returned is in host byte order. * */ - Q_UINT32 hostIPv4Addr(bool convertMapped = true) const; + TQ_UINT32 hostIPv4Addr(bool convertMapped = true) const; public: /*-- tests --*/ @@ -310,7 +310,7 @@ public: inline bool isMulticast() const { if (version() == 4) return isClassD(); - if (version() == 6) return ((Q_UINT8*)addr())[0] == 0xff; + if (version() == 6) return ((TQ_UINT8*)addr())[0] == 0xff; return false; } @@ -320,7 +320,7 @@ public: inline bool isLinkLocal() const { if (version() != 6) return false; - Q_UINT8* addr = (Q_UINT8*)this->addr(); + TQ_UINT8* addr = (TQ_UINT8*)this->addr(); return (addr[0] & 0xff) == 0xfe && (addr[1] & 0xc0) == 0x80; } @@ -331,7 +331,7 @@ public: inline bool isSiteLocal() const { if (version() != 6) return false; - Q_UINT8* addr = (Q_UINT8*)this->addr(); + TQ_UINT8* addr = (TQ_UINT8*)this->addr(); return (addr[0] & 0xff) == 0xfe && (addr[1] & 0xc0) == 0xc0; } @@ -348,10 +348,10 @@ public: inline bool isV4Mapped() const { if (version() != 6) return false; - Q_UINT32* addr = (Q_UINT32*)this->addr(); + TQ_UINT32* addr = (TQ_UINT32*)this->addr(); return addr[0] == 0 && addr[1] == 0 && - ((Q_UINT16*)&addr[2])[0] == 0 && - ((Q_UINT16*)&addr[2])[1] == 0xffff; + ((TQ_UINT16*)&addr[2])[0] == 0 && + ((TQ_UINT16*)&addr[2])[1] == 0xffff; } /** @@ -360,7 +360,7 @@ public: inline bool isV4Compat() const { if (version() != 6 || isLocalhost()) return false; - Q_UINT32* addr = (Q_UINT32*)this->addr(); + TQ_UINT32* addr = (TQ_UINT32*)this->addr(); return addr[0] == 0 && addr[1] == 0 && addr[2] == 0 && addr[3] != 0; } @@ -368,34 +368,34 @@ public: * Returns true if this is an IPv6 node-local multicast address. */ inline bool isMulticastNodeLocal() const - { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x1; } + { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x1; } /** * Returns true if this is an IPv6 link-local multicast address. */ inline bool isMulticastLinkLocal() const - { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x2; } + { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x2; } /** * Returns true if this is an IPv6 site-local multicast address. */ inline bool isMulticastSiteLocal() const - { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x5; } + { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x5; } /** * Returns true if this is an IPv6 organisational-local multicast address. */ inline bool isMulticastOrgLocal() const - { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0x8; } + { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0x8; } /** * Returns true if this is an IPv6 global multicast address. */ inline bool isMulticastGlobal() const - { return version() == 6 && isMulticast() && (((Q_UINT32*)addr())[0] & 0xf) == 0xe; } + { return version() == 6 && isMulticast() && (((TQ_UINT32*)addr())[0] & 0xf) == 0xe; } protected: - Q_UINT32 m_data[4]; // 16 bytes, needed for an IPv6 address + TQ_UINT32 m_data[4]; // 16 bytes, needed for an IPv6 address char m_version; @@ -437,7 +437,7 @@ public: * @param sa the socket address structure * @param len the socket address length */ - KSocketAddress(const sockaddr* sa, Q_UINT16 len); + KSocketAddress(const sockaddr* sa, TQ_UINT16 len); /** * Copy constructor. This creates a copy of the other @@ -490,7 +490,7 @@ public: * @param sa the socket address structure * @param len the socket address length */ - KSocketAddress& setAddress(const sockaddr *sa, Q_UINT16 len); + KSocketAddress& setAddress(const sockaddr *sa, TQ_UINT16 len); /** * Returns the socket address structure, to be passed down to @@ -502,7 +502,7 @@ public: /** * Returns the length of this socket address structure. */ - Q_UINT16 length() const; + TQ_UINT16 length() const; /** * Sets the length of this socket structure. @@ -511,7 +511,7 @@ public: * buffer to fit needs. This function should not be used except for handling * unknown socket address structures. * - * Also note that this function may invalidate the socket if a known + * Also note that this function may tqinvalidate the socket if a known * family is set (Internet or Unix socket) and the new length would be * too small to hold the system's sockaddr_* structure. If unsure, reset * the family: @@ -524,7 +524,7 @@ public: * * @param len the new length */ - KSocketAddress& setLength(Q_UINT16 len); + KSocketAddress& setLength(TQ_UINT16 len); /** * Returns the family of this address. @@ -535,7 +535,7 @@ public: /** * Sets the family of this object. * - * Note: setting the family will probably invalidate any address data + * Note: setting the family will probably tqinvalidate any address data * contained in this object. Use this function with care. * * @param family the new family to set @@ -666,7 +666,7 @@ public: * @param sa the sockaddr structure * @param len the structure's length */ - KInetSocketAddress(const sockaddr* sa, Q_UINT16 len); + KInetSocketAddress(const sockaddr* sa, TQ_UINT16 len); /** * Creates an object from an IP address and port. @@ -674,7 +674,7 @@ public: * @param host the IP address * @param port the port number */ - KInetSocketAddress(const KIpAddress& host, Q_UINT16 port); + KInetSocketAddress(const KIpAddress& host, TQ_UINT16 port); /** * Copy constructor. @@ -750,7 +750,7 @@ public: * @return a port number in the range 0 to 65535, inclusive. An empty or * invalid object will have a port number of 0. */ - Q_UINT16 port() const; + TQ_UINT16 port() const; /** * Sets the port number. If this object is empty, this function will default to @@ -759,7 +759,7 @@ public: * @param port the port number to set * @return a reference to itself */ - KInetSocketAddress& setPort(Q_UINT16 port); + KInetSocketAddress& setPort(TQ_UINT16 port); /** * Converts this object to an IPv4 socket address. It has no effect if the object @@ -787,7 +787,7 @@ public: * * @return the flowinfo information or 0 if this object is empty or IPv4 */ - Q_UINT32 flowinfo() const; + TQ_UINT32 flowinfo() const; /** * Sets the flowinfo information for an IPv6 socket address. If this is not @@ -796,7 +796,7 @@ public: * @param flowinfo the flowinfo to set * @return a reference to itself */ - KInetSocketAddress& setFlowinfo(Q_UINT32 flowinfo); + KInetSocketAddress& setFlowinfo(TQ_UINT32 flowinfo); /** * Returns the scope id this IPv6 socket is bound to. @@ -854,7 +854,7 @@ public: * @param sa the socket address structure * @param len the structure's length */ - KUnixSocketAddress(const sockaddr* sa, Q_UINT16 len); + KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len); /** * Copy constructor. Creates a copy of the other object, diff --git a/kdecore/network/ksocketbase.cpp b/kdecore/network/ksocketbase.cpp index 9071eea0e..1a486ee16 100644 --- a/kdecore/network/ksocketbase.cpp +++ b/kdecore/network/ksocketbase.cpp @@ -309,7 +309,7 @@ int KActiveSocketBase::putch(int ch) void KActiveSocketBase::setError(int status, SocketError error) { KSocketBase::setError(error); - setStatus(status); + setqStatus(status); } void KActiveSocketBase::resetError() diff --git a/kdecore/network/ksocketbase.h b/kdecore/network/ksocketbase.h index 133086114..b7df0c35f 100644 --- a/kdecore/network/ksocketbase.h +++ b/kdecore/network/ksocketbase.h @@ -504,7 +504,11 @@ public: * This call is not supported on sockets. Reimplemented from TQIODevice. * This will always return 0. */ +#ifdef USE_QT4 + virtual qint64 size() const +#else // USE_QT4 virtual Offset size() const +#endif // USE_QT4 { return 0; } /** @@ -533,7 +537,7 @@ public: * blocking. */ #ifdef USE_QT3 - virtual Q_LONG bytesAvailable() const = 0; + virtual TQ_LONG bytesAvailable() const = 0; #endif #ifdef USE_QT4 virtual qint64 bytesAvailable() const = 0; @@ -550,7 +554,7 @@ public: * * @returns the number of bytes available */ - virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L) = 0; + virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L) = 0; /** * Reads data from the socket. @@ -558,7 +562,7 @@ public: * Reimplemented from TQIODevice. See TQIODevice::readBlock for * more information. */ - virtual Q_LONG readBlock(char *data, Q_ULONG len) = 0; + virtual TQ_LONG readBlock(char *data, TQ_ULONG len) = 0; /** @overload * Receives data and the source address. @@ -571,7 +575,7 @@ public: * @param from the address of the sender will be stored here * @returns the actual number of bytes read */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) = 0; + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0; /** * Peeks the data in the socket. @@ -584,7 +588,7 @@ public: * @param maxlen the maximum number of bytes to peek * @returns the actual number of bytes copied into @p data */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen) = 0; + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen) = 0; /** @overload * Peeks the data in the socket and the source address. @@ -598,7 +602,7 @@ public: * @param from the address of the sender will be stored here * @returns the actual number of bytes copied into @p data */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) = 0; + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0; /** * Writes the given data to the socket. @@ -606,7 +610,7 @@ public: * Reimplemented from TQIODevice. See TQIODevice::writeBlock for * more information. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len) = 0; + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len) = 0; /** @overload * Writes the given data to the destination address. @@ -619,7 +623,7 @@ public: * @param to the address to send to * @returns the number of bytes actually sent */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to) = 0; + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) = 0; /** * Reads one character from the socket. diff --git a/kdecore/network/ksocketbuffer.cpp b/kdecore/network/ksocketbuffer.cpp index 18c926c83..4ea12ed14 100644 --- a/kdecore/network/ksocketbuffer.cpp +++ b/kdecore/network/ksocketbuffer.cpp @@ -33,7 +33,7 @@ using namespace KNetwork; using namespace KNetwork::Internal; -KSocketBuffer::KSocketBuffer(Q_LONG size) +KSocketBuffer::KSocketBuffer(TQ_LONG size) : m_mutex(true), m_offset(0), m_size(size), m_length(0) { } @@ -75,9 +75,9 @@ bool KSocketBuffer::canReadLine() const // walk the buffer for ( ; it != end; ++it) { - if ((*it).find('\n', offset) != -1) + if ((*it).tqfind('\n', offset) != -1) return true; - if ((*it).find('\r', offset) != -1) + if ((*it).tqfind('\r', offset) != -1) return true; offset = 0; } @@ -101,7 +101,7 @@ TQCString KSocketBuffer::readLine() // walk the buffer for ( ; it != end; ++it) { - int posnl = (*it).find('\n', offset); + int posnl = (*it).tqfind('\n', offset); if (posnl == -1) { // not found in this one @@ -120,17 +120,17 @@ TQCString KSocketBuffer::readLine() return result; } -Q_LONG KSocketBuffer::length() const +TQ_LONG KSocketBuffer::length() const { return m_length; } -Q_LONG KSocketBuffer::size() const +TQ_LONG KSocketBuffer::size() const { return m_size; } -bool KSocketBuffer::setSize(Q_LONG size) +bool KSocketBuffer::setSize(TQ_LONG size) { m_size = size; if (size == -1 || m_length < m_size) @@ -147,7 +147,7 @@ bool KSocketBuffer::setSize(Q_LONG size) return (m_length - m_size) == consumeBuffer(0L, m_length - m_size, true); } -Q_LONG KSocketBuffer::feedBuffer(const char *data, Q_LONG len) +TQ_LONG KSocketBuffer::feedBuffer(const char *data, TQ_LONG len) { if (data == 0L || len == 0) return 0; // nothing to write @@ -168,7 +168,7 @@ Q_LONG KSocketBuffer::feedBuffer(const char *data, Q_LONG len) return len; } -Q_LONG KSocketBuffer::consumeBuffer(char *destbuffer, Q_LONG maxlen, bool discard) +TQ_LONG KSocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool discard) { if (maxlen == 0 || isEmpty()) return 0; @@ -176,7 +176,7 @@ Q_LONG KSocketBuffer::consumeBuffer(char *destbuffer, Q_LONG maxlen, bool discar TQValueListIterator<TQByteArray> it = m_list.begin(), end = m_list.end(); TQIODevice::Offset offset = m_offset; - Q_LONG copied = 0; + TQ_LONG copied = 0; // walk the buffer while (it != end && maxlen) @@ -228,7 +228,7 @@ void KSocketBuffer::clear() m_length = 0; } -Q_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, Q_LONG len) +TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len) { if (len == 0 || isEmpty()) return 0; @@ -238,7 +238,7 @@ Q_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, Q_LONG len) TQValueListIterator<TQByteArray> it = m_list.begin(), end = m_list.end(); TQIODevice::Offset offset = m_offset; - Q_LONG written = 0; + TQ_LONG written = 0; // walk the buffer while (it != end && (len || len == -1)) @@ -248,11 +248,11 @@ Q_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, Q_LONG len) // better by concatenating a few of them into a big buffer // question is: how big should that buffer be? 2 kB should be enough - Q_ULONG bufsize = 1460; + TQ_ULONG bufsize = 1460; if (len != -1 && len < bufsize) bufsize = len; TQByteArray buf(bufsize); - Q_LONG count = 0; + TQ_LONG count = 0; while (it != end && count + ((*it).size() - offset) <= bufsize) { @@ -273,7 +273,7 @@ Q_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, Q_LONG len) } // now try to write those bytes - Q_LONG wrote = dev->writeBlock(buf, count); + TQ_LONG wrote = dev->writeBlock(buf, count); if (wrote == -1) // error? @@ -293,7 +293,7 @@ Q_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, Q_LONG len) return written; } -Q_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, Q_LONG len) +TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len) { if (len == 0 || isFull()) return 0; diff --git a/kdecore/network/ksocketbuffer_p.h b/kdecore/network/ksocketbuffer_p.h index a4a0d6a9e..0b8e96205 100644 --- a/kdecore/network/ksocketbuffer_p.h +++ b/kdecore/network/ksocketbuffer_p.h @@ -53,7 +53,7 @@ public: * * @param size the maximum size of the buffer */ - KSocketBuffer(Q_LONG size = -1); + KSocketBuffer(TQ_LONG size = -1); /** * Copy constructor. @@ -86,7 +86,7 @@ public: * * @sa size */ - virtual Q_LONG length() const; + virtual TQ_LONG length() const; /** * Retrieves the buffer size. The value of -1 indicates that @@ -94,7 +94,7 @@ public: * * @sa length for the length of the data stored */ - virtual Q_LONG size() const; + virtual TQ_LONG size() const; /** * Sets the size of the buffer, if allowed. @@ -103,7 +103,7 @@ public: * @returns true on success, false if an error occurred. * @note if the new size is less than length(), the buffer will be truncated */ - virtual bool setSize(Q_LONG size); + virtual bool setSize(TQ_LONG size); /** * Adds data to the end of the buffer. @@ -112,7 +112,7 @@ public: * @param len the data length, in bytes * @returns the number of bytes added to the end of the buffer. */ - virtual Q_LONG feedBuffer(const char *data, Q_LONG len); + virtual TQ_LONG feedBuffer(const char *data, TQ_LONG len); /** * Clears the buffer. @@ -127,7 +127,7 @@ public: * @param discard if true, the bytes copied will be discarded * @returns the number of bytes copied from the buffer */ - virtual Q_LONG consumeBuffer(char *data, Q_LONG maxlen, bool discard = true); + virtual TQ_LONG consumeBuffer(char *data, TQ_LONG maxlen, bool discard = true); /** * Sends at most @p len bytes of data to the I/O Device. @@ -137,7 +137,7 @@ public: * @returns the number of bytes sent and discarded from the buffer, -1 * indicates an error. */ - virtual Q_LONG sendTo(KActiveSocketBase* device, Q_LONG len = -1); + virtual TQ_LONG sendTo(KActiveSocketBase* device, TQ_LONG len = -1); /** * Tries to receive @p len bytes of data from the I/O device. @@ -148,15 +148,15 @@ public: * @returns the number of bytes received and copied into the buffer, * -1 indicates an error. */ - virtual Q_LONG receiveFrom(KActiveSocketBase* device, Q_LONG len = -1); + virtual TQ_LONG receiveFrom(KActiveSocketBase* device, TQ_LONG len = -1); protected: mutable TQMutex m_mutex; TQValueList<TQByteArray> m_list; TQIODevice::Offset m_offset; ///< offset of the start of data in the first element - Q_LONG m_size; ///< the maximum length of the buffer - mutable Q_LONG m_length; + TQ_LONG m_size; ///< the maximum length of the buffer + mutable TQ_LONG m_length; }; } } // namespace KNetwork::Internal diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp index 53a16ca0a..793642bf9 100644 --- a/kdecore/network/ksocketdevice.cpp +++ b/kdecore/network/ksocketdevice.cpp @@ -365,7 +365,7 @@ bool KSocketDevice::disconnect() } #ifdef USE_QT3 -Q_LONG KSocketDevice::bytesAvailable() const +TQ_LONG KSocketDevice::bytesAvailable() const #endif #ifdef USE_QT4 qint64 KSocketDevice::bytesAvailable() const @@ -381,7 +381,7 @@ qint64 KSocketDevice::bytesAvailable() const return nchars; } -Q_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) +TQ_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) { if (m_sockfd == -1) return -1; // there won't ever be anything to read... @@ -393,7 +393,7 @@ Q_LONG KSocketDevice::waitForMore(int msecs, bool *timeout) return bytesAvailable(); } -static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) +static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) { socklen_t len; if (from) @@ -419,7 +419,7 @@ static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress return 0; } -Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen) +TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -440,7 +440,7 @@ Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from) +TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -461,7 +461,7 @@ Q_LONG KSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from return retval; } -Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen) +TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -482,7 +482,7 @@ Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) +TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) { resetError(); if (m_sockfd == -1) @@ -503,12 +503,12 @@ Q_LONG KSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from return retval; } -Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len) +TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len) { return writeBlock(data, len, KSocketAddress()); } -Q_LONG KSocketDevice::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to) +TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) { resetError(); if (m_sockfd == -1) @@ -884,7 +884,7 @@ KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory) void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities) { TQMutexLocker locker(&defaultImplFactoryMutex); - if (factories.contains(capabilities)) + if (factories.tqcontains(capabilities)) delete factories[capabilities]; factories.insert(capabilities, factory); } diff --git a/kdecore/network/ksocketdevice.h b/kdecore/network/ksocketdevice.h index 5f86687b2..5324cd02b 100644 --- a/kdecore/network/ksocketdevice.h +++ b/kdecore/network/ksocketdevice.h @@ -199,7 +199,7 @@ public: * Returns the number of bytes available for reading without blocking. */ #ifdef USE_QT3 - virtual Q_LONG bytesAvailable() const; + virtual TQ_LONG bytesAvailable() const; #endif #ifdef USE_QT4 virtual qint64 bytesAvailable() const; @@ -211,37 +211,37 @@ public: * This function is a wrapper against @ref poll. This function will wait * for any read events. */ - virtual Q_LONG waitForMore(int msecs, bool *timeout = 0L); + virtual TQ_LONG waitForMore(int msecs, bool *timeout = 0L); /** * Reads data from this socket. */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); /** * Reads data and the source address from this socket. */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); /** * Peeks data in the socket. */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen); /** * Peeks the data in the socket and the source address. */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); /** * Writes data to the socket. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); /** * Writes the given data to the given destination address. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to); /** * Returns this socket's local address. diff --git a/kdecore/network/ksockssocketdevice.cpp b/kdecore/network/ksockssocketdevice.cpp index f67b90bc9..b9fcb6cdd 100644 --- a/kdecore/network/ksockssocketdevice.cpp +++ b/kdecore/network/ksockssocketdevice.cpp @@ -190,7 +190,7 @@ KSocksSocketDevice* KSocksSocketDevice::accept() return new KSocksSocketDevice(newfd); } -static int socks_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) +static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false) { kde_socklen_t len; if (from) @@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddr return 0; } -Q_LONG KSocksSocketDevice::readBlock(char *data, Q_ULONG maxlen) +TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -235,7 +235,7 @@ Q_LONG KSocksSocketDevice::readBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KSocksSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress &from) +TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from) { resetError(); if (m_sockfd == -1) @@ -256,7 +256,7 @@ Q_LONG KSocksSocketDevice::readBlock(char *data, Q_ULONG maxlen, KSocketAddress return retval; } -Q_LONG KSocksSocketDevice::peekBlock(char *data, Q_ULONG maxlen) +TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen) { resetError(); if (m_sockfd == -1) @@ -277,7 +277,7 @@ Q_LONG KSocksSocketDevice::peekBlock(char *data, Q_ULONG maxlen) return retval; } -Q_LONG KSocksSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from) +TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) { resetError(); if (m_sockfd == -1) @@ -298,12 +298,12 @@ Q_LONG KSocksSocketDevice::peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& return retval; } -Q_LONG KSocksSocketDevice::writeBlock(const char *data, Q_ULONG len) +TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len) { return writeBlock(data, len, KSocketAddress()); } -Q_LONG KSocksSocketDevice::writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to) +TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) { resetError(); if (m_sockfd == -1) diff --git a/kdecore/network/ksockssocketdevice.h b/kdecore/network/ksockssocketdevice.h index 62de23f05..1f8453836 100644 --- a/kdecore/network/ksockssocketdevice.h +++ b/kdecore/network/ksockssocketdevice.h @@ -83,20 +83,20 @@ public: /** * Overrides reading. */ - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen); - virtual Q_LONG readBlock(char *data, Q_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen); + virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); /** * Overrides peeking. */ - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen); - virtual Q_LONG peekBlock(char *data, Q_ULONG maxlen, KSocketAddress& from); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen); + virtual TQ_LONG peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from); /** * Overrides writing. */ - virtual Q_LONG writeBlock(const char *data, Q_ULONG len); - virtual Q_LONG writeBlock(const char *data, Q_ULONG len, const KSocketAddress& to); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len); + virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to); /** * Overrides getting socket address. diff --git a/kdecore/network/ksrvresolverworker.cpp b/kdecore/network/ksrvresolverworker.cpp index 07e3555fa..c1df59bde 100644 --- a/kdecore/network/ksrvresolverworker.cpp +++ b/kdecore/network/ksrvresolverworker.cpp @@ -33,7 +33,7 @@ using namespace KNetwork::Internal; namespace { - struct KSrvStartEvent: public QCustomEvent + struct KSrvStartEvent: public TQCustomEvent { inline KSrvStartEvent() : TQCustomEvent(TQEvent::User) { } }; @@ -51,11 +51,11 @@ bool KSrvResolverWorker::preprocess() return false; TQString node = nodeName(); - if (node.find('%') != -1) - node.truncate(node.find('%')); + if (node.tqfind('%') != -1) + node.truncate(node.tqfind('%')); - if (node.isEmpty() || node == TQString::fromLatin1("*") || - node == TQString::fromLatin1("localhost")) + if (node.isEmpty() || node == TQString::tqfromLatin1("*") || + node == TQString::tqfromLatin1("localhost")) return false; // empty == localhost encodedName = KResolver::domainToAscii(node); @@ -225,7 +225,7 @@ bool KSrvResolverWorker::postprocess() void KSrvResolverWorker::customEvent(TQCustomEvent*) { - dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv); + dns = new TQDns(TQString::tqfromLatin1(encodedName), TQDns::Srv); TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady())); } diff --git a/kdecore/network/ksrvresolverworker_p.h b/kdecore/network/ksrvresolverworker_p.h index 90074214f..293308544 100644 --- a/kdecore/network/ksrvresolverworker_p.h +++ b/kdecore/network/ksrvresolverworker_p.h @@ -42,13 +42,14 @@ namespace KNetwork public KNetwork::KResolverWorkerBase { Q_OBJECT + TQ_OBJECT public: struct Entry { TQString name; - Q_UINT16 port; - Q_UINT16 weight; + TQ_UINT16 port; + TQ_UINT16 weight; KNetwork::KResolver* resolver; }; @@ -57,7 +58,7 @@ namespace KNetwork PriorityClass() : totalWeight(0) { } TQValueList<Entry> entries; - Q_UINT16 totalWeight; + TQ_UINT16 totalWeight; }; private: @@ -66,7 +67,7 @@ namespace KNetwork TQCString encodedName; TQSemaphore *sem; - typedef TQMap<Q_UINT16, PriorityClass> Results; + typedef TQMap<TQ_UINT16, PriorityClass> Results; Results myResults; public: diff --git a/kdecore/network/kstreamsocket.cpp b/kdecore/network/kstreamsocket.cpp index 8ca4f91f6..3861a4e09 100644 --- a/kdecore/network/kstreamsocket.cpp +++ b/kdecore/network/kstreamsocket.cpp @@ -130,7 +130,7 @@ bool KStreamSocket::connect(const TQString& node, const TQString& service) // connection hasn't started yet if (!blocking()) { - TQObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot())); + QObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot())); return lookup(); } @@ -196,7 +196,7 @@ bool KStreamSocket::connect(const KResolverEntry& entry) void KStreamSocket::hostFoundSlot() { - TQObject::disconnect(this, TQT_SLOT(hostFoundSlot())); + QObject::disconnect(this, TQT_SLOT(hostFoundSlot())); if (timeout() > 0) d->timer.start(timeout(), true); TQTimer::singleShot(0, this, TQT_SLOT(connectionEvent())); diff --git a/kdecore/network/kstreamsocket.h b/kdecore/network/kstreamsocket.h index 099826cb8..9b58bf23a 100644 --- a/kdecore/network/kstreamsocket.h +++ b/kdecore/network/kstreamsocket.h @@ -97,6 +97,7 @@ class KStreamSocketPrivate; class KDECORE_EXPORT KStreamSocket: public KClientSocketBase { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kdecore/svgicons/ksvgiconengine.cpp b/kdecore/svgicons/ksvgiconengine.cpp index dd54e99be..faca9d967 100644 --- a/kdecore/svgicons/ksvgiconengine.cpp +++ b/kdecore/svgicons/ksvgiconengine.cpp @@ -127,12 +127,12 @@ public: TQColor qStopColor = m_engine->painter()->parseColor(parseColor); // Convert in a libart suitable form - Q_UINT32 stopColor = m_engine->painter()->toArtColor(qStopColor); + TQ_UINT32 stopColor = m_engine->painter()->toArtColor(qStopColor); int opacity = m_engine->painter()->parseOpacity(parseOpacity); - Q_UINT32 rgba = (stopColor << 8) | opacity; - Q_UINT32 r, g, b, a; + TQ_UINT32 rgba = (stopColor << 8) | opacity; + TQ_UINT32 r, g, b, a; // Convert from separated to premultiplied alpha a = rgba & 0xff; @@ -174,8 +174,8 @@ public: return TQPointArray(); points.replace(',', ' '); - points.replace('\r', TQString::null); - points.replace('\n', TQString::null); + points.replace('\r', TQString()); + points.replace('\n', TQString()); points = points.simplifyWhiteSpace(); @@ -201,7 +201,7 @@ public: // Combine new and old matrix TQWMatrix matrix = m_engine->painter()->parseTransform(transform); - TQWMatrix *current = m_engine->painter()->worldMatrix(); + TQWMatrix *current = m_engine->painter()->tqworldMatrix(); *current = matrix * *current; } @@ -221,9 +221,9 @@ public: TQPtrList<TQDomNamedNodeMap> applyList; applyList.setAutoDelete(true); - TQDomNode shape = node.parentNode(); - for(; !shape.isNull() ; shape = shape.parentNode()) - applyList.prepend(new TQDomNamedNodeMap(shape.attributes())); + TQDomNode tqshape = node.tqparentNode(); + for(; !tqshape.isNull() ; tqshape = tqshape.tqparentNode()) + applyList.prepend(new TQDomNamedNodeMap(tqshape.attributes())); // Apply parent attributes for(TQDomNamedNodeMap *map = applyList.first(); map != 0; map = applyList.next()) @@ -425,7 +425,7 @@ public: if(href.startsWith("data:")) { // Get input - TQCString input = href.remove(TQRegExp("^data:image/.*;base64,")).utf8(); + TQCString input = TQString(href.remove(TQRegExp("^data:image/.*;base64,"))).utf8(); // Decode into 'output' TQByteArray output; @@ -441,7 +441,7 @@ public: { // Scale, if needed if(image.width() != (int) w || image.height() != (int) h) - image = image.smoothScale((int) w, (int) h, TQImage_ScaleFree); + image = image.smoothScale((int) w, (int) h, TQ_ScaleFree); m_engine->painter()->drawImage(x, y, image); } @@ -622,7 +622,7 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path) d->width = w; d->height = h; - d->painter->worldMatrix()->scale(vratiow, vratioh); + d->painter->tqworldMatrix()->scale(vratiow, vratioh); } else { @@ -631,10 +631,10 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path) double ratiow = width / d->width; double ratioh = height / d->height; - d->painter->worldMatrix()->scale(ratiow, ratioh); + d->painter->tqworldMatrix()->scale(ratiow, ratioh); } - TQWMatrix initialMatrix = *d->painter->worldMatrix(); + TQWMatrix initialMatrix = *d->painter->tqworldMatrix(); d->helper->m_initialMatrix = initialMatrix; // Apply transform diff --git a/kdecore/svgicons/ksvgiconpainter.cpp b/kdecore/svgicons/ksvgiconpainter.cpp index 811dfe918..06d5804f8 100644 --- a/kdecore/svgicons/ksvgiconpainter.cpp +++ b/kdecore/svgicons/ksvgiconpainter.cpp @@ -65,7 +65,7 @@ public: m_useFillGradient = false; m_useStrokeGradient = false; - m_worldMatrix = new TQWMatrix(); + m_tqworldMatrix = new TQWMatrix(); // Create new image with alpha support m_image = new TQImage(width, height, 32); @@ -102,7 +102,7 @@ public: art_free(m_buffer); delete m_image; - delete m_worldMatrix; + delete m_tqworldMatrix; for(TQMap<TQString, ArtGradientLinear *>::Iterator it = m_linearGradientMap.begin(); it != m_linearGradientMap.end(); ++it) { @@ -185,7 +185,7 @@ public: m_tempBuffer = 0; } - Q_UINT32 toArtColor(const TQColor &color) + TQ_UINT32 toArtColor(const TQColor &color) { // Convert in a libart suitable form TQString tempName = color.name(); @@ -211,7 +211,7 @@ public: return result; } - void drawSVP(ArtSVP *svp, Q_UINT32 rgb, int opacity) + void drawSVP(ArtSVP *svp, TQ_UINT32 rgb, int opacity) { if(!svp) return; @@ -233,12 +233,12 @@ public: void drawBPath(ArtBpath *bpath) { double affine[6]; - affine[0] = m_worldMatrix->m11(); - affine[1] = m_worldMatrix->m12(); - affine[2] = m_worldMatrix->m21(); - affine[3] = m_worldMatrix->m22(); - affine[4] = m_worldMatrix->dx(); - affine[5] = m_worldMatrix->dy(); + affine[0] = m_tqworldMatrix->m11(); + affine[1] = m_tqworldMatrix->m12(); + affine[2] = m_tqworldMatrix->m21(); + affine[3] = m_tqworldMatrix->m22(); + affine[4] = m_tqworldMatrix->dx(); + affine[5] = m_tqworldMatrix->dy(); ArtBpath *temp = art_bpath_affine_transform(bpath, affine); ArtVpath *vec = art_bez_path_to_vec(temp, 0.25); @@ -249,12 +249,12 @@ public: void drawVPath(ArtVpath *vec) { double affine[6]; - affine[0] = m_worldMatrix->m11(); - affine[1] = m_worldMatrix->m12(); - affine[2] = m_worldMatrix->m21(); - affine[3] = m_worldMatrix->m22(); - affine[4] = m_worldMatrix->dx(); - affine[5] = m_worldMatrix->dy(); + affine[0] = m_tqworldMatrix->m11(); + affine[1] = m_tqworldMatrix->m12(); + affine[2] = m_tqworldMatrix->m21(); + affine[3] = m_tqworldMatrix->m22(); + affine[4] = m_tqworldMatrix->dx(); + affine[5] = m_tqworldMatrix->dy(); ArtVpath *temp = art_vpath_affine_transform(vec, affine); art_free(vec); @@ -267,7 +267,7 @@ public: ArtSVP *svp; ArtSVP *fillSVP = 0, *strokeSVP = 0; - Q_UINT32 fillColor = 0, strokeColor = 0; + TQ_UINT32 fillColor = 0, strokeColor = 0; // Filling { @@ -461,10 +461,10 @@ public: m.map(x1, y1, &x1, &y1); m.map(x2, y2, &x2, &y2); - double x1n = x1 * m_worldMatrix->m11() + y1 * m_worldMatrix->m21() + m_worldMatrix->dx(); - double y1n = x1 * m_worldMatrix->m12() + y1 * m_worldMatrix->m22() + m_worldMatrix->dy(); - double x2n = x2 * m_worldMatrix->m11() + y2 * m_worldMatrix->m21() + m_worldMatrix->dx(); - double y2n = x2 * m_worldMatrix->m12() + y2 * m_worldMatrix->m22() + m_worldMatrix->dy(); + double x1n = x1 * m_tqworldMatrix->m11() + y1 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx(); + double y1n = x1 * m_tqworldMatrix->m12() + y1 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy(); + double x2n = x2 * m_tqworldMatrix->m11() + y2 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx(); + double y2n = x2 * m_tqworldMatrix->m12() + y2 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy(); double dx = x2n - x1n; double dy = y2n - y1n; @@ -515,12 +515,12 @@ public: else fy = cy; - radial->affine[0] = m_worldMatrix->m11(); - radial->affine[1] = m_worldMatrix->m12(); - radial->affine[2] = m_worldMatrix->m21(); - radial->affine[3] = m_worldMatrix->m22(); - radial->affine[4] = m_worldMatrix->dx(); - radial->affine[5] = m_worldMatrix->dy(); + radial->affine[0] = m_tqworldMatrix->m11(); + radial->affine[1] = m_tqworldMatrix->m12(); + radial->affine[2] = m_tqworldMatrix->m21(); + radial->affine[3] = m_tqworldMatrix->m22(); + radial->affine[4] = m_tqworldMatrix->dx(); + radial->affine[5] = m_tqworldMatrix->dy(); radial->fx = (fx - cx) / r; radial->fy = (fy - cy) / r; @@ -674,7 +674,7 @@ public: { QRgb *sl = reinterpret_cast<QRgb *>(m_image->scanLine(y)); for(int x = 0; x < m_width; x++) - sl[x] = qRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]); + sl[x] = tqRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]); line += m_rowstride; } @@ -1123,7 +1123,7 @@ private: ArtSVP *m_clipSVP; TQImage *m_image; - TQWMatrix *m_worldMatrix; + TQWMatrix *m_tqworldMatrix; TQString m_fillRule; TQString m_joinStyle; @@ -1211,17 +1211,17 @@ TQImage *KSVGIconPainter::image() return new TQImage(*d->helper->m_image); } -TQWMatrix *KSVGIconPainter::worldMatrix() +TQWMatrix *KSVGIconPainter::tqworldMatrix() { - return d->helper->m_worldMatrix; + return d->helper->m_tqworldMatrix; } void KSVGIconPainter::setWorldMatrix(TQWMatrix *matrix) { - if(d->helper->m_worldMatrix) - delete d->helper->m_worldMatrix; + if(d->helper->m_tqworldMatrix) + delete d->helper->m_tqworldMatrix; - d->helper->m_worldMatrix = matrix; + d->helper->m_tqworldMatrix = matrix; } void KSVGIconPainter::setStrokeWidth(double width) @@ -1263,8 +1263,8 @@ void KSVGIconPainter::setStrokeColor(const TQString &stroke) TQString url = stroke; - unsigned int start = url.find("#") + 1; - unsigned int end = url.findRev(")"); + unsigned int start = url.tqfind("#") + 1; + unsigned int end = url.tqfindRev(")"); d->helper->m_strokeGradientReference = url.mid(start, end - start); } @@ -1291,8 +1291,8 @@ void KSVGIconPainter::setFillColor(const TQString &fill) TQString url = fill; - unsigned int start = url.find("#") + 1; - unsigned int end = url.findRev(")"); + unsigned int start = url.tqfind("#") + 1; + unsigned int end = url.tqfindRev(")"); d->helper->m_fillGradientReference = url.mid(start, end - start); } @@ -1315,7 +1315,7 @@ void KSVGIconPainter::setFillRule(const TQString &fillRule) d->helper->m_fillRule = fillRule; } -Q_UINT32 KSVGIconPainter::parseOpacity(const TQString &data) +TQ_UINT32 KSVGIconPainter::parseOpacity(const TQString &data) { int opacity = 255; @@ -2310,12 +2310,12 @@ void KSVGIconPainter::drawImage(double x, double y, TQImage &image) image = image.convertDepth(32); double affine[6]; - affine[0] = d->helper->m_worldMatrix->m11(); - affine[1] = d->helper->m_worldMatrix->m12(); - affine[2] = d->helper->m_worldMatrix->m21(); - affine[3] = d->helper->m_worldMatrix->m22(); + affine[0] = d->helper->m_tqworldMatrix->m11(); + affine[1] = d->helper->m_tqworldMatrix->m12(); + affine[2] = d->helper->m_tqworldMatrix->m21(); + affine[3] = d->helper->m_tqworldMatrix->m22(); // use the world matrix to convert the coordinates - d->helper->m_worldMatrix->map(x, y, &affine[4], &affine[5]); + d->helper->m_tqworldMatrix->map(x, y, &affine[4], &affine[5]); d->helper->art_rgba_rgba_affine(d->helper->m_buffer, 0, 0, d->helper->m_width, d->helper->m_height, d->helper->m_rowstride, image.bits(), image.width(), image.height(), @@ -2560,7 +2560,7 @@ TQColor KSVGIconPainter::parseColor(const TQString ¶m) return TQColor(245, 255, 250); else if(rgbColor == "mistyrose") return TQColor(255, 228, 225); - else if(rgbColor == "moccasin") + else if(rgbColor == "tqmoccasin") return TQColor(255, 228, 181); else if(rgbColor == "navajowhite") return TQColor(255, 222, 173); @@ -2753,7 +2753,7 @@ void KSVGIconPainter::addRadialGradientElement(ArtGradientRadial *gradient, TQDo d->helper->m_radialGradientElementMap.insert(gradient, element); } -Q_UINT32 KSVGIconPainter::toArtColor(const TQColor &color) +TQ_UINT32 KSVGIconPainter::toArtColor(const TQColor &color) { return d->helper->toArtColor(color); } diff --git a/kdecore/svgicons/ksvgiconpainter.h b/kdecore/svgicons/ksvgiconpainter.h index 9ba44d2cf..6b00d9d7c 100644 --- a/kdecore/svgicons/ksvgiconpainter.h +++ b/kdecore/svgicons/ksvgiconpainter.h @@ -41,7 +41,7 @@ public: TQImage *image(); - TQWMatrix *worldMatrix(); + TQWMatrix *tqworldMatrix(); void finish(); @@ -61,7 +61,7 @@ public: void setStrokeDashOffset(const TQString &dashOffset); void setStrokeDashArray(const TQString &dashes); - void setWorldMatrix(TQWMatrix *worldMatrix); + void setWorldMatrix(TQWMatrix *tqworldMatrix); void setClippingRect(int x, int y, int w, int h); void drawRectangle(double x, double y, double w, double h, double rx, double ry); @@ -73,8 +73,8 @@ public: void drawImage(double x, double y, TQImage &image); TQColor parseColor(const TQString ¶m); - Q_UINT32 toArtColor(const TQColor &color); - Q_UINT32 parseOpacity(const TQString &data); + TQ_UINT32 toArtColor(const TQColor &color); + TQ_UINT32 parseOpacity(const TQString &data); double toPixel(const TQString &s, bool hmode); double dpi(); diff --git a/kdecore/tests/kcalendartest.cpp b/kdecore/tests/kcalendartest.cpp index 51a40b892..8b6e8eea4 100644 --- a/kdecore/tests/kcalendartest.cpp +++ b/kdecore/tests/kcalendartest.cpp @@ -67,7 +67,7 @@ int main(int argc, char **argv) { option = args->getOption("date"); date = KGlobal::locale()->readDate(option); } else - date = TQDate::currentDate(); + date = TQDate::tqcurrentDate(); args->clear(); // Free up some memory. diff --git a/kdecore/tests/kconfigtestgui.cpp b/kdecore/tests/kconfigtestgui.cpp index abd476396..af560b496 100644 --- a/kdecore/tests/kconfigtestgui.cpp +++ b/kdecore/tests/kconfigtestgui.cpp @@ -121,7 +121,7 @@ KConfigTestView::KConfigTestView( TQWidget *parent, const char *name ) pQuitButton = new TQPushButton( this, "quitbutton" ); pQuitButton->setText( "Quit" ); pQuitButton->setGeometry( 340, 60, 60, 60 ); - connect( pQuitButton, TQT_SIGNAL(clicked()), qApp, TQT_SLOT(quit()) ); + connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) ); // create a default KConfig object in order to be able to start right away pConfig = new KConfig( TQString::null ); diff --git a/kdecore/tests/kconfigtestgui.h b/kdecore/tests/kconfigtestgui.h index 8311952b5..7655c8142 100644 --- a/kdecore/tests/kconfigtestgui.h +++ b/kdecore/tests/kconfigtestgui.h @@ -39,7 +39,7 @@ // KConfigTestView contains lots of Qt widgets. // -class KConfigTestView : public QDialog +class KConfigTestView : public TQDialog { Q_OBJECT public: diff --git a/kdecore/tests/kipctest.h b/kdecore/tests/kipctest.h index a8abd2e76..17122fbd8 100644 --- a/kdecore/tests/kipctest.h +++ b/kdecore/tests/kipctest.h @@ -3,7 +3,7 @@ #include <tqobject.h> -class MyObject: public QObject +class MyObject: public TQObject { Q_OBJECT public: diff --git a/kdecore/tests/klocaletest.cpp b/kdecore/tests/klocaletest.cpp index a980359b0..a81d867b1 100644 --- a/kdecore/tests/klocaletest.cpp +++ b/kdecore/tests/klocaletest.cpp @@ -53,7 +53,7 @@ Test::Test( TQWidget *parent, const char *name ) { setCaption("Testing KLocale"); - TQWidget *d = qApp->desktop(); + TQWidget *d = tqApp->desktop(); setGeometry((d->width()-320)>>1, (d->height()-160)>>1, 420, 420); createFields(); @@ -77,19 +77,19 @@ void Test::createFields() string+="Used language: "; string+=KGlobal::locale()->language()+"\n"; string+="Locale encoding: "; - string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n"; + string+=TQString::tqfromLatin1(KGlobal::locale()->encoding())+"\n"; string+="Localized date and time: "; - string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); + string+=KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); string+="\nLocalized monetary numbers: "; string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89); // This will not work // but you can copy other *.mo file string+="\nSome localized strings:\n"; - string+=TQString::fromLatin1("Yes = ")+i18n("Yes")+"\n"; - string+=TQString::fromLatin1("No = ")+i18n("No")+"\n"; - string+=TQString::fromLatin1("Help = ")+i18n("Help")+"\n"; - string+=TQString::fromLatin1("Cancel = ")+i18n("Cancel")+"\n"; + string+=TQString::tqfromLatin1("Yes = ")+i18n("Yes")+"\n"; + string+=TQString::tqfromLatin1("No = ")+i18n("No")+"\n"; + string+=TQString::tqfromLatin1("Help = ")+i18n("Help")+"\n"; + string+=TQString::tqfromLatin1("Cancel = ")+i18n("Cancel")+"\n"; label=new TQLabel(string,this,"Label"); label->setGeometry(10,10,400,400); @@ -102,9 +102,9 @@ int main( int argc, char ** argv ) KLocale::setMainCatalogue("kdelibs"); KApplication a( argc, argv, "klocaletest" ); - KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US")); - KGlobal::locale()->setCountry(TQString::fromLatin1("C")); - KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(",")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("en_US")); + KGlobal::locale()->setCountry(TQString::tqfromLatin1("C")); + KGlobal::locale()->setThousandsSeparator(TQString::tqfromLatin1(",")); TQString formatted; formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00"); @@ -152,8 +152,8 @@ int main( int argc, char ** argv ) TQDate date; date.setYMD( 2002, 5, 3 ); checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); - date = TQDate::currentDate(); - checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); + date = TQDate::tqcurrentDate(); + checkDate("readDate( TQDate::tqcurrentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) ); TQTime time; time = KGlobal::locale()->readTime( "11:22:33", &ok ); @@ -181,11 +181,11 @@ int main( int argc, char ** argv ) check("formatTime(\"0:22\", as duration)", timeStr, "00:22" ); kdDebug() << "setLanguage C\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("C")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("C")); kdDebug() << "C: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl; kdDebug() << "setLanguage de\n"; - KGlobal::locale()->setLanguage(TQString::fromLatin1("de")); + KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de")); kdDebug() << "de: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl; diff --git a/kdecore/tests/klocaletest.h b/kdecore/tests/klocaletest.h index f88cfc901..83f4f5cef 100644 --- a/kdecore/tests/klocaletest.h +++ b/kdecore/tests/klocaletest.h @@ -9,7 +9,7 @@ class TQLabel; /** test: a small test program for KLocale */ -class Test : public QWidget +class Test : public TQWidget { Q_OBJECT diff --git a/kdecore/tests/kmdcodectest.cpp b/kdecore/tests/kmdcodectest.cpp index 243d0d289..e74d6f4b4 100644 --- a/kdecore/tests/kmdcodectest.cpp +++ b/kdecore/tests/kmdcodectest.cpp @@ -192,15 +192,15 @@ void MD5_timeTrial () time_t endTime; time_t startTime; - Q_UINT8 block[TEST_BLOCK_LEN]; - Q_UINT32 i; + TQ_UINT8 block[TEST_BLOCK_LEN]; + TQ_UINT32 i; cout << "Timing test. Digesting " << TEST_BLOCK_COUNT << " blocks of " << TEST_BLOCK_LEN << "-byte..." << endl; // Initialize block for (i = 0; i < TEST_BLOCK_LEN; i++) - block[i] = (Q_UINT8)(i & 0xff); + block[i] = (TQ_UINT8)(i & 0xff); // Start timer time (&startTime); diff --git a/kdecore/tests/kprocesstest.h b/kdecore/tests/kprocesstest.h index 3e5d989ec..23ac443dd 100644 --- a/kdecore/tests/kprocesstest.h +++ b/kdecore/tests/kprocesstest.h @@ -15,7 +15,7 @@ #include <tqobject.h> #include "kprocess.h" -class Dummy : public QObject +class Dummy : public TQObject { Q_OBJECT diff --git a/kdecore/tests/kprociotest.h b/kdecore/tests/kprociotest.h index 6392fc708..9f948e644 100644 --- a/kdecore/tests/kprociotest.h +++ b/kdecore/tests/kprociotest.h @@ -15,7 +15,7 @@ #include <tqobject.h> #include "kprocio.h" -class Dummy : public QObject +class Dummy : public TQObject { Q_OBJECT diff --git a/kdecore/tests/kresolvertest.cpp b/kdecore/tests/kresolvertest.cpp index f1d3c11f9..1b2f5148d 100644 --- a/kdecore/tests/kresolvertest.cpp +++ b/kdecore/tests/kresolvertest.cpp @@ -75,8 +75,8 @@ public: bool tryLookup(const char* node, const char *serv) { int error; - TQString _node = TQString::fromLatin1(node); - TQString _serv = TQString::fromLatin1(serv); + TQString _node = TQString::tqfromLatin1(node); + TQString _serv = TQString::tqfromLatin1(serv); printf("\tTrying to lookup %s|%s... ", node, serv); TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, 0, &error); @@ -138,8 +138,8 @@ bool try_pton() bool tryLookup6(const char *node, const char *serv) { int error; - TQString _node = TQString::fromLatin1(node); - TQString _serv = TQString::fromLatin1(serv); + TQString _node = TQString::tqfromLatin1(node); + TQString _serv = TQString::tqfromLatin1(serv); printf("\tTrying to lookup IPv6 of %s|%s... ", node, serv); TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, KExtendedSocket::ipv6Socket, &error); diff --git a/kdecore/tests/ktimezonestest.cpp b/kdecore/tests/ktimezonestest.cpp index 650cc0512..69ea7c8a1 100644 --- a/kdecore/tests/ktimezonestest.cpp +++ b/kdecore/tests/ktimezonestest.cpp @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) // Find the current offset of the UTC timezone. timezone = timezones.zone("UTC"); - printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::currentDateTime()) ); + printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::tqcurrentDateTime()) ); // Find some offsets for Europe/London. char *london = "Europe/London"; diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp index f8f8c34f1..64298c273 100644 --- a/kded/kbuildservicefactory.cpp +++ b/kded/kbuildservicefactory.cpp @@ -67,7 +67,7 @@ KSycocaEntry * KBuildServiceFactory::createEntry( const TQString& file, const char *resource ) { TQString name = file; - int pos = name.findRev('/'); + int pos = name.tqfindRev('/'); if (pos != -1) { name = name.mid(pos+1); @@ -101,11 +101,11 @@ KBuildServiceFactory::saveHeader(TQDataStream &str) { KSycocaFactory::saveHeader(str); - str << (Q_INT32) m_nameDictOffset; - str << (Q_INT32) m_relNameDictOffset; - str << (Q_INT32) m_offerListOffset; - str << (Q_INT32) m_initListOffset; - str << (Q_INT32) m_menuIdDictOffset; + str << (TQ_INT32) m_nameDictOffset; + str << (TQ_INT32) m_relNameDictOffset; + str << (TQ_INT32) m_offerListOffset; + str << (TQ_INT32) m_initListOffset; + str << (TQ_INT32) m_menuIdDictOffset; } void @@ -113,32 +113,32 @@ KBuildServiceFactory::save(TQDataStream &str) { KSycocaFactory::save(str); - m_nameDictOffset = str.device()->at(); + m_nameDictOffset = str.tqdevice()->at(); m_nameDict->save(str); - m_relNameDictOffset = str.device()->at(); + m_relNameDictOffset = str.tqdevice()->at(); m_relNameDict->save(str); saveOfferList(str); saveInitList(str); - m_menuIdDictOffset = str.device()->at(); + m_menuIdDictOffset = str.tqdevice()->at(); m_menuIdDict->save(str); - int endOfFactoryData = str.device()->at(); + int endOfFactoryData = str.tqdevice()->at(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.device()->at(endOfFactoryData); + str.tqdevice()->at(endOfFactoryData); } void KBuildServiceFactory::saveOfferList(TQDataStream &str) { - m_offerListOffset = str.device()->at(); + m_offerListOffset = str.tqdevice()->at(); bool isNumber; for(TQDictIterator<KSycocaEntry::Ptr> itserv ( *m_entryDict ); @@ -190,18 +190,18 @@ KBuildServiceFactory::saveOfferList(TQDataStream &str) it2 != services.end(); ++it2) { KService *service = *it2; - str << (Q_INT32) entry->offset(); - str << (Q_INT32) service->offset(); + str << (TQ_INT32) entry->offset(); + str << (TQ_INT32) service->offset(); } } - str << (Q_INT32) 0; // End of list marker (0) + str << (TQ_INT32) 0; // End of list marker (0) } void KBuildServiceFactory::saveInitList(TQDataStream &str) { - m_initListOffset = str.device()->at(); + m_initListOffset = str.tqdevice()->at(); KService::List initList; @@ -215,19 +215,19 @@ KBuildServiceFactory::saveInitList(TQDataStream &str) initList.append(service); } } - str << (Q_INT32) initList.count(); // Nr of init services. + str << (TQ_INT32) initList.count(); // Nr of init services. for(KService::List::Iterator it = initList.begin(); it != initList.end(); ++it) { - str << (Q_INT32) (*it)->offset(); + str << (TQ_INT32) (*it)->offset(); } } void KBuildServiceFactory::addEntry(KSycocaEntry *newEntry, const char *resource) { - if (m_dupeDict.find(newEntry)) + if (m_dupeDict.tqfind(newEntry)) return; KSycocaFactory::addEntry(newEntry, resource); @@ -244,7 +244,7 @@ KBuildServiceFactory::addEntry(KSycocaEntry *newEntry, const char *resource) TQString name = service->desktopEntryName(); m_nameDict->add( name, newEntry ); - m_serviceDict.replace(name, service); + m_serviceDict.tqreplace(name, service); TQString relName = service->desktopEntryPath(); m_relNameDict->add( relName, newEntry ); diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp index e75931182..a992b885d 100644 --- a/kded/kbuildservicegroupfactory.cpp +++ b/kded/kbuildservicegroupfactory.cpp @@ -59,7 +59,7 @@ KBuildServiceGroupFactory::createEntry( const TQString&, const char * ) void KBuildServiceGroupFactory::addNewEntryTo( const TQString &menuName, KService *newEntry) { KServiceGroup *entry = 0; - KSycocaEntry::Ptr *ptr = m_entryDict->find(menuName); + KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(menuName); if (ptr) entry = dynamic_cast<KServiceGroup *>(ptr->data()); @@ -74,7 +74,7 @@ void KBuildServiceGroupFactory::addNewEntryTo( const TQString &menuName, KServic KServiceGroup * KBuildServiceGroupFactory::addNew( const TQString &menuName, const TQString& file, KServiceGroup *entry, bool isDeleted) { - KSycocaEntry::Ptr *ptr = m_entryDict->find(menuName); + KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(menuName); if (ptr) { kdWarning(7021) << "KBuildServiceGroupFactory::addNew( " << menuName << ", " << file << " ): menu already exists!" << endl; @@ -94,14 +94,14 @@ KBuildServiceGroupFactory::addNew( const TQString &menuName, const TQString& fil // Make sure parent dir exists. KServiceGroup *parentEntry = 0; TQString parent = menuName.left(menuName.length()-1); - int i = parent.findRev('/'); + int i = parent.tqfindRev('/'); if (i > 0) { parent = parent.left(i+1); } else { parent = "/"; } parentEntry = 0; - ptr = m_entryDict->find(parent); + ptr = m_entryDict->tqfind(parent); if (ptr) parentEntry = dynamic_cast<KServiceGroup *>(ptr->data()); if (!parentEntry) @@ -123,7 +123,7 @@ KBuildServiceGroupFactory::addNewChild( const TQString &parent, const char *reso TQString name = "#parent#"+parent; KServiceGroup *entry = 0; - KSycocaEntry::Ptr *ptr = m_entryDict->find(name); + KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(name); if (ptr) entry = dynamic_cast<KServiceGroup *>(ptr->data()); @@ -157,7 +157,7 @@ KBuildServiceGroupFactory::saveHeader(TQDataStream &str) { KSycocaFactory::saveHeader(str); - str << (Q_INT32) m_baseGroupDictOffset; + str << (TQ_INT32) m_baseGroupDictOffset; } void @@ -165,14 +165,14 @@ KBuildServiceGroupFactory::save(TQDataStream &str) { KSycocaFactory::save(str); - m_baseGroupDictOffset = str.device()->at(); + m_baseGroupDictOffset = str.tqdevice()->at(); m_baseGroupDict->save(str); - int endOfFactoryData = str.device()->at(); + int endOfFactoryData = str.tqdevice()->at(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.device()->at(endOfFactoryData); + str.tqdevice()->at(endOfFactoryData); } diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp index b5259c5cd..c6a386aca 100644 --- a/kded/kbuildservicetypefactory.cpp +++ b/kded/kbuildservicetypefactory.cpp @@ -69,7 +69,7 @@ KSycocaEntry * KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource) { TQString name = file; - int pos = name.findRev('/'); + int pos = name.tqfindRev('/'); if (pos != -1) { name = name.mid(pos+1); @@ -133,14 +133,14 @@ void KBuildServiceTypeFactory::saveHeader(TQDataStream &str) { KSycocaFactory::saveHeader(str); - str << (Q_INT32) m_fastPatternOffset; - str << (Q_INT32) m_otherPatternOffset; - str << (Q_INT32) m_propertyTypeDict.count(); + str << (TQ_INT32) m_fastPatternOffset; + str << (TQ_INT32) m_otherPatternOffset; + str << (TQ_INT32) m_propertyTypeDict.count(); TQMapIterator<TQString, int> it; for (it = m_propertyTypeDict.begin(); it != m_propertyTypeDict.end(); ++it) { - str << it.key() << (Q_INT32)it.data(); + str << it.key() << (TQ_INT32)it.data(); } } @@ -152,13 +152,13 @@ KBuildServiceTypeFactory::save(TQDataStream &str) savePatternLists(str); - int endOfFactoryData = str.device()->at(); + int endOfFactoryData = str.tqdevice()->at(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.device()->at(endOfFactoryData); + str.tqdevice()->at(endOfFactoryData); } void @@ -183,8 +183,8 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str) for ( ; patit != pat.end() ; ++patit ) { const TQString &pattern = *patit; - if ( pattern.findRev('*') == 0 - && pattern.findRev('.') == 1 + if ( pattern.tqfindRev('*') == 0 + && pattern.tqfindRev('.') == 1 && pattern.length() <= 6 ) // it starts with "*.", has no other '*' and no other '.', and is max 6 chars // => fast patttern @@ -193,20 +193,20 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str) otherPatterns.append( pattern ); // Assumption : there is only one mimetype for that pattern // It doesn't really make sense otherwise, anyway. - dict.replace( pattern, mimeType ); + dict.tqreplace( pattern, mimeType ); } } } // Sort the list - the fast one, useless for the other one fastPatterns.sort(); - Q_INT32 entrySize = 0; - Q_INT32 nrOfEntries = 0; + TQ_INT32 entrySize = 0; + TQ_INT32 nrOfEntries = 0; - m_fastPatternOffset = str.device()->at(); + m_fastPatternOffset = str.tqdevice()->at(); // Write out fastPatternHeader (Pass #1) - str.device()->at(m_fastPatternOffset); + str.tqdevice()->at(m_fastPatternOffset); str << nrOfEntries; str << entrySize; @@ -214,27 +214,27 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str) TQStringList::ConstIterator it = fastPatterns.begin(); for ( ; it != fastPatterns.end() ; ++it ) { - int start = str.device()->at(); + int start = str.tqdevice()->at(); // Justify to 6 chars with spaces, so that the size remains constant // in the database file. TQString paddedPattern = (*it).leftJustify(6).right(4); // remove leading "*." //kdDebug(7021) << TQString("FAST : '%1' '%2'").arg(paddedPattern).arg(dict[(*it)]->name()) << endl; str << paddedPattern; str << dict[(*it)]->offset(); - entrySize = str.device()->at() - start; + entrySize = str.tqdevice()->at() - start; nrOfEntries++; } // store position - m_otherPatternOffset = str.device()->at(); + m_otherPatternOffset = str.tqdevice()->at(); // Write out fastPatternHeader (Pass #2) - str.device()->at(m_fastPatternOffset); + str.tqdevice()->at(m_fastPatternOffset); str << nrOfEntries; str << entrySize; // For the other patterns - str.device()->at(m_otherPatternOffset); + str.tqdevice()->at(m_otherPatternOffset); it = otherPatterns.begin(); for ( ; it != otherPatterns.end() ; ++it ) @@ -267,7 +267,7 @@ KBuildServiceTypeFactory::addEntry(KSycocaEntry *newEntry, const char *resource) TQMap<TQString,TQVariant::Type>::ConstIterator pit = pd.begin(); for( ; pit != pd.end(); ++pit ) { - if (!m_propertyTypeDict.contains(pit.key())) + if (!m_propertyTypeDict.tqcontains(pit.key())) m_propertyTypeDict.insert(pit.key(), pit.data()); else if (m_propertyTypeDict[pit.key()] != pit.data()) kdWarning(7021) << "Property '"<< pit.key() << "' is defined multiple times ("<< serviceType->name() <<")" <<endl; diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index 9df927ca8..58585f19a 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -68,13 +68,13 @@ typedef TQDict<KSycocaEntry> KBSEntryDict; typedef TQValueList<KSycocaEntry::List> KSycocaEntryListList; -static Q_UINT32 newTimestamp = 0; +static TQ_UINT32 newTimestamp = 0; static KBuildServiceFactory *g_bsf = 0; static KBuildServiceGroupFactory *g_bsgf = 0; static KSycocaFactory *g_factory = 0; static KCTimeInfo *g_ctimeInfo = 0; -static TQDict<Q_UINT32> *g_ctimeDict = 0; +static TQDict<TQ_UINT32> *g_ctimeDict = 0; static const char *g_resource = 0; static KBSEntryDict *g_entryDict = 0; static KBSEntryDict *g_serviceGroupEntryDict = 0; @@ -160,12 +160,12 @@ void KBuildSycoca::processGnomeVfs() if (line[0] != '\t') { - app = TQString::fromLatin1(line); + app = TQString::tqfromLatin1(line); app.truncate(app.length()-1); } else if (strncmp(line+1, "mime_types=", 11) == 0) { - TQString mimetypes = TQString::fromLatin1(line+12); + TQString mimetypes = TQString::tqfromLatin1(line+12); mimetypes.truncate(mimetypes.length()-1); mimetypes.replace(TQRegExp("\\*"), "all"); KService *s = g_bsf->findServiceByName(app); @@ -186,7 +186,7 @@ void KBuildSycoca::processGnomeVfs() KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory) { - Q_UINT32 timeStamp = g_ctimeInfo->ctime(file); + TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file); if (!timeStamp) { timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, file, true); @@ -195,23 +195,23 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory) if (g_allEntries) { assert(g_ctimeDict); - Q_UINT32 *timeP = (*g_ctimeDict)[file]; - Q_UINT32 oldTimestamp = timeP ? *timeP : 0; + TQ_UINT32 *timeP = (*g_ctimeDict)[file]; + TQ_UINT32 oldTimestamp = timeP ? *timeP : 0; if (timeStamp && (timeStamp == oldTimestamp)) { // Re-use old entry if (g_factory == g_bsgf) // Strip .directory from service-group entries { - entry = g_entryDict->find(file.left(file.length()-10)); + entry = g_entryDict->tqfind(file.left(file.length()-10)); } else if (g_factory == g_bsf) { - entry = g_entryDict->find(file); + entry = g_entryDict->tqfind(file); } else { - entry = g_entryDict->find(file); + entry = g_entryDict->tqfind(file); } // remove from g_ctimeDict; if g_ctimeDict is not empty // after all files have been processed, it means @@ -300,7 +300,7 @@ bool KBuildSycoca::build() ++it1 ) { KSycocaResource res = (*it1); - if (!allResources.contains(res.resource)) + if (!allResources.tqcontains(res.resource)) allResources.append(res.resource); } } @@ -414,7 +414,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM TQString directoryFile = subMenu->directoryFile; if (directoryFile.isEmpty()) directoryFile = subName+".directory"; - Q_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile); + TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile); if (!timeStamp) { timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true); @@ -423,12 +423,12 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM KServiceGroup* entry = 0; if (g_allEntries) { - Q_UINT32 *timeP = (*g_ctimeDict)[directoryFile]; - Q_UINT32 oldTimestamp = timeP ? *timeP : 0; + TQ_UINT32 *timeP = (*g_ctimeDict)[directoryFile]; + TQ_UINT32 oldTimestamp = timeP ? *timeP : 0; if (timeStamp && (timeStamp == oldTimestamp)) { - entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->find(subName)); + entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->tqfind(subName)); if (entry && (entry->directoryEntryPath() != directoryFile)) entry = 0; // Can't reuse this one! } @@ -500,7 +500,7 @@ bool KBuildSycoca::recreate() if( build()) // Parse dirs { save(); // Save database - if (m_str->device()->status()) + if (m_str->tqdevice()->status()) database->abort(); // Error m_str = 0L; if (!database->close()) @@ -541,17 +541,17 @@ bool KBuildSycoca::recreate() void KBuildSycoca::save() { // Write header (#pass 1) - m_str->device()->at(0); + m_str->tqdevice()->at(0); - (*m_str) << (Q_INT32) KSycoca::version(); + (*m_str) << (TQ_INT32) KSycoca::version(); KSycocaFactory * servicetypeFactory = 0L; KSycocaFactory * serviceFactory = 0L; for(KSycocaFactory *factory = m_lstFactories->first(); factory; factory = m_lstFactories->next()) { - Q_INT32 aId; - Q_INT32 aOffset; + TQ_INT32 aId; + TQ_INT32 aOffset; aId = factory->factoryId(); if ( aId == KST_KServiceTypeFactory ) servicetypeFactory = factory; @@ -561,7 +561,7 @@ void KBuildSycoca::save() (*m_str) << aId; (*m_str) << aOffset; } - (*m_str) << (Q_INT32) 0; // No more factories. + (*m_str) << (TQ_INT32) 0; // No more factories. // Write KDEDIRS (*m_str) << KGlobal::dirs()->kfsstnd_prefixes(); (*m_str) << newTimestamp; @@ -575,31 +575,31 @@ void KBuildSycoca::save() factory = m_lstFactories->next()) { factory->save(*m_str); - if (m_str->device()->status()) + if (m_str->tqdevice()->status()) return; // error } - int endOfData = m_str->device()->at(); + int endOfData = m_str->tqdevice()->at(); // Write header (#pass 2) - m_str->device()->at(0); + m_str->tqdevice()->at(0); - (*m_str) << (Q_INT32) KSycoca::version(); + (*m_str) << (TQ_INT32) KSycoca::version(); for(KSycocaFactory *factory = m_lstFactories->first(); factory; factory = m_lstFactories->next()) { - Q_INT32 aId; - Q_INT32 aOffset; + TQ_INT32 aId; + TQ_INT32 aOffset; aId = factory->factoryId(); aOffset = factory->offset(); (*m_str) << aId; (*m_str) << aOffset; } - (*m_str) << (Q_INT32) 0; // No more factories. + (*m_str) << (TQ_INT32) 0; // No more factories. // Jump to end of database - m_str->device()->at(endOfData); + m_str->tqdevice()->at(endOfData); } bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime& stamp, bool top ) @@ -614,11 +614,11 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime } } TQDir dir( dirname ); - const QFileInfoList *list = dir.entryInfoList( TQDir::DefaultFilter, TQDir::Unsorted ); + const TQFileInfoList *list = dir.entryInfoList( TQDir::DefaultFilter, TQDir::Unsorted ); if (!list) return true; - for( QFileInfoListIterator it( *list ); + for( TQFileInfoListIterator it( *list ); it.current() != NULL; ++it ) { @@ -640,7 +640,7 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime // and also their directories // if all of them all older than the timestamp in file ksycocastamp, this // means that there's no need to rebuild ksycoca -bool KBuildSycoca::checkTimestamps( Q_UINT32 timestamp, const TQStringList &dirs ) +bool KBuildSycoca::checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs ) { kdDebug( 7021 ) << "checking file timestamps" << endl; TQDateTime stamp; @@ -806,8 +806,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KSycoca::self()->disableAutoRebuild(); // Prevent deadlock TQString current_language = KGlobal::locale()->language(); TQString ksycoca_language = KSycoca::self()->language(); - Q_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); - Q_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature(); + TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); + TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature(); if ((current_update_sig != ksycoca_update_sig) || (current_language != ksycoca_language) || @@ -822,7 +822,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) g_changeList = new TQStringList; bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles; - Q_UINT32 filestamp = 0; + TQ_UINT32 filestamp = 0; TQStringList oldresourcedirs; if( checkstamps && incremental ) { @@ -859,7 +859,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) cSycocaPath = 0; } - newTimestamp = (Q_UINT32) time(0); + newTimestamp = (TQ_UINT32) time(0); if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs ))) { @@ -874,7 +874,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KSycoca *oldSycoca = KSycoca::self(); KSycocaFactoryList *factories = new KSycocaFactoryList; g_allEntries = new KSycocaEntryListList; - g_ctimeDict = new TQDict<Q_UINT32>(523); + g_ctimeDict = new TQDict<TQ_UINT32>(523); // Must be in same order as in KBuildSycoca::recreate()! factories->append( new KServiceTypeFactory ); diff --git a/kded/kbuildsycoca.h b/kded/kbuildsycoca.h index 0f90c3df6..f98001781 100644 --- a/kded/kbuildsycoca.h +++ b/kded/kbuildsycoca.h @@ -47,7 +47,7 @@ public: */ bool recreate(); - static bool checkTimestamps( Q_UINT32 timestamp, const TQStringList &dirs ); + static bool checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs ); static TQStringList existingResourceDirs(); diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp index 25d78bab0..f268889c4 100644 --- a/kded/kctimefactory.cpp +++ b/kded/kctimefactory.cpp @@ -53,47 +53,47 @@ KCTimeInfo::save(TQDataStream &str) { KSycocaFactory::save(str); - m_dictOffset = str.device()->at(); - TQDictIterator<Q_UINT32> it(ctimeDict); + m_dictOffset = str.tqdevice()->at(); + TQDictIterator<TQ_UINT32> it(ctimeDict); while( it.current()) { str << it.currentKey() << *(it.current()); ++it; } - str << TQString::null << (Q_UINT32) 0; + str << TQString::null << (TQ_UINT32) 0; - int endOfFactoryData = str.device()->at(); + int endOfFactoryData = str.tqdevice()->at(); saveHeader(str); - str.device()->at(endOfFactoryData); + str.tqdevice()->at(endOfFactoryData); } void -KCTimeInfo::addCTime(const TQString &path, Q_UINT32 ctime) +KCTimeInfo::addCTime(const TQString &path, TQ_UINT32 ctime) { assert(!path.isEmpty()); - ctimeDict.replace(path, new Q_UINT32(ctime)); + ctimeDict.tqreplace(path, new TQ_UINT32(ctime)); } -Q_UINT32 +TQ_UINT32 KCTimeInfo::ctime(const TQString &path) { - Q_UINT32 *ctimeP = ctimeDict[path]; + TQ_UINT32 *ctimeP = ctimeDict[path]; return ctimeP ? *ctimeP : 0; } void -KCTimeInfo::fillCTimeDict(TQDict<Q_UINT32> &dict) +KCTimeInfo::fillCTimeDict(TQDict<TQ_UINT32> &dict) { assert(m_str); - m_str->device()->at(m_dictOffset); + m_str->tqdevice()->at(m_dictOffset); TQString path; - Q_UINT32 ctime; + TQ_UINT32 ctime; while(true) { KSycocaEntry::read(*m_str, path); (*m_str) >> ctime; if (path.isEmpty()) break; - dict.replace(path, new Q_UINT32(ctime)); + dict.tqreplace(path, new TQ_UINT32(ctime)); } } diff --git a/kded/kctimefactory.h b/kded/kctimefactory.h index b878b3033..64cfe6c19 100644 --- a/kded/kctimefactory.h +++ b/kded/kctimefactory.h @@ -50,14 +50,14 @@ public: KSycocaEntry * createEntry(const TQString &, const char *) { return 0; } KSycocaEntry * createEntry(int) { return 0; } - void addCTime(const TQString &path, Q_UINT32 ctime); + void addCTime(const TQString &path, TQ_UINT32 ctime); - Q_UINT32 ctime(const TQString &path); + TQ_UINT32 ctime(const TQString &path); - void fillCTimeDict(TQDict<Q_UINT32> &dict); + void fillCTimeDict(TQDict<TQ_UINT32> &dict); protected: - TQDict<Q_UINT32> ctimeDict; + TQDict<TQ_UINT32> ctimeDict; int m_dictOffset; }; diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp index 89ee5a857..873ce154d 100644 --- a/kded/kde-menu.cpp +++ b/kded/kde-menu.cpp @@ -96,7 +96,7 @@ static void findMenuEntry(KServiceGroup::Ptr parent, const TQString &name, const DCOPRef kicker( "kicker", "kicker" ); bool result = kicker.call( "highlightMenuItem", menuId ); if (!result) - error(3, i18n("Menu item '%1' could not be highlighted.").arg(menuId).local8Bit()); + error(3, TQString(i18n("Menu item '%1' could not be highlighted.").arg(menuId)).local8Bit()); } exit(0); } diff --git a/kded/kded.cpp b/kded/kded.cpp index d33bfc6b3..7f8ec9121 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -247,7 +247,7 @@ void Kded::noDemandLoad(const TQString &obj) KDEDModule *Kded::loadModule(const TQCString &obj, bool onDemand) { - KDEDModule *module = m_modules.find(obj); + KDEDModule *module = m_modules.tqfind(obj); if (module) return module; KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop"); @@ -260,7 +260,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand) if (s && !s->library().isEmpty()) { TQCString obj = s->desktopEntryName().latin1(); - KDEDModule *oldModule = m_modules.find(obj); + KDEDModule *oldModule = m_modules.tqfind(obj); if (oldModule) return oldModule; @@ -374,7 +374,7 @@ void Kded::slotApplicationRemoved(const TQCString &appId) it.current()->removeAll(appId); } - TQValueList<long> *windowIds = m_windowIdList.find(appId); + TQValueList<long> *windowIds = m_windowIdList.tqfind(appId); if (windowIds) { for( TQValueList<long>::ConstIterator it = windowIds->begin(); @@ -428,7 +428,7 @@ void Kded::updateResourceList() it != dirs.end(); ++it ) { - if (m_allResourceDirs.find(*it) == m_allResourceDirs.end()) + if (m_allResourceDirs.tqfind(*it) == m_allResourceDirs.end()) { m_allResourceDirs.append(*it); readDirectory(*it); @@ -577,7 +577,7 @@ void Kded::readDirectory( const TQString& _path ) if ( !d.exists() ) // exists&isdir? { - kdDebug(7020) << TQString("Does not exist! (%1)").arg(_path) << endl; + kdDebug(7020) << TQString(TQString("Does not exist! (%1)").arg(_path)) << endl; return; // return false } @@ -603,18 +603,18 @@ void Kded::readDirectory( const TQString& _path ) bool Kded::isWindowRegistered(long windowId) { - return m_globalWindowIdList.find(windowId) != 0; + return m_globalWindowIdList.tqfind(windowId) != 0; } // DCOP void Kded::registerWindowId(long windowId) { - m_globalWindowIdList.replace(windowId, &windowId); + m_globalWindowIdList.tqreplace(windowId, &windowId); TQCString sender = callingDcopClient()->senderId(); if( sender.isEmpty()) // local call sender = callingDcopClient()->appId(); - TQValueList<long> *windowIds = m_windowIdList.find(sender); + TQValueList<long> *windowIds = m_windowIdList.tqfind(sender); if (!windowIds) { windowIds = new TQValueList<long>; @@ -636,7 +636,7 @@ void Kded::unregisterWindowId(long windowId) TQCString sender = callingDcopClient()->senderId(); if( sender.isEmpty()) // local call sender = callingDcopClient()->appId(); - TQValueList<long> *windowIds = m_windowIdList.find(sender); + TQValueList<long> *windowIds = m_windowIdList.tqfind(sender); if (windowIds) { windowIds->remove(windowId); diff --git a/kded/kded.h b/kded/kded.h index 1b6ebe481..b30549083 100644 --- a/kded/kded.h +++ b/kded/kded.h @@ -173,7 +173,7 @@ private: static Kded *_self; }; -class KUpdateD : public QObject +class KUpdateD : public TQObject { Q_OBJECT public: @@ -200,7 +200,7 @@ private: TQTimer* m_pTimer; }; -class KHostnameD : public QObject +class KHostnameD : public TQObject { Q_OBJECT public: diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp index ca28a5c62..426ec21da 100644 --- a/kded/kdedmodule.cpp +++ b/kded/kdedmodule.cpp @@ -69,14 +69,14 @@ void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj // appKey acts as a placeholder KEntryKey appKey(app, 0); - d->objMap->replace(appKey, 0); + d->objMap->tqreplace(appKey, 0); KEntryKey indexKey(app, key); // Prevent deletion in case the same object is inserted again. KSharedPtr<KShared> _obj = obj; - d->objMap->replace(indexKey, _obj); + d->objMap->tqreplace(indexKey, _obj); resetIdle(); } diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 0fa837a2c..4965ae684 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -82,7 +82,7 @@ KHostName::KHostName() display = ::getenv("DISPLAY"); // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); if (display.isEmpty()) { fprintf(stderr, "%s", i18n("Error: DISPLAY environment variable not set.\n").local8Bit().data()); @@ -145,14 +145,14 @@ void KHostName::changeX() TQCString authName = entries[1]; TQCString authKey = entries[2]; - int i = netId.findRev(':'); + int i = netId.tqfindRev(':'); if (i == -1) continue; TQCString netDisplay = netId.mid(i); if (netDisplay != display) continue; - i = netId.find('/'); + i = netId.tqfind('/'); if (i == -1) continue; @@ -208,7 +208,7 @@ void KHostName::changeDcop() if (!newName.isEmpty()) { - int i = line1.findRev(':'); + int i = line1.tqfindRev(':'); if (i == -1) { fprintf(stderr, "Warning: File '%s' has unexpected format.\n", fname.data()); @@ -299,8 +299,8 @@ void KHostName::changeDcop() void KHostName::changeStdDirs(const TQCString &type) { // We make links to the old dirs cause we can't delete the old dirs. - TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type).arg(oldName)); - TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type).arg(newName)); + TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type.data()).arg(oldName.data())); + TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type.data()).arg(newName.data())); KDE_struct_stat st_buf; @@ -340,7 +340,7 @@ void KHostName::changeSessionManager() fprintf(stderr, "Warning: No session management specified.\n"); return; } - int i = sm.findRev(':'); + int i = sm.tqfindRev(':'); if ((i == -1) || (sm.left(6) != "local/")) { fprintf(stderr, "Warning: Session Management socket '%s' has unexpected format.\n", sm.data()); diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index b48662cb2..c2321cf39 100644 --- a/kded/vfolder_menu.cpp +++ b/kded/vfolder_menu.cpp @@ -39,7 +39,7 @@ static void foldNode(TQDomElement &docElem, TQDomElement &e, TQMap<TQString,TQDo { if (s.isEmpty()) s = e.text(); - TQMap<TQString,TQDomElement>::iterator it = dupeList.find(s); + TQMap<TQString,TQDomElement>::iterator it = dupeList.tqfind(s); if (it != dupeList.end()) { kdDebug(7021) << e.tagName() << " and " << s << " requires combining!" << endl; @@ -69,7 +69,7 @@ static void replaceNode(TQDomElement &docElem, TQDomNode &n, const TQStringList void VFolderMenu::registerFile(const TQString &file) { - int i = file.findRev('/'); + int i = file.tqfindRev('/'); if (i < 0) return; @@ -108,8 +108,8 @@ TQStringList VFolderMenu::allDirectories() static void track(const TQString &menuId, const TQString &menuName, TQDict<KService> *includeList, TQDict<KService> *excludeList, TQDict<KService> *itemList, const TQString &comment) { - if (itemList->find(menuId)) - printf("%s: %s INCL %d EXCL %d\n", menuName.latin1(), comment.latin1(), includeList->find(menuId) ? 1 : 0, excludeList->find(menuId) ? 1 : 0); + if (itemList->tqfind(menuId)) + printf("%s: %s INCL %d EXCL %d\n", menuName.latin1(), comment.latin1(), includeList->tqfind(menuId) ? 1 : 0, excludeList->tqfind(menuId) ? 1 : 0); } void @@ -117,7 +117,7 @@ VFolderMenu::includeItems(TQDict<KService> *items1, TQDict<KService> *items2) { for(TQDictIterator<KService> it(*items2); it.current(); ++it) { - items1->replace(it.current()->menuId(), it.current()); + items1->tqreplace(it.current()->menuId(), it.current()); } } @@ -128,7 +128,7 @@ VFolderMenu::matchItems(TQDict<KService> *items1, TQDict<KService> *items2) { TQString id = it.current()->menuId(); ++it; - if (!items2->find(id)) + if (!items2->tqfind(id)) items1->remove(id); } } @@ -145,7 +145,7 @@ VFolderMenu::excludeItems(TQDict<KService> *items1, TQDict<KService> *items2) VFolderMenu::SubMenu* VFolderMenu::takeSubMenu(SubMenu *parentMenu, const TQString &menuName) { - int i = menuName.find('/'); + int i = menuName.tqfind('/'); TQString s1 = i > 0 ? menuName.left(i) : menuName; TQString s2 = menuName.mid(i+1); @@ -231,7 +231,7 @@ VFolderMenu::mergeMenu(SubMenu *menu1, SubMenu *menu2, bool reversePriority) void VFolderMenu::insertSubMenu(SubMenu *parentMenu, const TQString &menuName, SubMenu *newMenu, bool reversePriority) { - int i = menuName.find('/'); + int i = menuName.tqfind('/'); TQString s1 = menuName.left(i); TQString s2 = menuName.mid(i+1); @@ -271,12 +271,12 @@ VFolderMenu::insertSubMenu(SubMenu *parentMenu, const TQString &menuName, SubMen void VFolderMenu::insertService(SubMenu *parentMenu, const TQString &name, KService *newService) { - int i = name.find('/'); + int i = name.tqfind('/'); if (i == -1) { // Add it here - parentMenu->items.replace(newService->menuId(), newService); + parentMenu->items.tqreplace(newService->menuId(), newService); return; } @@ -324,7 +324,7 @@ VFolderMenu::~VFolderMenu() for(appsInfo *info = m_appsInfoStack.first(); \ info; info = m_appsInfoStack.next()) \ { \ - KService::List *list = info->dictCategories.find(category); \ + KService::List *list = info->dictCategories.tqfind(category); \ if (list) for(KService::List::ConstIterator it = list->begin(); \ it != list->end(); ++it) \ { @@ -336,7 +336,7 @@ VFolderMenu::findApplication(const TQString &relPath) for(appsInfo *info = m_appsInfoStack.first(); info; info = m_appsInfoStack.next()) { - KService *s = info->applications.find(relPath); + KService *s = info->applications.tqfind(relPath); if (s) return s; } @@ -347,7 +347,7 @@ void VFolderMenu::addApplication(const TQString &id, KService *service) { service->setMenuId(id); - m_appsInfo->applications.replace(id, service); + m_appsInfo->applications.tqreplace(id, service); } void @@ -364,7 +364,7 @@ VFolderMenu::buildApplicationIndex(bool unusedOnly) KService *s = it.current(); TQDictIterator<KService> tmpIt = it; ++it; - if (unusedOnly && m_usedAppsDict.find(s->menuId())) + if (unusedOnly && m_usedAppsDict.tqfind(s->menuId())) { // Remove and skip this one info->applications.remove(tmpIt.currentKey()); @@ -376,7 +376,7 @@ VFolderMenu::buildApplicationIndex(bool unusedOnly) it2 != cats.end(); ++it2) { const TQString &cat = *it2; - KService::List *list = info->dictCategories.find(cat); + KService::List *list = info->dictCategories.tqfind(cat); if (!list) { list = new KService::List(); @@ -428,7 +428,7 @@ VFolderMenu::unloadAppsInfo() m_appsInfo = 0; } -QString +TQString VFolderMenu::absoluteDir(const TQString &_dir, const TQString &baseDir, bool keepRelativeToCfg) { TQString dir = _dir; @@ -471,7 +471,7 @@ static void tagBasePath(TQDomDocument &doc, const TQString &tag, const TQString } } -QDomDocument +TQDomDocument VFolderMenu::loadDoc() { TQDomDocument doc; @@ -603,7 +603,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name) else if( e.tagName() == "Menu") { TQString name; mergeMenus(e, name); - TQMap<TQString,TQDomElement>::iterator it = menuNodes.find(name); + TQMap<TQString,TQDomElement>::iterator it = menuNodes.tqfind(name); if (it != menuNodes.end()) { TQDomElement docElem2 = *it; @@ -719,7 +719,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir) return; } int i; - i = baseName.findRev('/'); + i = baseName.tqfindRev('/'); if (i > 0) { m_docInfo.baseDir = baseName.left(i+1); @@ -739,7 +739,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir m_docInfo.baseDir = baseDir; - TQString fileName = basePath.mid(basePath.findRev('/')+1); + TQString fileName = basePath.mid(basePath.tqfindRev('/')+1); m_docInfo.baseName = fileName.left( fileName.length() - 5 ); TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName); @@ -762,7 +762,7 @@ VFolderMenu::popDocInfo() m_docInfo = m_docInfoStack.pop(); } -QString +TQString VFolderMenu::locateMenuFile(const TQString &fileName) { if (!TQDir::isRelativePath(fileName)) @@ -800,7 +800,7 @@ VFolderMenu::locateMenuFile(const TQString &fileName) return result; } -QString +TQString VFolderMenu::locateDirectoryFile(const TQString &fileName) { if (fileName.isEmpty()) @@ -937,7 +937,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items) FOR_ALL_APPLICATIONS(it) { KService *s = it.current(); - items->replace(s->menuId(), s); + items->tqreplace(s->menuId(), s); } FOR_ALL_APPLICATIONS_END @@ -958,7 +958,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items) FOR_CATEGORY(domElem.text(), it) { KService *s = *it; - items->replace(s->menuId(), s); + items->tqreplace(s->menuId(), s); } FOR_CATEGORY_END } @@ -967,7 +967,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items) FOR_ALL_APPLICATIONS(it) { KService *s = it.current(); - items->replace(s->menuId(), s); + items->tqreplace(s->menuId(), s); } FOR_ALL_APPLICATIONS_END } @@ -977,7 +977,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items) kdDebug(7021) << "Adding file " << filename << endl; KService *s = findApplication(filename); if (s) - items->replace(filename, s); + items->tqreplace(filename, s); } } @@ -1000,7 +1000,7 @@ VFolderMenu::loadApplications(const TQString &dir, const TQString &prefix) while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1).latin1() == '~') + if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~') continue; TQString pathfn = dir + fn; @@ -1071,7 +1071,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl; { TQString id = name; // Strip path from id - int i = id.findRev('/'); + int i = id.tqfindRev('/'); if (i >= 0) id = id.mid(i+1); @@ -1079,7 +1079,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl; // TODO: add Legacy category addApplication(id, service); - items.replace(service->menuId(), service); + items.tqreplace(service->menuId(), service); if (service->categories().isEmpty()) insertService(m_currentMenu, name, service); @@ -1110,7 +1110,7 @@ kdDebug(7021) << "processLegacyDir(" << dir << ", " << relDir << ", " << prefix while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1).latin1() == '~') + if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~') continue; TQString pathfn = dir + fn; @@ -1144,10 +1144,10 @@ kdDebug(7021) << "processLegacyDir(" << dir << ", " << relDir << ", " << prefix // TODO: Add legacy category addApplication(id, service); - items.replace(service->menuId(), service); + items.tqreplace(service->menuId(), service); if (service->categories().isEmpty()) - m_currentMenu->items.replace(id, service); + m_currentMenu->items.tqreplace(id, service); } } } @@ -1305,7 +1305,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for <KDE>" << endl; processKDELegacyDirs(); - m_legacyNodes.replace("<KDE>", m_currentMenu); + m_legacyNodes.tqreplace("<KDE>", m_currentMenu); m_currentMenu = oldMenu; kdeLegacyDirsDone = true; @@ -1318,7 +1318,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for <KDE>" << endl; TQString prefix = e.attributes().namedItem("prefix").toAttr().value(); - if (m_defaultLegacyDirs.contains(dir)) + if (m_defaultLegacyDirs.tqcontains(dir)) { if (!kdeLegacyDirsDone) { @@ -1328,7 +1328,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl; processKDELegacyDirs(); - m_legacyNodes.replace("<KDE>", m_currentMenu); + m_legacyNodes.tqreplace("<KDE>", m_currentMenu); m_currentMenu = oldMenu; kdeLegacyDirsDone = true; @@ -1343,7 +1343,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl; processLegacyDir(dir, TQString::null, prefix); - m_legacyNodes.replace(dir, m_currentMenu); + m_legacyNodes.tqreplace(dir, m_currentMenu); m_currentMenu = oldMenu; } } @@ -1421,7 +1421,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl; { // Add legacy nodes to Menu structure TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir")); - SubMenu *legacyMenu = m_legacyNodes.find(dir); + SubMenu *legacyMenu = m_legacyNodes.tqfind(dir); if (legacyMenu) { mergeMenu(m_currentMenu, legacyMenu); @@ -1432,7 +1432,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl; { // Add legacy nodes to Menu structure TQString dir = "<KDE>"; - SubMenu *legacyMenu = m_legacyNodes.find(dir); + SubMenu *legacyMenu = m_legacyNodes.tqfind(dir); if (legacyMenu) { mergeMenu(m_currentMenu, legacyMenu); @@ -1618,7 +1618,7 @@ VFolderMenu::markUsedApplications(TQDict<KService> *items) { for(TQDictIterator<KService> it(*items); it.current(); ++it) { - m_usedAppsDict.replace(it.current()->menuId(), it.current()); + m_usedAppsDict.tqreplace(it.current()->menuId(), it.current()); } } diff --git a/kded/vfolder_menu.h b/kded/vfolder_menu.h index ce7183056..a2536af7d 100644 --- a/kded/vfolder_menu.h +++ b/kded/vfolder_menu.h @@ -29,7 +29,7 @@ #include <kservice.h> -class VFolderMenu : public QObject +class VFolderMenu : public TQObject { Q_OBJECT public: diff --git a/kdefx/kdrawutil.cpp b/kdefx/kdrawutil.cpp index 0fccb94f1..83fe7d300 100644 --- a/kdefx/kdrawutil.cpp +++ b/kdefx/kdrawutil.cpp @@ -143,21 +143,21 @@ KDEFX_EXPORT void kDrawRoundButton(TQPainter *p, int x, int y, int w, int h, kDrawRoundButton(p, r, g, sunken); } -#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +#define QCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) KDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear) { // round edge fills - static const QCOORD btm_left_fill[]={ 0,0,1,0,2,0,3,0,4,0,0,1,1,1,2,1,3,1,4,1, + static const TQCOORD btm_left_fill[]={ 0,0,1,0,2,0,3,0,4,0,0,1,1,1,2,1,3,1,4,1, 1,2,2,2,3,2,4,2,2,3,3,3,4,3,3,4,4,4 }; - static const QCOORD btm_right_fill[]={ 0,0,1,0,2,0,3,0,4,0,0,1,1,1,2,1,3,1,4, + static const TQCOORD btm_right_fill[]={ 0,0,1,0,2,0,3,0,4,0,0,1,1,1,2,1,3,1,4, 1,0,2,1,2,2,2,3,2,0,3,1,3,2,3,0,4,1,4 }; - static const QCOORD top_left_fill[]={ 3,0,4,0,2,1,3,1,4,1,1,2,2,2,3,2,4,2,0,3, + static const TQCOORD top_left_fill[]={ 3,0,4,0,2,1,3,1,4,1,1,2,2,2,3,2,4,2,0,3, 1,3,2,3,3,3,4,3,0,4,1,4,2,4,3,4,4,4 }; - static const QCOORD top_right_fill[]={ 0,0,1,0,0,1,1,1,2,1,0,2,1,2,2,2,3,2,0, + static const TQCOORD top_right_fill[]={ 0,0,1,0,0,1,1,1,2,1,0,2,1,2,2,2,3,2,0, 3,1,3,2,3,3,3,4,3,0,4,1,4,2,4,3,4,4,4 }; if(clear) diff --git a/kdefx/kdrawutil.h b/kdefx/kdrawutil.h index 27be8ac58..6aa0f3c44 100644 --- a/kdefx/kdrawutil.h +++ b/kdefx/kdrawutil.h @@ -125,7 +125,7 @@ KDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h); * @c \#include @c <kdrawutil.h> * * Paints the pixels covered by a round button of the given size with - * Qt::color1. This function is useful in TQStyle::drawControlMask(). + * Qt::color1. This function is useful in TQStyle::tqdrawControlMask(). * * @param p The painter to use for drawing the button. * @param x The X coordinate of the button. diff --git a/kdefx/kimageeffect.cpp b/kdefx/kimageeffect.cpp index eee05b497..80b3c3e68 100644 --- a/kdefx/kimageeffect.cpp +++ b/kdefx/kimageeffect.cpp @@ -84,9 +84,9 @@ inline const T& fxClamp( const T& x, const T& low, const T& high ) static inline unsigned int intensityValue(unsigned int color) { - return((unsigned int)((0.299*qRed(color) + - 0.587*qGreen(color) + - 0.1140000000000001*qBlue(color)))); + return((unsigned int)((0.299*tqRed(color) + + 0.587*tqGreen(color) + + 0.1140000000000001*tqBlue(color)))); } template<typename T> @@ -164,7 +164,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca, gl += gcdelta; bl += bcdelta; - rgb = qRgb( (rl>>16), (gl>>16), (bl>>16) ); + rgb = tqRgb( (rl>>16), (gl>>16), (bl>>16) ); for( x = 0; x < size.width(); x++ ) { *p = rgb; @@ -188,7 +188,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca, gl += gcdelta; bl += bcdelta; - *src++ = qRgb( (rl>>16), (gl>>16), (bl>>16)); + *src++ = tqRgb( (rl>>16), (gl>>16), (bl>>16)); } src = o_src; @@ -253,7 +253,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca, for (y = 0; y < size.height(); y++) { unsigned int *scanline = (unsigned int *)image.scanLine(y); for (x = 0; x < size.width(); x++) { - scanline[x] = qRgb(xtable[0][x] + ytable[0][y], + scanline[x] = tqRgb(xtable[0][x] + ytable[0][y], xtable[1][x] + ytable[1][y], xtable[2][x] + ytable[2][y]); } @@ -310,12 +310,12 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca, for (x = 0; x < w; x++, x2--) { unsigned int rgb = 0; if (eff == PyramidGradient) { - rgb = qRgb(rcb-rSign*(xtable[0][x]+ytable[0][y]), + rgb = tqRgb(rcb-rSign*(xtable[0][x]+ytable[0][y]), gcb-gSign*(xtable[1][x]+ytable[1][y]), bcb-bSign*(xtable[2][x]+ytable[2][y])); } if (eff == RectangleGradient) { - rgb = qRgb(rcb - rSign * + rgb = tqRgb(rcb - rSign * QMAX(xtable[0][x], ytable[0][y]) * 2, gcb - gSign * QMAX(xtable[1][x], ytable[1][y]) * 2, @@ -323,7 +323,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca, QMAX(xtable[2][x], ytable[2][y]) * 2); } if (eff == PipeCrossGradient) { - rgb = qRgb(rcb - rSign * + rgb = tqRgb(rcb - rSign * QMIN(xtable[0][x], ytable[0][y]) * 2, gcb - gSign * QMIN(xtable[1][x], ytable[1][y]) * 2, @@ -331,7 +331,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca, QMIN(xtable[2][x], ytable[2][y]) * 2); } if (eff == EllipticGradient) { - rgb = qRgb(rcb - rSign * + rgb = tqRgb(rcb - rSign * (int)sqrt((xtable[0][x]*xtable[0][x] + ytable[0][y]*ytable[0][y])*2.0), gcb - gSign * @@ -360,7 +360,7 @@ TQImage KImageEffect::gradient(const TQSize &size, const TQColor &ca, if (ncols && (TQPixmap::defaultDepth() < 15 )) { if ( ncols < 2 || ncols > 256 ) ncols = 3; - TQColor *dPal = new QColor[ncols]; + TQColor *dPal = new TQColor[ncols]; for (int i=0; i<ncols; i++) { dPal[i].setRgb ( rca + rDiff * i / ( ncols - 1 ), gca + gDiff * i / ( ncols - 1 ), @@ -463,7 +463,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca, dir = _xanti ? x : size.width() - 1 - x; rat = 1 - exp( - (float)x * xbal ); - src[dir] = qRgb(rcb - (int) ( rDiff * rat ), + src[dir] = tqRgb(rcb - (int) ( rDiff * rat ), gcb - (int) ( gDiff * rat ), bcb - (int) ( bDiff * rat )); } @@ -516,7 +516,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca, for (y = 0; y < h; y++) { unsigned int *scanline = (unsigned int *)image.scanLine(y); for (x = 0; x < w; x++) { - scanline[x] = qRgb(rcb - (xtable[0][x] + ytable[0][y]), + scanline[x] = tqRgb(rcb - (xtable[0][x] + ytable[0][y]), gcb - (xtable[1][x] + ytable[1][y]), bcb - (xtable[2][x] + ytable[2][y])); } @@ -558,13 +558,13 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca, for (x = 0; x < w; x++) { if (eff == PyramidGradient) { - scanline[x] = qRgb(rcb-rSign*(xtable[0][x]+ytable[0][y]), + scanline[x] = tqRgb(rcb-rSign*(xtable[0][x]+ytable[0][y]), gcb-gSign*(xtable[1][x]+ytable[1][y]), bcb-bSign*(xtable[2][x]+ytable[2][y])); } else if (eff == RectangleGradient) { - scanline[x] = qRgb(rcb - rSign * + scanline[x] = tqRgb(rcb - rSign * QMAX(xtable[0][x], ytable[0][y]) * 2, gcb - gSign * QMAX(xtable[1][x], ytable[1][y]) * 2, @@ -573,7 +573,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca, } else if (eff == PipeCrossGradient) { - scanline[x] = qRgb(rcb - rSign * + scanline[x] = tqRgb(rcb - rSign * QMIN(xtable[0][x], ytable[0][y]) * 2, gcb - gSign * QMIN(xtable[1][x], ytable[1][y]) * 2, @@ -582,7 +582,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca, } else if (eff == EllipticGradient) { - scanline[x] = qRgb(rcb - rSign * + scanline[x] = tqRgb(rcb - rSign * (int)sqrt((xtable[0][x]*xtable[0][x] + ytable[0][y]*ytable[0][y])*2.0), gcb - gSign * @@ -599,7 +599,7 @@ TQImage KImageEffect::unbalancedGradient(const TQSize &size, const TQColor &ca, if (ncols && (TQPixmap::defaultDepth() < 15 )) { if ( ncols < 2 || ncols > 256 ) ncols = 3; - TQColor *dPal = new QColor[ncols]; + TQColor *dPal = new TQColor[ncols]; for (int i=0; i<ncols; i++) { dPal[i].setRgb ( rca + rDiff * i / ( ncols - 1 ), gca + gDiff * i / ( ncols - 1 ), @@ -628,12 +628,12 @@ namespace { struct KIE4Pack { - Q_UINT16 data[4]; + TQ_UINT16 data[4]; }; struct KIE8Pack { - Q_UINT16 data[8]; + TQ_UINT16 data[8]; }; } @@ -675,7 +675,7 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent) if(haveMMX) { - Q_UINT16 p = Q_UINT16(256.0f*(percent)); + TQ_UINT16 p = TQ_UINT16(256.0f*(percent)); KIE4Pack mult = {{p,p,p,0}}; __asm__ __volatile__( @@ -685,7 +685,7 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent) unsigned int rem = pixels % 4; pixels -= rem; - Q_UINT32 *end = ( data + pixels ); + TQ_UINT32 *end = ( data + pixels ); if (brighten) { @@ -815,26 +815,26 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent) if(brighten){ // same here for(int i=0; i < pixels; ++i){ - int r = qRed(data[i]); - int g = qGreen(data[i]); - int b = qBlue(data[i]); - int a = qAlpha(data[i]); + int r = tqRed(data[i]); + int g = tqGreen(data[i]); + int b = tqBlue(data[i]); + int a = tqAlpha(data[i]); r = r + segTbl[r] > 255 ? 255 : r + segTbl[r]; g = g + segTbl[g] > 255 ? 255 : g + segTbl[g]; b = b + segTbl[b] > 255 ? 255 : b + segTbl[b]; - data[i] = qRgba(r, g, b,a); + data[i] = tqRgba(r, g, b,a); } } else{ for(int i=0; i < pixels; ++i){ - int r = qRed(data[i]); - int g = qGreen(data[i]); - int b = qBlue(data[i]); - int a = qAlpha(data[i]); + int r = tqRed(data[i]); + int g = tqGreen(data[i]); + int b = tqBlue(data[i]); + int a = tqAlpha(data[i]); r = r - segTbl[r] < 0 ? 0 : r - segTbl[r]; g = g - segTbl[g] < 0 ? 0 : g - segTbl[g]; b = b - segTbl[b] < 0 ? 0 : b - segTbl[b]; - data[i] = qRgba(r, g, b, a); + data[i] = tqRgba(r, g, b, a); } } delete [] segTbl; @@ -883,23 +883,23 @@ TQImage& KImageEffect::channelIntensity(TQImage &image, float percent, if(brighten){ // same here if(channel == Red){ // and here ;-) for(int i=0; i < pixels; ++i){ - int c = qRed(data[i]); + int c = tqRed(data[i]); c = c + segTbl[c] > 255 ? 255 : c + segTbl[c]; - data[i] = qRgba(c, qGreen(data[i]), qBlue(data[i]), qAlpha(data[i])); + data[i] = tqRgba(c, tqGreen(data[i]), tqBlue(data[i]), tqAlpha(data[i])); } } else if(channel == Green){ for(int i=0; i < pixels; ++i){ - int c = qGreen(data[i]); + int c = tqGreen(data[i]); c = c + segTbl[c] > 255 ? 255 : c + segTbl[c]; - data[i] = qRgba(qRed(data[i]), c, qBlue(data[i]), qAlpha(data[i])); + data[i] = tqRgba(tqRed(data[i]), c, tqBlue(data[i]), tqAlpha(data[i])); } } else{ for(int i=0; i < pixels; ++i){ - int c = qBlue(data[i]); + int c = tqBlue(data[i]); c = c + segTbl[c] > 255 ? 255 : c + segTbl[c]; - data[i] = qRgba(qRed(data[i]), qGreen(data[i]), c, qAlpha(data[i])); + data[i] = tqRgba(tqRed(data[i]), tqGreen(data[i]), c, tqAlpha(data[i])); } } @@ -907,23 +907,23 @@ TQImage& KImageEffect::channelIntensity(TQImage &image, float percent, else{ if(channel == Red){ for(int i=0; i < pixels; ++i){ - int c = qRed(data[i]); + int c = tqRed(data[i]); c = c - segTbl[c] < 0 ? 0 : c - segTbl[c]; - data[i] = qRgba(c, qGreen(data[i]), qBlue(data[i]), qAlpha(data[i])); + data[i] = tqRgba(c, tqGreen(data[i]), tqBlue(data[i]), tqAlpha(data[i])); } } else if(channel == Green){ for(int i=0; i < pixels; ++i){ - int c = qGreen(data[i]); + int c = tqGreen(data[i]); c = c - segTbl[c] < 0 ? 0 : c - segTbl[c]; - data[i] = qRgba(qRed(data[i]), c, qBlue(data[i]), qAlpha(data[i])); + data[i] = tqRgba(tqRed(data[i]), c, tqBlue(data[i]), tqAlpha(data[i])); } } else{ for(int i=0; i < pixels; ++i){ - int c = qBlue(data[i]); + int c = tqBlue(data[i]); c = c - segTbl[c] < 0 ? 0 : c - segTbl[c]; - data[i] = qRgba(qRed(data[i]), qGreen(data[i]), c, qAlpha(data[i])); + data[i] = tqRgba(tqRed(data[i]), tqGreen(data[i]), c, tqAlpha(data[i])); } } } @@ -982,22 +982,22 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse, color1 = *data1; if (type == Intensity || type == Contrast) { - r = qRed(color1); - g = qGreen(color1); - b = qBlue(color1); + r = tqRed(color1); + g = tqGreen(color1); + b = tqBlue(color1); if (channel != All) { - mod = (channel == Red) ? qRed(color2) : - (channel == Green) ? qGreen(color2) : - (channel == Blue) ? qBlue(color2) : - (channel == Gray) ? qGray(color2) : 0; + mod = (channel == Red) ? tqRed(color2) : + (channel == Green) ? tqGreen(color2) : + (channel == Blue) ? tqBlue(color2) : + (channel == Gray) ? tqGray(color2) : 0; mod = mod*factor/50; } if (type == Intensity) { if (channel == All) { - r += r * factor/50 * qRed(color2)/256; - g += g * factor/50 * qGreen(color2)/256; - b += b * factor/50 * qBlue(color2)/256; + r += r * factor/50 * tqRed(color2)/256; + g += g * factor/50 * tqGreen(color2)/256; + b += b * factor/50 * tqBlue(color2)/256; } else { r += r * mod/256; @@ -1007,9 +1007,9 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse, } else { // Contrast if (channel == All) { - r += (r-128) * factor/50 * qRed(color2)/128; - g += (g-128) * factor/50 * qGreen(color2)/128; - b += (b-128) * factor/50 * qBlue(color2)/128; + r += (r-128) * factor/50 * tqRed(color2)/128; + g += (g-128) * factor/50 * tqGreen(color2)/128; + b += (b-128) * factor/50 * tqBlue(color2)/128; } else { r += (r-128) * mod/128; @@ -1021,16 +1021,16 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse, if (r<0) r=0; if (r>255) r=255; if (g<0) g=0; if (g>255) g=255; if (b<0) b=0; if (b>255) b=255; - a = qAlpha(*data1); - *data1 = qRgba(r, g, b, a); + a = tqAlpha(*data1); + *data1 = tqRgba(r, g, b, a); } else if (type == Saturation || type == HueShift) { clr.setRgb(color1); clr.hsv(&h, &s, &v); - mod = (channel == Red) ? qRed(color2) : - (channel == Green) ? qGreen(color2) : - (channel == Blue) ? qBlue(color2) : - (channel == Gray) ? qGray(color2) : 0; + mod = (channel == Red) ? tqRed(color2) : + (channel == Green) ? tqGreen(color2) : + (channel == Blue) ? tqBlue(color2) : + (channel == Gray) ? tqGray(color2) : 0; mod = mod*factor/50; if (type == Saturation) { @@ -1044,7 +1044,7 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse, } clr.setHsv(h, s, v); - a = qAlpha(*data1); + a = tqAlpha(*data1); *data1 = clr.rgb() | ((uint)(a & 0xff) << 24); } data1++; data2++; data2b++; x++; @@ -1083,14 +1083,14 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity) #ifdef USE_SSE2_INLINE_ASM if ( KCPUInfo::haveExtension( KCPUInfo::IntelSSE2 ) && pixels > 16 ) { - Q_UINT16 alpha = Q_UINT16( ( 1.0 - opacity ) * 256.0 ); + TQ_UINT16 alpha = TQ_UINT16( ( 1.0 - opacity ) * 256.0 ); KIE8Pack packedalpha = { { alpha, alpha, alpha, 256, alpha, alpha, alpha, 256 } }; - Q_UINT16 red = Q_UINT16( clr.red() * 256 * opacity ); - Q_UINT16 green = Q_UINT16( clr.green() * 256 * opacity ); - Q_UINT16 blue = Q_UINT16( clr.blue() * 256 * opacity ); + TQ_UINT16 red = TQ_UINT16( clr.red() * 256 * opacity ); + TQ_UINT16 green = TQ_UINT16( clr.green() * 256 * opacity ); + TQ_UINT16 blue = TQ_UINT16( clr.blue() * 256 * opacity ); KIE8Pack packedcolor = { { blue, green, red, 0, blue, green, red, 0 } }; @@ -1103,10 +1103,10 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity) : : "r"(&packedalpha), "r"(&packedcolor), "m"(packedcolor), "m"(packedalpha) ); - Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dst.bits() ); + TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( dst.bits() ); - // Check how many pixels we need to process to achieve 16 byte alignment - int offset = (16 - (Q_UINT32( data ) & 0x0f)) / 4; + // Check how many pixels we need to process to achieve 16 byte tqalignment + int offset = (16 - (TQ_UINT32( data ) & 0x0f)) / 4; // The main loop processes 8 pixels / iteration int remainder = (pixels - offset) % 8; @@ -1188,12 +1188,12 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity) #ifdef USE_MMX_INLINE_ASM if ( KCPUInfo::haveExtension( KCPUInfo::IntelMMX ) && pixels > 1 ) { - Q_UINT16 alpha = Q_UINT16( ( 1.0 - opacity ) * 256.0 ); + TQ_UINT16 alpha = TQ_UINT16( ( 1.0 - opacity ) * 256.0 ); KIE4Pack packedalpha = { { alpha, alpha, alpha, 256 } }; - Q_UINT16 red = Q_UINT16( clr.red() * 256 * opacity ); - Q_UINT16 green = Q_UINT16( clr.green() * 256 * opacity ); - Q_UINT16 blue = Q_UINT16( clr.blue() * 256 * opacity ); + TQ_UINT16 red = TQ_UINT16( clr.red() * 256 * opacity ); + TQ_UINT16 green = TQ_UINT16( clr.green() * 256 * opacity ); + TQ_UINT16 blue = TQ_UINT16( clr.blue() * 256 * opacity ); KIE4Pack packedcolor = { { blue, green, red, 0 } }; @@ -1203,7 +1203,7 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity) "movq (%1), %%mm5\n\t" // Set up color * alpha * 256 in MM5 : : "r"(&packedalpha), "r"(&packedcolor), "m"(packedcolor), "m"(packedalpha) ); - Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dst.bits() ); + TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( dst.bits() ); // The main loop processes 4 pixels / iteration int remainder = pixels % 4; @@ -1333,7 +1333,7 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity) #ifdef USE_SSE2_INLINE_ASM if ( KCPUInfo::haveExtension( KCPUInfo::IntelSSE2 ) && pixels > 16 ) { - Q_UINT16 alpha = Q_UINT16( opacity * 256.0 ); + TQ_UINT16 alpha = TQ_UINT16( opacity * 256.0 ); KIE8Pack packedalpha = { { alpha, alpha, alpha, 0, alpha, alpha, alpha, 0 } }; @@ -1343,11 +1343,11 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity) "movdqu (%0), %%xmm6\n\t" // Set up alpha * 256 in XMM6 : : "r"(&packedalpha), "m"(packedalpha) ); - Q_UINT32 *data1 = reinterpret_cast<Q_UINT32*>( src.bits() ); - Q_UINT32 *data2 = reinterpret_cast<Q_UINT32*>( dst.bits() ); + TQ_UINT32 *data1 = reinterpret_cast<TQ_UINT32*>( src.bits() ); + TQ_UINT32 *data2 = reinterpret_cast<TQ_UINT32*>( dst.bits() ); - // Check how many pixels we need to process to achieve 16 byte alignment - int offset = (16 - (Q_UINT32( data2 ) & 0x0f)) / 4; + // Check how many pixels we need to process to achieve 16 byte tqalignment + int offset = (16 - (TQ_UINT32( data2 ) & 0x0f)) / 4; // The main loop processes 4 pixels / iteration int remainder = (pixels - offset) % 4; @@ -1428,7 +1428,7 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity) #ifdef USE_MMX_INLINE_ASM if ( KCPUInfo::haveExtension( KCPUInfo::IntelMMX ) && pixels > 1 ) { - Q_UINT16 alpha = Q_UINT16( opacity * 256.0 ); + TQ_UINT16 alpha = TQ_UINT16( opacity * 256.0 ); KIE4Pack packedalpha = { { alpha, alpha, alpha, 0 } }; // Prepare the MM6 and MM7 registers for blending and unpacking @@ -1437,8 +1437,8 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity) "movq (%0), %%mm6\n\t" // Set up alpha * 256 in MM6 : : "r"(&packedalpha), "m"(packedalpha) ); - Q_UINT32 *data1 = reinterpret_cast<Q_UINT32*>( src.bits() ); - Q_UINT32 *data2 = reinterpret_cast<Q_UINT32*>( dst.bits() ); + TQ_UINT32 *data1 = reinterpret_cast<TQ_UINT32*>( src.bits() ); + TQ_UINT32 *data2 = reinterpret_cast<TQ_UINT32*>( dst.bits() ); // The main loop processes 2 pixels / iteration int remainder = pixels % 2; @@ -1602,17 +1602,17 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity, for (x = xi; x < (int)xf ; x++) { if (eff == HorizontalGradient) intensity += var; ind = x + ind_base; - r = qRed (data[ind]) + (int)(intensity * - (r_bgnd - qRed (data[ind]))); - g = qGreen(data[ind]) + (int)(intensity * - (g_bgnd - qGreen(data[ind]))); - b = qBlue (data[ind]) + (int)(intensity * - (b_bgnd - qBlue (data[ind]))); + r = tqRed (data[ind]) + (int)(intensity * + (r_bgnd - tqRed (data[ind]))); + g = tqGreen(data[ind]) + (int)(intensity * + (g_bgnd - tqGreen(data[ind]))); + b = tqBlue (data[ind]) + (int)(intensity * + (b_bgnd - tqBlue (data[ind]))); if (r > 255) r = 255; if (r < 0 ) r = 0; if (g > 255) g = 255; if (g < 0 ) g = 0; if (b > 255) b = 255; if (b < 0 ) b = 0; - a = qAlpha(data[ind]); - data[ind] = qRgba(r, g, b, a); + a = tqAlpha(data[ind]); + data[ind] = tqRgba(r, g, b, a); } } } @@ -1627,17 +1627,17 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity, for (y = 0; y < image_height ; y++) { intensity = initial_intensity + tmp + yvar * y; - r = qRed (data[ind]) + (int)(intensity * - (r_bgnd - qRed (data[ind]))); - g = qGreen(data[ind]) + (int)(intensity * - (g_bgnd - qGreen(data[ind]))); - b = qBlue (data[ind]) + (int)(intensity * - (b_bgnd - qBlue (data[ind]))); + r = tqRed (data[ind]) + (int)(intensity * + (r_bgnd - tqRed (data[ind]))); + g = tqGreen(data[ind]) + (int)(intensity * + (g_bgnd - tqGreen(data[ind]))); + b = tqBlue (data[ind]) + (int)(intensity * + (b_bgnd - tqBlue (data[ind]))); if (r > 255) r = 255; if (r < 0 ) r = 0; if (g > 255) g = 255; if (g < 0 ) g = 0; if (b > 255) b = 255; if (b < 0 ) b = 0; - a = qAlpha(data[ind]); - data[ind] = qRgba(r, g, b, a); + a = tqAlpha(data[ind]); + data[ind] = tqRgba(r, g, b, a); ind += image_width; } @@ -1662,31 +1662,31 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity, //NW ind = x + image_width * y ; - r = qRed (data[ind]) + (int)(intensity * - (r_bgnd - qRed (data[ind]))); - g = qGreen(data[ind]) + (int)(intensity * - (g_bgnd - qGreen(data[ind]))); - b = qBlue (data[ind]) + (int)(intensity * - (b_bgnd - qBlue (data[ind]))); + r = tqRed (data[ind]) + (int)(intensity * + (r_bgnd - tqRed (data[ind]))); + g = tqGreen(data[ind]) + (int)(intensity * + (g_bgnd - tqGreen(data[ind]))); + b = tqBlue (data[ind]) + (int)(intensity * + (b_bgnd - tqBlue (data[ind]))); if (r > 255) r = 255; if (r < 0 ) r = 0; if (g > 255) g = 255; if (g < 0 ) g = 0; if (b > 255) b = 255; if (b < 0 ) b = 0; - a = qAlpha(data[ind]); - data[ind] = qRgba(r, g, b, a); + a = tqAlpha(data[ind]); + data[ind] = tqRgba(r, g, b, a); //NE ind = image_width - x - 1 + image_width * y ; - r = qRed (data[ind]) + (int)(intensity * - (r_bgnd - qRed (data[ind]))); - g = qGreen(data[ind]) + (int)(intensity * - (g_bgnd - qGreen(data[ind]))); - b = qBlue (data[ind]) + (int)(intensity * - (b_bgnd - qBlue (data[ind]))); + r = tqRed (data[ind]) + (int)(intensity * + (r_bgnd - tqRed (data[ind]))); + g = tqGreen(data[ind]) + (int)(intensity * + (g_bgnd - tqGreen(data[ind]))); + b = tqBlue (data[ind]) + (int)(intensity * + (b_bgnd - tqBlue (data[ind]))); if (r > 255) r = 255; if (r < 0 ) r = 0; if (g > 255) g = 255; if (g < 0 ) g = 0; if (b > 255) b = 255; if (b < 0 ) b = 0; - a = qAlpha(data[ind]); - data[ind] = qRgba(r, g, b, a); + a = tqAlpha(data[ind]); + data[ind] = tqRgba(r, g, b, a); } } @@ -1706,31 +1706,31 @@ TQImage& KImageEffect::blend(TQImage &image, float initial_intensity, //SW ind = x + image_width * (image_height - y -1) ; - r = qRed (data[ind]) + (int)(intensity * - (r_bgnd - qRed (data[ind]))); - g = qGreen(data[ind]) + (int)(intensity * - (g_bgnd - qGreen(data[ind]))); - b = qBlue (data[ind]) + (int)(intensity * - (b_bgnd - qBlue (data[ind]))); + r = tqRed (data[ind]) + (int)(intensity * + (r_bgnd - tqRed (data[ind]))); + g = tqGreen(data[ind]) + (int)(intensity * + (g_bgnd - tqGreen(data[ind]))); + b = tqBlue (data[ind]) + (int)(intensity * + (b_bgnd - tqBlue (data[ind]))); if (r > 255) r = 255; if (r < 0 ) r = 0; if (g > 255) g = 255; if (g < 0 ) g = 0; if (b > 255) b = 255; if (b < 0 ) b = 0; - a = qAlpha(data[ind]); - data[ind] = qRgba(r, g, b, a); + a = tqAlpha(data[ind]); + data[ind] = tqRgba(r, g, b, a); //SE ind = image_width-x-1 + image_width * (image_height - y - 1) ; - r = qRed (data[ind]) + (int)(intensity * - (r_bgnd - qRed (data[ind]))); - g = qGreen(data[ind]) + (int)(intensity * - (g_bgnd - qGreen(data[ind]))); - b = qBlue (data[ind]) + (int)(intensity * - (b_bgnd - qBlue (data[ind]))); + r = tqRed (data[ind]) + (int)(intensity * + (r_bgnd - tqRed (data[ind]))); + g = tqGreen(data[ind]) + (int)(intensity * + (g_bgnd - tqGreen(data[ind]))); + b = tqBlue (data[ind]) + (int)(intensity * + (b_bgnd - tqBlue (data[ind]))); if (r > 255) r = 255; if (r < 0 ) r = 0; if (g > 255) g = 255; if (g < 0 ) g = 0; if (b > 255) b = 255; if (b < 0 ) b = 0; - a = qAlpha(data[ind]); - data[ind] = qRgba(r, g, b, a); + a = tqAlpha(data[ind]); + data[ind] = tqRgba(r, g, b, a); } } } @@ -1809,16 +1809,16 @@ TQImage& KImageEffect::blend(TQImage &image1, TQImage &image2, while(x < (int)x1) { color3 = (colorTable3) ? colorTable3[data3b[ind3]] : data3[ind3]; - a = (channel == Red) ? qRed(color3) : - (channel == Green) ? qGreen(color3) : - (channel == Blue) ? qBlue(color3) : qGray(color3); + a = (channel == Red) ? tqRed(color3) : + (channel == Green) ? tqGreen(color3) : + (channel == Blue) ? tqBlue(color3) : tqGray(color3); - r = (a*qRed(data1[ind1]) + (256-a)*qRed(data2[ind2]))/256; - g = (a*qGreen(data1[ind1]) + (256-a)*qGreen(data2[ind2]))/256; - b = (a*qBlue(data1[ind1]) + (256-a)*qBlue(data2[ind2]))/256; + r = (a*tqRed(data1[ind1]) + (256-a)*tqRed(data2[ind2]))/256; + g = (a*tqGreen(data1[ind1]) + (256-a)*tqGreen(data2[ind2]))/256; + b = (a*tqBlue(data1[ind1]) + (256-a)*tqBlue(data2[ind2]))/256; - a = qAlpha(data1[ind1]); - data1[ind1] = qRgba(r, g, b, a); + a = tqAlpha(data1[ind1]); + data1[ind1] = tqRgba(r, g, b, a); ind1++; ind2++; ind3++; x++; if ( (x%x2) ==0) ind2 -= x2; @@ -1837,13 +1837,13 @@ TQImage& KImageEffect::blend(TQImage &image1, TQImage &image2, unsigned int KImageEffect::lHash(unsigned int c) { - unsigned char r = qRed(c), g = qGreen(c), b = qBlue(c), a = qAlpha(c); + unsigned char r = tqRed(c), g = tqGreen(c), b = tqBlue(c), a = tqAlpha(c); unsigned char nr, ng, nb; nr =(r >> 1) + (r >> 2); nr = nr > r ? 0 : nr; ng =(g >> 1) + (g >> 2); ng = ng > g ? 0 : ng; nb =(b >> 1) + (b >> 2); nb = nb > b ? 0 : nb; - return qRgba(nr, ng, nb, a); + return tqRgba(nr, ng, nb, a); } @@ -1851,13 +1851,13 @@ unsigned int KImageEffect::lHash(unsigned int c) unsigned int KImageEffect::uHash(unsigned int c) { - unsigned char r = qRed(c), g = qGreen(c), b = qBlue(c), a = qAlpha(c); + unsigned char r = tqRed(c), g = tqGreen(c), b = tqBlue(c), a = tqAlpha(c); unsigned char nr, ng, nb; nr = r + (r >> 3); nr = nr < r ? ~0 : nr; ng = g + (g >> 3); ng = ng < g ? ~0 : ng; nb = b + (b >> 3); nb = nb < b ? ~0 : nb; - return qRgba(nr, ng, nb, a); + return tqRgba(nr, ng, nb, a); } @@ -1969,7 +1969,7 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca, // pseudocolor for (int i = 0; i < img.numColors(); i++) { col = img.color(i); - int mean = (qRed(col) + qGreen(col) + qBlue(col)) / 3; + int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3; min = QMIN(min, mean); max = QMAX(max, mean); } @@ -1978,7 +1978,7 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca, for (int y=0; y < img.height(); y++) for (int x=0; x < img.width(); x++) { col = img.pixel(x, y); - int mean = (qRed(col) + qGreen(col) + qBlue(col)) / 3; + int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3; min = QMIN(min, mean); max = QMAX(max, mean); } @@ -1994,21 +1994,21 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca, if (img.numColors()) { for (int i=0; i < img.numColors(); i++) { col = img.color(i); - int mean = (qRed(col) + qGreen(col) + qBlue(col)) / 3; + int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3; int r = (int) (sr * (mean - min) + r1 + 0.5); int g = (int) (sg * (mean - min) + g1 + 0.5); int b = (int) (sb * (mean - min) + b1 + 0.5); - img.setColor(i, qRgba(r, g, b, qAlpha(col))); + img.setColor(i, tqRgba(r, g, b, tqAlpha(col))); } } else { for (int y=0; y < img.height(); y++) for (int x=0; x < img.width(); x++) { col = img.pixel(x, y); - int mean = (qRed(col) + qGreen(col) + qBlue(col)) / 3; + int mean = (tqRed(col) + tqGreen(col) + tqBlue(col)) / 3; int r = (int) (sr * (mean - min) + r1 + 0.5); int g = (int) (sg * (mean - min) + g1 + 0.5); int b = (int) (sb * (mean - min) + b1 + 0.5); - img.setPixel(x, y, qRgba(r, g, b, qAlpha(col))); + img.setPixel(x, y, tqRgba(r, g, b, tqAlpha(col))); } } @@ -2020,7 +2020,7 @@ TQImage& KImageEffect::flatten(TQImage &img, const TQColor &ca, if (ncols == 1) ncols++; if (ncols > 256) ncols = 256; - TQColor *pal = new QColor[ncols]; + TQColor *pal = new TQColor[ncols]; sr = ((float) r2 - r1) / (ncols - 1); sg = ((float) g2 - g1) / (ncols - 1); sb = ((float) b2 - b1) / (ncols - 1); @@ -2065,7 +2065,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color) // pseudo color for (int i=0; i<img.numColors(); i++) { col = img.color(i); - cr = qRed(col); cg = qGreen(col); cb = qBlue(col); + cr = tqRed(col); cg = tqGreen(col); cb = tqBlue(col); if (cr > red) r = cr - tbl[cr - red]; else @@ -2078,7 +2078,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color) b = cb - tbl[cb - blue]; else b = cb + tbl[blue - cb]; - img.setColor(i, qRgba(r, g, b, qAlpha(col))); + img.setColor(i, tqRgba(r, g, b, tqAlpha(col))); } } else { @@ -2087,7 +2087,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color) QRgb *data = (QRgb *) img.scanLine(y); for (int x=0; x<img.width(); x++) { col = *data; - cr = qRed(col); cg = qGreen(col); cb = qBlue(col); + cr = tqRed(col); cg = tqGreen(col); cb = tqBlue(col); if (cr > red) r = cr - tbl[cr - red]; else @@ -2100,7 +2100,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color) b = cb - tbl[cb - blue]; else b = cb + tbl[blue - cb]; - *data++ = qRgba(r, g, b, qAlpha(col)); + *data++ = tqRgba(r, g, b, tqAlpha(col)); } } } @@ -2116,7 +2116,7 @@ TQImage& KImageEffect::fade(TQImage &img, float val, const TQColor &color) // This code is adapted from code (C) Rik Hemsley <rik@kde.org> // -// The formula used (r + b + g) /3 is different from the qGray formula +// The formula used (r + b + g) /3 is different from the tqGray formula // used by Qt. This is because our formula is much much faster. If, // however, it turns out that this is producing sub-optimal images, // then it will have to change (kurt) @@ -2149,12 +2149,12 @@ TQImage& KImageEffect::toGray(TQImage &img, bool fast) { for (int i = 0; i < img.numColors(); i++) { - register uint r = qRed(img.color(i)); - register uint g = qGreen(img.color(i)); - register uint b = qBlue(img.color(i)); + register uint r = tqRed(img.color(i)); + register uint g = tqGreen(img.color(i)); + register uint b = tqBlue(img.color(i)); register uint gray = (((r + g) >> 1) + b) >> 1; - img.setColor(i, qRgba(gray, gray, gray, qAlpha(img.color(i)))); + img.setColor(i, tqRgba(gray, gray, gray, tqAlpha(img.color(i)))); } } } @@ -2165,8 +2165,8 @@ TQImage& KImageEffect::toGray(TQImage &img, bool fast) (unsigned int *)img.tqcolorTable(); int val, i; for(i=0; i < pixels; ++i){ - val = qGray(data[i]); - data[i] = qRgba(val, val, val, qAlpha(data[i])); + val = tqGray(data[i]); + data[i] = tqRgba(val, val, val, tqAlpha(data[i])); } } return img; @@ -2211,10 +2211,10 @@ TQImage& KImageEffect::contrast(TQImage &img, int c) (unsigned int *)img.tqcolorTable(); int i, r, g, b; for(i=0; i < pixels; ++i){ - r = qRed(data[i]); - g = qGreen(data[i]); - b = qBlue(data[i]); - if(qGray(data[i]) <= 127){ + r = tqRed(data[i]); + g = tqGreen(data[i]); + b = tqBlue(data[i]); + if(tqGray(data[i]) <= 127){ if(r - c > 0) r -= c; else @@ -2242,7 +2242,7 @@ TQImage& KImageEffect::contrast(TQImage &img, int c) else b = 255; } - data[i] = qRgba(r, g, b, qAlpha(data[i])); + data[i] = tqRgba(r, g, b, tqAlpha(data[i])); } return(img); } @@ -2290,11 +2290,11 @@ TQImage& KImageEffect::dither(TQImage &img, const TQColor *palette, int size) for ( i = 0; i < img.width(); i++ ) { - rerr1[i] = rerr2[i] + qRed( *ip ); + rerr1[i] = rerr2[i] + tqRed( *ip ); rerr2[i] = 0; - gerr1[i] = gerr2[i] + qGreen( *ip ); + gerr1[i] = gerr2[i] + tqGreen( *ip ); gerr2[i] = 0; - berr1[i] = berr2[i] + qBlue( *ip ); + berr1[i] = berr2[i] + tqBlue( *ip ); berr2[i] = 0; ip++; } @@ -2404,8 +2404,8 @@ bool KImageEffect::blend( do { - i = upper.scanLine(row); - o = output.scanLine(row); + i = const_cast<TQImage&>(upper).scanLine(row); + o = const_cast<TQImage&>(output).scanLine(row); col = w << 2; --col; @@ -2484,15 +2484,15 @@ bool KImageEffect::blend( register int j,k; for (j=0; j<ch; j++) { - b=reinterpret_cast<QRgb *>(&lower.scanLine(y+j) [ (x+cw) << 2 ]); - i=reinterpret_cast<QRgb *>(&upper.scanLine(cy+j)[ (cx+cw) << 2 ]); - o=reinterpret_cast<QRgb *>(&output.scanLine(j) [ cw << 2 ]); + b=reinterpret_cast<QRgb *>(&const_cast<TQImage&>(lower).scanLine(y+j) [ (x+cw) << 2 ]); + i=reinterpret_cast<QRgb *>(&const_cast<TQImage&>(upper).scanLine(cy+j)[ (cx+cw) << 2 ]); + o=reinterpret_cast<QRgb *>(&const_cast<TQImage&>(output).scanLine(j) [ cw << 2 ]); k=cw-1; --b; --i; --o; do { - while ( !(a=qAlpha(*i)) && k>0 ) + while ( !(a=tqAlpha(*i)) && k>0 ) { i--; // *o=0; @@ -2501,9 +2501,9 @@ bool KImageEffect::blend( k--; }; // *o=0xFF; - *o = qRgb(qRed(*b) + (((qRed(*i) - qRed(*b)) * a) >> 8), - qGreen(*b) + (((qGreen(*i) - qGreen(*b)) * a) >> 8), - qBlue(*b) + (((qBlue(*i) - qBlue(*b)) * a) >> 8)); + *o = tqRgb(tqRed(*b) + (((tqRed(*i) - tqRed(*b)) * a) >> 8), + tqGreen(*b) + (((tqGreen(*i) - tqGreen(*b)) * a) >> 8), + tqBlue(*b) + (((tqBlue(*i) - tqBlue(*b)) * a) >> 8)); --i; --o; --b; } while (k--); } @@ -2543,8 +2543,8 @@ bool KImageEffect::blendOnLower( for (int j=0; j<ch; j++) { - b=&lower.scanLine(y+j) [ (x+cw) << 2 ]; - i=&upper.scanLine(cy+j)[ (cx+cw) << 2 ]; + b=&const_cast<TQImage&>(lower).scanLine(y+j) [ (x+cw) << 2 ]; + i=&const_cast<TQImage&>(upper).scanLine(cy+j)[ (cx+cw) << 2 ]; k=cw-1; --b; --i; @@ -2593,12 +2593,12 @@ void KImageEffect::blendOnLower(const TQImage &upper, const TQPoint &upperOffset // blend for (int y = 0; y < lr.height(); y++) { for (int x = 0; x < lr.width(); x++) { - QRgb *b = reinterpret_cast<QRgb*>(lower.scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(QRgb)); - QRgb *d = reinterpret_cast<QRgb*>(upper.scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(QRgb)); - int a = qAlpha(*d); - *b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8), - qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8), - qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8)); + QRgb *b = reinterpret_cast<QRgb*>(const_cast<TQImage&>(lower).scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(QRgb)); + QRgb *d = reinterpret_cast<QRgb*>(const_cast<TQImage&>(upper).scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(QRgb)); + int a = tqAlpha(*d); + *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8), + tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8), + tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8)); } } } @@ -2615,12 +2615,12 @@ void KImageEffect::blendOnLower(const TQImage &upper, const TQPoint &upperOffset // blend for (int y = 0; y < lr.height(); y++) { for (int x = 0; x < lr.width(); x++) { - QRgb *b = reinterpret_cast<QRgb*>(lower.scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(QRgb)); - QRgb *d = reinterpret_cast<QRgb*>(upper.scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(QRgb)); - int a = qRound(opacity * qAlpha(*d)); - *b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8), - qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8), - qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8)); + QRgb *b = reinterpret_cast<QRgb*>(const_cast<TQImage&>(lower).scanLine(lr.y() + y)+ (lr.x() + x) * sizeof(QRgb)); + QRgb *d = reinterpret_cast<QRgb*>(const_cast<TQImage&>(upper).scanLine(upperOffset.y() + y) + (upperOffset.x() + x) * sizeof(QRgb)); + int a = tqRound(opacity * tqAlpha(*d)); + *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8), + tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8), + tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8)); } } } @@ -2940,10 +2940,10 @@ TQImage KImageEffect::despeckle(TQImage &src) srcData = (unsigned int *)src.scanLine(y); ++j; for(x=0; x < src.width(); ++x){ - red_channel[j] = qRed(srcData[x]); - green_channel[j] = qGreen(srcData[x]); - blue_channel[j] = qBlue(srcData[x]); - alpha_channel[j] = qAlpha(srcData[x]); + red_channel[j] = tqRed(srcData[x]); + green_channel[j] = tqGreen(srcData[x]); + blue_channel[j] = tqBlue(srcData[x]); + alpha_channel[j] = tqAlpha(srcData[x]); ++j; } ++j; @@ -2958,10 +2958,10 @@ TQImage KImageEffect::despeckle(TQImage &src) ++j; for(x=0; x < src.width(); ++x){ pixel = *(cTable+srcData[x]); - red_channel[j] = qRed(pixel); - green_channel[j] = qGreen(pixel); - blue_channel[j] = qBlue(pixel); - alpha_channel[j] = qAlpha(pixel); + red_channel[j] = tqRed(pixel); + green_channel[j] = tqGreen(pixel); + blue_channel[j] = tqBlue(pixel); + alpha_channel[j] = tqAlpha(pixel); ++j; } ++j; @@ -3000,7 +3000,7 @@ TQImage KImageEffect::despeckle(TQImage &src) ++j; for (x=0; x < dest.width(); ++x) { - destData[x] = qRgba(red_channel[j], green_channel[j], + destData[x] = tqRgba(red_channel[j], green_channel[j], blue_channel[j], alpha_channel[j]); ++j; } @@ -3121,10 +3121,10 @@ TQImage KImageEffect::addNoise(TQImage &src, NoiseType noise_type) srcData = (unsigned int *)src.scanLine(y); destData = (unsigned int *)dest.scanLine(y); for(x=0; x < src.width(); ++x){ - destData[x] = qRgba(generateNoise(qRed(srcData[x]), noise_type), - generateNoise(qGreen(srcData[x]), noise_type), - generateNoise(qBlue(srcData[x]), noise_type), - qAlpha(srcData[x])); + destData[x] = tqRgba(generateNoise(tqRed(srcData[x]), noise_type), + generateNoise(tqGreen(srcData[x]), noise_type), + generateNoise(tqBlue(srcData[x]), noise_type), + tqAlpha(srcData[x])); } } } @@ -3137,10 +3137,10 @@ TQImage KImageEffect::addNoise(TQImage &src, NoiseType noise_type) destData = (unsigned int *)dest.scanLine(y); for(x=0; x < src.width(); ++x){ pixel = *(cTable+srcData[x]); - destData[x] = qRgba(generateNoise(qRed(pixel), noise_type), - generateNoise(qGreen(pixel), noise_type), - generateNoise(qBlue(pixel), noise_type), - qAlpha(pixel)); + destData[x] = tqRgba(generateNoise(tqRed(pixel), noise_type), + generateNoise(tqGreen(pixel), noise_type), + generateNoise(tqBlue(pixel), noise_type), + tqAlpha(pixel)); } } @@ -3233,10 +3233,10 @@ unsigned int KImageEffect::interpolateColor(TQImage *image, double x_offset, alpha = 1.0-x_offset; beta = 1.0-y_offset; - return(qRgba((unsigned char)(beta*(alpha*qRed(p)+x_offset*qRed(q))+y_offset*(alpha*qRed(r)+x_offset*qRed(s))), - (unsigned char)(beta*(alpha*qGreen(p)+x_offset*qGreen(q))+y_offset*(alpha*qGreen(r)+x_offset*qGreen(s))), - (unsigned char)(beta*(alpha*qBlue(p)+x_offset*qBlue(q))+y_offset*(alpha*qBlue(r)+x_offset*qBlue(s))), - (unsigned char)(beta*(alpha*qAlpha(p)+x_offset*qAlpha(q))+y_offset*(alpha*qAlpha(r)+x_offset*qAlpha(s))))); + return(tqRgba((unsigned char)(beta*(alpha*tqRed(p)+x_offset*tqRed(q))+y_offset*(alpha*tqRed(r)+x_offset*tqRed(s))), + (unsigned char)(beta*(alpha*tqGreen(p)+x_offset*tqGreen(q))+y_offset*(alpha*tqGreen(r)+x_offset*tqGreen(s))), + (unsigned char)(beta*(alpha*tqBlue(p)+x_offset*tqBlue(q))+y_offset*(alpha*tqBlue(r)+x_offset*tqBlue(s))), + (unsigned char)(beta*(alpha*tqAlpha(p)+x_offset*tqAlpha(q))+y_offset*(alpha*tqAlpha(r)+x_offset*tqAlpha(s))))); } TQImage KImageEffect::implode(TQImage &src, double factor, @@ -3434,10 +3434,10 @@ void KImageEffect::solarize(TQImage &img, double factor) count = img.width()*img.height(); } for(i=0; i < count; ++i){ - data[i] = qRgba(qRed(data[i]) > threshold ? MaxRGB-qRed(data[i]) : qRed(data[i]), - qGreen(data[i]) > threshold ? MaxRGB-qGreen(data[i]) : qGreen(data[i]), - qBlue(data[i]) > threshold ? MaxRGB-qBlue(data[i]) : qBlue(data[i]), - qAlpha(data[i])); + data[i] = tqRgba(tqRed(data[i]) > threshold ? MaxRGB-tqRed(data[i]) : tqRed(data[i]), + tqGreen(data[i]) > threshold ? MaxRGB-tqGreen(data[i]) : tqGreen(data[i]), + tqBlue(data[i]) > threshold ? MaxRGB-tqBlue(data[i]) : tqBlue(data[i]), + tqAlpha(data[i])); } } @@ -3685,7 +3685,7 @@ TQImage KImageEffect::charcoal(TQImage &src, double radius, double sigma) TQImage img(edge(src, radius)); img = blur(img, radius, sigma); normalize(img); - img.invertPixels(false); + img.tqinvertPixels(false); KImageEffect::toGray(img); return(img); } @@ -3694,7 +3694,7 @@ void KImageEffect::normalize(TQImage &image) { struct double_packet high, low, intensity, *histogram; struct short_packet *normalize_map; - Q_INT64 number_pixels; + TQ_INT64 number_pixels; int x, y; unsigned int *p, *q; register long i; @@ -3725,10 +3725,10 @@ void KImageEffect::normalize(TQImage &image) for(y=0; y < image.height(); ++y){ p = (unsigned int *)image.scanLine(y); for(x=0; x < image.width(); ++x){ - histogram[(unsigned char)(qRed(*p))].red++; - histogram[(unsigned char)(qGreen(*p))].green++; - histogram[(unsigned char)(qBlue(*p))].blue++; - histogram[(unsigned char)(qAlpha(*p))].alpha++; + histogram[(unsigned char)(tqRed(*p))].red++; + histogram[(unsigned char)(tqGreen(*p))].green++; + histogram[(unsigned char)(tqBlue(*p))].blue++; + histogram[(unsigned char)(tqAlpha(*p))].alpha++; p++; } } @@ -3736,7 +3736,7 @@ void KImageEffect::normalize(TQImage &image) /* Find the histogram boundaries by locating the 0.1 percent levels. */ - number_pixels = (Q_INT64)image.width()*image.height(); + number_pixels = (TQ_INT64)image.width()*image.height(); threshold_intensity = number_pixels/1000; /* red */ @@ -3879,22 +3879,22 @@ void KImageEffect::normalize(TQImage &image) q = (unsigned int *)image.scanLine(y); for(x=0; x < image.width(); ++x){ if(low.red != high.red) - r = (normalize_map[(unsigned short)(qRed(q[x]))].red)/257; + r = (normalize_map[(unsigned short)(tqRed(q[x]))].red)/257; else - r = qRed(q[x]); + r = tqRed(q[x]); if(low.green != high.green) - g = (normalize_map[(unsigned short)(qGreen(q[x]))].green)/257; + g = (normalize_map[(unsigned short)(tqGreen(q[x]))].green)/257; else - g = qGreen(q[x]); + g = tqGreen(q[x]); if(low.blue != high.blue) - b = (normalize_map[(unsigned short)(qBlue(q[x]))].blue)/257; + b = (normalize_map[(unsigned short)(tqBlue(q[x]))].blue)/257; else - b = qBlue(q[x]); + b = tqBlue(q[x]); if(low.alpha != high.alpha) - a = (normalize_map[(unsigned short)(qAlpha(q[x]))].alpha)/257; + a = (normalize_map[(unsigned short)(tqAlpha(q[x]))].alpha)/257; else - a = qAlpha(q[x]); - q[x] = qRgba(r, g, b, a); + a = tqAlpha(q[x]); + q[x] = tqRgba(r, g, b, a); } } liberateMemory(&normalize_map); @@ -3933,10 +3933,10 @@ void KImageEffect::equalize(TQImage &image) for(y=0; y < image.height(); ++y){ p = (unsigned int *)image.scanLine(y); for(x=0; x < image.width(); ++x){ - histogram[(unsigned char)(qRed(*p))].red++; - histogram[(unsigned char)(qGreen(*p))].green++; - histogram[(unsigned char)(qBlue(*p))].blue++; - histogram[(unsigned char)(qAlpha(*p))].alpha++; + histogram[(unsigned char)(tqRed(*p))].red++; + histogram[(unsigned char)(tqGreen(*p))].green++; + histogram[(unsigned char)(tqBlue(*p))].blue++; + histogram[(unsigned char)(tqAlpha(*p))].alpha++; p++; } } @@ -3978,22 +3978,22 @@ void KImageEffect::equalize(TQImage &image) q = (unsigned int *)image.scanLine(y); for(x=0; x < image.width(); ++x){ if(low.red != high.red) - r = (equalize_map[(unsigned short)(qRed(q[x]))].red/257); + r = (equalize_map[(unsigned short)(tqRed(q[x]))].red/257); else - r = qRed(q[x]); + r = tqRed(q[x]); if(low.green != high.green) - g = (equalize_map[(unsigned short)(qGreen(q[x]))].green/257); + g = (equalize_map[(unsigned short)(tqGreen(q[x]))].green/257); else - g = qGreen(q[x]); + g = tqGreen(q[x]); if(low.blue != high.blue) - b = (equalize_map[(unsigned short)(qBlue(q[x]))].blue/257); + b = (equalize_map[(unsigned short)(tqBlue(q[x]))].blue/257); else - b = qBlue(q[x]); + b = tqBlue(q[x]); if(low.alpha != high.alpha) - a = (equalize_map[(unsigned short)(qAlpha(q[x]))].alpha/257); + a = (equalize_map[(unsigned short)(tqAlpha(q[x]))].alpha/257); else - a = qAlpha(q[x]); - q[x] = qRgba(r, g, b, a); + a = tqAlpha(q[x]); + q[x] = tqRgba(r, g, b, a); } } liberateMemory(&equalize_map); @@ -4102,10 +4102,10 @@ void KImageEffect::blurScanLine(double *kernel, int width, q = src; for(i=0; i < columns; ++i){ if((i >= (x-width/2)) && (i <= (x+width/2))){ - red += (*p)*(qRed(*q)*257); - green += (*p)*(qGreen(*q)*257); - blue += (*p)*(qBlue(*q)*257); - alpha += (*p)*(qAlpha(*q)*257); + red += (*p)*(tqRed(*q)*257); + green += (*p)*(tqGreen(*q)*257); + blue += (*p)*(tqBlue(*q)*257); + alpha += (*p)*(tqAlpha(*q)*257); } if(((i+width/2-x) >= 0) && ((i+width/2-x) < width)) scale+=kernel[i+width/2-x]; @@ -4123,7 +4123,7 @@ void KImageEffect::blurScanLine(double *kernel, int width, blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue; alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha; - dest[x] = qRgba((unsigned char)(red/257UL), + dest[x] = tqRgba((unsigned char)(red/257UL), (unsigned char)(green/257UL), (unsigned char)(blue/257UL), (unsigned char)(alpha/257UL)); @@ -4137,10 +4137,10 @@ void KImageEffect::blurScanLine(double *kernel, int width, p = kernel+width/2-x; q = src; for(i=width/2-x; i < width; ++i){ - red += (*p)*(qRed(*q)*257); - green += (*p)*(qGreen(*q)*257); - blue += (*p)*(qBlue(*q)*257); - alpha += (*p)*(qAlpha(*q)*257); + red += (*p)*(tqRed(*q)*257); + green += (*p)*(tqGreen(*q)*257); + blue += (*p)*(tqBlue(*q)*257); + alpha += (*p)*(tqAlpha(*q)*257); scale += (*p); p++; q++; @@ -4157,7 +4157,7 @@ void KImageEffect::blurScanLine(double *kernel, int width, blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue; alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha; - dest[x] = qRgba((unsigned char)(red/257UL), + dest[x] = tqRgba((unsigned char)(red/257UL), (unsigned char)(green/257UL), (unsigned char)(blue/257UL), (unsigned char)(alpha/257UL)); @@ -4168,10 +4168,10 @@ void KImageEffect::blurScanLine(double *kernel, int width, p = kernel; q = src+(x-width/2); for (i=0; i < (long) width; ++i){ - red += (*p)*(qRed(*q)*257); - green += (*p)*(qGreen(*q)*257); - blue += (*p)*(qBlue(*q)*257); - alpha += (*p)*(qAlpha(*q)*257); + red += (*p)*(tqRed(*q)*257); + green += (*p)*(tqGreen(*q)*257); + blue += (*p)*(tqBlue(*q)*257); + alpha += (*p)*(tqAlpha(*q)*257); p++; q++; } @@ -4185,7 +4185,7 @@ void KImageEffect::blurScanLine(double *kernel, int width, blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue; alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha; - dest[x] = qRgba((unsigned char)(red/257UL), + dest[x] = tqRgba((unsigned char)(red/257UL), (unsigned char)(green/257UL), (unsigned char)(blue/257UL), (unsigned char)(alpha/257UL)); @@ -4197,10 +4197,10 @@ void KImageEffect::blurScanLine(double *kernel, int width, p = kernel; q = src+(x-width/2); for(i=0; i < columns-x+width/2; ++i){ - red += (*p)*(qRed(*q)*257); - green += (*p)*(qGreen(*q)*257); - blue += (*p)*(qBlue(*q)*257); - alpha += (*p)*(qAlpha(*q)*257); + red += (*p)*(tqRed(*q)*257); + green += (*p)*(tqGreen(*q)*257); + blue += (*p)*(tqBlue(*q)*257); + alpha += (*p)*(tqAlpha(*q)*257); scale += (*p); p++; q++; @@ -4216,7 +4216,7 @@ void KImageEffect::blurScanLine(double *kernel, int width, blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue; alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha; - dest[x] = qRgba((unsigned char)(red/257UL), + dest[x] = tqRgba((unsigned char)(red/257UL), (unsigned char)(green/257UL), (unsigned char)(blue/257UL), (unsigned char)(alpha/257UL)); @@ -4381,10 +4381,10 @@ bool KImageEffect::convolveImage(TQImage *image, TQImage *dest, for(mcx=0; mcx < width; ++mcx, ++sx){ mx = sx < 0 ? 0 : sx > image->width()-1 ? image->width()-1 : sx; - red += (*k)*(qRed(jumpTable[my][mx])*257); - green += (*k)*(qGreen(jumpTable[my][mx])*257); - blue += (*k)*(qBlue(jumpTable[my][mx])*257); - alpha += (*k)*(qAlpha(jumpTable[my][mx])*257); + red += (*k)*(tqRed(jumpTable[my][mx])*257); + green += (*k)*(tqGreen(jumpTable[my][mx])*257); + blue += (*k)*(tqBlue(jumpTable[my][mx])*257); + alpha += (*k)*(tqAlpha(jumpTable[my][mx])*257); ++k; } } @@ -4394,7 +4394,7 @@ bool KImageEffect::convolveImage(TQImage *image, TQImage *dest, blue = blue < 0 ? 0 : blue > 65535 ? 65535 : blue+0.5; alpha = alpha < 0 ? 0 : alpha > 65535 ? 65535 : alpha+0.5; - *q++ = qRgba((unsigned char)(red/257UL), + *q++ = tqRgba((unsigned char)(red/257UL), (unsigned char)(green/257UL), (unsigned char)(blue/257UL), (unsigned char)(alpha/257UL)); @@ -4528,16 +4528,16 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth, } } if(!color_shading){ - *q = qRgba((unsigned char)(shade), + *q = tqRgba((unsigned char)(shade), (unsigned char)(shade), (unsigned char)(shade), - qAlpha(*s1)); + tqAlpha(*s1)); } else{ - *q = qRgba((unsigned char)((shade*qRed(*s1))/(MaxRGB+1)), - (unsigned char)((shade*qGreen(*s1))/(MaxRGB+1)), - (unsigned char)((shade*qBlue(*s1))/(MaxRGB+1)), - qAlpha(*s1)); + *q = tqRgba((unsigned char)((shade*tqRed(*s1))/(MaxRGB+1)), + (unsigned char)((shade*tqGreen(*s1))/(MaxRGB+1)), + (unsigned char)((shade*tqBlue(*s1))/(MaxRGB+1)), + tqAlpha(*s1)); } ++s0; ++s1; @@ -4585,16 +4585,16 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth, } } if(!color_shading){ - *q = qRgba((unsigned char)(shade), + *q = tqRgba((unsigned char)(shade), (unsigned char)(shade), (unsigned char)(shade), - qAlpha(*(cTable+(*s1)))); + tqAlpha(*(cTable+(*s1)))); } else{ - *q = qRgba((unsigned char)((shade*qRed(*(cTable+(*s1))))/(MaxRGB+1)), - (unsigned char)((shade*qGreen(*(cTable+(*s1))))/(MaxRGB+1)), - (unsigned char)((shade*qBlue(*(cTable+(*s1))))/(MaxRGB+1)), - qAlpha(*s1)); + *q = tqRgba((unsigned char)((shade*tqRed(*(cTable+(*s1))))/(MaxRGB+1)), + (unsigned char)((shade*tqGreen(*(cTable+(*s1))))/(MaxRGB+1)), + (unsigned char)((shade*tqBlue(*(cTable+(*s1))))/(MaxRGB+1)), + tqAlpha(*s1)); } ++s0; ++s1; @@ -4643,7 +4643,7 @@ void KImageEffect::contrastHSV(TQImage &img, bool sharpen) brightness=0.0; v = (int)(brightness*255); c.setHsv(h, s, v); - data[i] = qRgba(c.red(), c.green(), c.blue(), qAlpha(data[i])); + data[i] = tqRgba(c.red(), c.green(), c.blue(), tqAlpha(data[i])); } } @@ -4726,7 +4726,7 @@ static void bumpmap_convert_row( uint *row, unsigned int idx = (unsigned int)(intensityValue( *row ) + 0.5); *p++ = lut[(unsigned int) ( waterlevel + ( ( idx - - waterlevel) * qBlue( *row )) / 255.0 )]; + waterlevel) * tqBlue( *row )) / 255.0 )]; } else { unsigned int idx = (unsigned int)(intensityValue( *row ) + 0.5); *p++ = lut[idx]; @@ -4807,19 +4807,19 @@ static void bumpmap_row( uint *src, * also change */ if (compensate) { - int red = (int)((qRed( *src ) * shade) / (params->compensation * 255)); - int green = (int)((qGreen( *src ) * shade) / (params->compensation * 255)); - int blue = (int)((qBlue( *src ) * shade) / (params->compensation * 255)); - int alpha = (int)((qAlpha( *src ) * shade) / (params->compensation * 255)); + int red = (int)((tqRed( *src ) * shade) / (params->compensation * 255)); + int green = (int)((tqGreen( *src ) * shade) / (params->compensation * 255)); + int blue = (int)((tqBlue( *src ) * shade) / (params->compensation * 255)); + int alpha = (int)((tqAlpha( *src ) * shade) / (params->compensation * 255)); ++src; - *dest++ = qRgba( red, green, blue, alpha ); + *dest++ = tqRgba( red, green, blue, alpha ); } else { - int red = qRed( *src ) * shade / 255; - int green = qGreen( *src ) * shade / 255; - int blue = qBlue( *src ) * shade / 255; - int alpha = qAlpha( *src ) * shade / 255; + int red = tqRed( *src ) * shade / 255; + int green = tqGreen( *src ) * shade / 255; + int blue = tqBlue( *src ) * shade / 255; + int alpha = tqAlpha( *src ) * shade / 255; ++src; - *dest++ = qRgba( red, green, blue, alpha ); + *dest++ = tqRgba( red, green, blue, alpha ); } /* Next pixel */ diff --git a/kdefx/kpixmap.cpp b/kdefx/kpixmap.cpp index eeccb6213..152ae6e83 100644 --- a/kdefx/kpixmap.cpp +++ b/kdefx/kpixmap.cpp @@ -56,7 +56,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst ) for ( gc=0; gc<=MAX_G; gc++ ) for ( bc=0; bc<=MAX_B; bc++ ) { dst->setColor( INDEXOF(rc,gc,bc), - qRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) ); + tqRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) ); } int sw = src->width(); @@ -79,8 +79,8 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst ) b = dst->scanLine(y); int endian = (TQImage::systemBitOrder() == TQImage::BigEndian); int x; - uchar* q = src->scanLine(y); - uchar* q2 = src->scanLine(y+1 < src->height() ? y + 1 : 0); + uchar* q = const_cast<TQImage*>(src)->scanLine(y); + uchar* q2 = const_cast<TQImage*>(src)->scanLine(y+1 < src->height() ? y + 1 : 0); for (int chan = 0; chan < 3; chan++) { b = dst->scanLine(y); @@ -293,26 +293,26 @@ bool KPixmap::checkColorTable( const TQImage &image ) int i = 0; if (kpixmap_iconPalette == 0) { - kpixmap_iconPalette = new QColor[40]; + kpixmap_iconPalette = new TQColor[40]; // Standard palette - kpixmap_iconPalette[i++] = tqred; - kpixmap_iconPalette[i++] = tqgreen; - kpixmap_iconPalette[i++] = tqblue; - kpixmap_iconPalette[i++] = tqcyan; - kpixmap_iconPalette[i++] = tqmagenta; - kpixmap_iconPalette[i++] = tqyellow; - kpixmap_iconPalette[i++] = tqdarkRed; - kpixmap_iconPalette[i++] = tqdarkGreen; - kpixmap_iconPalette[i++] = tqdarkBlue; - kpixmap_iconPalette[i++] = tqdarkCyan; - kpixmap_iconPalette[i++] = tqdarkMagenta; - kpixmap_iconPalette[i++] = tqdarkYellow; - kpixmap_iconPalette[i++] = tqwhite; - kpixmap_iconPalette[i++] = tqlightGray; - kpixmap_iconPalette[i++] = tqgray; - kpixmap_iconPalette[i++] = tqdarkGray; - kpixmap_iconPalette[i++] = tqblack; + kpixmap_iconPalette[i++] = red; + kpixmap_iconPalette[i++] = green; + kpixmap_iconPalette[i++] = blue; + kpixmap_iconPalette[i++] = cyan; + kpixmap_iconPalette[i++] = magenta; + kpixmap_iconPalette[i++] = yellow; + kpixmap_iconPalette[i++] = darkRed; + kpixmap_iconPalette[i++] = darkGreen; + kpixmap_iconPalette[i++] = darkBlue; + kpixmap_iconPalette[i++] = darkCyan; + kpixmap_iconPalette[i++] = darkMagenta; + kpixmap_iconPalette[i++] = darkYellow; + kpixmap_iconPalette[i++] = white; + kpixmap_iconPalette[i++] = lightGray; + kpixmap_iconPalette[i++] = gray; + kpixmap_iconPalette[i++] = darkGray; + kpixmap_iconPalette[i++] = black; // Pastels kpixmap_iconPalette[i++] = TQColor( 255, 192, 192 ); @@ -367,9 +367,9 @@ bool KPixmap::checkColorTable( const TQImage &image ) for ( i=0; i<ncols; i++ ) { for ( j=0; j<40; j++ ) { - if ( kpixmap_iconPalette[j].red() == qRed( ctable[i] ) && - kpixmap_iconPalette[j].green() == qGreen( ctable[i] ) && - kpixmap_iconPalette[j].blue() == qBlue( ctable[i] ) ) { + if ( kpixmap_iconPalette[j].red() == tqRed( ctable[i] ) && + kpixmap_iconPalette[j].green() == tqGreen( ctable[i] ) && + kpixmap_iconPalette[j].blue() == tqBlue( ctable[i] ) ) { break; } } diff --git a/kdefx/kpixmap.h b/kdefx/kpixmap.h index 8b76e87af..34397791e 100644 --- a/kdefx/kpixmap.h +++ b/kdefx/kpixmap.h @@ -54,7 +54,7 @@ class KPixmapPrivate; * @author Mark Donohoe (donohoe@kde.org) * @version $Id$ */ -class KDEFX_EXPORT KPixmap : public QPixmap +class KDEFX_EXPORT KPixmap : public TQPixmap { public: /** diff --git a/kdefx/kpixmapeffect.cpp b/kdefx/kpixmapeffect.cpp index 91f85eac2..c4bf04dae 100644 --- a/kdefx/kpixmapeffect.cpp +++ b/kdefx/kpixmapeffect.cpp @@ -154,7 +154,7 @@ KPixmap& KPixmapEffect::blend(KPixmap &pixmap, float initial_intensity, if(pixmap.depth() <= 8 ) { if ( ncols < 2 || ncols > 256 ) ncols = 3; - TQColor *dPal = new QColor[ncols]; + TQColor *dPal = new TQColor[ncols]; for (int i=0; i<ncols; i++) { tmp = 0 + 255 * i / ( ncols - 1 ); dPal[i].setRgb ( tmp, tmp, tmp ); @@ -187,7 +187,7 @@ KPixmap& KPixmapEffect::hash(KPixmap &pixmap, Lighting lite, if(pixmap.depth() <= 8 ) { if ( ncols < 2 || ncols > 256 ) ncols = 3; - TQColor *dPal = new QColor[ncols]; + TQColor *dPal = new TQColor[ncols]; for (int i=0; i<ncols; i++) { tmp = 0 + 255 * i / ( ncols - 1 ); dPal[i].setRgb ( tmp, tmp, tmp ); diff --git a/kdefx/kstyle.cpp b/kdefx/kstyle.cpp index 6ebabf681..e6398add8 100644 --- a/kdefx/kstyle.cpp +++ b/kdefx/kstyle.cpp @@ -47,6 +47,7 @@ #include <tqstylefactory.h> #include <tqtabbar.h> #include <tqtoolbar.h> +#include <tqframe.h> #include <kpixmap.h> #include <kpixmapeffect.h> @@ -62,7 +63,6 @@ #undef HAVE_XRENDER #endif - #include <limits.h> namespace @@ -117,14 +117,14 @@ namespace static bool useDropShadow(TQWidget* w) { - return w && w->metaObject() && - w->metaObject()->findProperty("KStyleMenuDropShadow") != -1; + return w && w->tqmetaObject() && + w->tqmetaObject()->tqfindProperty("KStyleMenuDropShadow") != -1; } } namespace { -class TransparencyHandler : public QObject +class TransparencyHandler : public TQObject { public: TransparencyHandler(KStyle* style, TransparencyEngine tEngine, @@ -251,14 +251,13 @@ TQString KStyle::defaultStyle() return TQString("light, 3rd revision"); } - void KStyle::polish( TQWidget* widget ) { if ( d->useFilledFrameWorkaround ) { - if ( TQFrame *frame = tqqt_cast< TQFrame* >( widget ) ) { - TQFrame::Shape shape = frame->frameShape(); - if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel) + if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { + TQFrame::Shape tqshape = frame->frameShape(); + if (tqshape == TQFrame::ToolBarPanel || tqshape == TQFrame::MenuBarPanel) widget->installEventFilter(this); } } @@ -277,9 +276,9 @@ void KStyle::unPolish( TQWidget* widget ) { if ( d->useFilledFrameWorkaround ) { - if ( TQFrame *frame = tqqt_cast< TQFrame* >( widget ) ) { - TQFrame::Shape shape = frame->frameShape(); - if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel) + if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { + TQFrame::Shape tqshape = frame->frameShape(); + if (tqshape == TQFrame::ToolBarPanel || tqshape == TQFrame::MenuBarPanel) widget->removeEventFilter(this); } } @@ -365,13 +364,13 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe, else pix.resize( w-2, h-2 ); - TQString title = wid->parentWidget()->caption(); + TQString title = wid->tqparentWidget()->caption(); TQPainter p2; p2.begin(&pix); p2.fillRect(pix.rect(), cg.brush(TQColorGroup::Highlight)); p2.setPen(cg.highlightedText()); p2.setFont(fnt); - p2.drawText(pix.rect(), TQAlignCenter, title); + p2.drawText(pix.rect(), AlignCenter, title); p2.end(); // Draw a sunken bevel @@ -435,7 +434,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe, int i; for( i=0; i < 64; i++ ) a.setPoint( i, 0, i*2+1 ); - p2.setPen( tqcolor1 ); + p2.setPen( color1 ); p2.drawPoints( a ); p2.end(); TQApplication::flushX(); @@ -444,7 +443,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe, p2.begin( d->horizontalLine ); for( i=0; i < 64; i++ ) a.setPoint( i, i*2+1, 0 ); - p2.setPen( tqcolor1 ); + p2.setPen( color1 ); p2.drawPoints( a ); p2.end(); TQApplication::flushX(); @@ -536,25 +535,25 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) c // #ifdef USE_QT4 // kdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now -void KStyle::drawPrimitive( ControlElement pe, - TQPainter* p, - const TQRect &r, - const TQColorGroup &cg, - SFlags flags, - const TQStyleOption& opt ) const -{ - // FIXME: - // What should "widget" be in actuality? How should I get it? From where? - // Almost certainly it should not be null! - TQWidget *widget = 0; - drawControl(pe, p, widget, r, cg, flags, opt); -} +//void KStyle::tqdrawPrimitive( ControlElement pe, +// TQPainter* p, +// const TQRect &r, +// const TQColorGroup &cg, +// SFlags flags, +// const TQStyleOption& opt ) const +//{ +// // FIXME: +// // What should "widget" be in actuality? How should I get it? From where? +// // Almost certainly it should not be null! +// TQWidget *widget = 0; +// tqdrawControl(pe, p, widget, r, cg, flags, opt); +//} // #endif // USE_QT4 // ----------------------------------------------------------------------------- -void KStyle::drawPrimitive( PrimitiveElement pe, +void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter* p, const TQRect &r, const TQColorGroup &cg, @@ -570,7 +569,7 @@ void KStyle::drawPrimitive( PrimitiveElement pe, if (p && p->device()->devType() == TQInternal::Widget) { widget = static_cast<TQWidget*>(p->device()); - parent = widget->parentWidget(); + parent = widget->tqparentWidget(); } else return; // Don't paint on non-widgets @@ -620,9 +619,9 @@ void KStyle::drawPrimitive( PrimitiveElement pe, } XRenderFillRectangle( - p->device()->x11Display(), + p->tqdevice()->x11Display(), PictOpOver, - p->device()->x11RenderHandle(), + p->tqdevice()->x11RenderHandle(), &clr, rect.x() + point.x(), rect.y() + point.y(), @@ -630,9 +629,9 @@ void KStyle::drawPrimitive( PrimitiveElement pe, rect.height() ); p->save(); - p->setRasterOp( Qt::CopyROP ); + p->setRasterOp( TQt::CopyROP ); p->setPen( TQPen( cg.highlight().dark( 160 ), 1 ) ); - p->setBrush( TQNoBrush ); + p->setBrush( NoBrush ); p->drawRect( rect.x() + point.x(), rect.y() + point.y(), @@ -642,12 +641,12 @@ void KStyle::drawPrimitive( PrimitiveElement pe, #endif #endif } else - TQCommonStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + TQCommonStyle::tqdrawPrimitive( pe, p, r, cg, flags, opt ); } -void KStyle::drawControl( ControlElement element, +void KStyle::tqdrawControl( ControlElement element, TQPainter* p, const TQWidget* widget, const TQRect &r, @@ -661,7 +660,7 @@ void KStyle::drawControl( ControlElement element, // ------------------------------------------------------------------------ case CE_TabBarTab: { const TQTabBar* tb = (const TQTabBar*) widget; - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = tb->tqshape(); bool selected = flags & Style_Selected; int x = r.x(), y=r.y(), bottom=r.bottom(), right=r.right(); @@ -765,7 +764,7 @@ void KStyle::drawControl( ControlElement element, p->setPen (selected ? cg.background() : cg.mid()); p->setBrush(selected ? cg.background() : cg.mid()); p->drawPolygon(a); - p->setBrush(TQNoBrush); + p->setBrush(NoBrush); if (!selected) { p->translate(0,-1); p->setPen(cg.light()); @@ -808,7 +807,7 @@ void KStyle::drawControl( ControlElement element, p->setPen (selected ? cg.background() : cg.mid()); p->setBrush(selected ? cg.background() : cg.mid()); p->drawPolygon(a); - p->setBrush(TQNoBrush); + p->setBrush(NoBrush); if (!selected) { p->translate(0,1); p->setPen(cg.dark()); @@ -825,8 +824,8 @@ void KStyle::drawControl( ControlElement element, // ------------------------------------------------------------------------ case CE_PopupMenuScroller: { p->fillRect(r, cg.background()); - drawPrimitive(PE_ButtonTool, p, r, cg, Style_Enabled); - drawPrimitive((flags & Style_Up) ? PE_ArrowUp : PE_ArrowDown, p, r, cg, Style_Enabled); + tqdrawPrimitive(PE_ButtonTool, p, r, cg, Style_Enabled); + tqdrawPrimitive((flags & Style_Up) ? PE_ArrowUp : PE_ArrowDown, p, r, cg, Style_Enabled); break; } @@ -835,7 +834,7 @@ void KStyle::drawControl( ControlElement element, // ------------------------------------------------------------------------ case CE_ProgressBarGroove: { TQRect fr = subRect(SR_ProgressBarGroove, widget); - drawPrimitive(PE_Panel, p, fr, cg, Style_Sunken, TQStyleOption::TQSO_Default); + tqdrawPrimitive(PE_Panel, p, fr, cg, Style_Sunken, TQStyleOption::SO_Default); break; } @@ -930,22 +929,22 @@ void KStyle::drawControl( ControlElement element, p->save(); p->setPen(pb->isEnabled() ? (reverse ? cg.text() : cg.highlightedText()) : cg.text()); - p->drawText(r, TQAlignCenter, pb->progressString()); + p->drawText(r, AlignCenter, pb->progressString()); p->setClipRect(crect); p->setPen(reverse ? cg.highlightedText() : cg.text()); - p->drawText(r, TQAlignCenter, pb->progressString()); + p->drawText(r, AlignCenter, pb->progressString()); p->restore(); } else { p->setPen(cg.text()); - p->drawText(r, TQAlignCenter, pb->progressString()); + p->drawText(r, AlignCenter, pb->progressString()); } break; } default: - TQCommonStyle::drawControl(element, p, widget, r, cg, flags, opt); + TQCommonStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } @@ -972,7 +971,7 @@ TQRect KStyle::subRect(SubRect r, const TQWidget* widget) const } -int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const +int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const { switch(m) { @@ -987,13 +986,13 @@ int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const TQWidget* parent = 0; // Check that we are not a normal toolbar or a hidden dockwidget, // in which case we need to adjust the height for font size - if (widget && (parent = widget->parentWidget() ) + if (widget && (parent = widget->tqparentWidget() ) && !parent->inherits("QToolBar") && !parent->inherits("QMainWindow") && widget->inherits("QDockWindowHandle") ) return widget->fontMetrics().lineSpacing(); else - return TQCommonStyle::pixelMetric(m, widget); + return TQCommonStyle::tqpixelMetric(m, widget); } // TABS @@ -1003,8 +1002,8 @@ int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const case PM_TabBarTabVSpace: { const TQTabBar * tb = (const TQTabBar *) widget; - if ( tb->shape() == TQTabBar::RoundedAbove || - tb->shape() == TQTabBar::RoundedBelow ) + if ( tb->tqshape() == TQTabBar::RoundedAbove || + tb->tqshape() == TQTabBar::RoundedBelow ) return 10; else return 4; @@ -1012,7 +1011,7 @@ int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const case PM_TabBarTabOverlap: { const TQTabBar* tb = (const TQTabBar*)widget; - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = tb->tqshape(); if ( (tbs == TQTabBar::RoundedAbove) || (tbs == TQTabBar::RoundedBelow) ) @@ -1034,7 +1033,7 @@ int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const case PM_SliderControlThickness: { const TQSlider* slider = (const TQSlider*)widget; TQSlider::TickSetting ts = slider->tickmarks(); - int thickness = (slider->orientation() == TQ_Horizontal) ? + int thickness = (slider->orientation() == Qt::Horizontal) ? slider->height() : slider->width(); switch (ts) { case TQSlider::NoMarks: // Use total area. @@ -1077,10 +1076,10 @@ int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const return 0; case PM_PopupMenuScrollerHeight: - return pixelMetric( PM_ScrollBarExtent, 0); + return tqpixelMetric( PM_ScrollBarExtent, 0); default: - return TQCommonStyle::pixelMetric( m, widget ); + return TQCommonStyle::tqpixelMetric( m, widget ); } } @@ -1097,7 +1096,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) return sibling; } -void KStyle::drawComplexControl( ComplexControl control, +void KStyle::tqdrawComplexControl( ComplexControl control, TQPainter* p, const TQWidget* widget, const TQRect &r, @@ -1139,50 +1138,50 @@ void KStyle::drawComplexControl( ComplexControl control, // Draw the up/left button set if ((controls & SC_ScrollBarSubLine) && subline.isValid()) { - drawPrimitive(PE_ScrollBarSubLine, p, subline, cg, + tqdrawPrimitive(PE_ScrollBarSubLine, p, subline, cg, sflags | (active == SC_ScrollBarSubLine ? Style_Down : Style_Default)); if (useThreeButtonScrollBar && subline2.isValid()) - drawPrimitive(PE_ScrollBarSubLine, p, subline2, cg, + tqdrawPrimitive(PE_ScrollBarSubLine, p, subline2, cg, sflags | (active == SC_ScrollBarSubLine ? Style_Down : Style_Default)); } if ((controls & SC_ScrollBarAddLine) && addline.isValid()) - drawPrimitive(PE_ScrollBarAddLine, p, addline, cg, + tqdrawPrimitive(PE_ScrollBarAddLine, p, addline, cg, sflags | ((active == SC_ScrollBarAddLine) ? Style_Down : Style_Default)); if ((controls & SC_ScrollBarSubPage) && subpage.isValid()) - drawPrimitive(PE_ScrollBarSubPage, p, subpage, cg, + tqdrawPrimitive(PE_ScrollBarSubPage, p, subpage, cg, sflags | ((active == SC_ScrollBarSubPage) ? Style_Down : Style_Default)); if ((controls & SC_ScrollBarAddPage) && addpage.isValid()) - drawPrimitive(PE_ScrollBarAddPage, p, addpage, cg, + tqdrawPrimitive(PE_ScrollBarAddPage, p, addpage, cg, sflags | ((active == SC_ScrollBarAddPage) ? Style_Down : Style_Default)); if ((controls & SC_ScrollBarFirst) && first.isValid()) - drawPrimitive(PE_ScrollBarFirst, p, first, cg, + tqdrawPrimitive(PE_ScrollBarFirst, p, first, cg, sflags | ((active == SC_ScrollBarFirst) ? Style_Down : Style_Default)); if ((controls & SC_ScrollBarLast) && last.isValid()) - drawPrimitive(PE_ScrollBarLast, p, last, cg, + tqdrawPrimitive(PE_ScrollBarLast, p, last, cg, sflags | ((active == SC_ScrollBarLast) ? Style_Down : Style_Default)); if ((controls & SC_ScrollBarSlider) && slider.isValid()) { - drawPrimitive(PE_ScrollBarSlider, p, slider, cg, + tqdrawPrimitive(PE_ScrollBarSlider, p, slider, cg, sflags | ((active == SC_ScrollBarSlider) ? Style_Down : Style_Default)); // Draw focus rect if (sb->hasFocus()) { TQRect fr(slider.x() + 2, slider.y() + 2, slider.width() - 5, slider.height() - 5); - drawPrimitive(PE_FocusRect, p, fr, cg, Style_Default); + tqdrawPrimitive(PE_FocusRect, p, fr, cg, Style_Default); } } break; @@ -1201,10 +1200,10 @@ void KStyle::drawComplexControl( ComplexControl control, TQPainter p2; p2.begin(&pix); - if ( slider->parentWidget() && - slider->parentWidget()->backgroundPixmap() && - !slider->parentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(slider->parentWidget()->backgroundPixmap()); + if ( slider->tqparentWidget() && + slider->tqparentWidget()->backgroundPixmap() && + !slider->tqparentWidget()->backgroundPixmap()->isNull() ) { + TQPixmap pixmap = *(slider->tqparentWidget()->backgroundPixmap()); p2.drawTiledPixmap(r, pixmap, slider->pos()); } else pix.fill(cg.background()); @@ -1215,12 +1214,12 @@ void KStyle::drawComplexControl( ComplexControl control, // Draw the focus rect around the groove if (slider->hasFocus()) - drawPrimitive(PE_FocusRect, &p2, groove, cg); + tqdrawPrimitive(PE_FocusRect, &p2, groove, cg); } // Draw the tickmarks if (controls & SC_SliderTickmarks) - TQCommonStyle::drawComplexControl(control, &p2, widget, + TQCommonStyle::tqdrawComplexControl(control, &p2, widget, r, cg, flags, SC_SliderTickmarks, active, opt); // Draw the slider handle @@ -1246,7 +1245,7 @@ void KStyle::drawComplexControl( ComplexControl control, // Paint the icon and text. if ( controls & SC_ListView ) - TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); + TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); // If we're have a branch or are expanded... if ( controls & (SC_ListViewBranch | SC_ListViewExpand) ) @@ -1386,7 +1385,7 @@ void KStyle::drawComplexControl( ComplexControl control, } default: - TQCommonStyle::drawComplexControl( control, p, widget, r, cg, + TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); break; } @@ -1425,7 +1424,7 @@ TQRect KStyle::querySubControlMetrics( ComplexControl control, const TQScrollBar *sb = (const TQScrollBar*)widget; bool horizontal = sb->orientation() == Qt::Horizontal; int sliderstart = sb->sliderStart(); - int sbextent = pixelMetric(PM_ScrollBarExtent, widget); + int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget); int maxlen = (horizontal ? sb->width() : sb->height()) - (sbextent * (threeButtonScrollBar ? 3 : 2)); int sliderlen; @@ -1436,7 +1435,7 @@ TQRect KStyle::querySubControlMetrics( ComplexControl control, uint range = sb->maxValue() - sb->minValue(); sliderlen = (sb->pageStep() * maxlen) / (range + sb->pageStep()); - int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget ); + int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget ); if ( sliderlen < slidermin || range > INT_MAX / 2 ) sliderlen = slidermin; if ( sliderlen > maxlen ) @@ -1826,7 +1825,7 @@ TQPixmap KStyle::stylePixmap( StylePixmap stylepixmap, } -int KStyle::styleHint( StyleHint sh, const TQWidget* w, +int KStyle::tqstyleHint( StyleHint sh, const TQWidget* w, const TQStyleOption &opt, QStyleHintReturn* shr) const { switch (sh) @@ -1841,7 +1840,7 @@ int KStyle::styleHint( StyleHint sh, const TQWidget* w, return d->menuAltKeyNavigation ? 1 : 0; case SH_PopupMenu_SubMenuPopupDelay: - if ( styleHint( SH_PopupMenu_SloppySubMenus, w ) ) + if ( tqstyleHint( SH_PopupMenu_SloppySubMenus, w ) ) return QMIN( 100, d->popupMenuDelay ); else return d->popupMenuDelay; @@ -1877,7 +1876,7 @@ int KStyle::styleHint( StyleHint sh, const TQWidget* w, } default: - return TQCommonStyle::styleHint(sh, w, opt, shr); + return TQCommonStyle::tqstyleHint(sh, w, opt, shr); } } @@ -1890,19 +1889,19 @@ bool KStyle::eventFilter( TQObject* object, TQEvent* event ) // ensure that the filled frame contents are properly painted. // We essentially modify the paintEvent's rect to include the // panel border, which also paints the widget's interior. - // This is nasty, but I see no other way to properly repaint + // This is nasty, but I see no other way to properly tqrepaint // filled frames in all QMenuBars and QToolBars. // -- Karol. TQFrame *frame = 0; if ( event->type() == TQEvent::Paint - && (frame = tqqt_cast<TQFrame*>(object)) ) + && (frame = ::tqqt_cast<TQFrame*>(object)) ) { if (frame->frameShape() != TQFrame::ToolBarPanel && frame->frameShape() != TQFrame::MenuBarPanel) return false; bool horizontal = true; TQPaintEvent* pe = (TQPaintEvent*)event; - TQToolBar *toolbar = tqqt_cast< TQToolBar *>( frame ); + TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame ); TQRect r = pe->rect(); if (toolbar && toolbar->orientation() == Qt::Vertical) @@ -2042,8 +2041,8 @@ void TransparencyHandler::createShadowWindows(const TQWidget* p) // Create a fake drop-down shadow effect via blended Xwindows ShadowElements se; - se.w1 = new TQWidget(0, 0, WStyle_Customize | WType_Popup | WX11BypassWM ); - se.w2 = new TQWidget(0, 0, WStyle_Customize | WType_Popup | WX11BypassWM ); + se.w1 = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WType_Popup | WX11BypassWM) ); + se.w2 = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WType_Popup | WX11BypassWM) ); se.w1->setGeometry(shadow1); se.w2->setGeometry(shadow2); XSelectInput(qt_xdisplay(), se.w1->winId(), StructureNotifyMask ); @@ -2082,7 +2081,7 @@ void TransparencyHandler::createShadowWindows(const TQWidget* p) void TransparencyHandler::removeShadowWindows(const TQWidget* p) { #ifdef Q_WS_X11 - ShadowMap::iterator it = shadowMap().find(p); + ShadowMap::iterator it = shadowMap().tqfind(p); if (it != shadowMap().end()) { ShadowElements se = it.data(); @@ -2128,12 +2127,12 @@ bool TransparencyHandler::eventFilter( TQObject* object, TQEvent* event ) case XRender: #endif case SoftwareBlend: - blendToPixmap(p->colorGroup(), p); + blendToPixmap(p->tqcolorGroup(), p); break; case SoftwareTint: default: - blendToColor(p->colorGroup().button()); + blendToColor(p->tqcolorGroup().button()); }; p->setErasePixmap(pix); @@ -2145,7 +2144,7 @@ bool TransparencyHandler::eventFilter( TQObject* object, TQEvent* event ) // * TODO : determine real cause for duplicate events // * till 20021005 if ((dropShadow || useDropShadow(p)) - && p->width() > 16 && p->height() > 16 && !shadowMap().contains( p )) + && p->width() > 16 && p->height() > 16 && !shadowMap().tqcontains( p )) createShadowWindows(p); } else if (et == TQEvent::Resize && p->isShown() && p->isTopLevel()) @@ -2198,8 +2197,8 @@ void TransparencyHandler::blendToPixmap(const TQColorGroup &cg, const TQWidget* return; // Allow styles to define the blend pixmap - allows for some interesting effects. - if (::qt_cast<TQPopupMenu*>(p)) - kstyle->renderMenuBlendPixmap( blendPix, cg, ::qt_cast<TQPopupMenu*>(p) ); + if (::tqqt_cast<TQPopupMenu*>(p)) + kstyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) ); else blendPix.fill(cg.button()); // Just tint as the default behavior @@ -2220,11 +2219,11 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p) renderPix.resize( pix.width(), pix.height() ); // Allow styles to define the blend pixmap - allows for some interesting effects. - if (::qt_cast<TQPopupMenu*>(p)) - kstyle->renderMenuBlendPixmap( renderPix, p->colorGroup(), - ::qt_cast<TQPopupMenu*>(p) ); + if (::tqqt_cast<TQPopupMenu*>(p)) + kstyle->renderMenuBlendPixmap( renderPix, p->tqcolorGroup(), + ::tqqt_cast<TQPopupMenu*>(p) ); else - renderPix.fill(p->colorGroup().button()); // Just tint as the default behavior + renderPix.fill(p->tqcolorGroup().button()); // Just tint as the default behavior Display* dpy = qt_xdisplay(); Pixmap alphaPixmap; diff --git a/kdefx/kstyle.h b/kdefx/kstyle.h index 1e8b0df2c..a50ab721e 100644 --- a/kdefx/kstyle.h +++ b/kdefx/kstyle.h @@ -54,9 +54,10 @@ struct KStylePrivate; * @author Karol Szwed (gallium@kde.org) * @version $Id$ */ -class KDEFX_EXPORT KStyle: public QCommonStyle +class KDEFX_EXPORT KStyle: public TQCommonStyle { Q_OBJECT + TQ_OBJECT public: @@ -70,7 +71,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle * internal menu transparency engine. * * @li FilledFrameWorkaround - Enable this flag to facilitate - * proper repaints of QMenuBars and QToolBars when the style chooses + * proper tqrepaints of QMenuBars and QToolBars when the style chooses * to paint the interior of a TQFrame. The style primitives in question * are PE_PanelMenuBar and PE_PanelDockWindow. The HighColor style uses * this workaround to enable painting of gradients in menubars and @@ -171,7 +172,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle * This virtual function defines the pixmap used to blend between the popup * menu and the background to create different menu transparency effects. * For example, you can fill the pixmap "pix" with a gradient based on the - * popup's colorGroup, a texture, or some other fancy painting routine. + * popup's tqcolorGroup, a texture, or some other fancy painting routine. * KStyle will then internally blend this pixmap with a snapshot of the * background behind the popupMenu to create the illusion of transparency. * @@ -237,13 +238,13 @@ class KDEFX_EXPORT KStyle: public QCommonStyle }; /** - * This function is identical to Qt's TQStyle::drawPrimitive(), except that + * This function is identical to Qt's TQStyle::tqdrawPrimitive(), except that * it adds one further parameter, 'widget', that can be used to determine * the widget state of the KStylePrimitive in question. * * @see KStyle::KStylePrimitive - * @see TQStyle::drawPrimitive - * @see TQStyle::drawComplexControl + * @see TQStyle::tqdrawPrimitive + * @see TQStyle::tqdrawComplexControl */ virtual void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, @@ -251,7 +252,7 @@ class KDEFX_EXPORT KStyle: public QCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::TQSO_Default ) const; + const TQStyleOption& = TQStyleOption::SO_Default ) const; enum KStylePixelMetric { @@ -274,33 +275,33 @@ class KDEFX_EXPORT KStyle: public QCommonStyle void unPolish( TQWidget* widget ); void polishPopupMenu( TQPopupMenu* ); - void drawPrimitive( PrimitiveElement pe, + void tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter* p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::TQSO_Default ) const; + const TQStyleOption& = TQStyleOption::SO_Default ) const; // #ifdef USE_QT4 // kdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now - void drawPrimitive( ControlElement pe, - TQPainter* p, - const TQRect &r, - const TQColorGroup &cg, - SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::TQSO_Default ) const; +// void tqdrawPrimitive( ControlElement pe, +// TQPainter* p, +// const TQRect &r, +// const TQColorGroup &cg, +// SFlags flags = Style_Default, +// const TQStyleOption& = TQStyleOption::SO_Default ) const; // #endif // USE_QT4 - void drawControl( ControlElement element, + void tqdrawControl( ControlElement element, TQPainter* p, const TQWidget* widget, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::TQSO_Default ) const; + const TQStyleOption& = TQStyleOption::SO_Default ) const; - void drawComplexControl( ComplexControl control, + void tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget* widget, const TQRect &r, @@ -308,19 +309,19 @@ class KDEFX_EXPORT KStyle: public QCommonStyle SFlags flags = Style_Default, SCFlags controls = SC_All, SCFlags active = SC_None, - const TQStyleOption& = TQStyleOption::TQSO_Default ) const; + const TQStyleOption& = TQStyleOption::SO_Default ) const; SubControl querySubControl( ComplexControl control, const TQWidget* widget, const TQPoint &pos, - const TQStyleOption& = TQStyleOption::TQSO_Default ) const; + const TQStyleOption& = TQStyleOption::SO_Default ) const; TQRect querySubControlMetrics( ComplexControl control, const TQWidget* widget, SubControl sc, - const TQStyleOption& = TQStyleOption::TQSO_Default ) const; + const TQStyleOption& = TQStyleOption::SO_Default ) const; - int pixelMetric( PixelMetric m, + int tqpixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const; TQRect subRect( SubRect r, @@ -328,11 +329,11 @@ class KDEFX_EXPORT KStyle: public QCommonStyle TQPixmap stylePixmap( StylePixmap stylepixmap, const TQWidget* widget = 0, - const TQStyleOption& = TQStyleOption::TQSO_Default ) const; + const TQStyleOption& = TQStyleOption::SO_Default ) const; - int styleHint( StyleHint sh, + int tqstyleHint( StyleHint sh, const TQWidget* w = 0, - const TQStyleOption &opt = TQStyleOption::TQSO_Default, + const TQStyleOption &opt = TQStyleOption::SO_Default, QStyleHintReturn* shr = 0 ) const; protected: diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp index ef1b0f4e8..8a6d44d6e 100644 --- a/kdeprint/cups/cupsaddsmb2.cpp +++ b/kdeprint/cups/cupsaddsmb2.cpp @@ -156,7 +156,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) while (1) { // read a line - line = TQString::fromLatin1(""); + line = TQString::tqfromLatin1(""); partial = true; while (index < buflen) { @@ -231,7 +231,7 @@ void CupsAddSmb::checkActionStatus() m_status = (m_buffer.count() == 0); break; case MkDir: - m_status = (m_buffer.count() == 1 || m_buffer[1].find("ERRfilexists") != -1); + m_status = (m_buffer.count() == 1 || m_buffer[1].tqfind("ERRfilexists") != -1); break; case AddDriver: case AddPrinter: @@ -315,7 +315,7 @@ void CupsAddSmb::slotProcessExited(KProcess*) if (m_proc.normalExit() && m_state != Start && m_status) { // last process went OK. If it was smbclient, then switch to rpcclient - if (qstrncmp(m_proc.args().first(), "smbclient", 9) == 0) + if (tqstrncmp(m_proc.args().first(), "smbclient", 9) == 0) { doInstall(); return; @@ -433,7 +433,7 @@ bool CupsAddSmb::doExport() m_actions << "quit"; m_proc.clearArguments(); - m_proc << "smbclient" << TQString::fromLatin1("//")+m_servered->text()+"/print$"; + m_proc << "smbclient" << TQString::tqfromLatin1("//")+m_servered->text()+"/print$"; return startProcess(); } diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp index 1811abf68..d4f5b900f 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp @@ -76,7 +76,7 @@ TQString AddressDialog::newAddress(TQWidget *parent) TQString AddressDialog::editAddress(const TQString& addr, TQWidget *parent) { AddressDialog dlg(parent); - int p = addr.find(' '); + int p = addr.tqfind(' '); if (p != -1) { dlg.type_->setCurrentItem(addr.left(p).lower() == "deny" ? 1 : 0); diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp index 43847299b..62c9a0c6f 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -92,7 +92,7 @@ TQString CupsdComment::comment(const TQString& key) { if (comments_.count() != 0 || loadComments()) { - Comment *comm = comments_.find(key); + Comment *comm = comments_.tqfind(key); if (comm) return comm->comment(); } @@ -103,7 +103,7 @@ TQString CupsdComment::toolTip(const TQString& key) { if (comments_.count() != 0 || loadComments()) { - Comment *comm = comments_.find(key); + Comment *comm = comments_.tqfind(key); if (comm) return comm->toolTip(); } diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index f500d219c..535866e4f 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -42,7 +42,7 @@ TQString findDir(const TQStringList& list) void splitSizeSpec(const TQString& s, int& sz, int& suff) { - int p = s.find(TQRegExp("\\D")); + int p = s.tqfind(TQRegExp("\\D")); sz = s.mid(0, p).toInt(); if (p != -1) { @@ -484,7 +484,7 @@ bool CupsdConf::parseOption(const TQString& line) int p(-1); TQString keyword, value, l(line.simplifyWhiteSpace()); - if ((p=l.find(' ')) != -1) + if ((p=l.tqfind(' ')) != -1) { keyword = l.left(p).lower(); value = l.mid(p+1); @@ -508,7 +508,7 @@ bool CupsdConf::parseOption(const TQString& line) { browseprotocols_.clear(); TQStringList prots = TQStringList::split(TQRegExp("\\s"), value, false); - if (prots.find("all") != prots.end()) + if (prots.tqfind("all") != prots.end()) browseprotocols_ << "CUPS" << "SLP"; else for (TQStringList::ConstIterator it=prots.begin(); it!=prots.end(); ++it) @@ -718,7 +718,7 @@ CupsLocation::CupsLocation(const CupsLocation& loc) bool CupsLocation::parseResource(const TQString& line) { QString str = line.simplifyWhiteSpace(); - int p1 = line.find(' '), p2 = line.find('>'); + int p1 = line.tqfind(' '), p2 = line.tqfind('>'); if (p1 != -1 && p2 != -1) { resourcename_ = str.mid(p1+1,p2-p1-1); @@ -732,7 +732,7 @@ bool CupsLocation::parseOption(const TQString& line) int p(-1); TQString keyword, value, l(line.simplifyWhiteSpace()); - if ((p=l.find(' ')) != -1) + if ((p=l.tqfind(' ')) != -1) { keyword = l.left(p).lower(); value = l.mid(p+1); @@ -760,7 +760,7 @@ bool CupsLocation::parseOption(const TQString& line) else if (keyword == "authgroupname") authname_ = value; else if (keyword == "require") { - int p = value.find(' '); + int p = value.tqfind(' '); if (p != -1) { authname_ = value.mid(p+1); @@ -810,8 +810,8 @@ int CupsResource::typeFromText(const TQString& text) { if (text == i18n("Base", "Root") || text == i18n("All printers") || text == i18n("All classes") || text == i18n("Print jobs")) return RESOURCE_GLOBAL; else if (text == i18n("Administration")) return RESOURCE_ADMIN; - else if (text.find(i18n("Class")) == 0) return RESOURCE_CLASS; - else if (text.find(i18n("Printer")) == 0) return RESOURCE_PRINTER; + else if (text.tqfind(i18n("Class")) == 0) return RESOURCE_CLASS; + else if (text.tqfind(i18n("Printer")) == 0) return RESOURCE_PRINTER; else return RESOURCE_PRINTER; } @@ -832,12 +832,12 @@ TQString CupsResource::textToPath(const TQString& text) else if (text == i18n("All classes")) path = "/classes"; else if (text == i18n("Print jobs")) path = "/jobs"; else if (text == i18n("Base", "Root")) path = "/"; - else if (text.find(i18n("Printer")) == 0) + else if (text.tqfind(i18n("Printer")) == 0) { path = "/printers/"; path.append(text.right(text.length()-i18n("Printer").length()-1)); } - else if (text.find(i18n("Class")) == 0) + else if (text.tqfind(i18n("Class")) == 0) { path = "/classes/"; path.append(text.right(text.length()-i18n("Class").length()-1)); @@ -853,13 +853,13 @@ TQString CupsResource::pathToText(const TQString& path) else if (path == "/classes") text = i18n("All classes"); else if (path == "/") text = i18n("Root"); else if (path == "/jobs") text = i18n("Print jobs"); - else if (path.find("/printers/") == 0) + else if (path.tqfind("/printers/") == 0) { text = i18n("Printer"); text.append(" "); text.append(path.right(path.length()-10)); } - else if (path.find("/classes/") == 0) + else if (path.tqfind("/classes/") == 0) { text = i18n("Class"); text.append(" "); diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index 8023aeef7..50f8a3858 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -337,7 +337,7 @@ int CupsdDialog::serverOwner() while (!t.eof()) { str = t.readLine(); - if (str.find("Uid:",0,false) == 0) + if (str.tqfind("Uid:",0,false) == 0) { QStringList list = TQStringList::split('\t', str, false); if (list.count() >= 2) diff --git a/kdeprint/cups/cupsdconf2/cupsdpage.h b/kdeprint/cups/cupsdconf2/cupsdpage.h index e503319ca..f6c8b932b 100644 --- a/kdeprint/cups/cupsdconf2/cupsdpage.h +++ b/kdeprint/cups/cupsdconf2/cupsdpage.h @@ -24,7 +24,7 @@ struct CupsdConf; -class CupsdPage : public QWidget +class CupsdPage : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp index 9dd7581a8..754e7cbd5 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -39,11 +39,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) QLabel *cupslogo_ = new TQLabel(this); QString logopath = locate("data", TQString("kdeprint/cups_logo.png")); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - cupslogo_->setAlignment(Qt::AlignCenter); + cupslogo_->tqsetAlignment(Qt::AlignCenter); QLabel *kupslogo_ = new TQLabel(this); logopath = locate("data", TQString("kdeprint/kde_logo.png")); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - kupslogo_->setAlignment(Qt::AlignCenter); + kupslogo_->tqsetAlignment(Qt::AlignCenter); QLabel *helptxt_ = new TQLabel(this); helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. " diff --git a/kdeprint/cups/cupsdconf2/editlist.h b/kdeprint/cups/cupsdconf2/editlist.h index 9035d980f..9f4800c15 100644 --- a/kdeprint/cups/cupsdconf2/editlist.h +++ b/kdeprint/cups/cupsdconf2/editlist.h @@ -26,7 +26,7 @@ class KListBox; class TQPushButton; -class EditList : public QWidget +class EditList : public TQWidget { Q_OBJECT diff --git a/kdeprint/cups/cupsdconf2/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp index e17e2b081..184005c13 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.cpp +++ b/kdeprint/cups/cupsdconf2/portdialog.cpp @@ -93,12 +93,12 @@ TQString PortDialog::editListen(const TQString& s, TQWidget *parent, CupsdConf * { PortDialog dlg(parent); dlg.setInfos(conf); - int p = s.find(' '); + int p = s.tqfind(' '); if (p != -1) { dlg.usessl_->setChecked(s.left(p).startsWith("SSL")); QString addr = s.mid(p+1).stripWhiteSpace(); - int p1 = addr.find(':'); + int p1 = addr.tqfind(':'); if (p1 == -1) { dlg.address_->setText(addr); diff --git a/kdeprint/cups/cupsdconf2/qdirlineedit.h b/kdeprint/cups/cupsdconf2/qdirlineedit.h index 1f4d87d17..9d4a03b34 100644 --- a/kdeprint/cups/cupsdconf2/qdirlineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirlineedit.h @@ -26,7 +26,7 @@ class TQLineEdit; class TQPushButton; -class QDirLineEdit : public QWidget +class QDirLineEdit : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index 1daca81cb..7b96d4ef9 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -44,7 +44,7 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); m_remove->setEnabled(false); - m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2)); + m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->tqsizeHint().height()*2)); QHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3); QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h index 8853bd18e..66586d37f 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.h +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.h @@ -26,7 +26,7 @@ class KListView; class TQListViewItem; class TQPushButton; -class QDirMultiLineEdit : public QWidget +class QDirMultiLineEdit : public TQWidget { Q_OBJECT diff --git a/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp index d77fe5aaa..5920c30a9 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.cpp +++ b/kdeprint/cups/cupsdconf2/sizewidget.cpp @@ -45,7 +45,7 @@ SizeWidget::SizeWidget( TQWidget *parent, const char *name ) void SizeWidget::setSizeString( const TQString& sz ) { - int p = sz.find( TQRegExp( "\\D" ) ); + int p = sz.tqfind( TQRegExp( "\\D" ) ); m_size->setValue( sz.left( p ).toInt() ); switch( sz[ p ].latin1() ) { diff --git a/kdeprint/cups/cupsdconf2/sizewidget.h b/kdeprint/cups/cupsdconf2/sizewidget.h index faa52e27b..56818b9a1 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.h +++ b/kdeprint/cups/cupsdconf2/sizewidget.h @@ -25,7 +25,7 @@ class TQSpinBox; class TQComboBox; -class SizeWidget : public QWidget +class SizeWidget : public TQWidget { public: SizeWidget( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kdeprint/cups/cupsinfos.cpp b/kdeprint/cups/cupsinfos.cpp index 839f83612..78bbeb458 100644 --- a/kdeprint/cups/cupsinfos.cpp +++ b/kdeprint/cups/cupsinfos.cpp @@ -119,9 +119,9 @@ void CupsInfos::load() { KConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); - host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer())); + host_ = conf_->readEntry("Host",TQString::tqfromLatin1(cupsServer())); port_ = conf_->readNumEntry("Port",ippPort()); - login_ = conf_->readEntry("Login",TQString::fromLatin1(cupsUser())); + login_ = conf_->readEntry("Login",TQString::tqfromLatin1(cupsUser())); savepwd_ = conf_->readBoolEntry( "SavePassword", false ); if ( savepwd_ ) { diff --git a/kdeprint/cups/image.cpp b/kdeprint/cups/image.cpp index 4fe214bc1..9e32ce771 100644 --- a/kdeprint/cups/image.cpp +++ b/kdeprint/cups/image.cpp @@ -267,9 +267,9 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne for (int j=0;j<image.height();j++) { c = image.pixel(i,j); - r = qRed(c); - g = qGreen(c); - b = qBlue(c); + r = tqRed(c); + g = tqGreen(c); + b = tqBlue(c); v = lut[0][0][r] + lut[1][0][g] + lut[2][0][b]; if (gamma != 1000) v = (int)rint(pow(v,gam)); @@ -289,7 +289,7 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne else if (v > 255) b2 = 255; else b2 = v; - img.setPixel(i,j,qRgb(r2,g2,b2)); + img.setPixel(i,j,tqRgb(r2,g2,b2)); } return img; } diff --git a/kdeprint/cups/imageposition.cpp b/kdeprint/cups/imageposition.cpp index bc2b207fd..9e0ab4941 100644 --- a/kdeprint/cups/imageposition.cpp +++ b/kdeprint/cups/imageposition.cpp @@ -44,8 +44,8 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name) : TQWidget(parent,name) { position_ = Center; - setMinimumSize(sizeHint()); - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + setMinimumSize(tqsizeHint()); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); pix_.load(locate("data", "kdeprint/preview-mini.png")); } @@ -147,7 +147,7 @@ void ImagePosition::paintEvent(TQPaintEvent*) p.end(); } -TQSize ImagePosition::sizeHint() const +TQSize ImagePosition::tqsizeHint() const { return TQSize(60, 80); } diff --git a/kdeprint/cups/imageposition.h b/kdeprint/cups/imageposition.h index caaa63ca2..406e96951 100644 --- a/kdeprint/cups/imageposition.h +++ b/kdeprint/cups/imageposition.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqpixmap.h> -class ImagePosition : public QWidget +class ImagePosition : public TQWidget { public: enum PositionType {TopLeft, @@ -45,7 +45,7 @@ public: void setPosition(int horiz = 1, int vert = 1); PositionType position() const { return (PositionType)position_; } TQString positionString() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void paintEvent(TQPaintEvent *); diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp index 7ae5dabf0..9272399e4 100644 --- a/kdeprint/cups/imagepreview.cpp +++ b/kdeprint/cups/imagepreview.cpp @@ -51,7 +51,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga hue_ = hue; saturation_ = saturation; gamma_ = gamma; - repaint(); + tqrepaint(); } void ImagePreview::paintEvent(TQPaintEvent*){ @@ -59,7 +59,7 @@ void ImagePreview::paintEvent(TQPaintEvent*){ int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2; QPixmap buffer(width(), height()); - buffer.fill(parentWidget(), 0, 0); + buffer.fill(tqparentWidget(), 0, 0); QPainter p(&buffer); p.drawImage(x,y,tmpImage); p.end(); @@ -72,7 +72,7 @@ void ImagePreview::setBlackAndWhite(bool on){ update(); } -TQSize ImagePreview::minimumSizeHint() const +TQSize ImagePreview::tqminimumSizeHint() const { return image_.size(); } diff --git a/kdeprint/cups/imagepreview.h b/kdeprint/cups/imagepreview.h index 1967efdc2..ff9da9fb8 100644 --- a/kdeprint/cups/imagepreview.h +++ b/kdeprint/cups/imagepreview.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <tqimage.h> -class ImagePreview : public QWidget +class ImagePreview : public TQWidget { public: ImagePreview(TQWidget *parent=0, const char *name=0); @@ -32,7 +32,7 @@ public: void setParameters(int brightness, int hue, int saturation, int gamma); void setImage(const TQImage& image); void setBlackAndWhite(bool on); - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; private: // Private attributes int brightness_; diff --git a/kdeprint/cups/ippreportdlg.cpp b/kdeprint/cups/ippreportdlg.cpp index 343cd4118..20882d8c4 100644 --- a/kdeprint/cups/ippreportdlg.cpp +++ b/kdeprint/cups/ippreportdlg.cpp @@ -59,7 +59,7 @@ void IppReportDlg::slotUser1() int hh = rich.height(), page(1); while (1) { - rich.draw(&painter, margin, margin, r, colorGroup()); + rich.draw(&painter, margin, margin, r, tqcolorGroup()); QString s = caption() + ": " + TQString::number(page); QRect br = painter.fontMetrics().boundingRect(s); painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s); diff --git a/kdeprint/cups/ipprequest.cpp b/kdeprint/cups/ipprequest.cpp index 0b32e45e7..0f6c8cbc6 100644 --- a/kdeprint/cups/ipprequest.cpp +++ b/kdeprint/cups/ipprequest.cpp @@ -66,7 +66,7 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString:: ipp_attribute_t *attr = req->attrs; while (attr) { - TQString s = TQString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16); + TQString s = TQString::tqfromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16); for (int i=0;i<attr->num_values;i++) { switch (attr->value_tag) diff --git a/kdeprint/cups/kcupsprinterimpl.cpp b/kdeprint/cups/kcupsprinterimpl.cpp index 1bf6d55bf..7fa6da140 100644 --- a/kdeprint/cups/kcupsprinterimpl.cpp +++ b/kdeprint/cups/kcupsprinterimpl.cpp @@ -37,9 +37,9 @@ TQSize rangeToSize(const TQString& s) int p(-1); int from, to; - if ((p=range.find(',')) != -1) + if ((p=range.tqfind(',')) != -1) range.truncate(p); - if ((p=range.find('-')) != -1) + if ((p=range.tqfind('-')) != -1) { from = range.left(p).toInt(); to = range.right(range.length()-p-1).toInt(); @@ -67,8 +67,8 @@ bool KCupsPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) // check printer object if (!printer) return false; - QString hoststr = TQString::fromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); - cmd = TQString::fromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName())); + QString hoststr = TQString::tqfromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); + cmd = TQString::tqfromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName())); if (!CupsInfos::self()->login().isEmpty()) { QString userstr(CupsInfos::self()->login()); @@ -127,7 +127,7 @@ void KCupsPrinterImpl::broadcastOption(const TQString& key, const TQString& valu KPrinterImpl::broadcastOption("orientation-requested",(value == "Landscape" ? "4" : "3")); else if (key == "kde-pagesize") { - QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); + QString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); KPrinterImpl::broadcastOption("PageSize",pagename); // simple hack for classes KPrinterImpl::broadcastOption("media",pagename); diff --git a/kdeprint/cups/kmcupsconfigwidget.h b/kdeprint/cups/kmcupsconfigwidget.h index 6c0ceedf7..6f213af6c 100644 --- a/kdeprint/cups/kmcupsconfigwidget.h +++ b/kdeprint/cups/kmcupsconfigwidget.h @@ -26,7 +26,7 @@ class TQLineEdit; class TQCheckBox; class KConfig; -class KMCupsConfigWidget : public QWidget +class KMCupsConfigWidget : public TQWidget { public: KMCupsConfigWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/kdeprint/cups/kmcupsjobmanager.cpp b/kdeprint/cups/kmcupsjobmanager.cpp index 011256cd6..35f2ea272 100644 --- a/kdeprint/cups/kmcupsjobmanager.cpp +++ b/kdeprint/cups/kmcupsjobmanager.cpp @@ -93,7 +93,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int ac if (argstr.isEmpty()) return false; req.setOperation(CUPS_MOVE_JOB); uri = - TQString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(), + TQString::tqfromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(), argstr); req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri); break; @@ -150,7 +150,7 @@ bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType ty // other attributes req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys); if (type == KMJobManager::CompletedJobs) - req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::fromLatin1("completed")); + req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::tqfromLatin1("completed")); if (limit > 0) req.addInteger(IPP_TAG_OPERATION,"limit",limit); @@ -218,7 +218,7 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) } else if (name == "job-priority") { - job->setAttribute(0, TQString::fromLatin1("%1").arg(attr->values[0].integer, 3)); + job->setAttribute(0, TQString::tqfromLatin1("%1").arg(attr->values[0].integer, 3)); } else if (name == "job-billing") { @@ -356,7 +356,7 @@ static TQString processRange(const TQString& range) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { s.append(*it); - if ((*it).find('-') == -1) + if ((*it).tqfind('-') == -1) s.append("-").append(*it); s.append(","); } diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp index 2d923a371..e4fe957e6 100644 --- a/kdeprint/cups/kmcupsmanager.cpp +++ b/kdeprint/cups/kmcupsmanager.cpp @@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager() TQString KMCupsManager::driverDbCreationProgram() { - return TQString::fromLatin1("/opt/kde3/bin/make_driver_db_cups"); + return TQString::tqfromLatin1("/opt/kde3/bin/make_driver_db_cups"); } TQString KMCupsManager::driverDirectory() @@ -173,7 +173,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p) else if (!p->option("requesting-user-name-allowed").isEmpty()) req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQStringList::split(",",p->option("requesting-user-name-allowed"),false)); else - req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::fromLatin1("all")); + req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::tqfromLatin1("all")); } req.addText(IPP_TAG_PRINTER,"printer-info",p->description()); req.addText(IPP_TAG_PRINTER,"printer-location",p->location()); @@ -287,9 +287,9 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) delete kes; m_hostSuccess = false; } else { - TQDateTime tm = TQDateTime::currentDateTime().addSecs(2); - while (!m_lookupDone && (TQDateTime::currentDateTime() < tm)) - qApp->processEvents(); + TQDateTime tm = TQDateTime::tqcurrentDateTime().addSecs(2); + while (!m_lookupDone && (TQDateTime::tqcurrentDateTime() < tm)) + tqApp->processEvents(); kes->cancelAsyncConnect(); @@ -358,8 +358,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) // banners req.name("job-sheets-default",values); while (values.count() < 2) values.append("none"); - p->setOption("kde-banners",values.join(TQString::fromLatin1(","))); - if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::fromLatin1(","))); + p->setOption("kde-banners",values.join(TQString::tqfromLatin1(","))); + if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::tqfromLatin1(","))); // quotas int ival; @@ -405,7 +405,7 @@ bool KMCupsManager::testPrinter(KMPrinter *p) req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); req.addMime(IPP_TAG_OPERATION,"document-format","application/postscript"); if (!CupsInfos::self()->login().isEmpty()) req.addName(IPP_TAG_OPERATION,"requesting-user-name",CupsInfos::self()->login()); - req.addName(IPP_TAG_OPERATION,"job-name",TQString::fromLatin1("KDE Print Test")); + req.addName(IPP_TAG_OPERATION,"job-name",TQString::tqfromLatin1("KDE Print Test")); if (req.doFileRequest("/printers/",testpage)) return true; reportIppError(&req); @@ -453,7 +453,7 @@ void KMCupsManager::loadServerPrinters() // load default req.init(); req.setOperation(CUPS_GET_DEFAULT); - req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name")); + req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name")); if (req.doRequest("/printers/")) { QString s = TQString::null; @@ -576,7 +576,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) { QStringList comps = TQStringList::split('/', drname, false); QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - QString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { @@ -655,10 +655,10 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) if (line.startsWith("*% COMDATA #")) { int p(-1), q(-1); - if ((p=line.find("'name'")) != -1) + if ((p=line.tqfind("'name'")) != -1) { - p = line.find('\'',p+6)+1; - q = line.find('\'',p); + p = line.tqfind('\'',p+6)+1; + q = line.tqfind('\'',p); keyword = line.mid(p,q-p); opt = driver->findOption(keyword); if (opt && (opt->type() == DrBase::Integer || opt->type() == DrBase::Float)) @@ -666,19 +666,19 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) else isnumeric = false; } - /*else if ((p=line.find("'type'")) != -1) + /*else if ((p=line.tqfind("'type'")) != -1) { - p = line.find('\'',p+6)+1; - if (line.find("float",p) != -1 || line.find("int",p) != -1) + p = line.tqfind('\'',p+6)+1; + if (line.tqfind("float",p) != -1 || line.tqfind("int",p) != -1) isnumeric = true; else isnumeric = false; }*/ - else if ((p=line.find("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric) + else if ((p=line.tqfind("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric) { QString prefix = line.left(p+9); tout << prefix << " => '" << opt->valueText() << '\''; - if (line.find(',',p) != -1) + if (line.tqfind(',',p) != -1) tout << ','; tout << endl; continue; @@ -687,11 +687,11 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) } else if (line.startsWith("*Default")) { - int p = line.find(':',8); + int p = line.tqfind(':',8); keyword = line.mid(8,p-8); DrBase *bopt = 0; if ( keyword == "PageRegion" || keyword == "ImageableArea" || keyword == "PaperDimension" ) - bopt = driver->findOption( TQString::fromLatin1( "PageSize" ) ); + bopt = driver->findOption( TQString::tqfromLatin1( "PageSize" ) ); else bopt = driver->findOption( keyword ); if (bopt) @@ -938,7 +938,7 @@ void KMCupsManager::slotConnectionSuccess() IppRequest req; req.setOperation( CUPS_GET_PRINTERS ); - req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::fromLatin1( "printer-name" ) ); + req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::tqfromLatin1( "printer-name" ) ); if ( req.doRequest( "/printers/" ) ) setUpdatePossible( true ); else diff --git a/kdeprint/cups/kmpropusers.cpp b/kdeprint/cups/kmpropusers.cpp index 3f0792d9c..35d6f0fe1 100644 --- a/kdeprint/cups/kmpropusers.cpp +++ b/kdeprint/cups/kmpropusers.cpp @@ -29,7 +29,7 @@ KMPropUsers::KMPropUsers(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { m_text = new TQTextView(this); - m_text->setPaper(colorGroup().background()); + m_text->setPaper(tqcolorGroup().background()); m_text->setFrameStyle(TQFrame::NoFrame); QVBoxLayout *l0 = new TQVBoxLayout(this, 10, 0); diff --git a/kdeprint/cups/kmwbanners.cpp b/kdeprint/cups/kmwbanners.cpp index 80a21a37c..7755e9774 100644 --- a/kdeprint/cups/kmwbanners.cpp +++ b/kdeprint/cups/kmwbanners.cpp @@ -70,7 +70,7 @@ TQString mapBanner( const TQString& ban ) if ( map.size() == 0 ) for ( int i=0; bannermap[ i ].banner; i++ ) map[ bannermap[ i ].banner ] = bannermap[ i ].name; - TQMap<TQString,TQString>::ConstIterator it = map.find( ban ); + TQMap<TQString,TQString>::ConstIterator it = map.tqfind( ban ); if ( it == map.end() ) return ban; else @@ -120,7 +120,7 @@ void KMWBanners::initPrinter(KMPrinter *p) m_bans = TQStringList::split(',',p->option("kde-banners-supported"),false); if (m_bans.count() == 0) m_bans = defaultBanners(); - if (m_bans.find("none") == m_bans.end()) + if (m_bans.tqfind("none") == m_bans.end()) m_bans.prepend("none"); for ( TQStringList::Iterator it=m_bans.begin(); it!=m_bans.end(); ++it ) { diff --git a/kdeprint/cups/kmwfax.cpp b/kdeprint/cups/kmwfax.cpp index ea5b98f3b..45cd502fd 100644 --- a/kdeprint/cups/kmwfax.cpp +++ b/kdeprint/cups/kmwfax.cpp @@ -48,7 +48,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name) // initialize IppRequest req; req.setOperation(CUPS_GET_DEVICES); - QString uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + QString uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); if (req.doRequest("/")) { @@ -57,7 +57,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name) { if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0) { - m_list->insertItem(SmallIcon("blockdevice"),TQString::fromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("blockdevice"),TQString::tqfromLatin1(attr->values[0].string.text)); } attr = attr->next; } diff --git a/kdeprint/cups/kmwipp.cpp b/kdeprint/cups/kmwipp.cpp index c0d30c452..81bcf584c 100644 --- a/kdeprint/cups/kmwipp.cpp +++ b/kdeprint/cups/kmwipp.cpp @@ -41,7 +41,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name) "before continuing.</p>")); setLabel(0,i18n("Host:")); setLabel(1,i18n("Port:")); - setText( 1, TQString::fromLatin1( "631" ) ); + setText( 1, TQString::tqfromLatin1( "631" ) ); } bool KMWIpp::isValid(TQString& msg) diff --git a/kdeprint/cups/kmwippprinter.cpp b/kdeprint/cups/kmwippprinter.cpp index 4900a584b..b5f799fc5 100644 --- a/kdeprint/cups/kmwippprinter.cpp +++ b/kdeprint/cups/kmwippprinter.cpp @@ -59,7 +59,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) l1->setBuddy(m_uri); m_info = new TQTextView(this); - m_info->setPaper(colorGroup().background()); + m_info->setPaper(tqcolorGroup().background()); m_info->setMinimumHeight(100); m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>")); m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "kdeprint_report"), this); @@ -157,7 +157,7 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item) req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); req.setHost(item->text(1)); req.setPort(item->text(2).toInt()); - uri = TQString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); + uri = TQString::tqfromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); keys.append("printer-name"); keys.append("printer-state"); @@ -176,7 +176,7 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item) if (req.uri("printer-uri-supported",value)) { if (value[0] == '/') - value.prepend(TQString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); + value.prepend(TQString::tqfromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); m_uri->setText(value); } if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value)); diff --git a/kdeprint/cups/kmwippselect.cpp b/kdeprint/cups/kmwippselect.cpp index fbfa597c7..38fff88df 100644 --- a/kdeprint/cups/kmwippselect.cpp +++ b/kdeprint/cups/kmwippselect.cpp @@ -75,16 +75,16 @@ void KMWIppSelect::initPrinter(KMPrinter *p) IppRequest req; QString uri; req.setOperation(CUPS_GET_PRINTERS); - uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name")); + req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name")); if (req.doRequest("/printers/")) { ipp_attribute_t *attr = req.first(); while (attr) { if (attr->name && strcmp(attr->name,"printer-name") == 0) - m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::fromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text)); attr = attr->next; } m_list->sort(); diff --git a/kdeprint/cups/kmwother.cpp b/kdeprint/cups/kmwother.cpp index 36e80c76d..f7c91cca0 100644 --- a/kdeprint/cups/kmwother.cpp +++ b/kdeprint/cups/kmwother.cpp @@ -89,7 +89,7 @@ void KMWOther::initPrinter(KMPrinter *p) TQString prt = *( ++it ); if ( !prt.isEmpty() ) desc.append( " [" + prt + "]" ); - TQListViewItem *parent = parents.find( cl ); + TQListViewItem *parent = parents.tqfind( cl ); if ( !parent ) { parent = new TQListViewItem( root, lastparent, cl ); @@ -105,7 +105,7 @@ void KMWOther::initPrinter(KMPrinter *p) lastparent = parent; parents.insert( cl, parent ); } - item = new TQListViewItem( parent, last.find( cl ), desc, uri); + item = new TQListViewItem( parent, last.tqfind( cl ), desc, uri); last.insert( cl, item ); } } diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp index c4cf50e48..a1b519f59 100644 --- a/kdeprint/cups/kpimagepage.cpp +++ b/kdeprint/cups/kpimagepage.cpp @@ -192,7 +192,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQString whatsThisPreviewPositionImagePage = i18n( " <qt> " " <p><b>Position Preview Thumbnail</b></p> " " <p>This position preview thumbnail indicates the position of the image on the paper sheet. " - " <p>Click on horizontal and vertical radio buttons to move image alignment on paper around. Options are: " + " <p>Click on horizontal and vertical radio buttons to move image tqalignment on paper around. Options are: " " <ul> " " <li> center </li>" " <li> top </li>" @@ -313,7 +313,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) QRadioButton *left = new TQRadioButton(positionbox); QRadioButton *right = new TQRadioButton(positionbox); QRadioButton *hcenter = new TQRadioButton(positionbox); - QSize sz = bottom->sizeHint(); + QSize sz = bottom->tqsizeHint(); bottom->setFixedSize(sz); vcenter->setFixedSize(sz); top->setFixedSize(sz); diff --git a/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp index 7a1fd0924..b03f42e75 100644 --- a/kdeprint/cups/kptagspage.cpp +++ b/kdeprint/cups/kptagspage.cpp @@ -93,7 +93,7 @@ KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name) QFont f = lab->font(); f.setBold(true); lab->setFont(f); - lab->setAlignment(AlignVCenter|AlignRight); + lab->tqsetAlignment(AlignVCenter|AlignRight); l0->addWidget(lab); } } @@ -110,7 +110,7 @@ bool KPTagsPage::isValid(TQString& msg) QString tag(m_tags->text(r, 0)); if (tag.isEmpty()) continue; - else if (tag.find(re) != -1) + else if (tag.tqfind(re) != -1) { msg = i18n("The tag name must not contain any spaces, tabs or quotes: <b>%1</b>.").arg(tag); return false; @@ -153,12 +153,12 @@ void KPTagsPage::getOptions(TQMap<TQString,TQString>& opts, bool) } } -TQSize KPTagsPage::sizeHint() const +TQSize KPTagsPage::tqsizeHint() const { return TQSize(-1, -1); } -TQSize KPTagsPage::minimumSizeHint() const +TQSize KPTagsPage::tqminimumSizeHint() const { return TQSize(-1, -1); } diff --git a/kdeprint/cups/kptagspage.h b/kdeprint/cups/kptagspage.h index 46b85c000..fc5c88046 100644 --- a/kdeprint/cups/kptagspage.h +++ b/kdeprint/cups/kptagspage.h @@ -34,8 +34,8 @@ public: void setOptions(const TQMap<TQString,TQString>& opts); bool isValid(TQString& msg); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; private: QTable *m_tags; diff --git a/kdeprint/cups/kptextpage.cpp b/kdeprint/cups/kptextpage.cpp index 75fc838cc..6aece51d2 100644 --- a/kdeprint/cups/kptextpage.cpp +++ b/kdeprint/cups/kptextpage.cpp @@ -212,7 +212,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) m_prettypix = new TQLabel(prettybox); TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); - m_prettypix->setAlignment(Qt::AlignCenter); + m_prettypix->tqsetAlignment(Qt::AlignCenter); QRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox); TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage); QRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox); diff --git a/kdeprint/driver.cpp b/kdeprint/driver.cpp index ce411f0a4..4250b96e7 100644 --- a/kdeprint/driver.cpp +++ b/kdeprint/driver.cpp @@ -224,7 +224,7 @@ void DrGroup::addObject(DrBase *optgrp) void DrGroup::removeOption(const TQString& name) { - DrBase *opt = m_options.find(name); + DrBase *opt = m_options.tqfind(name); if (opt) { m_listoptions.removeRef(opt); @@ -264,7 +264,7 @@ void DrGroup::createTree(DriverItem *parent) DrBase* DrGroup::findOption(const TQString& name, DrGroup **parentGroup) { - DrBase *opt = m_options.find(name); + DrBase *opt = m_options.tqfind(name); if (!opt) { TQPtrListIterator<DrGroup> it(m_subgroups); @@ -334,7 +334,7 @@ void DrGroup::flattenGroup(TQMap<TQString, DrBase*>& optmap, int& index) optmap[oit.current()->name()] = oit.current(); if (name().isEmpty()) - optmap[TQString::fromLatin1("group%1").arg(index++)] = this; + optmap[TQString::tqfromLatin1("group%1").arg(index++)] = this; else optmap[name()] = this; diff --git a/kdeprint/driver.h b/kdeprint/driver.h index a2ccab8a8..2ffacd1c2 100644 --- a/kdeprint/driver.h +++ b/kdeprint/driver.h @@ -159,7 +159,7 @@ public: DriverItem* createTreeView(TQListView *parent); void addConstraint(DrConstraint *c) { m_constraints.append(c); } int checkConstraints(); - DrPageSize* findPageSize(const TQString& name) { return m_pagesizes.find(name); } + DrPageSize* findPageSize(const TQString& name) { return m_pagesizes.tqfind(name); } void addPageSize(DrPageSize *sz); void removeOptionGlobally(const TQString& name); void removeGroupGlobally(DrGroup *grp); diff --git a/kdeprint/driveritem.cpp b/kdeprint/driveritem.cpp index 7bb1715aa..8bbfff6a4 100644 --- a/kdeprint/driveritem.cpp +++ b/kdeprint/driveritem.cpp @@ -46,7 +46,7 @@ void DriverItem::updateText() { QString s(m_item->get("text")); if (m_item->isOption()) - s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText())); + s.append(TQString::tqfromLatin1(": <%1>").arg(m_item->prettyText())); if (m_item->type() == DrBase::List) { // remove all children: something has changed (otherwise this @@ -107,7 +107,7 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width, p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); w += w1; p->setPen(cg.text()); - s = TQString::fromLatin1(">"); + s = TQString::tqfromLatin1(">"); w1 = p->fontMetrics().width(s); p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); } @@ -133,7 +133,7 @@ bool DriverItem::updateConflict() m_conflict = (m_item->conflict()); } } - repaint(); + tqrepaint(); return m_conflict; } diff --git a/kdeprint/driveritem.h b/kdeprint/driveritem.h index 1d6fdcd4a..b9469be23 100644 --- a/kdeprint/driveritem.h +++ b/kdeprint/driveritem.h @@ -25,7 +25,7 @@ class DrBase; -class DriverItem : public QListViewItem +class DriverItem : public TQListViewItem { public: DriverItem(TQListView *parent, DrBase *item); diff --git a/kdeprint/driverview.h b/kdeprint/driverview.h index 59f72133b..421786c50 100644 --- a/kdeprint/driverview.h +++ b/kdeprint/driverview.h @@ -36,7 +36,7 @@ public: DrListView(TQWidget *parent = 0, const char *name = 0); }; -class KDEPRINT_EXPORT DriverView : public QWidget +class KDEPRINT_EXPORT DriverView : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/droptionview.h b/kdeprint/droptionview.h index a4334ad31..0e2775d2f 100644 --- a/kdeprint/droptionview.h +++ b/kdeprint/droptionview.h @@ -35,7 +35,7 @@ class TQListViewItem; class DrBase; class DriverItem; -class OptionBaseView : public QWidget +class OptionBaseView : public TQWidget { Q_OBJECT public: @@ -112,7 +112,7 @@ private: QStringList m_choices; }; -class DrOptionView : public QGroupBox +class DrOptionView : public TQGroupBox { Q_OBJECT public: diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.cpp b/kdeprint/foomatic/kfoomaticprinterimpl.cpp index b72fbd191..7e47a505f 100644 --- a/kdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/kdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -44,7 +44,7 @@ bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) QString exe = executable(); if (!exe.isEmpty()) { - cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd = exe + TQString::tqfromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies()); return true; } else diff --git a/kdeprint/foomatic/kmfoomaticmanager.cpp b/kdeprint/foomatic/kmfoomaticmanager.cpp index 57edf07c9..76ca31a4e 100644 --- a/kdeprint/foomatic/kmfoomaticmanager.cpp +++ b/kdeprint/foomatic/kmfoomaticmanager.cpp @@ -97,10 +97,10 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem) printer->setName(e.text()); printer->setPrinterName(e.text()); printer->setState(KMPrinter::Idle); - /*if (printer->name().find('/') != -1) + /*if (printer->name().tqfind('/') != -1) { QString s(printer->name()); - int p = s.find('/'); + int p = s.tqfind('/'); printer->setPrinterName(s.left(p)); printer->setInstanceName(s.mid(p+1)); printer->addType(KMPrinter::Virtual); @@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) { driver->set("manufacturer", pelem.namedItem("make").toElement().text()); driver->set("model", pelem.namedItem("model").toElement().text()); - QString s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); + QString s = TQString::tqfromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); driver->set("description", s); driver->set("text", s); diff --git a/kdeprint/foomatic2loader.cpp b/kdeprint/foomatic2loader.cpp index 4ca1464dd..ec26e5907 100644 --- a/kdeprint/foomatic2loader.cpp +++ b/kdeprint/foomatic2loader.cpp @@ -141,7 +141,7 @@ DrMain* Foomatic2Loader::buildDriver() const if ( m_foodata.isEmpty() ) return NULL; - TQVariant v = m_foodata.find( "VAR" ).data(); + TQVariant v = m_foodata.tqfind( "VAR" ).data(); if ( !v.isNull() && v.type() == TQVariant::Map ) { DrMain *driver = new DrMain; @@ -152,7 +152,7 @@ DrMain* Foomatic2Loader::buildDriver() const driver->set( "matic_driver", v.mapFind( "driver" ).data().toString() ); driver->set( "text", TQString( "%1 %2 (%3)" ).arg( driver->get( "manufacturer" ) ).arg( driver->get( "model" ) ).arg( driver->get( "matic_driver" ) ) ); if ( m_foodata.contains( "POSTPIPE" ) ) - driver->set( "postpipe", m_foodata.find( "POSTPIPE" ).data().toString() ); + driver->set( "postpipe", m_foodata.tqfind( "POSTPIPE" ).data().toString() ); v = v.mapFind( "args" ).data(); if ( !v.isNull() && v.type() == TQVariant::List ) { @@ -211,7 +211,7 @@ DrMain* Foomatic2Loader::modifyDriver( DrMain *driver ) const TQValueList<DrBase*> optList; DrGroup *grp = NULL; - TQVariant V = m_foodata.find( "VAR" ).data(); + TQVariant V = m_foodata.tqfind( "VAR" ).data(); if ( !V.isNull() && V.type() == TQVariant::Map ) { TQVariant v = V.mapFind( "args" ).data(); diff --git a/kdeprint/kdeprintcheck.cpp b/kdeprint/kdeprintcheck.cpp index 5c807ae9b..114477191 100644 --- a/kdeprint/kdeprintcheck.cpp +++ b/kdeprint/kdeprintcheck.cpp @@ -101,8 +101,8 @@ bool KdeprintChecker::checkConfig(const KURL& url) const char* const *p = config_stddirs; while (*p) { - // kdDebug( 500 ) << "checkConfig() with " << TQString::fromLatin1( *p ) + f << endl; - if ( TQFile::exists( TQString::fromLatin1( *p ) + f ) ) + // kdDebug( 500 ) << "checkConfig() with " << TQString::tqfromLatin1( *p ) + f << endl; + if ( TQFile::exists( TQString::tqfromLatin1( *p ) + f ) ) { state = true; break; diff --git a/kdeprint/kdeprintd.cpp b/kdeprint/kdeprintd.cpp index 198147463..9a4964cac 100644 --- a/kdeprint/kdeprintd.cpp +++ b/kdeprint/kdeprintd.cpp @@ -66,11 +66,11 @@ StatusWindow::StatusWindow(int pid) : TQWidget(NULL, "StatusWindow", WType_TopLevel|WStyle_DialogBorder|WStyle_StaysOnTop|WDestructiveClose), m_pid(pid) { m_label = new TQLabel(this); - m_label->setAlignment(AlignCenter); + m_label->tqsetAlignment(AlignCenter); m_button = new KPushButton(KStdGuiItem::close(), this); m_icon = new TQLabel(this); m_icon->setPixmap(DesktopIcon("fileprint")); - m_icon->setAlignment(AlignCenter); + m_icon->tqsetAlignment(AlignCenter); KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("fileprint")); QGridLayout *l0 = new TQGridLayout(this, 2, 3, 10, 10); l0->setRowStretch(0, 1); @@ -86,8 +86,8 @@ void StatusWindow::setMessage(const TQString& msg) { //QSize oldSz = size(); m_label->setText(msg); - //QSize sz = m_label->sizeHint(); - //sz += TQSize(layout()->margin()*2, layout()->margin()*2+layout()->spacing()+m_button->sizeHint().height()); + //QSize sz = m_label->tqsizeHint(); + //sz += TQSize(layout()->margin()*2, layout()->margin()*2+layout()->spacing()+m_button->tqsizeHint().height()); // dialog will never be smaller //sz = sz.expandedTo(oldSz); //resize(sz); @@ -192,7 +192,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files) void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appName) { - StatusWindow *w = m_windows.find(pid); + StatusWindow *w = m_windows.tqfind(pid); if (!w && !msg.isEmpty()) { w = new StatusWindow(pid); diff --git a/kdeprint/kfilelist.cpp b/kdeprint/kfilelist.cpp index c61f3b948..a8402e8ce 100644 --- a/kdeprint/kfilelist.cpp +++ b/kdeprint/kfilelist.cpp @@ -263,7 +263,7 @@ void KFileList::slotOpenFile() } } -TQSize KFileList::sizeHint() const +TQSize KFileList::tqsizeHint() const { return TQSize(100, 100); } diff --git a/kdeprint/kfilelist.h b/kdeprint/kfilelist.h index ca4d925c8..667938d29 100644 --- a/kdeprint/kfilelist.h +++ b/kdeprint/kfilelist.h @@ -28,7 +28,7 @@ class KListView; class TQToolButton; class TQListViewItem; -class KFileList : public QWidget +class KFileList : public TQWidget { Q_OBJECT public: @@ -37,7 +37,7 @@ public: void setFileList(const TQStringList&); TQStringList fileList() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected slots: void slotAddFile(); diff --git a/kdeprint/kmdbentry.cpp b/kdeprint/kmdbentry.cpp index 9402dd02c..87bb76c6c 100644 --- a/kdeprint/kmdbentry.cpp +++ b/kdeprint/kmdbentry.cpp @@ -43,13 +43,13 @@ bool KMDBEntry::validate(bool checkIt) // check manufacturer if (manufacturer.isEmpty()) { - int p = model.find(' ',0); + int p = model.tqfind(' ',0); if (p != -1) manufacturer = model.left(p); if (manufacturer.isEmpty()) return false; } // extract manufacturer from model - if (model.find(manufacturer,0,false) == 0) + if (model.tqfind(manufacturer,0,false) == 0) { model = model.right(model.length()-manufacturer.length()-1).stripWhiteSpace(); if (model.isEmpty()) return false; diff --git a/kdeprint/kmfactory.cpp b/kdeprint/kmfactory.cpp index 96397adc4..aa696490f 100644 --- a/kdeprint/kmfactory.cpp +++ b/kdeprint/kmfactory.cpp @@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst) if (sys.isEmpty()) // load default configured print plugin sys = printSystem(); - QString libname = TQString::fromLatin1("kdeprint_%1").arg(sys); + QString libname = TQString::tqfromLatin1("kdeprint_%1").arg(sys); m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname)); if (!m_factory) { @@ -311,7 +311,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name) { QString path(name); if (path[0] != '/') - path = locate("data", TQString::fromLatin1("kdeprint/plugins/%1.print").arg(name)); + path = locate("data", TQString::tqfromLatin1("kdeprint/plugins/%1.print").arg(name)); KSimpleConfig conf(path); PluginInfo info; @@ -363,7 +363,7 @@ TQString KMFactory::autoDetect() currentPrecedence = plugins[i].detectPrecedence; } } - return (pluginIndex == -1 ? TQString::fromLatin1("lpdunix") : plugins[pluginIndex].name); + return (pluginIndex == -1 ? TQString::tqfromLatin1("lpdunix") : plugins[pluginIndex].name); } void KMFactory::slot_pluginChanged(pid_t pid) diff --git a/kdeprint/kmjob.cpp b/kdeprint/kmjob.cpp index 0576303e2..5c904538b 100644 --- a/kdeprint/kmjob.cpp +++ b/kdeprint/kmjob.cpp @@ -75,7 +75,7 @@ TQString KMJob::pixmap() { // special case if (m_type == KMJob::Threaded) - return TQString::fromLatin1("exec"); + return TQString::tqfromLatin1("exec"); // normal case QString str("kdeprint_job"); diff --git a/kdeprint/kmjobmanager.cpp b/kdeprint/kmjobmanager.cpp index afbca7a2f..fcc7d1a00 100644 --- a/kdeprint/kmjobmanager.cpp +++ b/kdeprint/kmjobmanager.cpp @@ -214,7 +214,7 @@ void KMJobManager::validatePluginActions(KActionCollection*, const TQPtrList<KMJ void KMJobManager::addPrinter(const TQString& pr, KMJobManager::JobType type, bool isSpecial) { - struct JobFilter *jf = m_filter.find(pr); + struct JobFilter *jf = m_filter.tqfind(pr); if (!jf) { jf = new JobFilter; @@ -226,7 +226,7 @@ void KMJobManager::addPrinter(const TQString& pr, KMJobManager::JobType type, bo void KMJobManager::removePrinter(const TQString& pr, KMJobManager::JobType type) { - struct JobFilter *jf = m_filter.find(pr); + struct JobFilter *jf = m_filter.tqfind(pr); if (jf) { jf->m_type[type] = QMAX(0, jf->m_type[type]-1); diff --git a/kdeprint/kmjobmanager.h b/kdeprint/kmjobmanager.h index 643be34d1..8b95bf7ac 100644 --- a/kdeprint/kmjobmanager.h +++ b/kdeprint/kmjobmanager.h @@ -43,7 +43,7 @@ class KAction; * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMJobManager : public QObject +class KDEPRINT_EXPORT KMJobManager : public TQObject { Q_OBJECT diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp index ec161d755..675e31bf2 100644 --- a/kdeprint/kmmanager.cpp +++ b/kdeprint/kmmanager.cpp @@ -268,7 +268,7 @@ TQPtrList<KMPrinter>* KMManager::printerList(bool reload) // - use the PRINTER variable if (!softDefault()) { - KMPrinter *defprinter = findPrinter(TQString::fromLatin1(getenv("PRINTER"))); + KMPrinter *defprinter = findPrinter(TQString::tqfromLatin1(getenv("PRINTER"))); if (defprinter) setSoftDefault(defprinter); } @@ -475,7 +475,7 @@ TQStringList KMManager::detectLocalPrinters() { QStringList list; for (int i=0; i<3; i++) - list << TQString::null << TQString::fromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString::null; + list << TQString::null << TQString::tqfromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString::null; return list; } diff --git a/kdeprint/kmmanager.h b/kdeprint/kmmanager.h index 8826273a0..ecdacba06 100644 --- a/kdeprint/kmmanager.h +++ b/kdeprint/kmmanager.h @@ -45,7 +45,7 @@ class PrinterFilter; * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMManager : public QObject +class KDEPRINT_EXPORT KMManager : public TQObject { Q_OBJECT diff --git a/kdeprint/kmprinter.cpp b/kdeprint/kmprinter.cpp index 5749a47c5..e612c2717 100644 --- a/kdeprint/kmprinter.cpp +++ b/kdeprint/kmprinter.cpp @@ -216,7 +216,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent) TQString KMPrinter::deviceProtocol() const { - int p = m_device.find( ':' ); + int p = m_device.tqfind( ':' ); if ( p != -1 ) return m_device.left( p ); else diff --git a/kdeprint/kmspecialmanager.cpp b/kdeprint/kmspecialmanager.cpp index 7ccebedff..bb2caea24 100644 --- a/kdeprint/kmspecialmanager.cpp +++ b/kdeprint/kmspecialmanager.cpp @@ -66,7 +66,7 @@ bool KMSpecialManager::savePrinters() conf.setGroup("General"); int n = conf.readNumEntry("Number",0); for (int i=0;i<n;i++) - conf.deleteGroup(TQString::fromLatin1("Printer %1").arg(i),true); + conf.deleteGroup(TQString::tqfromLatin1("Printer %1").arg(i),true); // then add printers n = 0; @@ -74,7 +74,7 @@ bool KMSpecialManager::savePrinters() for (;it.current();++it) { if (!it.current()->isSpecial() || it.current()->isVirtual()) continue; - conf.setGroup(TQString::fromLatin1("Printer %1").arg(n)); + conf.setGroup(TQString::tqfromLatin1("Printer %1").arg(n)); conf.writeEntry("Name",it.current()->name()); conf.writeEntry("Description",it.current()->description()); conf.writeEntry("Comment",it.current()->location()); @@ -139,7 +139,7 @@ bool KMSpecialManager::loadDesktopFile(const TQString& filename) int n = conf.readNumEntry("Number",0); for (int i=0;i<n;i++) { - QString grpname = TQString::fromLatin1("Printer %1").arg(i); + QString grpname = TQString::tqfromLatin1("Printer %1").arg(i); if (!conf.hasGroup(grpname)) continue; conf.setGroup(grpname); KMPrinter *printer = new KMPrinter; diff --git a/kdeprint/kmspecialmanager.h b/kdeprint/kmspecialmanager.h index f8619a6f9..47adec6b2 100644 --- a/kdeprint/kmspecialmanager.h +++ b/kdeprint/kmspecialmanager.h @@ -28,7 +28,7 @@ class KMManager; class KXmlCommand; class DrMain; -class KMSpecialManager : public QObject +class KMSpecialManager : public TQObject { public: KMSpecialManager(KMManager *parent, const char *name = 0); diff --git a/kdeprint/kmthreadjob.cpp b/kdeprint/kmthreadjob.cpp index bea9382db..43dcda831 100644 --- a/kdeprint/kmthreadjob.cpp +++ b/kdeprint/kmthreadjob.cpp @@ -106,7 +106,7 @@ bool KMThreadJob::checkJob(int ID) KMJob* KMThreadJob::findJob(int ID) { - return m_jobs.find(ID); + return m_jobs.tqfind(ID); } KMJob* KMThreadJob::findJob(const TQString& uri) @@ -115,7 +115,7 @@ KMJob* KMThreadJob::findJob(const TQString& uri) { int pid = uri.mid(6).toInt(); if (pid > 0) - return m_jobs.find(pid); + return m_jobs.tqfind(pid); } return NULL; } @@ -150,7 +150,7 @@ void KMThreadJob::createJob(KMJob *job) if (job->id() > 0) { loadJobs(); - if (!m_jobs.find(job->id())) + if (!m_jobs.tqfind(job->id())) { m_jobs.insert(job->id(),job); saveJobs(); diff --git a/kdeprint/kmthreadjob.h b/kdeprint/kmthreadjob.h index 3d2e6cf2f..b4eedfbfd 100644 --- a/kdeprint/kmthreadjob.h +++ b/kdeprint/kmthreadjob.h @@ -26,7 +26,7 @@ class KMJob; class KMJobManager; -class KMThreadJob : public QObject +class KMThreadJob : public TQObject { public: KMThreadJob(TQObject *parent = 0, const char *name = 0); diff --git a/kdeprint/kmuimanager.h b/kdeprint/kmuimanager.h index 3c6a74719..478dbc0df 100644 --- a/kdeprint/kmuimanager.h +++ b/kdeprint/kmuimanager.h @@ -33,7 +33,7 @@ class KPrinterPropertyDialog; class KMConfigDialog; class TQListView; -class KDEPRINT_EXPORT KMUiManager : public QObject +class KDEPRINT_EXPORT KMUiManager : public TQObject { Q_OBJECT public: diff --git a/kdeprint/kpcopiespage.cpp b/kdeprint/kpcopiespage.cpp index 1a7756913..994e9ea61 100644 --- a/kdeprint/kpcopiespage.cpp +++ b/kdeprint/kpcopiespage.cpp @@ -186,7 +186,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) m_order = new TQCheckBox(i18n("Re&verse"), m_copybox); TQWhatsThis::add(m_order, whatsThisReverseLabel); m_collatepix = new TQLabel(m_copybox); - m_collatepix->setAlignment(Qt::AlignCenter); + m_collatepix->tqsetAlignment(Qt::AlignCenter); m_collatepix->setMinimumHeight(70); QLabel *m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox); m_copies = new TQSpinBox(m_copybox); @@ -336,7 +336,7 @@ void KPCopiesPage::getOptions(TQMap<TQString,TQString>& options, bool incldef) options["kde-collate"] = (m_collate->isChecked() ? "Collate" : "Uncollate"); // ranges options["kde-current"] = (m_current->isChecked() ? "1" : "0"); - options["kde-range"] = (m_range->isChecked() ? m_rangeedit->text() : (incldef ? TQString::fromLatin1("1-") : TQString::fromLatin1(""))); + options["kde-range"] = (m_range->isChecked() ? m_rangeedit->text() : (incldef ? TQString::tqfromLatin1("1-") : TQString::tqfromLatin1(""))); // page set options["kde-pageset"] = TQString::number(m_pageset->currentItem()); } diff --git a/kdeprint/kpfilterpage.cpp b/kdeprint/kpfilterpage.cpp index d7906a290..882a81923 100644 --- a/kdeprint/kpfilterpage.cpp +++ b/kdeprint/kpfilterpage.cpp @@ -295,7 +295,7 @@ void KPFilterPage::setOptions(const TQMap<TQString,TQString>& opts) TQDictIterator<KXmlCommand> dit(m_activefilters); for (;dit.current();) { - if (filters.find(dit.currentKey()) == filters.end()) + if (filters.tqfind(dit.currentKey()) == filters.end()) m_activefilters.remove(dit.currentKey()); else { @@ -309,7 +309,7 @@ void KPFilterPage::setOptions(const TQMap<TQString,TQString>& opts) for (TQStringList::ConstIterator sit=filters.begin(); sit!=filters.end(); ++sit) { KXmlCommand *f(0); - if ((f=m_activefilters.find(*sit)) == 0) + if ((f=m_activefilters.tqfind(*sit)) == 0) { f = KXmlCommandManager::self()->loadCommand(*sit); if (f) @@ -329,7 +329,7 @@ void KPFilterPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) QStringList filters = activeList(); for (TQStringList::ConstIterator it=filters.begin(); it!=filters.end(); ++it) { - KXmlCommand *f = m_activefilters.find(*it); + KXmlCommand *f = m_activefilters.tqfind(*it); if (f) f->getOptions(opts, incldef); } @@ -355,7 +355,7 @@ KXmlCommand* KPFilterPage::currentFilter() { KXmlCommand *filter(0); if (m_view->selectedItem()) - filter = m_activefilters.find(m_view->selectedItem()->text(1)); + filter = m_activefilters.tqfind(m_view->selectedItem()->text(1)); return filter; } @@ -367,10 +367,10 @@ void KPFilterPage::checkFilterChain() while (item) { item->setPixmap(0, (ok ? SmallIcon("filter") : SmallIcon("filterstop"))); - KXmlCommand *f1 = m_activefilters.find(item->text(1)); + KXmlCommand *f1 = m_activefilters.tqfind(item->text(1)); if (f1 && item->nextSibling()) { - KXmlCommand *f2 = m_activefilters.find(item->nextSibling()->text(1)); + KXmlCommand *f2 = m_activefilters.tqfind(item->nextSibling()->text(1)); if (f2) { if (!f2->acceptMimeType(f1->mimeType())) diff --git a/kdeprint/kpgeneralpage.cpp b/kdeprint/kpgeneralpage.cpp index 73f21f4af..bd7c42283 100644 --- a/kdeprint/kpgeneralpage.cpp +++ b/kdeprint/kpgeneralpage.cpp @@ -261,15 +261,15 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const // widget creation QLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); - m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel); QLabel *m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this); - m_papertypelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_papertypelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel); QLabel *m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this); - m_inputslotlabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_inputslotlabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel); m_pagesize = new TQComboBox(this); @@ -304,19 +304,19 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const m_portrait->setChecked(true); m_orientpix = new TQLabel(m_orientbox); - m_orientpix->setAlignment(Qt::AlignCenter); + m_orientpix->tqsetAlignment(Qt::AlignCenter); QRadioButton *m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox); QRadioButton *m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox); QRadioButton *m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox); m_dupnone->setChecked(true); m_duplexpix = new TQLabel(m_duplexbox); - m_duplexpix->setAlignment(Qt::AlignCenter); + m_duplexpix->tqsetAlignment(Qt::AlignCenter); QRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); QRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox); QRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox); m_nup1->setChecked(true); m_nuppix = new TQLabel(m_nupbox); - m_nuppix->setAlignment(Qt::AlignCenter); + m_nuppix->tqsetAlignment(Qt::AlignCenter); m_startbanner = new TQComboBox(m_bannerbox); m_endbanner = new TQComboBox(m_bannerbox); QLabel *m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox); diff --git a/kdeprint/kpipeprocess.h b/kdeprint/kpipeprocess.h index 966838d53..8cf3dbf30 100644 --- a/kdeprint/kpipeprocess.h +++ b/kdeprint/kpipeprocess.h @@ -25,7 +25,7 @@ #include <kdelibs_export.h> -class KDEPRINT_EXPORT KPipeProcess : public QFile +class KDEPRINT_EXPORT KPipeProcess : public TQFile { public: KPipeProcess(const TQString& cmd = TQString::null, int mode = IO_ReadOnly); diff --git a/kdeprint/kpposterpage.cpp b/kdeprint/kpposterpage.cpp index fa4b1481b..bc95bfa10 100644 --- a/kdeprint/kpposterpage.cpp +++ b/kdeprint/kpposterpage.cpp @@ -194,7 +194,7 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name ) m_lockbtn->setToggleButton( true ); m_lockbtn->setPixmap( SmallIcon( "encrypted" ) ); m_lockbtn->setOn( true ); - m_lockbtn->setFixedSize( m_lockbtn->sizeHint() ); + m_lockbtn->setFixedSize( m_lockbtn->tqsizeHint() ); TQToolTip::add( m_lockbtn, i18n( "Link/unlink poster and print size" ) ); for ( int i=0; i<KPrinter::NPageSize-1; i++ ) @@ -265,7 +265,7 @@ void KPPosterPage::setOptions( const TQMap<TQString,TQString>& opts ) m_mediasize->setText( ps ); m_preview->setMediaSize( ps ); - if ( opts[ "_kde-filters" ].find( "poster" ) != -1 ) + if ( opts[ "_kde-filters" ].tqfind( "poster" ) != -1 ) { m_postercheck->setChecked( true ); ps = opts[ "_kde-poster-size" ]; diff --git a/kdeprint/kpqtpage.cpp b/kdeprint/kpqtpage.cpp index c6d19a506..b13ba8d6d 100644 --- a/kdeprint/kpqtpage.cpp +++ b/kdeprint/kpqtpage.cpp @@ -116,7 +116,7 @@ void KPQtPage::init() m_pagesize = new TQComboBox(this); TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel); QLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); - m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); m_pagesizelabel->setBuddy(m_pagesize); m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel); @@ -129,7 +129,7 @@ void KPQtPage::init() TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel); m_orientpix = new TQLabel(m_orientbox); - m_orientpix->setAlignment(Qt::AlignCenter); + m_orientpix->tqsetAlignment(Qt::AlignCenter); TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel); QRadioButton *m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox); @@ -137,7 +137,7 @@ void KPQtPage::init() QRadioButton *m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox); m_colorpix = new TQLabel(m_colorbox); - m_colorpix->setAlignment(Qt::AlignCenter); + m_colorpix->tqsetAlignment(Qt::AlignCenter); TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel); m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); @@ -152,7 +152,7 @@ void KPQtPage::init() TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel); m_nuppix = new TQLabel(m_nupbox); - m_nuppix->setAlignment(Qt::AlignCenter); + m_nuppix->tqsetAlignment(Qt::AlignCenter); TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel); // layout creation @@ -268,7 +268,7 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts) else if (!opts["kde-pagesize"].isEmpty()) m_pagesize->setCurrentItem(findIndex(opts["kde-pagesize"].toInt())); ID = NUP_1; - if (opts["_kde-filters"].find("psnup") != -1) + if (opts["_kde-filters"].tqfind("psnup") != -1) { if (opts.contains("_kde-psnup-nup")) { ID = opts["_kde-psnup-nup"].toInt(); @@ -323,7 +323,7 @@ void KPQtPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) else if (ID != NUP_OTHER) { int nup(ID == NUP_2 ? 2 : 4); - if (s.find("psnup") == -1) + if (s.tqfind("psnup") == -1) { QStringList fl = TQStringList::split(',', s, false); KXmlCommandManager::self()->insertCommand(fl, "psnup"); diff --git a/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp index 4e62e791b..8b51ccfb6 100644 --- a/kdeprint/kprintaction.cpp +++ b/kdeprint/kprintaction.cpp @@ -31,33 +31,33 @@ public: KPrintActionPrivate() { type = All; - parentWidget = 0; + tqparentWidget = 0; } PrinterType type; QStringList printers; - TQWidget *parentWidget; + TQWidget *tqparentWidget; }; -KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) : KActionMenu(text, parent, name) { d = new KPrintActionPrivate(); - initialize(type, parentWidget); + initialize(type, tqparentWidget); } -KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) : KActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); - initialize(type, parentWidget); + initialize(type, tqparentWidget); } -KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) : KActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); - initialize(type, parentWidget); + initialize(type, tqparentWidget); } KPrintAction::~KPrintAction() @@ -65,13 +65,13 @@ KPrintAction::~KPrintAction() delete d; } -void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget) +void KPrintAction::initialize(PrinterType type, TQWidget *tqparentWidget) { connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); d->type = type; - d->parentWidget = parentWidget; + d->tqparentWidget = tqparentWidget; } void KPrintAction::slotAboutToShow() @@ -105,26 +105,26 @@ void KPrintAction::slotActivated(int ID) { KPrinter printer(false); KMPrinter *mprt = KMManager::self()->findPrinter(d->printers[ID]); - if (mprt && mprt->autoConfigure(&printer, d->parentWidget)) + if (mprt && mprt->autoConfigure(&printer, d->tqparentWidget)) { // emit the signal emit print(&printer); } } -KPrintAction* KPrintAction::exportAll(TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportAll(TQWidget *tqparentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), All, parentWidget, parent, (name ? name : "export_all")); + return new KPrintAction(i18n("&Export..."), All, tqparentWidget, parent, (name ? name : "export_all")); } -KPrintAction* KPrintAction::exportRegular(TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportRegular(TQWidget *tqparentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), Regular, parentWidget, parent, (name ? name : "export_regular")); + return new KPrintAction(i18n("&Export..."), Regular, tqparentWidget, parent, (name ? name : "export_regular")); } -KPrintAction* KPrintAction::exportSpecial(TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportSpecial(TQWidget *tqparentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), Specials, parentWidget, parent, (name ? name : "export_special")); + return new KPrintAction(i18n("&Export..."), Specials, tqparentWidget, parent, (name ? name : "export_special")); } #include "kprintaction.moc" diff --git a/kdeprint/kprintaction.h b/kdeprint/kprintaction.h index eb23d6e31..b9ba54add 100644 --- a/kdeprint/kprintaction.h +++ b/kdeprint/kprintaction.h @@ -30,14 +30,14 @@ class KDEPRINT_EXPORT KPrintAction : public KActionMenu public: enum PrinterType { All, Regular, Specials }; - KPrintAction(const TQString& text, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); - KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); - KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); virtual ~KPrintAction(); - static KPrintAction* exportAll(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); - static KPrintAction* exportRegular(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); - static KPrintAction* exportSpecial(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportAll(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportRegular(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportSpecial(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); signals: void print(KPrinter*); @@ -47,7 +47,7 @@ protected slots: void slotActivated(int); protected: - void initialize(PrinterType type, TQWidget *parentWidget); + void initialize(PrinterType type, TQWidget *tqparentWidget); private: class KPrintActionPrivate; diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp index c84472677..a2b67c344 100644 --- a/kdeprint/kprintdialog.cpp +++ b/kdeprint/kprintdialog.cpp @@ -546,7 +546,7 @@ void KPrintDialog::initialize(KPrinter *printer) TQPtrList<KMPrinter> *plist = KMFactory::self()->manager()->printerList(); if (!KMManager::self()->errorMsg().isEmpty()) { - KMessageBox::error(parentWidget(), + KMessageBox::error(tqparentWidget(), "<qt><nobr>"+ i18n("An error occurred while retrieving the printer list:") +"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>"); @@ -568,7 +568,7 @@ void KPrintDialog::initialize(KPrinter *printer) if (!sep && it.current()->isSpecial()) { sep = true; - d->m_printers->insertItem(TQPixmap(), TQString::fromLatin1("--------")); + d->m_printers->insertItem(TQPixmap(), TQString::tqfromLatin1("--------")); } d->m_printers->insertItem(SmallIcon(it.current()->pixmap(),0,(it.current()->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay)),it.current()->name(),false/*sep*/); if (it.current()->isSoftDefault()) @@ -863,7 +863,7 @@ void KPrintDialog::expandDialog(bool on) if (on) { - sz.setHeight(sz.height()+d->m_dummy->minimumSize().height()+d->m_plugin->minimumSize().height()+2*layout()->spacing()); + sz.setHeight(sz.height()+d->m_dummy->tqminimumSize().height()+d->m_plugin->tqminimumSize().height()+2*layout()->spacing()); if (isVisible() || !d->m_dummy->isVisible() || !d->m_plugin->isVisible()) { d->m_dummy->show(); @@ -934,7 +934,7 @@ void KPrintDialog::slotUpdatePossible( bool flag ) { MessageWindow::remove( this ); if ( !flag ) - KMessageBox::error(parentWidget(), + KMessageBox::error(tqparentWidget(), "<qt><nobr>"+ i18n("An error occurred while retrieving the printer list:") +"</nobr><br><br>"+KMManager::self()->errorMsg()+"</qt>"); diff --git a/kdeprint/kprintdialogpage.h b/kdeprint/kprintdialogpage.h index 70416d18f..1802eb6ec 100644 --- a/kdeprint/kprintdialogpage.h +++ b/kdeprint/kprintdialogpage.h @@ -87,7 +87,7 @@ class DrMain; * @short Base class for customized print dialog pages. * @see KPrinter */ -class KDEPRINT_EXPORT KPrintDialogPage : public QWidget +class KDEPRINT_EXPORT KPrintDialogPage : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/kprinter.cpp b/kdeprint/kprinter.cpp index c96db7a8d..34e215a8e 100644 --- a/kdeprint/kprinter.cpp +++ b/kdeprint/kprinter.cpp @@ -486,7 +486,7 @@ TQValueList<int> KPrinter::pageList() const QStringList ranges = TQStringList::split(',',option("kde-range"),false); for (TQStringList::ConstIterator it=ranges.begin();it!=ranges.end();++it) { - int p = (*it).find('-'); + int p = (*it).tqfind('-'); bool ok; if (p == -1) { @@ -519,7 +519,7 @@ TQValueList<int> KPrinter::pageList() const if (pageOrder() == LastPageFirst) { for (uint i=0;i<(list.count()/2);i++) - qSwap(list[i],list[list.count()-1-i]); + tqSwap(list[i],list[list.count()-1-i]); } // select page set if needed @@ -846,7 +846,7 @@ int KPrinter::toPage() const { return (option("kde-topage").isEmpty() ? 0 : option("kde-topage").toInt()); } void KPrinter::setFromTo(int m, int M) -{ setOption("kde-frompage",TQString::number(m)); setOption("kde-topage",TQString::number(M)); setOption("kde-range",(m>0 && M>0 ? TQString("%1-%2").arg(m).arg(M) : TQString::fromLatin1(""))); } +{ setOption("kde-frompage",TQString::number(m)); setOption("kde-topage",TQString::number(M)); setOption("kde-range",(m>0 && M>0 ? TQString("%1-%2").arg(m).arg(M) : TQString::tqfromLatin1(""))); } // if no page size defined, use the localized one KPrinter::PageSize KPrinter::pageSize() const @@ -880,16 +880,16 @@ void KPrinter::setPrintProgram(const TQString& prg) else { QString s(prg); - if (s.find("%in") == -1) + if (s.tqfind("%in") == -1) s.append(" %in"); - setOutputToFile( s.find( "%out" ) != -1 ); + setOutputToFile( s.tqfind( "%out" ) != -1 ); setOption("kde-isspecial", "1"); setOption("kde-special-command", s); } } TQString KPrinter::printerSelectionOption() const -{ return TQString::fromLatin1(""); } +{ return TQString::tqfromLatin1(""); } void KPrinter::setPrinterSelectionOption(const TQString&) {} diff --git a/kdeprint/kprinterimpl.cpp b/kdeprint/kprinterimpl.cpp index 94750b607..61c5bdc5f 100644 --- a/kdeprint/kprinterimpl.cpp +++ b/kdeprint/kprinterimpl.cpp @@ -252,7 +252,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T QString command(cmd), filestr; QStringList printfiles; - if (command.find("%in") == -1) command.append(" %in"); + if (command.tqfind("%in") == -1) command.append(" %in"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) if (TQFile::exists(*it)) @@ -379,7 +379,7 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ for (TQStringList::Iterator it=files.begin(); it!=files.end(); ++it) { QString mime = KMimeMagic::self()->findFileType(*it)->mimeType(); - if (inputMimeTypes.find(mime) == inputMimeTypes.end()) + if (inputMimeTypes.tqfind(mime) == inputMimeTypes.end()) { if (KMessageBox::warningContinueCancel(0, "<p>" + i18n("The MIME type %1 is not supported as input of the filter chain " @@ -508,7 +508,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool TQString::null, i18n("Convert"), i18n("Keep"), - TQString::fromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes) + TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes) { // find the filter chain QStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType); diff --git a/kdeprint/kprinterimpl.h b/kdeprint/kprinterimpl.h index ae6b8b75d..b06d77706 100644 --- a/kdeprint/kprinterimpl.h +++ b/kdeprint/kprinterimpl.h @@ -31,7 +31,7 @@ class KPrinter; class KMPrinter; -class KDEPRINT_EXPORT KPrinterImpl : public QObject +class KDEPRINT_EXPORT KPrinterImpl : public TQObject { Q_OBJECT public: diff --git a/kdeprint/kprintpreview.cpp b/kdeprint/kprintpreview.cpp index 5ad8a428f..ec2ea0a37 100644 --- a/kdeprint/kprintpreview.cpp +++ b/kdeprint/kprintpreview.cpp @@ -111,7 +111,7 @@ static KLibFactory* componentFactory() factory = KLibLoader::self()->factory("libkghostviewpart"); if( factory ) return factory; - KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null); + KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("application/postscript"), TQString::tqfromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null); for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) { KService::Ptr service = *it; diff --git a/kdeprint/kxmlcommand.cpp b/kdeprint/kxmlcommand.cpp index 27f8c6642..db707a120 100644 --- a/kdeprint/kxmlcommand.cpp +++ b/kdeprint/kxmlcommand.cpp @@ -161,7 +161,7 @@ void KXmlCommand::setMimeType(const TQString& s) bool KXmlCommand::acceptMimeType(const TQString& s) { check(); - return (d->m_inputMime.find(s) != d->m_inputMime.end()); + return (d->m_inputMime.tqfind(s) != d->m_inputMime.end()); } TQStringList KXmlCommand::inputMimeTypes() @@ -383,7 +383,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi { QString format = dopt->get("format"); TQString value = dopt->valueText(); - if ( format.find( quotedRe ) != -1 ) + if ( format.tqfind( quotedRe ) != -1 ) { if ( ( value.right( 1 ) == "'" && value.left( 1 ) == "'" ) || ( value.right( 1 ) == "\"" && value.left( 1 ) == "\"" ) ) @@ -463,7 +463,7 @@ void KXmlCommand::saveXml() TQDomElement KXmlCommand::createIO(TQDomDocument& doc, int n, const TQString& tag) { QDomElement elem = doc.createElement(tag); - if (d->m_command.find("%"+tag) != -1) + if (d->m_command.tqfind("%"+tag) != -1) { for (int i=0; i<2; i++) { @@ -632,7 +632,7 @@ TQStringList KXmlCommandManager::commandList() for (TQStringList::ConstIterator it2=list.begin(); it2!=list.end(); ++it2) { QString cmdName = (*it2).left((*it2).length()-8); - if (d->m_cmdlist.find(cmdName) == d->m_cmdlist.end()) + if (d->m_cmdlist.tqfind(cmdName) == d->m_cmdlist.end()) d->m_cmdlist.append(cmdName); } } @@ -791,12 +791,12 @@ bool KXmlCommandManager::checkCommand(const TQString& xmlId, int inputCheck, int QString cmd = (xmlCmd ? xmlCmd->command() : xmlId); if (status && !cmd.isEmpty() && (inputCheck > None || outputCheck > None)) { - if (inputCheck > None && (cmd.find("%in") == -1 || inputCheck == Advanced) && cmd.find("%filterinput") == -1) + if (inputCheck > None && (cmd.tqfind("%in") == -1 || inputCheck == Advanced) && cmd.tqfind("%filterinput") == -1) { status = false; errmsg = i18n("The command does not contain the required tag %1.").arg(inputCheck == Advanced ? "%filterinput" : "{%in,%filterinput}"); } - if (status && outputCheck > None && (cmd.find("%out") == -1 || outputCheck == Advanced) && cmd.find("filteroutput") == -1) + if (status && outputCheck > None && (cmd.tqfind("%out") == -1 || outputCheck == Advanced) && cmd.tqfind("filteroutput") == -1) { status = false; errmsg = i18n("The command does not contain the required tag %1.").arg(outputCheck == Advanced ? "%filteroutput" : "{%out,%filteroutput}"); diff --git a/kdeprint/kxmlcommand.h b/kdeprint/kxmlcommand.h index c6e4c25fc..e24266f49 100644 --- a/kdeprint/kxmlcommand.h +++ b/kdeprint/kxmlcommand.h @@ -30,7 +30,7 @@ class DrMain; class DrGroup; class DrBase; -class KDEPRINT_EXPORT KXmlCommand : public QObject +class KDEPRINT_EXPORT KXmlCommand : public TQObject { friend class KXmlCommandManager; @@ -86,7 +86,7 @@ private: KXmlCommandPrivate *d; }; -class KDEPRINT_EXPORT KXmlCommandManager : public QObject +class KDEPRINT_EXPORT KXmlCommandManager : public TQObject { public: enum IO_CheckType { None = 0, Basic, Advanced }; diff --git a/kdeprint/lpd/gschecker.cpp b/kdeprint/lpd/gschecker.cpp index 8f23fcc32..012d3cd4d 100644 --- a/kdeprint/lpd/gschecker.cpp +++ b/kdeprint/lpd/gschecker.cpp @@ -48,12 +48,12 @@ void GsChecker::loadDriverList() line = t.readLine().stripWhiteSpace(); if (ok) { - if (line.find(':') != -1) + if (line.tqfind(':') != -1) break; else buffer.append(line).append(" "); } - else if (line.startsWith(TQString::fromLatin1("Available devices:"))) + else if (line.startsWith(TQString::tqfromLatin1("Available devices:"))) ok = true; } m_driverlist = TQStringList::split(' ',buffer,false); diff --git a/kdeprint/lpd/gschecker.h b/kdeprint/lpd/gschecker.h index 65f247380..1814ca1d7 100644 --- a/kdeprint/lpd/gschecker.h +++ b/kdeprint/lpd/gschecker.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <tqobject.h> -class GsChecker : public QObject +class GsChecker : public TQObject { public: GsChecker(TQObject *parent = 0, const char *name = 0); diff --git a/kdeprint/lpd/klpdprinterimpl.cpp b/kdeprint/lpd/klpdprinterimpl.cpp index 8a04927e6..8b365cbd1 100644 --- a/kdeprint/lpd/klpdprinterimpl.cpp +++ b/kdeprint/lpd/klpdprinterimpl.cpp @@ -46,6 +46,6 @@ bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr")); return false; } - cmd = TQString::fromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd = TQString::tqfromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies()); return true; } diff --git a/kdeprint/lpd/kmlpdmanager.cpp b/kdeprint/lpd/kmlpdmanager.cpp index 95623a56f..e5e641b68 100644 --- a/kdeprint/lpd/kmlpdmanager.cpp +++ b/kdeprint/lpd/kmlpdmanager.cpp @@ -65,12 +65,12 @@ KMLpdManager::~KMLpdManager() TQString KMLpdManager::driverDbCreationProgram() { - return TQString::fromLatin1("make_driver_db_lpd"); + return TQString::tqfromLatin1("make_driver_db_lpd"); } TQString KMLpdManager::driverDirectory() { - return TQString::fromLatin1("/usr/lib/rhs/rhs-printfilters"); + return TQString::tqfromLatin1("/usr/lib/rhs/rhs-printfilters"); } bool KMLpdManager::completePrinter(KMPrinter *printer) @@ -80,7 +80,7 @@ bool KMLpdManager::completePrinter(KMPrinter *printer) bool KMLpdManager::completePrinterShort(KMPrinter *printer) { - PrintcapEntry *entry = m_entries.find(printer->name()); + PrintcapEntry *entry = m_entries.tqfind(printer->name()); if (entry) { QString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp")); @@ -91,11 +91,11 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer) KURL url; if (!entry->arg("rm").isEmpty()) { - url = TQString::fromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp")); + url = TQString::tqfromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp")); printer->setDescription(i18n("Remote LPD queue %1@%2").arg(entry->arg("rp")).arg(entry->arg("rm"))); } else if (!lp.isEmpty() && lp != "/dev/null") - url = TQString::fromLatin1("parallel:%1").arg(lp); + url = TQString::tqfromLatin1("parallel:%1").arg(lp); else if (TQFile::exists(entry->arg("sd")+"/.config")) { TQMap<TQString,TQString> map = loadPrinttoolCfgFile(entry->arg("sd")+"/.config"); @@ -103,17 +103,17 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer) { QStringList l = TQStringList::split('\\',map["share"],false); if (map["workgroup"].isEmpty()) - url = TQString::fromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]); + url = TQString::tqfromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]); else - url = TQString::fromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]); + url = TQString::tqfromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]); url.setUser(map["user"]); url.setPass(map["password"]); } else if (type == "DIRECT") - url = TQString::fromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]); + url = TQString::tqfromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]); else if (type == "NCP") { - url = TQString::fromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]); + url = TQString::tqfromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]); url.setUser(map["user"]); url.setPass(map["password"]); } @@ -146,9 +146,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer) { // remote lpd queue ent->m_args["rm"] = printer->device().host(); - ent->m_args["rp"] = printer->device().path().replace("/",TQString::fromLatin1("")); + ent->m_args["rp"] = printer->device().path().replace("/",TQString::tqfromLatin1("")); ent->m_args["lpd_bounce"] = "true"; - ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## REMOTE"); + ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## REMOTE"); } ent->m_args["mx"] = (printer->option("mx").isEmpty() ? "#0" : printer->option("mx")); ent->m_args["sh"] = TQString::null; @@ -259,7 +259,7 @@ bool KMLpdManager::disablePrinter(KMPrinter *printer) void KMLpdManager::listPrinters() { m_entries.clear(); - loadPrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix)); + loadPrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix)); TQDictIterator<PrintcapEntry> it(m_entries); for (;it.current();++it) @@ -299,11 +299,11 @@ void KMLpdManager::checkStatus() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - if ((p=line.find(':')) != -1) + if ((p=line.tqfind(':')) != -1) printer = findPrinter(line.left(p)); else if (line.startsWith("printing") && printer) - printer->setState(line.find("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped); - else if (line.find("entries") != -1 && printer) + printer->setState(line.tqfind("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped); + else if (line.tqfind("entries") != -1 && printer) if (!line.startsWith("no") && printer->state() == KMPrinter::Idle) printer->setState(KMPrinter::Processing); } @@ -312,7 +312,7 @@ void KMLpdManager::checkStatus() bool KMLpdManager::writePrinters() { - if (!writePrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix))) + if (!writePrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix))) { setErrorMsg(i18n("Unable to write printcap file.")); return false; @@ -367,7 +367,7 @@ PrinttoolEntry* KMLpdManager::findPrinttoolEntry(const TQString& name) { if (m_ptentries.count() == 0) loadPrinttoolDb(driverDirectory()+"/printerdb"); - PrinttoolEntry *ent = m_ptentries.find(name); + PrinttoolEntry *ent = m_ptentries.tqfind(name); if (!ent) setErrorMsg(i18n("Couldn't find driver <b>%1</b> in printtool database.").arg(name)); return ent; @@ -406,7 +406,7 @@ DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry) PrintcapEntry* KMLpdManager::findPrintcapEntry(const TQString& name) { - PrintcapEntry *ent = m_entries.find(name); + PrintcapEntry *ent = m_entries.tqfind(name); if (!ent) setErrorMsg(i18n("Couldn't find printer <b>%1</b> in printcap file.").arg(name)); return ent; @@ -471,7 +471,7 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file break; if (line.startsWith("export ")) line.replace(0,7,""); - if ((p=line.find('=')) != -1) + if ((p=line.tqfind('=')) != -1) { name = line.left(p); val = line.right(line.length()-p-1); @@ -489,7 +489,7 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt { // defines input and output file QString fname = TQFileInfo(templatefile).fileName(); - fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1("")); + fname.replace(TQRegExp("\\.in$"),TQString::tqfromLatin1("")); QFile fin(templatefile); QFile fout(dirname + "/" + fname); if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly)) @@ -508,9 +508,9 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt if (line.startsWith("export ")) { tout << "export "; - line.replace(0,7,TQString::fromLatin1("")); + line.replace(0,7,TQString::tqfromLatin1("")); } - if ((p=line.find('=')) != -1) + if ((p=line.tqfind('=')) != -1) { name = line.left(p); tout << name << '=' << options[name] << endl; @@ -543,8 +543,8 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) return false; QString resol(options["RESOLUTION"]), color(options["COLOR"]); // update entry comment to make printtool happy and save printcap file - ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15))); - ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter"); + ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::tqfromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::tqfromLatin1("Default") : color.right(color.length()-15))); + ent->m_args["if"] = spooldir+TQString::tqfromLatin1("/filter"); if (!writePrinters()) return false; // write various driver files using templates @@ -566,11 +566,11 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry { KURL dev(printer->device()); QString prot = dev.protocol(), sd(entry->arg("sd")); - entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer)); + entry->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer)); if (prot == "smb" || prot == "ncp" || prot == "socket") { - entry->m_args["af"] = sd+TQString::fromLatin1("/acct"); - QFile f(sd+TQString::fromLatin1("/.config")); + entry->m_args["af"] = sd+TQString::tqfromLatin1("/acct"); + QFile f(sd+TQString::tqfromLatin1("/.config")); if (f.open(IO_WriteOnly)) { QTextStream t(&f); @@ -578,7 +578,7 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry { t << "printer_ip=" << dev.host() << endl; t << "port=" << dev.port() << endl; - entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/directprint"); + entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/directprint"); } else if (prot == "smb") { @@ -594,20 +594,20 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry t << "hostip=" << endl; t << "user='" << dev.user() << '\'' << endl; t << "password='" << dev.pass() << '\'' << endl; - t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::fromLatin1("")) << '\'' << endl; - entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/smbprint"); + t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::tqfromLatin1("")) << '\'' << endl; + entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/smbprint"); } else if (prot == "ncp") { t << "server=" << dev.host() << endl; - t << "queue=" << dev.path().replace("/",TQString::fromLatin1("")) << endl; + t << "queue=" << dev.path().replace("/",TQString::tqfromLatin1("")) << endl; t << "user=" << dev.user() << endl; t << "password=" << dev.pass() << endl; - entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/ncpprint"); + entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/ncpprint"); } } else return false; - entry->m_args["lp"] = TQString::fromLatin1("/dev/null"); + entry->m_args["lp"] = TQString::tqfromLatin1("/dev/null"); } else if (prot != "lpd") entry->m_args["lp"] = dev.path(); @@ -618,7 +618,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry) { // first check if it has a "sd" defined if (entry->arg("sd").isEmpty()) - entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name; + entry->m_args["sd"] = TQString::tqfromLatin1("/var/spool/lpd/")+entry->m_name; QString sd = entry->arg("sd"); if (!KStandardDirs::exists(sd)) { diff --git a/kdeprint/lpd/lpdtools.cpp b/kdeprint/lpd/lpdtools.cpp index 3b1651337..ee919ff95 100644 --- a/kdeprint/lpd/lpdtools.cpp +++ b/kdeprint/lpd/lpdtools.cpp @@ -60,7 +60,7 @@ TQString nextWord(const TQString& s, int& pos) if (s[p1] == '{') { p1++; - p2 = s.find('}',p1); + p2 = s.tqfind('}',p1); } else { @@ -81,12 +81,12 @@ bool PrintcapEntry::readLine(const TQString& line) m_name = l[0]; int p(-1); // discard aliases - if ((p=m_name.find('|')) != -1) + if ((p=m_name.tqfind('|')) != -1) m_name = m_name.left(p); m_args.clear(); for (uint i=1; i<l.count(); i++) { - int p = l[i].find('='); + int p = l[i].tqfind('='); if (p == -1) p = 2; QString key = l[i].left(p); QString value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p)); @@ -140,22 +140,22 @@ KMPrinter* PrintcapEntry::createPrinter() TQStringList splitPrinttoolLine(const TQString& line) { QStringList l; - int p = line.find(':'); + int p = line.tqfind(':'); if (p != -1) { l.append(line.left(p)); - p = line.find('{',p); + p = line.tqfind('{',p); if (p == -1) l.append(line.right(line.length()-l[0].length()-1).stripWhiteSpace()); else { while (p != -1) { - int q = line.find('}',p); + int q = line.tqfind('}',p); if (q != -1) { l.append(line.mid(p+1,q-p-1)); - p = line.find('{',q); + p = line.tqfind('{',q); } else break; } @@ -257,11 +257,11 @@ DrMain* PrinttoolEntry::createDriver() for (int i=0;it.current();++it,i++) { ch = new DrBase; - ch->setName(TQString::fromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi)); + ch->setName(TQString::tqfromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi)); if (it.current()->comment.isEmpty()) - ch->set("text",TQString::fromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi)); + ch->set("text",TQString::tqfromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi)); else - ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi)); + ch->set("text",TQString::tqfromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi)); lopt->addChoice(ch); } QString defval = lopt->choices()->first()->name(); @@ -281,13 +281,13 @@ DrMain* PrinttoolEntry::createDriver() { ch = new DrBase; if (m_gsdriver != "uniprint") - ch->setName(TQString::fromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp)); + ch->setName(TQString::tqfromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp)); else ch->setName(it.current()->bpp); if (it.current()->comment.isEmpty()) ch->set("text",it.current()->bpp); else - ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment)); + ch->set("text",TQString::tqfromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment)); lopt->addChoice(ch); } QString defval = lopt->choices()->first()->name(); diff --git a/kdeprint/lpdunix/klpdunixprinterimpl.cpp b/kdeprint/lpdunix/klpdunixprinterimpl.cpp index 7a9a3ad81..8a680ae6e 100644 --- a/kdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/kdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -36,12 +36,12 @@ KLpdUnixPrinterImpl::~KLpdUnixPrinterImpl() void KLpdUnixPrinterImpl::initLpPrint(TQString& cmd, KPrinter *printer) { - cmd += TQString::fromLatin1(" -d %1 -n%2").arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd += TQString::tqfromLatin1(" -d %1 -n%2").arg(quote(printer->printerName())).arg(printer->numCopies()); } void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer) { - cmd += TQString::fromLatin1(" -P %1 '-#%2'").arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd += TQString::tqfromLatin1(" -P %1 '-#%2'").arg(quote(printer->printerName())).arg(printer->numCopies()); } // look for executable, starting with "lpr" diff --git a/kdeprint/lpdunix/kmlpdunixmanager.cpp b/kdeprint/lpdunix/kmlpdunixmanager.cpp index f288702eb..1adb21ccb 100644 --- a/kdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/kdeprint/lpdunix/kmlpdunixmanager.cpp @@ -114,12 +114,12 @@ TQMap<TQString,TQString> readEntry(KTextBuffer& t) if (l.count() > 0) { int p(-1); - if ((p=l[0].find('|')) != -1) + if ((p=l[0].tqfind('|')) != -1) entry["printer-name"] = l[0].left(p); // only keep first name (discard aliases else entry["printer-name"] = l[0]; for (uint i=1; i<l.count(); i++) - if ((p=l[i].find('=')) != -1) + if ((p=l[i].tqfind('=')) != -1) entry[l[i].left(p).stripWhiteSpace()] = l[i].right(l[i].length()-p-1).stripWhiteSpace(); else entry[l[i].stripWhiteSpace()] = TQString::null; @@ -168,7 +168,7 @@ TQString getPrintcapFileName() if (pcentry[0] == '|') { // printcap through pipe printcap = locateLocal("tmp","printcap"); - QString cmd = TQString::fromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap); + QString cmd = TQString::tqfromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap); kdDebug() << "printcap obtained through pipe" << endl << "executing: " << cmd << endl; ::system(cmd.local8Bit()); } @@ -199,7 +199,7 @@ void KMLpdUnixManager::parseEtcPrintcap() if (entry.contains("all")) { // find separator - int p = entry["all"].find(TQRegExp("[^a-zA-Z0-9_\\s-]")); + int p = entry["all"].tqfind(TQRegExp("[^a-zA-Z0-9_\\s-]")); if (p != -1) { QChar c = entry["all"][p]; @@ -234,7 +234,7 @@ TQString getEtcPrintersConfName() { // standard file not found, try NIS printersconf = locateLocal("tmp","printers.conf"); - QString cmd = TQString::fromLatin1("ypcat printers.conf.byname > %1").arg(printersconf); + QString cmd = TQString::tqfromLatin1("ypcat printers.conf.byname > %1").arg(printersconf); kdDebug() << "printers.conf obtained from NIS server: " << cmd << endl; ::system(TQFile::encodeName(cmd)); } diff --git a/kdeprint/lpr/apshandler.cpp b/kdeprint/lpr/apshandler.cpp index fc6ade276..526edaf49 100644 --- a/kdeprint/lpr/apshandler.cpp +++ b/kdeprint/lpr/apshandler.cpp @@ -50,8 +50,8 @@ bool ApsHandler::validate(PrintcapEntry *entry) KMPrinter* ApsHandler::createPrinter(PrintcapEntry *entry) { - entry->comment = TQString::fromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter); - entry->postcomment = TQString::fromLatin1("# APS%1_END - don't delete this").arg(m_counter); + entry->comment = TQString::tqfromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter); + entry->postcomment = TQString::tqfromLatin1("# APS%1_END - don't delete this").arg(m_counter); m_counter++; return LprHandler::createPrinter(entry); } @@ -148,7 +148,7 @@ TQMap<TQString,TQString> ApsHandler::loadVarFile(const TQString& filename) while (!t.atEnd()) { line = t.readLine().stripWhiteSpace(); - if (line.isEmpty() || line[0] == '#' || (p = line.find('=')) == -1) + if (line.isEmpty() || line[0] == '#' || (p = line.tqfind('=')) == -1) continue; QString variable = line.left(p).stripWhiteSpace(); QString value = line.mid(p+1).stripWhiteSpace(); @@ -187,7 +187,7 @@ DrMain* ApsHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool config DrMain* ApsHandler::loadDbDriver(const TQString& s) { - int p = s.find('/'); + int p = s.tqfind('/'); DrMain *driver = loadApsDriver(true); if (driver) driver->set("gsdriver", s.mid(p+1)); @@ -309,8 +309,8 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt) entry->addField("af", Field::String, sd + "/acct"); entry->addField("lf", Field::String, sd + "/log"); entry->addField("if", Field::String, sysconfDir() + "/basedir/bin/apsfilter"); - entry->comment = TQString::fromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter); - entry->postcomment = TQString::fromLatin1("# APS%1_END").arg(m_counter); + entry->comment = TQString::tqfromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter); + entry->postcomment = TQString::tqfromLatin1("# APS%1_END").arg(m_counter); m_counter++; return entry; } diff --git a/kdeprint/lpr/klprprinterimpl.cpp b/kdeprint/lpr/klprprinterimpl.cpp index 1d77b166c..9f0956ff3 100644 --- a/kdeprint/lpr/klprprinterimpl.cpp +++ b/kdeprint/lpr/klprprinterimpl.cpp @@ -41,7 +41,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) if (!printer || m_exepath.isEmpty()) return false; - cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() ); + cmd = TQString::tqfromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() ); QString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer); if (!opts.isEmpty()) cmd += (" " + opts); @@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value KPrinterImpl::broadcastOption(key,value); if (key == "kde-pagesize") { - QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); + QString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); KPrinterImpl::broadcastOption("PageSize",pagename); } } diff --git a/kdeprint/lpr/kmlprmanager.cpp b/kdeprint/lpr/kmlprmanager.cpp index 65b08eb67..008674a78 100644 --- a/kdeprint/lpr/kmlprmanager.cpp +++ b/kdeprint/lpr/kmlprmanager.cpp @@ -160,7 +160,7 @@ LprHandler* KMLprManager::findHandler(KMPrinter *prt) { QString handlerstr(prt->option("kde-lpr-handler")); LprHandler *handler(0); - if (handlerstr.isEmpty() || (handler = m_handlers.find(handlerstr)) == NULL) + if (handlerstr.isEmpty() || (handler = m_handlers.tqfind(handlerstr)) == NULL) { return NULL; } @@ -169,7 +169,7 @@ LprHandler* KMLprManager::findHandler(KMPrinter *prt) PrintcapEntry* KMLprManager::findEntry(KMPrinter *prt) { - PrintcapEntry *entry = m_entries.find(prt->printerName()); + PrintcapEntry *entry = m_entries.tqfind(prt->printerName()); if (!entry) { return NULL; @@ -230,9 +230,9 @@ DrMain* KMLprManager::loadPrinterDriver(KMPrinter *prt, bool config) DrMain* KMLprManager::loadFileDriver(const TQString& filename) { - int p = filename.find('/'); - QString handler_str = (p != -1 ? filename.left(p) : TQString::fromLatin1("default")); - LprHandler *handler = m_handlers.find(handler_str); + int p = filename.tqfind('/'); + QString handler_str = (p != -1 ? filename.left(p) : TQString::tqfromLatin1("default")); + LprHandler *handler = m_handlers.tqfind(handler_str); if (handler) { DrMain *driver = handler->loadDbDriver(filename); @@ -311,7 +311,7 @@ bool KMLprManager::savePrintcapFile() bool KMLprManager::createPrinter(KMPrinter *prt) { // remove existing printcap entry - PrintcapEntry *oldEntry = m_entries.find(prt->printerName()); + PrintcapEntry *oldEntry = m_entries.tqfind(prt->printerName()); // look for the handler and re-create entry LprHandler *handler(0); @@ -320,11 +320,11 @@ bool KMLprManager::createPrinter(KMPrinter *prt) // or we use the handler of the existing printer // (modifying something else, handler stays the same) if (prt->driver()) - handler = m_handlers.find(prt->driver()->get("handler")); + handler = m_handlers.tqfind(prt->driver()->get("handler")); else if (oldEntry) handler = findHandler(prt); else - handler = m_handlers.find("default"); + handler = m_handlers.tqfind("default"); if (!handler) { setErrorMsg(i18n("Internal error: no handler defined.")); @@ -422,7 +422,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt) TQString KMLprManager::driverDbCreationProgram() { - return TQString::fromLatin1("make_driver_db_lpr"); + return TQString::tqfromLatin1("make_driver_db_lpr"); } TQString KMLprManager::driverDirectory() diff --git a/kdeprint/lpr/lpchelper.cpp b/kdeprint/lpr/lpchelper.cpp index 516e85af3..fb39a37f9 100644 --- a/kdeprint/lpr/lpchelper.cpp +++ b/kdeprint/lpr/lpchelper.cpp @@ -82,26 +82,26 @@ void LpcHelper::parseStatusLPR(TQTextStream &t) line = t.readLine(); if (line.isEmpty()) continue; - else if (!line[0].isSpace() && (p = line.find(':')) != -1) + else if (!line[0].isSpace() && (p = line.tqfind(':')) != -1) { printer = line.left(p); m_state[printer] = KMPrinter::Idle; } - else if (line.find("printing is disabled") != -1) + else if (line.tqfind("printing is disabled") != -1) { if (!printer.isEmpty()) m_state[printer] = KMPrinter::PrinterState((KMPrinter::Stopped) | (m_state[printer] & ~KMPrinter::StateMask)); } - else if (line.find("queuing is disabled") != -1) + else if (line.tqfind("queuing is disabled") != -1) { if (!printer.isEmpty()) m_state[printer] = KMPrinter::PrinterState((KMPrinter::Rejecting) | (m_state[printer] & KMPrinter::StateMask)); } - else if (line.find("entries") != -1) + else if (line.tqfind("entries") != -1) { if (!printer.isEmpty() && (m_state[printer] & KMPrinter::StateMask) != KMPrinter::Stopped && - line.find("no entries") == -1) + line.tqfind("no entries") == -1) m_state[printer] = KMPrinter::PrinterState((m_state[printer] & ~KMPrinter::StateMask) | KMPrinter::Processing); } } @@ -121,7 +121,7 @@ void LpcHelper::parseStatusLPRng(TQTextStream& t) l = TQStringList::split(TQRegExp("\\s"), t.readLine(), false); if (l.count() < 4) continue; - p = l[0].find('@'); + p = l[0].tqfind('@'); if (p == 0) printer = l[0]; else @@ -206,11 +206,11 @@ static TQString lprngAnswer(const TQString& result, const TQString& printer) { int p, q; - p = result.find("\n" + printer); + p = result.tqfind("\n" + printer); if (p != -1) { - q = result.find(':', p)+2; - p = result.find('\n', q); + q = result.tqfind(':', p)+2; + p = result.tqfind('\n', q); QString answer = result.mid(q, p-q).stripWhiteSpace(); return answer; } @@ -274,9 +274,9 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg) return false; } QString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); - if (result.find("dequeued") != -1) + if (result.tqfind("dequeued") != -1) return true; - else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1) + else if (result.tqfind("Permission denied") != -1 || result.tqfind("no permissions") != -1) msg = i18n("Permission denied."); else msg = i18n("Execution of lprm failed: %1").arg(result); diff --git a/kdeprint/lpr/lpchelper.h b/kdeprint/lpr/lpchelper.h index d7e6c7897..2c711f41b 100644 --- a/kdeprint/lpr/lpchelper.h +++ b/kdeprint/lpr/lpchelper.h @@ -27,7 +27,7 @@ class KMJob; -class LpcHelper : public QObject +class LpcHelper : public TQObject { public: LpcHelper(TQObject *parent = 0, const char *name = 0); diff --git a/kdeprint/lpr/lpqhelper.cpp b/kdeprint/lpr/lpqhelper.cpp index 2675c9d41..aa8e19879 100644 --- a/kdeprint/lpr/lpqhelper.cpp +++ b/kdeprint/lpr/lpqhelper.cpp @@ -46,7 +46,7 @@ KMJob* LpqHelper::parseLineLpr(const TQString& line) job->setOwner(line.mid(7, 11).stripWhiteSpace()); job->setId(line.mid(18, 5).toInt()); job->setName(line.mid(23, 38).stripWhiteSpace()); - int p = line.find(' ', 61); + int p = line.tqfind(' ', 61); if (p != -1) { job->setSize(line.mid(61, p-61).toInt() / 1000); @@ -61,14 +61,14 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line) return NULL; KMJob *job = new KMJob; job->setState((rank[0].isDigit() ? KMJob::Queued : (rank == "hold" ? KMJob::Held : KMJob::Printing))); - int p = line.find('@', 7), q = line.find(' ', 7); + int p = line.tqfind('@', 7), q = line.tqfind(' ', 7); job->setOwner(line.mid(7, QMIN(p,q)-7)); while (line[q].isSpace()) q++; q++; while (line[q].isSpace()) q++; - p = line.find(' ', q); + p = line.tqfind(' ', q); job->setId(line.mid(q, p-q).toInt()); while (line[p].isSpace()) p++; diff --git a/kdeprint/lpr/lpqhelper.h b/kdeprint/lpr/lpqhelper.h index b41521f66..d79903f57 100644 --- a/kdeprint/lpr/lpqhelper.h +++ b/kdeprint/lpr/lpqhelper.h @@ -25,7 +25,7 @@ class KMJob; -class LpqHelper : public QObject +class LpqHelper : public TQObject { public: LpqHelper(TQObject *parent = 0, const char *name = 0); diff --git a/kdeprint/lpr/lprhandler.cpp b/kdeprint/lpr/lprhandler.cpp index 600df4796..4a2a96b0f 100644 --- a/kdeprint/lpr/lprhandler.cpp +++ b/kdeprint/lpr/lprhandler.cpp @@ -61,7 +61,7 @@ bool LprHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool) KURL uri; if (!val.isEmpty() && val != "/dev/null") { - int p = val.find('@'); + int p = val.tqfind('@'); if (p != -1) { prt->setLocation(i18n("Remote queue (%1) on %2").arg(val.left(p)).arg(val.mid(p+1))); @@ -69,7 +69,7 @@ bool LprHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool) uri.setHost(val.mid(p+1)); uri.setPath("/" + val.left(p)); } - else if ((p = val.find('%')) != -1) + else if ((p = val.tqfind('%')) != -1) { prt->setLocation(i18n("Network printer (%1)").arg("socket")); uri.setProtocol("socket"); diff --git a/kdeprint/lpr/lprngtoolhandler.cpp b/kdeprint/lpr/lprngtoolhandler.cpp index 3710496a9..624b74114 100644 --- a/kdeprint/lpr/lprngtoolhandler.cpp +++ b/kdeprint/lpr/lprngtoolhandler.cpp @@ -40,7 +40,7 @@ LPRngToolHandler::LPRngToolHandler(KMManager *mgr) bool LPRngToolHandler::validate(PrintcapEntry *entry) { if (entry->comment.startsWith("##LPRNGTOOL##") && - entry->comment.find("UNKNOWN") == -1) + entry->comment.tqfind("UNKNOWN") == -1) return true; return false; } @@ -82,14 +82,14 @@ bool LPRngToolHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, boo if (!(str=entry->field("ifhp")).isEmpty()) { QString model; - int p = str.find("model"); + int p = str.tqfind("model"); if (p != -1) { - p = str.find('=', p); + p = str.tqfind('=', p); if (p != -1) { p++; - int q = str.find(',', p); + int q = str.tqfind(',', p); if (q == -1) model = str.mid(p); else @@ -142,7 +142,7 @@ void LPRngToolHandler::loadAuthFile(const TQString& filename, TQString& user, TQ line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - int p = line.find('='); + int p = line.tqfind('='); if (p != -1) { QString key = line.left(p); @@ -182,7 +182,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool DrMain* LPRngToolHandler::loadDbDriver(const TQString& s) { - int p = s.find('/'); + int p = s.tqfind('/'); DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); if (driver) driver->set("driverID", s.mid(p+1)); @@ -209,13 +209,13 @@ TQValueList< QPair<TQString,TQStringList> > LPRngToolHandler::loadChoiceDict(con key = TQString::null; if (line.contains('|') == 2 || line.right(7) == "BOOLEAN") { - int p = line.find('|', 7); + int p = line.tqfind('|', 7); key = line.mid(7, p-7); } } else if (line.startsWith("CHOICE")) { - int p = line.find('|', 7); + int p = line.tqfind('|', 7); l << line.mid(7, p-7); } } @@ -239,7 +239,7 @@ TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr) bool found(false); for (TQValueList< QPair<TQString,TQStringList> >::ConstIterator p=m_dict.begin(); p!=m_dict.end() && !found; ++p) { - if ((*p).second.find(*it) != (*p).second.end()) + if ((*p).second.tqfind(*it) != (*p).second.end()) { opts[(*p).first] = (*it); found = true; @@ -308,7 +308,7 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt) QString work, server, printer, user, passwd; if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) ) { - entry->addField("xfer_options", Field::String, TQString::fromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work)); + entry->addField("xfer_options", Field::String, TQString::tqfromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work)); QFile authfile(LprSettings::self()->baseSpoolDir() + "/" + prt->printerName() + "/auth"); if (authfile.open(IO_WriteOnly)) { @@ -331,8 +331,8 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt) DrMain *driver = prt->driver(); comment.append("filtertype=IFHP ifhp_options=status@,sync@,pagecount@,waitend@ printerdb_entry="); comment.append(driver->get("driverID")); - entry->addField("ifhp", Field::String, TQString::fromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID"))); - entry->addField("lprngtooloptions", Field::String, TQString::fromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID"))); + entry->addField("ifhp", Field::String, TQString::tqfromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID"))); + entry->addField("lprngtooloptions", Field::String, TQString::tqfromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID"))); TQMap<TQString,TQString> opts; QString optstr; driver->getOptions(opts, false); diff --git a/kdeprint/lpr/matichandler.cpp b/kdeprint/lpr/matichandler.cpp index f3f0d4cdc..9f830c821 100644 --- a/kdeprint/lpr/matichandler.cpp +++ b/kdeprint/lpr/matichandler.cpp @@ -85,7 +85,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh { prt->setLocation(i18n("Local printer on %1").arg(val)); KURL url(val); - if (val.find("usb") != -1) + if (val.tqfind("usb") != -1) url.setProtocol("usb"); else url.setProtocol("parallel"); @@ -104,7 +104,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh KURL url ( parsePostpipe(postpipe) ); if (!url.isEmpty()) { - QString ds = TQString::fromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol()); + QString ds = TQString::tqfromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol()); prt->setDevice(url.url()); prt->setLocation(ds); } @@ -115,7 +115,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh { prt->setManufacturer(m["make"].toString()); prt->setModel(m["model"].toString()); - prt->setDriverInfo(TQString::fromLatin1("%1 %2 (%3)").arg(prt->manufacturer()).arg(prt->model()).arg(m["driver"].toString())); + prt->setDriverInfo(TQString::tqfromLatin1("%1 %2 (%3)").arg(prt->manufacturer()).arg(prt->model()).arg(m["driver"].toString())); } } } @@ -167,7 +167,7 @@ TQString MaticHandler::parsePostpipe(const TQString& s) else { QString host = (args[i].length() == 2 ? args[i+1] : args[i].right(args[i].length()-2)); - int p = host.find("\\@"); + int p = host.tqfind("\\@"); if (p != -1) { url = "lpd://" + host.right(host.length()-p-2) + "/" + host.left(p); @@ -247,7 +247,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) } QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - QString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { @@ -309,13 +309,13 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai line = tin.readLine(); if (line.stripWhiteSpace().startsWith("$postpipe")) continue; - else if ((p = line.find("'name'")) != -1) + else if ((p = line.tqfind("'name'")) != -1) { - p = line.find('\'', p+6)+1; - q = line.find('\'', p); + p = line.tqfind('\'', p+6)+1; + q = line.tqfind('\'', p); optname = line.mid(p, q-p); } - else if ((p = line.find("'default'")) != -1) + else if ((p = line.tqfind("'default'")) != -1) { DrBase *opt = driver->findOption(optname); if (opt) @@ -351,7 +351,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) if (mdriver.isEmpty() || mprinter.isEmpty()) return true; - QString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { @@ -372,7 +372,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) line = tin.readLine(); if (line.startsWith("*% COMDATA #")) { - if (line.find("'default'") != -1) + if (line.tqfind("'default'") != -1) { DrBase *opt = (optname.isEmpty() ? NULL : driver->findOption(optname)); if (opt) diff --git a/kdeprint/lpr/printcapreader.cpp b/kdeprint/lpr/printcapreader.cpp index a3ab30e8f..7abd094f9 100644 --- a/kdeprint/lpr/printcapreader.cpp +++ b/kdeprint/lpr/printcapreader.cpp @@ -101,7 +101,7 @@ PrintcapEntry* PrintcapReader::nextEntry() // now parse the entry kdDebug() << "COMMENT: " << comment << endl; kdDebug() << "LINE: " << buf << endl; - int p = buf.find(':'); + int p = buf.tqfind(':'); if (p == -1) name = buf; else @@ -132,14 +132,14 @@ PrintcapEntry* PrintcapReader::nextEntry() for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { Field f; - int p = (*it).find('='); + int p = (*it).tqfind('='); if (p == -1) { - p = (*it).find('#'); + p = (*it).tqfind('#'); if (p == -1) { f.type = Field::Boolean; - p = (*it).find('@'); + p = (*it).tqfind('@'); if (p == -1) { f.name = (*it); diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp index 7bad07264..d9d3ea126 100644 --- a/kdeprint/management/cjanuswidget.cpp +++ b/kdeprint/management/cjanuswidget.cpp @@ -118,7 +118,7 @@ void CJanusWidget::CListBox::computeWidth() item = item->next(); } if (verticalScrollBar()->isVisible()) - w += verticalScrollBar()->sizeHint().width(); + w += verticalScrollBar()->tqsizeHint().width(); w += (frameWidth()*2); setFixedWidth(w); } diff --git a/kdeprint/management/cjanuswidget.h b/kdeprint/management/cjanuswidget.h index 2b06aed21..d73cafd31 100644 --- a/kdeprint/management/cjanuswidget.h +++ b/kdeprint/management/cjanuswidget.h @@ -28,7 +28,7 @@ class TQWidgetStack; class TQLabel; class TQListBoxItem; -class CJanusWidget : public QWidget +class CJanusWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp index 10dff4749..4b0d81e46 100644 --- a/kdeprint/management/kmconfigfilter.cpp +++ b/kdeprint/management/kmconfigfilter.cpp @@ -97,7 +97,7 @@ void KMConfigFilter::loadConfig(KConfig *conf) { if (!it.current()->isSpecial() && !it.current()->isVirtual()) { - KListBox *lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2); + KListBox *lb = (m_plist.tqfind(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2); lb->insertItem(SmallIcon(it.current()->pixmap()), it.current()->printerName()); } } diff --git a/kdeprint/management/kmconfigpage.h b/kdeprint/management/kmconfigpage.h index 138d7c152..596b8c5ec 100644 --- a/kdeprint/management/kmconfigpage.h +++ b/kdeprint/management/kmconfigpage.h @@ -26,7 +26,7 @@ class KConfig; -class KDEPRINT_EXPORT KMConfigPage : public QWidget +class KDEPRINT_EXPORT KMConfigPage : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp index 3b271ff00..cce83605d 100644 --- a/kdeprint/management/kmdbcreator.cpp +++ b/kdeprint/management/kmdbcreator.cpp @@ -109,7 +109,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena { if (!m_dlg) { - m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true); + m_dlg = new TQProgressDialog(parent->tqtopLevelWidget(),"progress-dialog",true); m_dlg->setLabelText(i18n("Please wait while KDE rebuilds a driver database.")); m_dlg->setCaption(i18n("Driver Database")); connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled())); @@ -133,7 +133,7 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) // the toInt() will return 0. If that occurs for the first number, // then the number of steps will be also 0. bool ok; - int p = str.find('\n'); + int p = str.tqfind('\n'); int n = str.mid(0, p).toInt(&ok); // process the number received diff --git a/kdeprint/management/kmdbcreator.h b/kdeprint/management/kmdbcreator.h index 82fa5469e..d4281a51d 100644 --- a/kdeprint/management/kmdbcreator.h +++ b/kdeprint/management/kmdbcreator.h @@ -28,7 +28,7 @@ class TQWidget; class TQProgressDialog; -class KMDBCreator : public QObject +class KMDBCreator : public TQObject { Q_OBJECT public: diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp index 6e275a6d4..ca872da43 100644 --- a/kdeprint/management/kmdriverdb.cpp +++ b/kdeprint/management/kmdriverdb.cpp @@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB() TQString KMDriverDB::dbFile() { // this calls insure missing directories creation - QString filename = locateLocal("data",TQString::fromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); + QString filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); return filename; } @@ -110,7 +110,7 @@ void KMDriverDB::slotDbCreated() KMDBEntryList* KMDriverDB::findEntry(const TQString& manu, const TQString& model) { - TQDict<KMDBEntryList> *models = m_entries.find(manu); + TQDict<KMDBEntryList> *models = m_entries.tqfind(manu); if (models) return models->find(model); return 0; @@ -118,7 +118,7 @@ KMDBEntryList* KMDriverDB::findEntry(const TQString& manu, const TQString& model KMDBEntryList* KMDriverDB::findPnpEntry(const TQString& manu, const TQString& model) { - TQDict<KMDBEntryList> *models = m_pnpentries.find(manu); + TQDict<KMDBEntryList> *models = m_pnpentries.tqfind(manu); if (models) return models->find(model); return 0; @@ -126,7 +126,7 @@ KMDBEntryList* KMDriverDB::findPnpEntry(const TQString& manu, const TQString& mo TQDict<KMDBEntryList>* KMDriverDB::findModels(const TQString& manu) { - return m_entries.find(manu); + return m_entries.tqfind(manu); } void KMDriverDB::insertEntry(KMDBEntry *entry) @@ -140,7 +140,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry) } // insert it in normal entries - TQDict<KMDBEntryList> *models = m_entries.find(entry->manufacturer); + TQDict<KMDBEntryList> *models = m_entries.tqfind(entry->manufacturer); if (!models) { models = new TQDict<KMDBEntryList>(17,false); @@ -159,7 +159,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry) if (!entry->pnpmanufacturer.isEmpty() && !entry->pnpmodel.isEmpty()) { // insert it in PNP entries - models = m_pnpentries.find(entry->manufacturer); + models = m_pnpentries.tqfind(entry->manufacturer); if (!models) { models = new TQDict<KMDBEntryList>(17,false); @@ -209,7 +209,7 @@ void KMDriverDB::loadDbFile() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - int p = line.find('='); + int p = line.tqfind('='); if (p == -1) continue; words.clear(); diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h index 1ffecdc0a..3913d74ef 100644 --- a/kdeprint/management/kmdriverdb.h +++ b/kdeprint/management/kmdriverdb.h @@ -29,7 +29,7 @@ class KMDBCreator; -class KMDriverDB : public QObject +class KMDriverDB : public TQObject { Q_OBJECT public: diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp index fdd3d263c..95175cb07 100644 --- a/kdeprint/management/kmdriverdbwidget.cpp +++ b/kdeprint/management/kmdriverdbwidget.cpp @@ -105,7 +105,7 @@ void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model) // try by stripping the manufacturer name from // the beginning of the model string. This is // often the case with PPD files - item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::fromLatin1(""))); + item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1(""))); if (item) m_model->setCurrentItem(item); } diff --git a/kdeprint/management/kmdriverdbwidget.h b/kdeprint/management/kmdriverdbwidget.h index c9e263f47..09298f3fa 100644 --- a/kdeprint/management/kmdriverdbwidget.h +++ b/kdeprint/management/kmdriverdbwidget.h @@ -27,7 +27,7 @@ class TQListBox; class TQCheckBox; class TQPushButton; -class KMDriverDbWidget : public QWidget +class KMDriverDbWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp index 5d16e34d0..c53cc8148 100644 --- a/kdeprint/management/kmiconview.cpp +++ b/kdeprint/management/kmiconview.cpp @@ -99,7 +99,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) setText(TQString::null); setText(p->name()); } - setKey(TQString::fromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name())); + setKey(TQString::tqfromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name())); m_isclass = p->isClass(false); } if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap)) @@ -114,7 +114,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) setPixmap(SmallIcon(m_pixmap, 0, iconstate)); } //if (update) - // repaint(); + // tqrepaint(); setDiscarded(false); } diff --git a/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp index e06fa3c28..6f3503566 100644 --- a/kdeprint/management/kminfopage.cpp +++ b/kdeprint/management/kminfopage.cpp @@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) { m_title = new TQLabel(this); m_titlepixmap = new TQLabel(this); - m_titlepixmap->setAlignment(Qt::AlignCenter); + m_titlepixmap->tqsetAlignment(Qt::AlignCenter); KSeparator* sep = new KSeparator( KSeparator::HLine, this); m_type = new TQLabel(this); m_description = new TQLabel(this); @@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) m_uri = new TQLabel(this); m_device = new TQLabel(this); QLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this); - m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_loclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_desclabel = new TQLabel(i18n("Description:"), this); - m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_desclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_typelabel = new TQLabel(i18n("Type:"), this); - m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_typelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this); - m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_statelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_urilabel = new TQLabel(i18n("URI:"), this); - m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_urilabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_devlabel = new TQLabel(i18n("Device:"), this); - m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_devlabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_modellabel = new TQLabel(i18n("Model:"), this); - m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_modellabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5); QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); @@ -107,7 +107,7 @@ void KMInfoPage::setPrinter(KMPrinter *p) } else { - m_title->setText(TQString::fromLatin1("<b>%1</b>").arg(p->name())); + m_title->setText(TQString::tqfromLatin1("<b>%1</b>").arg(p->name())); m_titlepixmap->setPixmap(SmallIcon(p->pixmap())); if (p->isImplicit()) m_type->setText(i18n("Implicit class")); else if (p->isClass(false)) diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp index 6e6fcc391..d53c1eca7 100644 --- a/kdeprint/management/kminstancepage.cpp +++ b/kdeprint/management/kminstancepage.cpp @@ -138,7 +138,7 @@ void KMInstancePage::slotNew() i18n("(Default)"),&ok,this); if (ok) { - if (name.find(TQRegExp("[/\\s]")) != -1) + if (name.tqfind(TQRegExp("[/\\s]")) != -1) KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes.")); else { @@ -183,7 +183,7 @@ void KMInstancePage::slotCopy() i18n("(Default)"),&ok,this); if (ok) { - if (name.find(TQRegExp("[/\\s]")) != -1) + if (name.tqfind(TQRegExp("[/\\s]")) != -1) KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes.")); else { diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp index a5e419fc6..e8c6efce0 100644 --- a/kdeprint/management/kmjobviewer.cpp +++ b/kdeprint/management/kmjobviewer.cpp @@ -280,7 +280,7 @@ void KMJobViewer::initActions() connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged())); connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool))); m_userfield->setEnabled(false); - m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_userfield->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); KWidgetAction *ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username"); if (!m_pop) diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp index e754cfe1d..4a35a230e 100644 --- a/kdeprint/management/kmlistview.cpp +++ b/kdeprint/management/kmlistview.cpp @@ -89,7 +89,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p) } setDiscarded(false); if (update) - repaint(); + tqrepaint(); } void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int w, int a) diff --git a/kdeprint/management/kmlistview.h b/kdeprint/management/kmlistview.h index e9a6b29e5..9f5b24b46 100644 --- a/kdeprint/management/kmlistview.h +++ b/kdeprint/management/kmlistview.h @@ -26,7 +26,7 @@ class KMListViewItem; class KMPrinter; -class KMListView : public QListView +class KMListView : public TQListView { Q_OBJECT public: diff --git a/kdeprint/management/kmpages.h b/kdeprint/management/kmpages.h index e300aa998..75ad4641a 100644 --- a/kdeprint/management/kmpages.h +++ b/kdeprint/management/kmpages.h @@ -26,7 +26,7 @@ class KMPrinter; class KMPrinterPage; -class KMPages : public QTabWidget +class KMPages : public TQTabWidget { public: KMPages(TQWidget *parent = 0, const char *name = 0); diff --git a/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp index 794683f54..f43f8f62a 100644 --- a/kdeprint/management/kmprinterview.cpp +++ b/kdeprint/management/kmprinterview.cpp @@ -47,7 +47,7 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); setViewType(m_type); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); } KMPrinterView::~KMPrinterView() @@ -105,9 +105,9 @@ void KMPrinterView::slotPrinterSelected(const TQString& p) m_current = p; } -TQSize KMPrinterView::minimumSizeHint() const +TQSize KMPrinterView::tqminimumSizeHint() const { - return TQWidgetStack::minimumSizeHint(); + return TQWidgetStack::tqminimumSizeHint(); } #include "kmprinterview.moc" diff --git a/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h index 5ea565dba..0b3a17789 100644 --- a/kdeprint/management/kmprinterview.h +++ b/kdeprint/management/kmprinterview.h @@ -28,7 +28,7 @@ class KMListView; class KMPrinter; class TQIconViewItem; -class KMPrinterView : public QWidgetStack +class KMPrinterView : public TQWidgetStack { Q_OBJECT public: @@ -42,7 +42,7 @@ public: void setViewType(ViewType t); ViewType viewType() const { return m_type; } - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; signals: void printerSelected(const TQString&); diff --git a/kdeprint/management/kmpropcontainer.h b/kdeprint/management/kmpropcontainer.h index ff4ca8439..5d9ca5455 100644 --- a/kdeprint/management/kmpropcontainer.h +++ b/kdeprint/management/kmpropcontainer.h @@ -26,7 +26,7 @@ class KMPropWidget; class TQPushButton; class KMPrinter; -class KMPropContainer : public QWidget +class KMPropContainer : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/management/kmpropmembers.cpp b/kdeprint/management/kmpropmembers.cpp index 775c71f89..6fa76cba9 100644 --- a/kdeprint/management/kmpropmembers.cpp +++ b/kdeprint/management/kmpropmembers.cpp @@ -29,7 +29,7 @@ KMPropMembers::KMPropMembers(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { m_members = new TQTextView(this); - m_members->setPaper(colorGroup().background()); + m_members->setPaper(tqcolorGroup().background()); m_members->setFrameStyle(TQFrame::NoFrame); QVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0); diff --git a/kdeprint/management/kmpropwidget.h b/kdeprint/management/kmpropwidget.h index f4d3a865b..a9c2b918f 100644 --- a/kdeprint/management/kmpropwidget.h +++ b/kdeprint/management/kmpropwidget.h @@ -27,7 +27,7 @@ class KMPrinter; class KMWizard; -class KDEPRINT_EXPORT KMPropWidget : public QWidget +class KDEPRINT_EXPORT KMPropWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/management/kmtimer.h b/kdeprint/management/kmtimer.h index cf5efb719..6dcf962a0 100644 --- a/kdeprint/management/kmtimer.h +++ b/kdeprint/management/kmtimer.h @@ -34,7 +34,7 @@ * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMTimer : public QTimer +class KDEPRINT_EXPORT KMTimer : public TQTimer { Q_OBJECT public: diff --git a/kdeprint/management/kmwbackend.cpp b/kdeprint/management/kmwbackend.cpp index 53803d383..481651e87 100644 --- a/kdeprint/management/kmwbackend.cpp +++ b/kdeprint/management/kmwbackend.cpp @@ -102,7 +102,7 @@ void KMWBackend::updatePrinter(KMPrinter *p) else p->setType(KMPrinter::Printer); p->setOption("kde-backend",TQString::number(ID)); QString s = m_buttons->selected()->text(); - s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1("")); + s.replace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1("")); p->setOption("kde-backend-description",s); setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error)); } diff --git a/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp index a50454d0b..bf5ef9c4b 100644 --- a/kdeprint/management/kmwdriver.cpp +++ b/kdeprint/management/kmwdriver.cpp @@ -49,7 +49,7 @@ void KMWDriver::initPrinter(KMPrinter *p) { // use auto-detection info instead: split the string // into make/model pair at the first space character - int p = autoDetect.find( ' ' ); + int p = autoDetect.tqfind( ' ' ); if ( p != -1 ) { TQString manu = autoDetect.left( p ), model = autoDetect.mid( p+1 ); diff --git a/kdeprint/management/kmwend.cpp b/kdeprint/management/kmwend.cpp index 5fd3c7fc0..0d638dfd9 100644 --- a/kdeprint/management/kmwend.cpp +++ b/kdeprint/management/kmwend.cpp @@ -42,11 +42,11 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name) void KMWEnd::initPrinter(KMPrinter *p) { QString txt; - QString s(TQString::fromLatin1("<li><u>%1</u>: %2</li>")); + QString s(TQString::tqfromLatin1("<li><u>%1</u>: %2</li>")); int ID = p->option("kde-backend").toInt(); // general information - txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General"))); + txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General"))); txt.append(s.arg(i18n("Type")).arg(p->option("kde-backend-description"))); txt.append(s.arg(i18n("Name")).arg(p->name())); txt.append(s.arg(i18n("Location")).arg(p->location())); @@ -56,9 +56,9 @@ void KMWEnd::initPrinter(KMPrinter *p) if (ID == KMWizard::Class) { // class members - txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members"))); + txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members"))); QStringList m(p->members()); - QString s1(TQString::fromLatin1("<li>%1</li>")); + QString s1(TQString::tqfromLatin1("<li>%1</li>")); for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it) txt.append(s1.arg(*it)); txt.append("</ul><br>"); @@ -66,7 +66,7 @@ void KMWEnd::initPrinter(KMPrinter *p) else { // backend information - txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend"))); + txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend"))); KURL url ( p->device() ); switch (ID) { @@ -101,7 +101,7 @@ void KMWEnd::initPrinter(KMPrinter *p) if (p->option("kde-driver") == "raw" || p->driver()) { // driver information - txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver"))); + txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver"))); if (p->option("kde-driver") == "raw") txt.append(s.arg(i18n("Type")).arg(i18n("Raw printer"))); else diff --git a/kdeprint/management/kmwfile.cpp b/kdeprint/management/kmwfile.cpp index 9daeee77b..33deb0836 100644 --- a/kdeprint/management/kmwfile.cpp +++ b/kdeprint/management/kmwfile.cpp @@ -72,6 +72,6 @@ bool KMWFile::isValid(TQString& msg) void KMWFile::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("file:%1").arg(m_url->url()); + QString dev = TQString::tqfromLatin1("file:%1").arg(m_url->url()); p->setDevice(dev); } diff --git a/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp index 6a793dd5a..59bfa644d 100644 --- a/kdeprint/management/kmwizard.cpp +++ b/kdeprint/management/kmwizard.cpp @@ -178,14 +178,14 @@ void KMWizard::configure(int start, int end, bool inclusive) void KMWizard::setNextPage(int page, int next) { - KMWizardPage *p = m_pagepool.find(page); + KMWizardPage *p = m_pagepool.tqfind(page); if (p) p->setNextPage(next); } void KMWizard::setCurrentPage(int ID, bool back) { - KMWizardPage *page = m_pagepool.find(ID); + KMWizardPage *page = m_pagepool.tqfind(ID); if (!page) { KMessageBox::error(this,i18n("Unable to find the requested page."),i18n("Add Printer Wizard")); diff --git a/kdeprint/management/kmwizard.h b/kdeprint/management/kmwizard.h index 54a97abcd..0c981967d 100644 --- a/kdeprint/management/kmwizard.h +++ b/kdeprint/management/kmwizard.h @@ -34,7 +34,7 @@ class KMPrinter; class KMWBackend; class SidePixmap; -class KDEPRINT_EXPORT KMWizard : public QDialog +class KDEPRINT_EXPORT KMWizard : public TQDialog { Q_OBJECT public: diff --git a/kdeprint/management/kmwizardpage.h b/kdeprint/management/kmwizardpage.h index d6756ab37..68f655b2a 100644 --- a/kdeprint/management/kmwizardpage.h +++ b/kdeprint/management/kmwizardpage.h @@ -26,7 +26,7 @@ class KMPrinter; -class KDEPRINT_EXPORT KMWizardPage : public QWidget +class KDEPRINT_EXPORT KMWizardPage : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp index 1a89babe0..0340a5fe1 100644 --- a/kdeprint/management/kmwlocal.cpp +++ b/kdeprint/management/kmwlocal.cpp @@ -173,7 +173,7 @@ void KMWLocal::initialize() ++it; QString uri = *it; - int p = uri.find( ':' ); + int p = uri.tqfind( ':' ); QString desc = *(++it), prot = ( p != -1 ? uri.left( p ) : TQString::null ); QString printer = *(++it); int index(-1); diff --git a/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp index c2686b481..d1bb53cab 100644 --- a/kdeprint/management/kmwlpd.cpp +++ b/kdeprint/management/kmwlpd.cpp @@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg) void KMWLpd::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); + QString dev = TQString::tqfromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); p->setDevice(dev); } @@ -81,7 +81,7 @@ bool checkLpdQueue(const char *host, const char *queue) char res[64] = {0}; snprintf(res,64,"%c%s\n",(char)4,queue); - if (sock.writeBlock(res, strlen(res)) != (Q_LONG)(strlen(res))) + if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) return false; char buf[1024] = {0}; diff --git a/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp index d46b104a7..43f6f3fad 100644 --- a/kdeprint/management/kmwname.cpp +++ b/kdeprint/management/kmwname.cpp @@ -48,7 +48,7 @@ bool KMWName::isValid(TQString& msg) msg = i18n("You must supply at least a name."); return false; } - else if (text(0).find(TQRegExp("\\s")) != -1) + else if (text(0).tqfind(TQRegExp("\\s")) != -1) { QString conv = text(0); conv.replace(TQRegExp("\\s"), ""); diff --git a/kdeprint/management/kmwpassword.cpp b/kdeprint/management/kmwpassword.cpp index a84b8f904..f05fa2378 100644 --- a/kdeprint/management/kmwpassword.cpp +++ b/kdeprint/management/kmwpassword.cpp @@ -121,7 +121,7 @@ void KMWPassword::updatePrinter(KMPrinter *p) p->setOption( "kde-password", TQString::null ); break; case 1: - p->setOption( "kde-login", TQString::fromLatin1( "guest" ) ); + p->setOption( "kde-login", TQString::tqfromLatin1( "guest" ) ); p->setOption( "kde-password", TQString::null ); break; case 2: diff --git a/kdeprint/management/kmwsocket.cpp b/kdeprint/management/kmwsocket.cpp index 749ab8ea7..59b7e9d72 100644 --- a/kdeprint/management/kmwsocket.cpp +++ b/kdeprint/management/kmwsocket.cpp @@ -88,7 +88,7 @@ KMWSocket::~KMWSocket() void KMWSocket::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); + QString dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); p->setDevice(dev); } diff --git a/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp index d3f838ce7..6c1cce103 100644 --- a/kdeprint/management/kmwsocketutil.cpp +++ b/kdeprint/management/kmwsocketutil.cpp @@ -53,12 +53,12 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); QLineEdit *mm = new TQLineEdit(dummy); - mm->setText(TQString::fromLatin1(".[0-255]")); + mm->setText(TQString::tqfromLatin1(".[0-255]")); mm->setReadOnly(true); mm->setFixedWidth(fontMetrics().width(mm->text())+10); mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + mask_->tqsetAlignment(Qt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp index 24e6f4adf..13778043e 100644 --- a/kdeprint/management/kxmlcommanddlg.cpp +++ b/kdeprint/management/kxmlcommanddlg.cpp @@ -52,8 +52,8 @@ TQString generateId(const TQMap<TQString, DrBase*>& map) { int index(-1); - while (map.contains(TQString::fromLatin1("item%1").arg(++index))) ; - return TQString::fromLatin1("item%1").arg(index); + while (map.contains(TQString::tqfromLatin1("item%1").arg(++index))) ; + return TQString::tqfromLatin1("item%1").arg(index); } TQListViewItem* findPrev(TQListViewItem *item) @@ -735,10 +735,10 @@ void KXmlCommandAdvancedDlg::slotMoveDown() void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd) { - m_inputfile->parentWidget()->setEnabled(cmd.find("%filterinput") != -1); - m_outputfile->parentWidget()->setEnabled(cmd.find("%filteroutput") != -1); - m_view->setEnabled(cmd.find("%filterargs") != -1); - m_name->parentWidget()->setEnabled(m_view->isEnabled()); + m_inputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1); + m_outputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1); + m_view->setEnabled(cmd.tqfind("%filterargs") != -1); + m_name->tqparentWidget()->setEnabled(m_view->isEnabled()); slotSelectionChanged((m_view->isEnabled() ? m_view->currentItem() : 0)); m_view->setOpen(m_view->firstChild(), m_view->isEnabled()); } @@ -1025,7 +1025,7 @@ void KXmlCommandDlg::slotRemoveMime() void KXmlCommandDlg::slotEditCommand() { - KXmlCommandAdvancedDlg::editCommand(m_cmd, parentWidget()); + KXmlCommandAdvancedDlg::editCommand(m_cmd, tqparentWidget()); } void KXmlCommandDlg::slotAddReq() diff --git a/kdeprint/management/kxmlcommanddlg.h b/kdeprint/management/kxmlcommanddlg.h index f30b321ad..ccd52ba0b 100644 --- a/kdeprint/management/kxmlcommanddlg.h +++ b/kdeprint/management/kxmlcommanddlg.h @@ -40,7 +40,7 @@ class DrGroup; class DrBase; class KXmlCommand; -class KXmlCommandAdvancedDlg : public QWidget +class KXmlCommandAdvancedDlg : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp index 4e57b3922..ed7ff0150 100644 --- a/kdeprint/management/kxmlcommandselector.cpp +++ b/kdeprint/management/kxmlcommandselector.cpp @@ -275,7 +275,7 @@ void KXmlCommandSelector::slotHelpCommand() { KPopupFrame *pop = new KPopupFrame( m_helpbtn ); KActiveLabel *lab = new KActiveLabel( m_help, pop ); - lab->resize( lab->sizeHint() ); + lab->resize( lab->tqsizeHint() ); pop->setMainWidget( lab ); pop->exec( m_helpbtn->mapToGlobal( TQPoint( m_helpbtn->width(), 0 ) ) ); pop->close( 0 ); diff --git a/kdeprint/management/kxmlcommandselector.h b/kdeprint/management/kxmlcommandselector.h index d632aaddf..0f1335174 100644 --- a/kdeprint/management/kxmlcommandselector.h +++ b/kdeprint/management/kxmlcommandselector.h @@ -32,7 +32,7 @@ class TQLabel; class TQPushButton; class KDialogBase; -class KDEPRINT_EXPORT KXmlCommandSelector : public QWidget +class KDEPRINT_EXPORT KXmlCommandSelector : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp index 41b368ab0..576840760 100644 --- a/kdeprint/management/networkscanner.cpp +++ b/kdeprint/management/networkscanner.cpp @@ -157,7 +157,7 @@ void NetworkScanner::slotScanClicked() if ( !d->scanning ) { if ( d->localPrefix() == d->prefixaddress || - KMessageBox::warningContinueCancel( this->parentWidget(), + KMessageBox::warningContinueCancel( this->tqparentWidget(), i18n( "You are about to scan a subnet (%1.*) that does not " "correspond to the current subnet of this computer (%2.*). Do you want " "to scan the specified subnet anyway?" ).arg( d->prefixaddress ).arg( d->localPrefix() ), @@ -339,12 +339,12 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char * QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); QLineEdit *mm = new TQLineEdit(dummy); - mm->setText(TQString::fromLatin1(".[0-255]")); + mm->setText(TQString::tqfromLatin1(".[0-255]")); mm->setReadOnly(true); mm->setFixedWidth(fontMetrics().width(mm->text())+10); mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + mask_->tqsetAlignment(Qt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); diff --git a/kdeprint/management/networkscanner.h b/kdeprint/management/networkscanner.h index 462d26427..ea9602afa 100644 --- a/kdeprint/management/networkscanner.h +++ b/kdeprint/management/networkscanner.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> -class KDEPRINT_EXPORT NetworkScanner : public QWidget +class KDEPRINT_EXPORT NetworkScanner : public TQWidget { Q_OBJECT diff --git a/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp index 99a1e6198..696d7b025 100644 --- a/kdeprint/management/sidepixmap.cpp +++ b/kdeprint/management/sidepixmap.cpp @@ -32,7 +32,7 @@ SidePixmap::SidePixmap(TQWidget *parent, const char *name) m_tileup.load(locate("data", "kdeprint/tileup.png")); m_tiledown.load(locate("data", "kdeprint/tiledown.png")); - setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum)); } bool SidePixmap::isValid() @@ -42,7 +42,7 @@ bool SidePixmap::isValid() && (m_side.width() == m_tiledown.width())); } -TQSize SidePixmap::sizeHint() const +TQSize SidePixmap::tqsizeHint() const { return (TQSize(m_side.width()+lineWidth(), 300+lineWidth())); } diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h index 33db2275c..330b63e2d 100644 --- a/kdeprint/management/sidepixmap.h +++ b/kdeprint/management/sidepixmap.h @@ -25,11 +25,11 @@ #include <kdelibs_export.h> -class KDEPRINT_EXPORT SidePixmap : public QFrame +class KDEPRINT_EXPORT SidePixmap : public TQFrame { public: SidePixmap(TQWidget *parent = 0, const char *name = 0); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool isValid(); protected: diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp index 08f8487f7..987c3f6ae 100644 --- a/kdeprint/management/smbview.cpp +++ b/kdeprint/management/smbview.cpp @@ -216,7 +216,7 @@ void SmbView::processGroups() clear(); for (TQStringList::ConstIterator it=grps.begin(); it!=grps.end(); ++it) { - int p = (*it).find("<1d>"); + int p = (*it).tqfind("<1d>"); if (p == -1) continue; QListViewItem *item = new TQListViewItem(this,(*it).left(p).stripWhiteSpace()); diff --git a/kdeprint/marginpreview.h b/kdeprint/marginpreview.h index 8cceba7bc..7722b73c7 100644 --- a/kdeprint/marginpreview.h +++ b/kdeprint/marginpreview.h @@ -22,7 +22,7 @@ #include <tqwidget.h> -class MarginPreview : public QWidget +class MarginPreview : public TQWidget { Q_OBJECT diff --git a/kdeprint/marginwidget.h b/kdeprint/marginwidget.h index 90cef87ef..c526c9f9a 100644 --- a/kdeprint/marginwidget.h +++ b/kdeprint/marginwidget.h @@ -30,7 +30,7 @@ class MarginPreview; class TQCheckBox; class TQComboBox; -class KDEPRINT_EXPORT MarginWidget : public QWidget +class KDEPRINT_EXPORT MarginWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/messagewindow.cpp b/kdeprint/messagewindow.cpp index d4c4ae40d..553d78e21 100644 --- a/kdeprint/messagewindow.cpp +++ b/kdeprint/messagewindow.cpp @@ -55,13 +55,13 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, MessageWindow::~MessageWindow() { - m_windows.remove( parentWidget() ); + m_windows.remove( tqparentWidget() ); } void MessageWindow::slotTimer() { - TQSize psz = parentWidget()->size(), sz = sizeHint(); - move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) ); + TQSize psz = tqparentWidget()->size(), sz = tqsizeHint(); + move( tqparentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) ); if ( !isVisible() ) { show(); @@ -85,7 +85,7 @@ void MessageWindow::add( TQWidget *parent, const TQString& txt, int delay ) kdWarning( 500 ) << "Cannot add a message window to a null parent" << endl; else { - MessageWindow *w = m_windows.find( parent ); + MessageWindow *w = m_windows.tqfind( parent ); if ( w ) w->setText( txt ); else @@ -96,14 +96,14 @@ void MessageWindow::add( TQWidget *parent, const TQString& txt, int delay ) void MessageWindow::remove( TQWidget *parent ) { if ( parent ) - delete m_windows.find( parent ); + delete m_windows.tqfind( parent ); } void MessageWindow::change( TQWidget *parent, const TQString& txt ) { if ( parent ) { - MessageWindow *w = m_windows.find( parent ); + MessageWindow *w = m_windows.tqfind( parent ); if ( w ) w->setText( txt ); else diff --git a/kdeprint/messagewindow.h b/kdeprint/messagewindow.h index a86378a53..52e73ea2e 100644 --- a/kdeprint/messagewindow.h +++ b/kdeprint/messagewindow.h @@ -27,7 +27,7 @@ class TQLabel; -class KDEPRINT_EXPORT MessageWindow : public QWidget +class KDEPRINT_EXPORT MessageWindow : public TQWidget { Q_OBJECT diff --git a/kdeprint/plugincombobox.cpp b/kdeprint/plugincombobox.cpp index 038e9ddbd..b6533353a 100644 --- a/kdeprint/plugincombobox.cpp +++ b/kdeprint/plugincombobox.cpp @@ -44,7 +44,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name) TQWhatsThis::add(m_combo, whatsThisCurrentPrintsystem); QLabel *m_label = new TQLabel(i18n("Print s&ystem currently used:"), this); TQWhatsThis::add(m_label, whatsThisCurrentPrintsystem); - m_label->setAlignment(AlignVCenter|AlignRight); + m_label->tqsetAlignment(AlignVCenter|AlignRight); m_label->setBuddy(m_combo); m_plugininfo = new TQLabel("Plugin information", this); QGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 5); diff --git a/kdeprint/posterpreview.cpp b/kdeprint/posterpreview.cpp index fbdfe5200..f3535de25 100644 --- a/kdeprint/posterpreview.cpp +++ b/kdeprint/posterpreview.cpp @@ -106,7 +106,7 @@ void PosterPreview::drawContents( TQPainter *painter ) TQPixmap pix( width(), height() ); TQPainter *p = new TQPainter( &pix ); - p->fillRect( 0, 0, width(), height(), colorGroup().background() ); + p->fillRect( 0, 0, width(), height(), tqcolorGroup().background() ); if ( isEnabled() ) { @@ -120,7 +120,7 @@ void PosterPreview::drawContents( TQPainter *painter ) int x = ( width()-richtext.widthUsed() )/2, y = ( height()-richtext.height() )/2; x = QMAX( x, 0 ); y = QMAX( y, 0 ); - richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), colorGroup() ); + richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), tqcolorGroup() ); m_boundingrect = TQRect(); } else @@ -139,7 +139,7 @@ void PosterPreview::drawContents( TQPainter *painter ) { for ( int j=0; j<m_cols; j++, x+=m_pw ) { - bool selected = ( m_selectedpages.find( i*m_cols+j+1 ) != m_selectedpages.end() ); + bool selected = ( m_selectedpages.tqfind( i*m_cols+j+1 ) != m_selectedpages.end() ); p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? KGlobalSettings::highlightColor() : white ) ); p->drawRect( x, y, m_pw, m_ph ); if ( pw > 0 && ph > 0 ) @@ -187,7 +187,7 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e ) r = m_rows - ( e->pos().y()-m_boundingrect.y() )/( m_boundingrect.height()/m_rows ); int pagenum = ( r-1 )*m_cols+c; - if ( m_selectedpages.find( pagenum ) == m_selectedpages.end() || + if ( m_selectedpages.tqfind( pagenum ) == m_selectedpages.end() || !( e->state() & Qt::ShiftButton ) ) { if ( !( e->state() & Qt::ShiftButton ) ) @@ -267,7 +267,7 @@ void PosterPreview::setSelectedPages( const TQString& s ) for ( TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it ) { int p; - if ( ( p = ( *it ).find( '-' ) ) == -1 ) + if ( ( p = ( *it ).tqfind( '-' ) ) == -1 ) m_selectedpages.append( ( *it ).toInt() ); else { diff --git a/kdeprint/posterpreview.h b/kdeprint/posterpreview.h index 25fda31eb..bd9b6cc77 100644 --- a/kdeprint/posterpreview.h +++ b/kdeprint/posterpreview.h @@ -25,7 +25,7 @@ class KProcess; -class PosterPreview : public QFrame +class PosterPreview : public TQFrame { Q_OBJECT public: diff --git a/kdeprint/ppdloader.cpp b/kdeprint/ppdloader.cpp index 9fbecc774..035038a7a 100644 --- a/kdeprint/ppdloader.cpp +++ b/kdeprint/ppdloader.cpp @@ -78,7 +78,7 @@ static TQValueList<float> splitNumberString( const TQString& _s ) int p1 = 1, p2 = 0; while ( true ) { - p2 = s.find( ' ', p1 ); + p2 = s.tqfind( ' ', p1 ); if ( p2 != -1 ) { l.append( s.mid( p1, p2-p1 ).toFloat() ); @@ -431,7 +431,7 @@ bool PPDLoader::putPaperDimension( const TQString& name, const TQString& s ) { TQValueList<float> l = splitNumberString( s ); - PS_private *ps = m_ps.find( name ); + PS_private *ps = m_ps.tqfind( name ); if ( !ps ) { ps = new PS_private; @@ -448,7 +448,7 @@ bool PPDLoader::putImageableArea( const TQString& name, const TQString& s ) { TQValueList<float> l = splitNumberString( s ); - PS_private *ps = m_ps.find( name ); + PS_private *ps = m_ps.tqfind( name ); if ( !ps ) { ps = new PS_private; diff --git a/kdeprint/printerfilter.cpp b/kdeprint/printerfilter.cpp index a6f02f077..2590f41a4 100644 --- a/kdeprint/printerfilter.cpp +++ b/kdeprint/printerfilter.cpp @@ -62,7 +62,7 @@ bool PrinterFilter::filter(KMPrinter *prt) if (m_enabled) { if ((!m_locationRe.isEmpty() && m_locationRe.exactMatch(prt->location())) || - m_printers.find(prt->printerName()) != m_printers.end()) + m_printers.tqfind(prt->printerName()) != m_printers.end()) return true; else return false; diff --git a/kdeprint/rlpr/kmproxywidget.h b/kdeprint/rlpr/kmproxywidget.h index 8dfdd149a..4d2799a67 100644 --- a/kdeprint/rlpr/kmproxywidget.h +++ b/kdeprint/rlpr/kmproxywidget.h @@ -26,7 +26,7 @@ class KConfig; class TQLineEdit; class TQCheckBox; -class KMProxyWidget : public QGroupBox +class KMProxyWidget : public TQGroupBox { public: KMProxyWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/kdeprint/rlpr/kmrlprmanager.cpp b/kdeprint/rlpr/kmrlprmanager.cpp index f455fd1ff..718969116 100644 --- a/kdeprint/rlpr/kmrlprmanager.cpp +++ b/kdeprint/rlpr/kmrlprmanager.cpp @@ -116,7 +116,7 @@ void KMRlprManager::loadPrintersConf(const TQString& filename) if (w.count() > 4) printer->setLocation(w[4]); } printer->setState(KMPrinter::Idle); - printer->setDevice(TQString::fromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2])); + printer->setDevice(TQString::tqfromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2])); addPrinter(printer); } diff --git a/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp index 78f483db6..915bf74ae 100644 --- a/kdeprint/rlpr/kmwrlpr.cpp +++ b/kdeprint/rlpr/kmwrlpr.cpp @@ -53,7 +53,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name) m_view = new KListView(this); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); - m_view->addColumn(TQString::fromLatin1("")); + m_view->addColumn(TQString::tqfromLatin1("")); m_view->header()->hide(); m_view->setRootIsDecorated(true); m_view->setSorting(0); @@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p) void KMWRlpr::updatePrinter(KMPrinter *p) { - QString uri = TQString::fromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text()); + QString uri = TQString::tqfromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text()); p->setDevice(uri); p->setOption("host",m_host->text()); p->setOption("queue",m_queue->text()); @@ -140,7 +140,7 @@ void KMWRlpr::initialize() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - if ((p=line.find(':')) != -1) + if ((p=line.tqfind(':')) != -1) { host = line.left(p).stripWhiteSpace(); QListViewItem *hitem = new TQListViewItem(m_view,host); @@ -180,7 +180,7 @@ void KMWRlpr::initialize() } if (buffer.isEmpty()) continue; - int p = buffer.find(':'); + int p = buffer.tqfind(':'); if (p != -1) { QString name = buffer.left(p); diff --git a/kdeprint/rlpr/krlprprinterimpl.cpp b/kdeprint/rlpr/krlprprinterimpl.cpp index 1d4845bde..ac18d1a2b 100644 --- a/kdeprint/rlpr/krlprprinterimpl.cpp +++ b/kdeprint/rlpr/krlprprinterimpl.cpp @@ -54,7 +54,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) return false; } - cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies()); + cmd = TQString::tqfromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies()); // proxy settings KConfig *conf = KMFactory::self()->printConfig(); diff --git a/kdeprint/tests/drawdemo.cpp b/kdeprint/tests/drawdemo.cpp index 443cc89e8..20fc3d12e 100644 --- a/kdeprint/tests/drawdemo.cpp +++ b/kdeprint/tests/drawdemo.cpp @@ -78,7 +78,7 @@ void drawFonts( TQPainter *p ) // -// This function draws some shapes +// This function draws some tqshapes // void drawShapes( TQPainter *p ) @@ -115,7 +115,7 @@ struct DrawThing { DrawThing ourDrawFunctions[] = { { drawColorWheel, "Draw color wheel" }, { drawFonts, "Draw fonts" }, - { drawShapes, "Draw shapes" }, + { drawShapes, "Draw tqshapes" }, { 0, 0 } }; diff --git a/kdeprint/tests/drawdemo.h b/kdeprint/tests/drawdemo.h index 5d2412477..963da64db 100644 --- a/kdeprint/tests/drawdemo.h +++ b/kdeprint/tests/drawdemo.h @@ -6,7 +6,7 @@ // and a text in the table above. // -class DrawView : public QWidget +class DrawView : public TQWidget { Q_OBJECT public: diff --git a/kdeprint/tests/helpwindow.cpp b/kdeprint/tests/helpwindow.cpp index c2cdb1b22..bee755d20 100644 --- a/kdeprint/tests/helpwindow.cpp +++ b/kdeprint/tests/helpwindow.cpp @@ -67,7 +67,7 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P ); file->insertSeparator(); file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q ); - file->insertItem( "E&xit", qApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); + file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); // The same three icons are used twice each. TQIconSet icon_back( TQPixmap("back.xpm") ); @@ -278,7 +278,7 @@ void HelpWindow::print() TQRect view( body ); int page = 1; do { - richText.draw( &p, body.left(), body.top(), view, colorGroup() ); + richText.draw( &p, body.left(), body.top(), view, tqcolorGroup() ); view.moveBy( 0, body.height() ); p.translate( 0 , -body.height() ); p.setFont( font ); diff --git a/kdeprint/tests/richpage.cpp b/kdeprint/tests/richpage.cpp index f12040b71..30da712de 100644 --- a/kdeprint/tests/richpage.cpp +++ b/kdeprint/tests/richpage.cpp @@ -23,7 +23,7 @@ RichPage::RichPage(TQWidget *parent, const char *name) QFontDatabase db; QStringList fonts = db.families(); fontname_->insertStringList(fonts); - fontname_->setCurrentItem(fonts.findIndex(TQString::fromLatin1("times"))); + fontname_->setCurrentItem(fonts.findIndex(TQString::tqfromLatin1("times"))); if (fontname_->currentItem() < 0) fontname_->setCurrentItem(0); QLabel *l1 = new TQLabel("Margin:",this); diff --git a/kdeprint/tools/escputil/escpwidget.cpp b/kdeprint/tools/escputil/escpwidget.cpp index ef0e2390b..4a65a380d 100644 --- a/kdeprint/tools/escputil/escpwidget.cpp +++ b/kdeprint/tools/escputil/escpwidget.cpp @@ -97,20 +97,20 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); QLabel *printerlab = new TQLabel(i18n("Printer:"), this); - printerlab->setAlignment(AlignRight|AlignVCenter); + printerlab->tqsetAlignment(AlignRight|AlignVCenter); QLabel *devicelab = new TQLabel(i18n("Device:"), this); - devicelab->setAlignment(AlignRight|AlignVCenter); + devicelab->tqsetAlignment(AlignRight|AlignVCenter); QLabel *cleanlab = new TQLabel(i18n("Clea&n print head"), this); QLabel *nozzlelab = new TQLabel(i18n("&Print a nozzle test pattern"), this); QLabel *alignlab = new TQLabel(i18n("&Align print head"), this); QLabel *inklab = new TQLabel(i18n("&Ink level"), this); QLabel *identlab = new TQLabel(i18n("P&rinter identification"), this); - cleanlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - nozzlelab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - alignlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - inklab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - identlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + cleanlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); + nozzlelab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); + alignlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); + inklab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); + identlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); cleanbtn->setAccel(TQAccel::shortcutKey(cleanlab->text())); nozzlebtn->setAccel(TQAccel::shortcutKey(nozzlelab->text())); diff --git a/kdeprint/tools/escputil/escpwidget.h b/kdeprint/tools/escputil/escpwidget.h index 528de97c9..9cc0f2d38 100644 --- a/kdeprint/tools/escputil/escpwidget.h +++ b/kdeprint/tools/escputil/escpwidget.h @@ -27,7 +27,7 @@ class TQLabel; class TQCheckBox; -class EscpWidget : public QWidget +class EscpWidget : public TQWidget { Q_OBJECT diff --git a/kdeprint/treecombobox.cpp b/kdeprint/treecombobox.cpp index 1e4f1b694..752562e62 100644 --- a/kdeprint/treecombobox.cpp +++ b/kdeprint/treecombobox.cpp @@ -102,7 +102,7 @@ void TreeListBoxItem::paint(TQPainter *p) if (m_depth > 0) { QPen oldPen = p->pen(); - p->setPen(listBox()->colorGroup().mid()); + p->setPen(listBox()->tqcolorGroup().mid()); TreeListBoxItem *item = this; int s = xo-stepSize()/2; diff --git a/kdeprint/treecombobox.h b/kdeprint/treecombobox.h index 398633752..fa31c4471 100644 --- a/kdeprint/treecombobox.h +++ b/kdeprint/treecombobox.h @@ -27,7 +27,7 @@ /** * Class that represents a single object in the tree */ -class TreeListBoxItem : public QListBoxPixmap +class TreeListBoxItem : public TQListBoxPixmap { public: TreeListBoxItem(TQListBox *lb, const TQPixmap& pix, const TQString& txt, bool oneBlock = false); @@ -47,7 +47,7 @@ private: /** * Class for the listbox shown on popup */ -class TreeListBox : public QListBox +class TreeListBox : public TQListBox { friend class TreeListBoxItem; public: @@ -63,7 +63,7 @@ private: /** * Main class. */ -class TreeComboBox : public QComboBox +class TreeComboBox : public TQComboBox { public: TreeComboBox(TQWidget *parent = 0, const char *name = 0); diff --git a/kdeprint/util.cpp b/kdeprint/util.cpp index d95ca2c0c..01e276ae1 100644 --- a/kdeprint/util.cpp +++ b/kdeprint/util.cpp @@ -44,7 +44,7 @@ KURL smbToUrl(const TQString& s) { // allow to handle non-encoded chars in login/password KURL url; - int p = s.find('@'); + int p = s.tqfind('@'); if (p == -1) { // assumes url starts with "smb://". Use encoding in @@ -56,7 +56,7 @@ KURL smbToUrl(const TQString& s) // assumes URL starts with "smb://" QString username = s.mid(6, p-6); url = KURL("smb://" + KURL::encode_string(s.mid(p+1))); - int q = username.find(':'); + int q = username.tqfind(':'); if (q == -1) url.setUser(username); else @@ -99,14 +99,14 @@ bool splitSmbURI( const TQString& uri, TQString& work, TQString& server, TQStrin return false; p = 6; - int p1 = uri.find( '/', p ); + int p1 = uri.tqfind( '/', p ); if ( p1 != -1 ) { - int p2 = uri.find( '@', p ); + int p2 = uri.tqfind( '@', p ); if ( p2 != -1 && p2 < p1 ) { // Got a user - int p3 = uri.find( ':', p ); + int p3 = uri.tqfind( ':', p ); if ( p3 != -1 && p3 < p2 ) { // Got a password diff --git a/kdesu/client.cpp b/kdesu/client.cpp index 5261886fc..b5c9361aa 100644 --- a/kdesu/client.cpp +++ b/kdesu/client.cpp @@ -59,12 +59,12 @@ KDEsuClient::KDEsuClient() } // strip the screen number from the display - display.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); #else TQCString display("QWS"); #endif - sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display))); + sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display.data()))); d = new KDEsuClientPrivate; connect(); } @@ -169,13 +169,13 @@ TQCString KDEsuClient::escape(const TQCString &str) { TQCString copy = str; int n = 0; - while ((n = copy.find("\\", n)) != -1) + while ((n = copy.tqfind("\\", n)) != -1) { copy.insert(n, '\\'); n += 2; } n = 0; - while ((n = copy.find("\"", n)) != -1) + while ((n = copy.tqfind("\"", n)) != -1) { copy.insert(n, '\\'); n += 2; @@ -313,7 +313,7 @@ TQValueList<TQCString> KDEsuClient::getKeys(const TQCString &group) // kdDebug(900) << "Found a matching entry: " << reply << endl; while (1) { - pos = reply.find( '\007', index ); + pos = reply.tqfind( '\007', index ); if( pos == -1 ) { if( index == 0 ) diff --git a/kdesu/kcookie.cpp b/kdesu/kcookie.cpp index f60ec7314..60ddcfe3e 100644 --- a/kdesu/kcookie.cpp +++ b/kdesu/kcookie.cpp @@ -54,7 +54,7 @@ QCStringList KCookie::split(const TQCString &line, char ch) QCStringList result; int i=0, pos; - while ((pos = line.find(ch, i)) != -1) + while ((pos = line.tqfind(ch, i)) != -1) { result += line.mid(i, pos-i); i = pos+1; diff --git a/kdesu/process.cpp b/kdesu/process.cpp index 06558ce04..cce910c47 100644 --- a/kdesu/process.cpp +++ b/kdesu/process.cpp @@ -179,7 +179,7 @@ TQCString PtyProcess::readLine(bool block) if (!m_Inbuf.isEmpty()) { - pos = m_Inbuf.find('\n'); + pos = m_Inbuf.tqfind('\n'); if (pos == -1) { ret = m_Inbuf; @@ -228,7 +228,7 @@ TQCString PtyProcess::readLine(bool block) buf[nbytes] = '\000'; m_Inbuf += buf; - pos = m_Inbuf.find('\n'); + pos = m_Inbuf.tqfind('\n'); if (pos == -1) { ret = m_Inbuf; @@ -356,7 +356,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args) for(QCStringList::ConstIterator it = d->env.begin(); it != d->env.end(); it++) { - putenv((*it).data()); + putenv(const_cast<TQCString&>(*it).data()); } unsetenv("KDE_FULL_SESSION"); @@ -513,7 +513,7 @@ int PtyProcess::waitForChild() if (!m_Exit.isEmpty()) { // match exit string only at line starts - int pos = output.find(m_Exit); + int pos = output.tqfind(m_Exit.data()); if ((pos >= 0) && ((pos == 0 && lineStart) || (output.at (pos - 1) == '\n'))) { kill(m_Pid, SIGTERM); diff --git a/kdesu/ssh.cpp b/kdesu/ssh.cpp index d39634ac5..03051b826 100644 --- a/kdesu/ssh.cpp +++ b/kdesu/ssh.cpp @@ -156,12 +156,12 @@ TQCString SshProcess::dcopForward() if (srv.isEmpty()) return result; - int i = srv.find('/'); + int i = srv.tqfind('/'); if (i == -1) return result; if (srv.left(i) != "tcp") return result; - int j = srv.find(':', ++i); + int j = srv.tqfind(':', ++i); if (j == -1) return result; TQCString host = srv.mid(i, j-i); diff --git a/kdesu/stub.cpp b/kdesu/stub.cpp index 2af171d72..c7f39c4a8 100644 --- a/kdesu/stub.cpp +++ b/kdesu/stub.cpp @@ -145,7 +145,7 @@ int StubProcess::ConverseStub(int check) it != env.end(); ++it ) { - if( (*it).find( "DESKTOP_STARTUP_ID=" ) == 0 ) + if( (*it).tqfind( "DESKTOP_STARTUP_ID=" ) == 0 ) tmp = (*it).mid( strlen( "DESKTOP_STARTUP_ID=" )); } if( tmp.isEmpty()) diff --git a/kdeui/kaboutdialog.cpp b/kdeui/kaboutdialog.cpp index 12e610791..3ad8391e2 100644 --- a/kdeui/kaboutdialog.cpp +++ b/kdeui/kaboutdialog.cpp @@ -41,25 +41,25 @@ #include <kaboutdialog_private.h> #include <kdebug.h> -//MOC_SKIP_BEGIN +//TQMOC_SKIP_BEGIN template class TQPtrList<KAboutContributor>; -//MOC_SKIP_END +//TQMOC_SKIP_END #define WORKTEXT_IDENTATION 16 #define Grid 3 // ############################################################## -// MOC OUTPUT FILES: +// TQMOC OUTPUT FILES: #include "kaboutdialog.moc" #include "kaboutdialog_private.moc" // ############################################################## -class KAboutTabWidget : public QTabWidget +class KAboutTabWidget : public TQTabWidget { public: KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} - TQSize sizeHint() const { - return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) ); + TQSize tqsizeHint() const { + return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) ); } }; @@ -106,7 +106,7 @@ KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname, connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), TQT_SLOT(urlClickedSlot(const TQString &))); - mLabel[3]->setAlignment( AlignTop ); + mLabel[3]->tqsetAlignment( AlignTop ); fontChange( font() ); updateLayout(); @@ -227,8 +227,8 @@ void KAboutContributor::updateLayout( void ) { if( mShowHeader ) { - gbox->addWidget( mLabel[i], r, 0, AlignLeft ); - gbox->addWidget( mText[i], r, 1, AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQ_Alignment)AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft ); mLabel[i]->show(); mText[i]->show(); } @@ -237,11 +237,11 @@ void KAboutContributor::updateLayout( void ) mLabel[i]->hide(); if( !i ) { - gbox->addMultiCellWidget( mText[i], r, r, 0, 1, AlignLeft ); + gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQ_Alignment)AlignLeft ); } else { - gbox->addWidget( mText[i], r, 1, AlignLeft ); + gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft ); } mText[i]->show(); } @@ -256,7 +256,7 @@ void KAboutContributor::updateLayout( void ) } gbox->activate(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } @@ -272,9 +272,9 @@ void KAboutContributor::fontChange( const TQFont &/*oldFont*/ ) } -TQSize KAboutContributor::sizeHint( void ) const +TQSize KAboutContributor::tqsizeHint( void ) const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -314,7 +314,7 @@ KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent, if( layoutType & AbtTitle ) { mTitleLabel = new TQLabel( this, "title" ); - mTitleLabel->setAlignment(AlignCenter); + mTitleLabel->tqsetAlignment(AlignCenter); mTopLayout->addWidget( mTitleLabel ); mTopLayout->addSpacing( KDialog::spacingHint() ); } @@ -427,9 +427,9 @@ void KAboutContainerBase::show( void ) TQWidget::show(); } -TQSize KAboutContainerBase::sizeHint( void ) const +TQSize KAboutContainerBase::tqsizeHint( void ) const { - return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) ); + return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) ); } void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) @@ -451,7 +451,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); - mVersionLabel->parentWidget()->layout()->activate(); + mVersionLabel->tqparentWidget()->layout()->activate(); } update(); @@ -716,7 +716,7 @@ void KAboutContainerBase::setProduct( const TQString &appName, mAuthorLabel->hide(); } - mIconLabel->parentWidget()->layout()->activate(); + mIconLabel->tqparentWidget()->layout()->activate(); } @@ -790,26 +790,26 @@ void KAboutContainer::childEvent( TQChildEvent *e ) TQWidget* const w = static_cast<TQWidget *>(e->child()); mVbox->addWidget( w, 0, mAlignment ); - const TQSize s( sizeHint() ); + const TQSize s( tqsizeHint() ); setMinimumSize( s ); - TQObjectList* const l = const_cast<TQObjectList *>(children()); // silence please - TQObjectListIterator itr( *l ); + TQObjectList const l = childrenListObject(); // silence please + TQObjectListIterator itr( l ); TQObject * o; while ( (o = itr.current()) ) { ++itr; if( o->isWidgetType() ) { - static_cast<TQWidget *>(o)->setMinimumWidth( s.width() ); + TQT_TQWIDGET(o)->setMinimumWidth( s.width() ); } } } -TQSize KAboutContainer::sizeHint( void ) const +TQSize KAboutContainer::tqsizeHint( void ) const { // - // The size is computed by adding the sizeHint().height() of all + // The size is computed by adding the tqsizeHint().height() of all // widget children and taking the width of the widest child and adding // layout()->margin() and layout()->spacing() // @@ -817,24 +817,24 @@ TQSize KAboutContainer::sizeHint( void ) const TQSize total_size; int numChild = 0; - TQObjectList* const l = const_cast<TQObjectList *>(children()); // silence please + TQObjectList const l = childrenListObject(); // silence please - TQObjectListIterator itr( *l ); + TQObjectListIterator itr( l ); TQObject * o; while ( (o = itr.current()) ) { ++itr; if( o->isWidgetType() ) { ++numChild; - TQWidget* const w= static_cast<TQWidget *>(o); + TQWidget* const w= TQT_TQWIDGET(o); - TQSize s = w->minimumSize(); + TQSize s = w->tqminimumSize(); if( s.isEmpty() ) { - s = w->minimumSizeHint(); + s = w->tqminimumSizeHint(); if( s.isEmpty() ) { - s = w->sizeHint(); + s = w->tqsizeHint(); if( s.isEmpty() ) { s = TQSize( 100, 100 ); // Default size @@ -864,9 +864,9 @@ TQSize KAboutContainer::sizeHint( void ) const } -TQSize KAboutContainer::minimumSizeHint( void ) const +TQSize KAboutContainer::tqminimumSizeHint( void ) const { - return sizeHint(); + return tqsizeHint(); } @@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email, } -void KAboutContainer::addTitle( const TQString &title, int alignment, +void KAboutContainer::addTitle( const TQString &title, int tqalignment, bool showFrame, bool showBold ) { @@ -905,11 +905,11 @@ void KAboutContainer::addTitle( const TQString &title, int alignment, { label->setFrameStyle(TQFrame::Panel | TQFrame::Raised); } - label->setAlignment( alignment ); + label->tqsetAlignment( tqalignment ); } -void KAboutContainer::addImage( const TQString &fileName, int alignment ) +void KAboutContainer::addImage( const TQString &fileName, int tqalignment ) { if( fileName.isNull() ) { @@ -924,11 +924,11 @@ void KAboutContainer::addImage( const TQString &fileName, int alignment ) pix = logo; label->setPixmap( pix ); } - label->setAlignment( alignment ); + label->tqsetAlignment( tqalignment ); } #if 0 -//MOC_SKIP_BEGIN +//TQMOC_SKIP_BEGIN /** Every person displayed is stored in a KAboutContributor object. * Every contributor, the author and/or the maintainer of the application are @@ -960,8 +960,8 @@ public: void setWork(const TQString&); /** The size hint. Very important here, since KAboutWidget relies on it for * geometry management. */ - TQSize sizeHint(); - TQSize minimumSizeHint(void); + TQSize tqsizeHint(); + TQSize tqminimumSizeHint(void); virtual void show( void ); // ---------------------------------------------------------------------------- @@ -1007,7 +1007,7 @@ KAboutContributor::KAboutContributor(TQWidget* parent, const char* n) if(name==0 || email==0) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutContributor::KAboutContributor: Out of memory." << endl; - qApp->quit(); + tqApp->quit(); } setFrameStyle(TQFrame::Panel | TQFrame::Raised); // ----- @@ -1096,7 +1096,7 @@ KAboutContributor::setWork(const TQString& w) #if 0 QSize -KAboutContributor::sizeHint() +KAboutContributor::tqsizeHint() { // ############################################################################ const int FrameWidth=frameWidth(); @@ -1104,8 +1104,8 @@ KAboutContributor::sizeHint() int maxx, maxy; TQRect rect; // ----- first calculate name and email width: - maxx=name->sizeHint().width(); - maxx=QMAX(maxx, email->sizeHint().width()+WORKTEXT_IDENTATION); + maxx=name->tqsizeHint().width(); + maxx=QMAX(maxx, email->tqsizeHint().width()+WORKTEXT_IDENTATION); // ----- now determine "work" text rectangle: if(!work.isEmpty()) // save time { @@ -1116,10 +1116,10 @@ KAboutContributor::sizeHint() { maxx=WorkTextWidth+WORKTEXT_IDENTATION; } - maxx=QMAX(maxx, url->sizeHint().width()+WORKTEXT_IDENTATION); + maxx=QMAX(maxx, url->tqsizeHint().width()+WORKTEXT_IDENTATION); // ----- - maxy=2*(name->sizeHint().height()+Grid); // need a space above the KURLLabels - maxy+=/* email */ name->sizeHint().height(); + maxy=2*(name->tqsizeHint().height()+Grid); // need a space above the KURLLabels + maxy+=/* email */ name->tqsizeHint().height(); maxy+=rect.height(); // ----- maxx+=2*FrameWidth; @@ -1128,16 +1128,16 @@ KAboutContributor::sizeHint() // ############################################################################ } -TQSize KAboutContributor::minimumSizeHint(void) +TQSize KAboutContributor::tqminimumSizeHint(void) { - return( sizeHint() ); + return( tqsizeHint() ); } void KAboutContributor::show( void ) { TQFrame::show(); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } @@ -1151,15 +1151,15 @@ KAboutContributor::resizeEvent(TQResizeEvent*) int cy=framewidth; // ----- name->setGeometry - (framewidth, framewidth, childwidth, name->sizeHint().height()); + (framewidth, framewidth, childwidth, name->tqsizeHint().height()); cy=name->height()+Grid; email->setGeometry (framewidth+WORKTEXT_IDENTATION, cy, - childwidth-WORKTEXT_IDENTATION, /* email */ name->sizeHint().height()); + childwidth-WORKTEXT_IDENTATION, /* email */ name->tqsizeHint().height()); cy+=name->height()+Grid; url->setGeometry (framewidth+WORKTEXT_IDENTATION, cy, - childwidth-WORKTEXT_IDENTATION, /* url */ name->sizeHint().height()); + childwidth-WORKTEXT_IDENTATION, /* url */ name->tqsizeHint().height()); // the work text is drawn in the paint event // ############################################################################ } @@ -1181,20 +1181,20 @@ KAboutContributor::paintEvent(TQPaintEvent* e) paint.drawText(WORKTEXT_IDENTATION, cy, w, h, AlignLeft | WordBreak, work); // ############################################################################ } -// MOC_SKIP_END +// TQMOC_SKIP_END #endif #if 0 -TQSize KAboutContributor::sizeHint( void ) +TQSize KAboutContributor::tqsizeHint( void ) { int s = KDialog::spacingHint(); int h = fontMetrics().lineSpacing()*3 + 2*s; int m = frameWidth(); - int w = name->sizeHint().width(); - w = QMAX( w, email->sizeHint().width()+s); - w = QMAX( w, url->sizeHint().width()+s); + int w = name->tqsizeHint().width(); + w = QMAX( w, email->tqsizeHint().width()+s); + w = QMAX( w, url->tqsizeHint().width()+s); if( work.isEmpty() == false ) { @@ -1214,10 +1214,10 @@ TQSize KAboutContributor::sizeHint( void ) int s = 3; int m = frameWidth() + KDialog::spacingHint(); int h = ls * 3 + s * 2; - int w = name->sizeHint().width(); + int w = name->tqsizeHint().width(); - w = QMAX( w, email->sizeHint().width()+WORKTEXT_IDENTATION); - w = QMAX( w, url->sizeHint().width()+WORKTEXT_IDENTATION); + w = QMAX( w, email->tqsizeHint().width()+WORKTEXT_IDENTATION); + w = QMAX( w, url->tqsizeHint().width()+WORKTEXT_IDENTATION); if( work.isEmpty() == false ) { const int WorkTextWidth=200; @@ -1257,7 +1257,7 @@ void KAboutContributor::resizeEvent(TQResizeEvent*) int x = frameWidth() + KDialog::spacingHint(); int y = x; int w = width() - 2*x; - int h = name->sizeHint().height(); + int h = name->tqsizeHint().height(); int s = 3; name->setGeometry( x, y, w, h ); @@ -1291,7 +1291,7 @@ void KAboutContributor::paintEvent( TQPaintEvent *e ) int s = 3; int x = frameWidth() + KDialog::spacingHint() + WORKTEXT_IDENTATION; int w = width()-WORKTEXT_IDENTATION-2*(frameWidth()+KDialog::spacingHint()); - int y = frameWidth()+KDialog::spacingHint()+(name->sizeHint().height()+s)*3; + int y = frameWidth()+KDialog::spacingHint()+(name->tqsizeHint().height()+s)*3; int h = height()-y-frameWidth(); TQPainter paint( this ); @@ -1320,13 +1320,13 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutWidget::KAboutWidget: Out of memory." << endl; - qApp->quit(); + tqApp->quit(); } // ----- cont->setText(i18n("Other Contributors:")); logo->setText(i18n("(No logo available)")); logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised); - version->setAlignment(AlignCenter); + version->tqsetAlignment(AlignCenter); // ----- connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); @@ -1350,33 +1350,33 @@ KAboutWidget::adjust() // ----- if(showMaintainer) { - total_size=maintainer->sizeHint(); + total_size=maintainer->tqsizeHint(); maintWidth=total_size.width(); maintHeight=total_size.height(); } else { maintWidth=0; maintHeight=0; } - total_size=author->sizeHint(); + total_size=author->tqsizeHint(); logo->adjustSize(); - cy=version->sizeHint().height()+Grid; + cy=version->tqsizeHint().height()+Grid; cx=logo->width(); tempx=QMAX(total_size.width(), maintWidth); cx+=Grid+tempx; - cx=QMAX(cx, version->sizeHint().width()); + cx=QMAX(cx, version->tqsizeHint().width()); cy+=QMAX(logo->height(), total_size.height()+(showMaintainer ? Grid+maintHeight : 0)); // ----- if(!contributors.isEmpty()) { - cx=QMAX(cx, cont->sizeHint().width()); - cy+=cont->sizeHint().height()+Grid; + cx=QMAX(cx, cont->tqsizeHint().width()); + cy+=cont->tqsizeHint().height()+Grid; TQPtrListIterator<KAboutContributor> _pos(contributors); KAboutContributor* currEntry; while ( (currEntry = _pos.current()) ) { ++_pos; - cy+=currEntry->sizeHint().height(); + cy+=currEntry->tqsizeHint().height(); } } // ----- @@ -1459,7 +1459,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*) // ############################################################################ int _x=0, _y, cx, tempx, tempy; // ----- set version label geometry: - version->setGeometry(0, 0, width(), version->sizeHint().height()); + version->setGeometry(0, 0, width(), version->tqsizeHint().height()); _y=version->height()+Grid; // ----- move logo to correct position: logo->adjustSize(); @@ -1468,16 +1468,16 @@ KAboutWidget::resizeEvent(TQResizeEvent*) tempx=logo->width()+Grid; cx=width()-tempx; author->setGeometry - (tempx, _y, cx, author->sizeHint().height()); + (tempx, _y, cx, author->tqsizeHint().height()); maintainer->setGeometry - (tempx, _y+author->height()+Grid, cx, maintainer->sizeHint().height()); + (tempx, _y+author->height()+Grid, cx, maintainer->tqsizeHint().height()); _y+=QMAX(logo->height(), author->height()+(showMaintainer ? Grid+maintainer->height() : 0)); // ----- if(!contributors.isEmpty()) { - tempy=cont->sizeHint().height(); + tempy=cont->tqsizeHint().height(); cont->setGeometry(0, _y, width(), tempy); cont->show(); _y+=tempy+Grid; @@ -1489,7 +1489,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*) while( (currEntry = _pos.current()) ) { ++_pos; - tempy=currEntry->sizeHint().height(); + tempy=currEntry->tqsizeHint().height(); // y+=Grid; currEntry->setGeometry(_x, _y, width(), tempy); _y+=tempy; @@ -1512,7 +1512,7 @@ KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal) { // this will nearly never happen (out of memory in about box?) kdDebug() << "KAboutDialog::KAboutDialog: Out of memory." << endl; - qApp->quit(); + tqApp->quit(); } setMainWidget(about); connect(about, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), @@ -1567,7 +1567,7 @@ void KAboutDialog::adjust() if( !about ) { return; } about->adjust(); //initializeGeometry(); - resize( sizeHint() ); + resize( tqsizeHint() ); } diff --git a/kdeui/kaboutdialog.h b/kdeui/kaboutdialog.h index 8d732cdbe..345bc9f2c 100644 --- a/kdeui/kaboutdialog.h +++ b/kdeui/kaboutdialog.h @@ -47,7 +47,7 @@ class KAboutContainerPrivate; /** * KAboutContainer can be used to make a application specific AboutDialog. */ -class KDEUI_EXPORT KAboutContainer : public QFrame +class KDEUI_EXPORT KAboutContainer : public TQFrame { Q_OBJECT @@ -62,12 +62,12 @@ class KDEUI_EXPORT KAboutContainer : public QFrame const TQString &url, const TQString &task, bool showHeader = false, bool showframe = false, bool showBold = false ); - void addTitle( const TQString &title, int alignment=AlignLeft, + void addTitle( const TQString &title, int tqalignment=AlignLeft, bool showframe = false, bool showBold = false ); - void addImage( const TQString &fileName, int alignment=AlignLeft ); + void addImage( const TQString &fileName, int tqalignment=AlignLeft ); - virtual TQSize sizeHint( void ) const; - virtual TQSize minimumSizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; + virtual TQSize tqminimumSizeHint( void ) const; protected: virtual void childEvent( TQChildEvent *e ); @@ -89,7 +89,7 @@ class KAboutContributorPrivate; * Used internally by KAboutWidget * @internal */ -class KDEUI_EXPORT KAboutContributor : public QFrame +class KDEUI_EXPORT KAboutContributor : public TQFrame { Q_OBJECT @@ -115,7 +115,7 @@ class KDEUI_EXPORT KAboutContributor : public QFrame TQString getURL( void ) const; TQString getWork( void ) const; - virtual TQSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; protected: virtual void fontChange( const TQFont &oldFont ); @@ -147,7 +147,7 @@ class KDEUI_EXPORT KAboutContributor : public QFrame * * It has a minimum size set. */ -class KDEUI_EXPORT KAboutWidget : public QWidget +class KDEUI_EXPORT KAboutWidget : public TQWidget { Q_OBJECT diff --git a/kdeui/kaboutdialog_private.h b/kdeui/kaboutdialog_private.h index 563eb825b..3f6ffedd5 100644 --- a/kdeui/kaboutdialog_private.h +++ b/kdeui/kaboutdialog_private.h @@ -32,7 +32,7 @@ class TQVBoxLayout; * Used internally by KAboutContainerBase * @internal */ -class KImageTrackLabel : public QLabel +class KImageTrackLabel : public TQLabel { Q_OBJECT @@ -66,7 +66,7 @@ class KAboutContainerBasePrivate; * Used internally by KAboutDialog * @internal */ -class KAboutContainerBase : public QWidget +class KAboutContainerBase : public TQWidget { Q_OBJECT @@ -88,7 +88,7 @@ class KAboutContainerBase : public QWidget public: KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 ); virtual void show( void ); - virtual TQSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; void setTitle( const TQString &title ); void setImage( const TQString &fileName ); diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp index 1d05e289c..7ab50dca6 100644 --- a/kdeui/kaboutkde.cpp +++ b/kdeui/kaboutkde.cpp @@ -27,7 +27,7 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) - :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::fromLatin1("KDE"), + :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::tqfromLatin1("KDE"), KDialogBase::Help|KDialogBase::Close, KDialogBase::Close, parent, name, modal ) { @@ -75,13 +75,13 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) "donation, using one of the ways described at " "<a href=\"http://trinity.pearsoncomputing.net/support/\">http://trinity.pearsoncomputing.net/support/</a>." "<br><br>Thank you very much in advance for your support!"); - setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null ); + setHelp( TQString::tqfromLatin1("khelpcenter/main.html"), TQString::null ); setTitle(i18n("Trinity Desktop Environment. Release %1"). - arg(TQString::fromLatin1(KDE_VERSION_STRING)) ); + arg(TQString::tqfromLatin1(KDE_VERSION_STRING)) ); addTextPage( i18n("About Trinity","&About"), text1, true ); addTextPage( i18n("&Report Bugs or Wishes"), text2, true ); addTextPage( i18n("&Join the Trinity Team"), text3, true ); addTextPage( i18n("&Support Trinity"), text4, true ); - setImage( locate( "data", TQString::fromLatin1("kdeui/pics/aboutkde.png")) ); + setImage( locate( "data", TQString::tqfromLatin1("kdeui/pics/aboutkde.png")) ); setImageBackgroundColor( white ); } diff --git a/kdeui/kaccelgen.h b/kdeui/kaccelgen.h index 8f0c50bed..382320a15 100644 --- a/kdeui/kaccelgen.h +++ b/kdeui/kaccelgen.h @@ -131,7 +131,7 @@ loadPredefined(Iter begin, Iter end, TQMap<TQChar,bool>& keys) { for (Iter i = begin; i != end; ++i) { TQString item = Deref::deref(i); - int user_ampersand = item.find(TQChar('&')); + int user_ampersand = item.tqfind(TQChar('&')); if( user_ampersand >= 0 ) { // Sanity check. Note that we don't try to find an // accelerator if the user shoots him/herself in the foot @@ -178,7 +178,7 @@ generate(Iter begin, Iter end, TQStringList& target) // Attempt to find a good accelerator, but only if the user // has not manually hardcoded one. - int user_ampersand = item.find(TQChar('&')); + int user_ampersand = item.tqfind(TQChar('&')); if( user_ampersand < 0 || item[user_ampersand+1] == '&') { bool found = false; uint found_idx; diff --git a/kdeui/kaction.cpp b/kdeui/kaction.cpp index 9bfd23468..5327845ab 100644 --- a/kdeui/kaction.cpp +++ b/kdeui/kaction.cpp @@ -515,11 +515,11 @@ void KAction::updateShortcut( int i ) int id = itemId( i ); TQWidget* w = container( i ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>(w); updateShortcut( menu, id ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->setAccel( d->m_cut.keyCodeQt(), id ); } @@ -530,7 +530,7 @@ void KAction::updateShortcut( TQPopupMenu* menu, int id ) // show the string representation of its shortcut. if ( d->m_kaccel || d->m_kaccelList.count() ) { TQString s = menu->text( id ); - int i = s.find( '\t' ); + int i = s.tqfind( '\t' ); if ( i >= 0 ) s.replace( i+1, s.length()-i, d->m_cut.seq(0).toString() ); else @@ -616,7 +616,7 @@ void KAction::updateToolTip( int i ) { TQWidget *w = container( i ); - if ( ::qt_cast<KToolBar *>( w ) ) + if ( ::tqqt_cast<KToolBar *>( w ) ) TQToolTip::add( static_cast<KToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() ); } @@ -649,7 +649,7 @@ int KAction::plug( TQWidget *w, int index ) plugShortcut(); - if ( ::qt_cast<TQPopupMenu *>( w ) ) + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( w ); int id; @@ -683,7 +683,7 @@ int KAction::plug( TQWidget *w, int index ) menu->setItemEnabled( id, false ); if ( !d->whatsThis().isEmpty() ) - menu->setWhatsThis( id, whatsThisWithIcon() ); + menu->TQMenuData::setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); @@ -693,7 +693,7 @@ int KAction::plug( TQWidget *w, int index ) return d->m_containers.count() - 1; } - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { KToolBar *bar = static_cast<KToolBar *>( w ); @@ -706,8 +706,8 @@ int KAction::plug( TQWidget *w, int index ) if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, Qt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, Qt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index ); } else @@ -715,8 +715,8 @@ int KAction::plug( TQWidget *w, int index ) TQString icon = d->iconName(); if ( icon.isEmpty() ) icon = "unknown"; - bar->insertButton( icon, id_, TQT_SIGNAL( buttonClicked(int, Qt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, Qt::ButtonState) ), + bar->insertButton( icon, id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index, instance ); } @@ -749,17 +749,17 @@ void KAction::unplug( TQWidget *w ) return; int id = itemId( i ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu *menu = static_cast<TQPopupMenu *>( w ); menu->removeItem( id ); } - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { KToolBar *bar = static_cast<KToolBar *>( w ); bar->removeItemDelayed( id ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) { TQMenuBar *bar = static_cast<TQMenuBar *>( w ); bar->removeItem( id ); @@ -810,10 +810,10 @@ void KAction::unplugAccel() void KAction::plugMainWindowAccel( TQWidget *w ) { - // Note: topLevelWidget() stops too early, we can't use it. + // Note: tqtopLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow @@ -857,11 +857,11 @@ void KAction::updateEnabled( int i ) { TQWidget *w = container( i ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) static_cast<TQPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) static_cast<KToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); } @@ -903,18 +903,18 @@ void KAction::updateText( int i ) { TQWidget *w = container( i ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { int id = itemId( i ); static_cast<TQPopupMenu*>(w)->changeItem( id, d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), id ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( i ), d->text() ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget *button = static_cast<KToolBar *>(w)->getWidget( itemId( i ) ); - if ( ::qt_cast<KToolBarButton *>( button ) ) + if ( ::tqqt_cast<KToolBarButton *>( button ) ) static_cast<KToolBarButton *>(button)->setText( d->plainText() ); } } @@ -943,15 +943,15 @@ void KAction::updateIcon( int id ) { TQWidget* w = container( id ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { int itemId_ = itemId( id ); static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( KIcon::Small ), d->text() ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) static_cast<KToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() ); } @@ -974,16 +974,16 @@ void KAction::updateIconSet( int id ) { TQWidget *w = container( id ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { int itemId_ = itemId( id ); static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ ); } - else if ( ::qt_cast<TQMenuBar *>( w ) ) + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { if ( icon().isEmpty() && d->hasIcon() ) // only if there is no named icon ( scales better ) static_cast<KToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() ); @@ -1016,7 +1016,7 @@ void KAction::updateWhatsThis( int i ) TQPopupMenu* pm = popupMenu( i ); if ( pm ) { - pm->setWhatsThis( itemId( i ), d->whatsThis() ); + pm->TQMenuData::setWhatsThis( itemId( i ), d->whatsThis() ); return; } @@ -1039,7 +1039,7 @@ TQString KAction::whatsThisWithIcon() const { TQString text = whatsThis(); if (!d->iconName().isEmpty()) - return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text); + return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text); return text; } @@ -1103,10 +1103,10 @@ void KAction::activate() void KAction::slotActivated() { - const TQObject *senderObj = sender(); + const TQObject *senderObj = TQT_TQOBJECT_CONST(sender()); if ( senderObj ) { - if ( ::qt_cast<KAccelPrivate *>( senderObj ) ) + if ( ::tqqt_cast<KAccelPrivate *>( senderObj ) ) emit activated( KAction::AccelActivation, Qt::NoButton ); } emit activated(); @@ -1118,7 +1118,7 @@ void KAction::slotActivated() // only called by QPopupMenus, we plugged us in. void KAction::slotPopupActivated() { - if( ::qt_cast<TQSignal *>(sender())) + if( ::tqqt_cast<TQSignal *>(sender())) { int id = dynamic_cast<const TQSignal *>(sender())->value().toInt(); int pos = findContainer(id); @@ -1128,7 +1128,7 @@ void KAction::slotPopupActivated() if(qpm) { KPopupMenu* kpm = dynamic_cast<KPopupMenu *>( qpm ); - Qt::ButtonState state; + TQt::ButtonState state; if ( kpm ) // KPopupMenu? Nice, it stores the state. state = kpm->state(); else { // just a QPopupMenu? We'll ask for the state now then (small race condition?) @@ -1147,13 +1147,13 @@ void KAction::slotPopupActivated() slotActivated(); } -void KAction::slotButtonClicked( int, Qt::ButtonState state ) +void KAction::slotButtonClicked( int, TQt::ButtonState state ) { kdDebug(129) << "slotButtonClicked() state=" << state << endl; emit activated( KAction::ToolBarActivation, state ); // RightButton isn't really an activation - if ( ( state & LeftButton ) || ( state & MidButton ) ) + if ( ( state & Qt::LeftButton ) || ( state & Qt::MidButton ) ) slotActivated(); } @@ -1161,7 +1161,7 @@ void KAction::slotButtonClicked( int, Qt::ButtonState state ) void KAction::slotDestroyed() { kdDebug(129) << "KAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl; - const TQObject* const o = sender(); + const TQObject* const o = TQT_TQOBJECT_CONST(sender()); #ifndef KDE_NO_COMPAT // KDE 4: remove if ( o == d->m_kaccel ) @@ -1187,7 +1187,7 @@ void KAction::slotDestroyed() int i; do { - i = findContainer( static_cast<const TQWidget*>( o ) ); + i = findContainer( TQT_TQWIDGET_CONST( static_cast<const QObject*>(o) ) ); if ( i != -1 ) removeContainer( i ); } while ( i != -1 ); diff --git a/kdeui/kaction.h b/kdeui/kaction.h index 85be6e3dc..203272256 100644 --- a/kdeui/kaction.h +++ b/kdeui/kaction.h @@ -199,7 +199,7 @@ class KMainWindow; * * @see KStdAction */ -class KDEUI_EXPORT KAction : public QObject +class KDEUI_EXPORT KAction : public TQObject { friend class KActionCollection; Q_OBJECT @@ -570,7 +570,7 @@ protected slots: /// @since 3.4 void slotPopupActivated(); // KDE4: make virtual /// @since 3.4 - void slotButtonClicked( int, Qt::ButtonState state ); // KDE4: make virtual + void slotButtonClicked( int, TQt::ButtonState state ); // KDE4: make virtual protected: KToolBar* toolBar( int index ) const; @@ -620,7 +620,7 @@ signals: * * @since 3.4 */ - void activated( KAction::ActivationReason reason, Qt::ButtonState state ); + void activated( KAction::ActivationReason reason, TQt::ButtonState state ); void enabled( bool ); private: diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp index f5a031869..3185db276 100644 --- a/kdeui/kactionclasses.cpp +++ b/kdeui/kactionclasses.cpp @@ -137,7 +137,7 @@ KToggleAction::~KToggleAction() int KToggleAction::plug( TQWidget* widget, int index ) { - if ( !::qt_cast<TQPopupMenu *>( widget ) && !::qt_cast<KToolBar *>( widget ) ) + if ( !::tqqt_cast<TQPopupMenu *>( widget ) && !::tqqt_cast<KToolBar *>( widget ) ) { kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl; return -1; @@ -149,7 +149,7 @@ int KToggleAction::plug( TQWidget* widget, int index ) if ( _index == -1 ) return _index; - if ( ::qt_cast<KToolBar *>( widget ) ) { + if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = static_cast<KToolBar *>( widget ); bar->setToggle( itemId( _index ), true ); @@ -176,11 +176,11 @@ void KToggleAction::setChecked( bool c ) updateChecked( i ); if ( c && parent() && !exclusiveGroup().isEmpty() ) { - const TQObjectList *list = parent()->children(); - if ( list ) { - TQObjectListIt it( *list ); + const TQObjectList list = tqparent()->childrenListObject(); + if ( !list.isEmpty() ) { + TQObjectListIt it( list ); for( ; it.current(); ++it ) { - if ( ::qt_cast<KToggleAction *>( it.current() ) && it.current() != this && + if ( ::tqqt_cast<KToggleAction *>( it.current() ) && it.current() != this && static_cast<KToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) { KToggleAction *a = static_cast<KToggleAction*>(it.current()); if( a->isChecked() ) { @@ -197,7 +197,7 @@ void KToggleAction::updateChecked( int id ) { TQWidget *w = container( id ); - if ( ::qt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* pm = static_cast<TQPopupMenu*>(w); int itemId_ = itemId( id ); if ( !d->m_checkedGuiItem ) @@ -215,16 +215,16 @@ void KToggleAction::updateChecked( int id ) pm->setItemChecked( itemId_, d->m_checked ); if ( !d->m_checkedGuiItem->whatsThis().isEmpty() ) // if empty, we keep the initial one - pm->setWhatsThis( itemId_, gui->whatsThis() ); + pm->TQMenuData::setWhatsThis( itemId_, gui->whatsThis() ); updateShortcut( pm, itemId_ ); } } - else if ( ::qt_cast<TQMenuBar *>( w ) ) // not handled in plug... + else if ( ::tqqt_cast<TQMenuBar *>( w ) ) // not handled in plug... static_cast<TQMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked ); - else if ( ::qt_cast<KToolBar *>( w ) ) + else if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getButton( itemId( id ) ); - if ( r && ::qt_cast<KToolBarButton *>( r ) ) { + if ( r && ::tqqt_cast<KToolBarButton *>( r ) ) { static_cast<KToolBar*>( w )->setButton( itemId( id ), d->m_checked ); if ( d->m_checkedGuiItem && d->m_checkedGuiItem->hasIcon() ) { const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem(); @@ -322,12 +322,12 @@ void KRadioAction::slotActivated() { if ( isChecked() ) { - const TQObject *senderObj = sender(); + const TQObject *senderObj = TQT_TQOBJECT_CONST(sender()); - if ( !senderObj || !::qt_cast<const KToolBarButton *>( senderObj ) ) + if ( !senderObj || !::tqqt_cast<const KToolBarButton *>( senderObj ) ) return; - const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( senderObj ) )->on( true ); + const_cast<KToolBarButton *>( static_cast<const KToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); return; } @@ -537,10 +537,10 @@ void KSelectAction::changeItem( int id, int index, const TQString& text) return; TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = (static_cast<KToolBar*>( w ))->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->changeItem(text, index ); @@ -587,9 +587,9 @@ void KSelectAction::updateCurrentItem( int id ) return; TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) { + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) { + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->setCurrentItem( d->m_current ); } @@ -604,9 +604,9 @@ int KSelectAction::comboWidth() const void KSelectAction::updateComboWidth( int id ) { TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) { + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) { + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->setMinimumWidth( d->m_comboWidth ); cb->setMaximumWidth( d->m_comboWidth ); @@ -618,17 +618,17 @@ void KSelectAction::updateItems( int id ) { kdDebug(129) << "KAction::updateItems( " << id << ", lst )" << endl; // remove -- ellis TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) { + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) { + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->clear(); TQStringList lst = comboItems(); TQStringList::ConstIterator it = lst.begin(); for( ; it != lst.end(); ++it ) cb->insertItem( *it ); - // qt caches and never recalculates the sizeHint() - // qcombobox.cpp recommends calling setFont to invalidate the sizeHint + // qt caches and never recalculates the tqsizeHint() + // qcombobox.cpp recommends calling setFont to tqinvalidate the tqsizeHint // setFont sets own_font = True, so we're a bit mean and calll // unsetFont which calls setFont and then overwrites the own_font cb->unsetFont(); @@ -641,7 +641,7 @@ int KSelectAction::plug( TQWidget *widget, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; kdDebug(129) << "KSelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( ::qt_cast<TQPopupMenu *>( widget) ) + if ( ::tqqt_cast<TQPopupMenu *>( widget) ) { // Create the PopupMenu and store it in m_menu (void)popupMenu(); @@ -658,14 +658,14 @@ int KSelectAction::plug( TQWidget *widget, int index ) TQString wth = whatsThis(); if ( !wth.isEmpty() ) - menu->setWhatsThis( id, wth ); + menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); return containerCount() - 1; } - else if ( ::qt_cast<KToolBar *>( widget ) ) + else if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar* bar = static_cast<KToolBar*>( widget ); int id_ = KAction::getToolButtonID(); @@ -677,8 +677,8 @@ int KSelectAction::plug( TQWidget *widget, int index ) TQComboBox *cb = bar->getCombo( id_ ); if ( cb ) { - if (!isEditable()) cb->setFocusPolicy(TQWidget::NoFocus); - cb->setMinimumWidth( cb->sizeHint().width() ); + if (!isEditable()) cb->setFocusPolicy(TQ_NoFocus); + cb->setMinimumWidth( cb->tqsizeHint().width() ); if ( d->m_comboWidth > 0 ) { cb->setMinimumWidth( d->m_comboWidth ); @@ -697,7 +697,7 @@ int KSelectAction::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) { // Create the PopupMenu and store it in m_menu (void)popupMenu(); @@ -710,7 +710,7 @@ int KSelectAction::plug( TQWidget *widget, int index ) TQString wth = whatsThis(); if ( !wth.isEmpty() ) - menu->setWhatsThis( id, wth ); + menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); @@ -730,7 +730,7 @@ TQStringList KSelectAction::comboItems() const for( ; it != d->m_list.end(); ++it ) { TQString item = *it; - int i = item.find( '&' ); + int i = item.tqfind( '&' ); if ( i > -1 ) item = item.remove( i, 1 ); lst.append( item ); @@ -754,9 +754,9 @@ void KSelectAction::clear() void KSelectAction::updateClear( int id ) { TQWidget* w = container( id ); - if ( ::qt_cast<KToolBar *>( w ) ) { + if ( ::tqqt_cast<KToolBar *>( w ) ) { TQWidget* r = static_cast<KToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::qt_cast<TQComboBox *>( r ) ) { + if ( ::tqqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->clear(); } @@ -779,18 +779,18 @@ void KSelectAction::slotActivated( const TQString &text ) if ( isEditable() ) { TQStringList lst = d->m_list; - if(!lst.contains(text)) + if(!lst.tqcontains(text)) { lst.append( text ); setItems( lst ); } } - int i = d->m_list.findIndex( text ); + int i = d->m_list.tqfindIndex( text ); if ( i > -1 ) setCurrentItem( i ); else - setCurrentItem( comboItems().findIndex( text ) ); + setCurrentItem( comboItems().tqfindIndex( text ) ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); @@ -1272,7 +1272,7 @@ int KRecentFilesAction::plug( TQWidget *widget, int index ) return -1; // This is very related to KActionMenu::plug. // In fact this class could be an interesting base class for KActionMenu - if ( ::qt_cast<KToolBar *>( widget ) ) + if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = (KToolBar *)widget; @@ -1476,7 +1476,7 @@ void KFontAction::setFont( const TQString &family ) return; } } - i = lowerName.find(" ["); + i = lowerName.tqfind(" ["); if (i>-1) { lowerName = lowerName.left(i); @@ -1513,7 +1513,7 @@ void KFontAction::setFont( const TQString &family ) FcConfigSubstitute (config, pattern, FcMatchPattern); pattern = FcFontMatch(NULL, pattern, NULL); realFamily = (char*)FcNameUnparse(pattern); - realFamily.remove(realFamily.find(regExp), realFamily.length()); + realFamily.remove(realFamily.tqfind(regExp), realFamily.length()); if ( !realFamily.isEmpty() && realFamily != family ) setFont( realFamily ); @@ -1525,7 +1525,7 @@ int KFontAction::plug( TQWidget *w, int index ) { if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( ::qt_cast<KToolBar *>( w ) ) + if ( ::tqqt_cast<KToolBar *>( w ) ) { KToolBar* bar = static_cast<KToolBar*>( w ); int id_ = KAction::getToolButtonID(); @@ -1534,7 +1534,7 @@ int KFontAction::plug( TQWidget *w, int index ) TQT_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); - cb->setMinimumWidth( cb->sizeHint().width() ); + cb->setMinimumWidth( cb->tqsizeHint().width() ); addContainer( bar, id_ ); @@ -1626,7 +1626,7 @@ void KFontSizeAction::init() setEditable( true ); TQFontDatabase fontDB; - TQValueList<int> sizes = fontDB.standardSizes(); + TQValueList<int> sizes = fontDB.tqstandardSizes(); TQStringList lst; for ( TQValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it ) lst.append( TQString::number( *it ) ); @@ -1637,7 +1637,7 @@ void KFontSizeAction::init() void KFontSizeAction::setFontSize( int size ) { if ( size == fontSize() ) { - setCurrentItem( items().findIndex( TQString::number( size ) ) ); + setCurrentItem( items().tqfindIndex( TQString::number( size ) ) ); return; } @@ -1646,7 +1646,7 @@ void KFontSizeAction::setFontSize( int size ) return; } - int index = items().findIndex( TQString::number( size ) ); + int index = items().tqfindIndex( TQString::number( size ) ); if ( index == -1 ) { // Insert at the correct position in the list (to keep sorting) TQValueList<int> lst; @@ -1664,7 +1664,7 @@ void KFontSizeAction::setFontSize( int size ) strLst.append( TQString::number(*it) ); KSelectAction::setItems( strLst ); // Find new current item - index = lst.findIndex( size ); + index = lst.tqfindIndex( size ); setCurrentItem( index ); } else @@ -1795,7 +1795,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; kdDebug(129) << "KActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( ::qt_cast<TQPopupMenu *>( widget ) ) + if ( ::tqqt_cast<TQPopupMenu *>( widget ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); int id; @@ -1815,7 +1815,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<KToolBar *>( widget ) ) + else if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = static_cast<KToolBar *>( widget ); @@ -1857,7 +1857,7 @@ int KActionMenu::plug( TQWidget* widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) { TQMenuBar *bar = static_cast<TQMenuBar *>( widget ); @@ -1942,7 +1942,7 @@ int KToolBarPopupAction::plug( TQWidget *widget, int index ) return -1; // This is very related to KActionMenu::plug. // In fact this class could be an interesting base class for KActionMenu - if ( ::qt_cast<KToolBar *>( widget ) ) + if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = (KToolBar *)widget; @@ -2021,10 +2021,10 @@ int KToggleToolBarAction::plug( TQWidget* w, int index ) return -1; if ( !m_toolBar ) { - // Note: topLevelWidget() stops too early, we can't use it. + // Note: tqtopLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow @@ -2054,7 +2054,7 @@ void KToggleToolBarAction::setChecked( bool c ) m_toolBar->hide(); } TQMainWindow* mw = m_toolBar->mainWindow(); - if ( mw && ::qt_cast<KMainWindow *>( mw ) ) + if ( mw && ::tqqt_cast<KMainWindow *>( mw ) ) static_cast<KMainWindow *>( mw )->setSettingsDirty(); } KToggleAction::setChecked( c ); @@ -2102,7 +2102,7 @@ void KToggleFullScreenAction::setChecked( bool c ) bool KToggleFullScreenAction::eventFilter( TQObject* o, TQEvent* e ) { - if( o == window ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(window) ) if( e->type() == TQEvent::WindowStateChange ) { if( window->isFullScreen() != isChecked()) @@ -2152,7 +2152,7 @@ int KWidgetAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( !::qt_cast<KToolBar *>( w ) ) { + if ( !::tqqt_cast<KToolBar *>( w ) ) { kdError() << "KWidgetAction::plug: KWidgetAction must be plugged into KToolBar." << endl; return -1; } @@ -2216,7 +2216,7 @@ KActionSeparator::~KActionSeparator() int KActionSeparator::plug( TQWidget *widget, int index ) { - if ( ::qt_cast<TQPopupMenu *>( widget) ) + if ( ::tqqt_cast<TQPopupMenu *>( widget) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); @@ -2227,7 +2227,7 @@ int KActionSeparator::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) { TQMenuBar *menuBar = static_cast<TQMenuBar *>( widget ); @@ -2239,7 +2239,7 @@ int KActionSeparator::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::qt_cast<KToolBar *>( widget ) ) + else if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *toolBar = static_cast<KToolBar *>( widget ); @@ -2284,7 +2284,7 @@ int KPasteTextAction::plug( TQWidget *widget, int index ) { if (kapp && !kapp->authorizeKAction(name())) return -1; - if ( ::qt_cast<KToolBar *>( widget ) ) + if ( ::tqqt_cast<KToolBar *>( widget ) ) { KToolBar *bar = (KToolBar *)widget; @@ -2326,7 +2326,7 @@ void KPasteTextAction::menuAboutToShow() if (reply.isValid()) list = reply; } - TQString clipboardText = qApp->clipboard()->text(QClipboard::Clipboard); + TQString clipboardText = tqApp->clipboard()->text(TQClipboard::Clipboard); if (list.isEmpty()) list << clipboardText; bool found = false; @@ -2354,7 +2354,7 @@ void KPasteTextAction::menuItemActivated( int id) TQString clipboardText = reply; reply = klipper.call("setClipboardContents(TQString)", clipboardText); if (reply.isValid()) - kdDebug(129) << "Clipboard: " << qApp->clipboard()->text(QClipboard::Clipboard) << endl; + kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl; } TQTimer::singleShot(20, this, TQT_SLOT(slotActivated())); } @@ -2362,8 +2362,8 @@ void KPasteTextAction::menuItemActivated( int id) void KPasteTextAction::slotActivated() { if (!m_mixedMode) { - TQWidget *w = qApp->widgetAt(TQCursor::pos(), true); - TQMimeSource *data = TQApplication::clipboard()->data(); + TQWidget *w = tqApp->widgetAt(TQCursor::pos(), true); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if (!data->provides("text/plain") && w) { m_popup->popup(w->mapToGlobal(TQPoint(0, w->height()))); } else diff --git a/kdeui/kactionclasses.h b/kdeui/kactionclasses.h index 9a0ffbbae..1a1096aa7 100644 --- a/kdeui/kactionclasses.h +++ b/kdeui/kactionclasses.h @@ -68,6 +68,7 @@ class KMainWindow; class KDEUI_EXPORT KToggleAction : public KAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool checked READ isChecked WRITE setChecked ) Q_PROPERTY( TQString exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup ) public: @@ -230,6 +231,7 @@ private: class KDEUI_EXPORT KRadioAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: /** * Constructs a radio action with text and potential keyboard @@ -329,6 +331,7 @@ private: class KDEUI_EXPORT KSelectAction : public KAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem ) Q_PROPERTY( TQStringList items READ items WRITE setItems ) Q_PROPERTY( bool editable READ isEditable WRITE setEditable ) @@ -581,6 +584,7 @@ private: class KDEUI_EXPORT_DEPRECATED KListAction : public KSelectAction { Q_OBJECT + TQ_OBJECT public: /** * Constructs a list action with text and potential keyboard @@ -696,6 +700,7 @@ private: class KDEUI_EXPORT KRecentFilesAction : public KListAction // TODO public KSelectAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( uint maxItems READ maxItems WRITE setMaxItems ) public: /** @@ -905,6 +910,7 @@ private: class KDEUI_EXPORT KFontAction : public KSelectAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( TQString font READ font WRITE setFont ) public: KFontAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, @@ -955,6 +961,7 @@ private: class KDEUI_EXPORT KFontSizeAction : public KSelectAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize ) public: KFontSizeAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, @@ -1013,6 +1020,7 @@ private: class KDEUI_EXPORT KActionMenu : public KAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool delayed READ delayed WRITE setDelayed ) Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) @@ -1086,6 +1094,7 @@ private: class KDEUI_EXPORT KToolBarPopupAction : public KAction { Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool delayed READ delayed WRITE setDelayed ) Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) @@ -1208,6 +1217,7 @@ private: class KDEUI_EXPORT KToggleToolBarAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: /** * Create a KToggleToolbarAction that manages the toolbar @@ -1254,6 +1264,7 @@ private: class KDEUI_EXPORT KToggleFullScreenAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: /** * Create a KToggleFullScreenAction @@ -1298,6 +1309,7 @@ private: class KDEUI_EXPORT KWidgetAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Create an action that will embed widget into a toolbar @@ -1342,6 +1354,7 @@ private: class KDEUI_EXPORT KActionSeparator : public KAction { Q_OBJECT + TQ_OBJECT public: KActionSeparator( TQObject* parent = 0, const char* name = 0 ); virtual ~KActionSeparator(); @@ -1368,6 +1381,7 @@ private: class KDEUI_EXPORT KPasteTextAction: public KAction { Q_OBJECT + TQ_OBJECT public: /** * Create a KPasteTextAction, with a text, an icon, an accelerator, diff --git a/kdeui/kactioncollection.cpp b/kdeui/kactioncollection.cpp index e383809c6..47f649d6b 100644 --- a/kdeui/kactioncollection.cpp +++ b/kdeui/kactioncollection.cpp @@ -426,7 +426,7 @@ TQStringList KActionCollection::groups() const TQAsciiDictIterator<KAction> it( d->m_actionDict ); for( ; it.current(); ++it ) - if ( !it.current()->group().isEmpty() && !lst.contains( it.current()->group() ) ) + if ( !it.current()->group().isEmpty() && !lst.tqcontains( it.current()->group() ) ) lst.append( it.current()->group() ); return lst; @@ -501,14 +501,14 @@ void KActionCollection::connectHighlight( TQWidget *container, KAction *action ) { actionList = new TQPtrList<KAction>; - if ( ::qt_cast<TQPopupMenu *>( container ) ) + if ( ::tqqt_cast<TQPopupMenu *>( container ) ) { connect( container, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotMenuItemHighlighted( int ) ) ); connect( container, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuAboutToHide() ) ); } - else if ( ::qt_cast<KToolBar *>( container ) ) + else if ( ::tqqt_cast<KToolBar *>( container ) ) { connect( container, TQT_SIGNAL( highlighted( int, bool ) ), this, TQT_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); @@ -547,7 +547,7 @@ void KActionCollection::slotMenuItemHighlighted( int id ) if ( d->m_currentHighlightAction ) emit actionHighlighted( d->m_currentHighlightAction, false ); - TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ) ); + TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() )); d->m_currentHighlightAction = findAction( container, id ); @@ -581,7 +581,7 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight ) if ( !d->m_highlight ) return; - TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ) ); + TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() )); KAction *action = findAction( container, id ); @@ -606,7 +606,7 @@ void KActionCollection::slotToolBarButtonHighlighted( int id, bool highlight ) void KActionCollection::slotDestroyed() { - d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject *>(sender()) ) ); + d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())) ) ); } KAction *KActionCollection::findAction( TQWidget *container, int id ) @@ -713,8 +713,8 @@ bool KActionShortcutList::save() const if( m_actions.xmlFile().isEmpty() ) return writeSettings(); - TQString attrShortcut = TQString::fromLatin1("shortcut"); - TQString attrAccel = TQString::fromLatin1("accel"); // Depricated attribute + TQString attrShortcut = TQString::tqfromLatin1("shortcut"); + TQString attrAccel = TQString::tqfromLatin1("accel"); // Depricated attribute // Read XML file TQString sXml( KXMLGUIFactory::readConfigFile( xmlFile, false, instance() ) ); diff --git a/kdeui/kactioncollection.h b/kdeui/kactioncollection.h index 7ce10052c..971bc862f 100644 --- a/kdeui/kactioncollection.h +++ b/kdeui/kactioncollection.h @@ -75,7 +75,7 @@ typedef TQValueList<KAction *> KActionPtrList; * statusBar(), TQT_SLOT( clear() ) ); * \endcode */ -class KDEUI_EXPORT KActionCollection : public QObject +class KDEUI_EXPORT KActionCollection : public TQObject { friend class KAction; friend class KXMLGUIClient; diff --git a/kdeui/kactionselector.cpp b/kdeui/kactionselector.cpp index 9bbf52dbf..056045906 100644 --- a/kdeui/kactionselector.cpp +++ b/kdeui/kactionselector.cpp @@ -343,7 +343,7 @@ void KActionSelector::polish() void KActionSelector::keyPressEvent( TQKeyEvent *e ) { if ( ! d->keyboardEnabled ) return; - if ( (e->state() & Qt::ControlButton) ) + if ( (e->state() & TQt::ControlButton) ) { switch ( e->key() ) { @@ -370,7 +370,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) { if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress ) { - if ( (((TQKeyEvent*)e)->state() & Qt::ControlButton) ) + if ( (((TQKeyEvent*)e)->state() & TQt::ControlButton) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/kdeui/kactivelabel.cpp b/kdeui/kactivelabel.cpp index c01a91d41..0315e348d 100644 --- a/kdeui/kactivelabel.cpp +++ b/kdeui/kactivelabel.cpp @@ -40,11 +40,11 @@ KActiveLabel::KActiveLabel(const TQString &text, TQWidget * parent, const char * void KActiveLabel::init() { - setTextFormat(Qt::RichText); + setTextFormat(TQt::RichText); setVScrollBarMode(TQScrollView::AlwaysOff); setHScrollBarMode(TQScrollView::AlwaysOff); setFrameStyle(TQFrame::NoFrame); - setFocusPolicy( TQWidget::TabFocus ); + setFocusPolicy( TQ_TabFocus ); paletteChanged(); connect(this, TQT_SIGNAL(linkClicked(const TQString &)), @@ -111,9 +111,9 @@ void KActiveLabel::keyPressEvent( TQKeyEvent *e ) } } -TQSize KActiveLabel::minimumSizeHint() const +TQSize KActiveLabel::tqminimumSizeHint() const { - TQSize ms = minimumSize(); + TQSize ms = tqminimumSize(); if ((ms.width() > 0) && (ms.height() > 0)) return ms; @@ -134,9 +134,9 @@ TQSize KActiveLabel::minimumSizeHint() const return TQSize(w, h); } -TQSize KActiveLabel::sizeHint() const +TQSize KActiveLabel::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } #include "kactivelabel.moc" diff --git a/kdeui/kactivelabel.h b/kdeui/kactivelabel.h index 8ab2bacf2..1220c9ce8 100644 --- a/kdeui/kactivelabel.h +++ b/kdeui/kactivelabel.h @@ -34,7 +34,7 @@ class KActiveLabelPrivate; * @author Waldo Bastian (bastian@kde.org) * @version $Id$ */ -class KDEUI_EXPORT KActiveLabel : public QTextBrowser +class KDEUI_EXPORT KActiveLabel : public TQTextBrowser { Q_OBJECT public: @@ -56,8 +56,8 @@ public: */ KActiveLabel(const TQString & text, TQWidget * parent, const char * name = 0); - TQSize minimumSizeHint() const; - TQSize sizeHint() const; + TQSize tqminimumSizeHint() const; + TQSize tqsizeHint() const; public slots: /** diff --git a/kdeui/kanimwidget.cpp b/kdeui/kanimwidget.cpp index 5ff1037d5..7b723a1f0 100644 --- a/kdeui/kanimwidget.cpp +++ b/kdeui/kanimwidget.cpp @@ -74,7 +74,7 @@ void KAnimWidget::stop() { d->current_frame = 0; d->timer.stop(); - repaint(); + tqrepaint(); } void KAnimWidget::setSize( int size ) @@ -142,7 +142,7 @@ void KAnimWidget::mousePressEvent( TQMouseEvent *e ) void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton && + if ( e->button() == Qt::LeftButton && rect().contains( e->pos() ) ) emit clicked(); @@ -159,10 +159,10 @@ void KAnimWidget::slotTimerUpdate() d->current_frame = 0; // TODO - // We have to clear the widget when repainting a transparent image + // We have to clear the widget when tqrepainting a transparent image // By doing it like this we get a bit of flicker though. A better // way might be to merge it with the background in drawContents. - repaint(d->transparent); + tqrepaint(d->transparent); } void KAnimWidget::drawContents( TQPainter *p ) diff --git a/kdeui/kanimwidget.h b/kdeui/kanimwidget.h index 23e043e15..68f33d1b0 100644 --- a/kdeui/kanimwidget.h +++ b/kdeui/kanimwidget.h @@ -52,7 +52,7 @@ class KAnimWidgetPrivate; * * @author Kurt Granroth <granroth@kde.org> */ -class KDEUI_EXPORT KAnimWidget : public QFrame +class KDEUI_EXPORT KAnimWidget : public TQFrame { Q_OBJECT Q_PROPERTY( int size READ size WRITE setSize ) diff --git a/kdeui/karrowbutton.cpp b/kdeui/karrowbutton.cpp index fd9624b67..ab0d6785c 100644 --- a/kdeui/karrowbutton.cpp +++ b/kdeui/karrowbutton.cpp @@ -40,7 +40,7 @@ KArrowButton::~KArrowButton() delete d; } -TQSize KArrowButton::sizeHint() const +TQSize KArrowButton::tqsizeHint() const { return TQSize( 12, 12 ); } @@ -49,7 +49,7 @@ void KArrowButton::setArrowType(Qt::ArrowType a) { if (d->arrow != a) { d->arrow = a; - repaint(); + tqrepaint(); } } Qt::ArrowType KArrowButton::arrowType() const @@ -62,9 +62,9 @@ void KArrowButton::drawButton(TQPainter *p) const unsigned int arrowSize = 8; const unsigned int margin = 2; - p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); - style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ), - colorGroup(), + p->fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ), + tqcolorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default, TQStyleOption( 2, 0 ) ); @@ -103,8 +103,8 @@ void KArrowButton::drawButton(TQPainter *p) int flags = TQStyle::Style_Enabled; if ( isDown() ) flags |= TQStyle::Style_Down; - style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ), - colorGroup(), flags ); + tqstyle().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ), + tqcolorGroup(), flags ); } void KArrowButton::virtual_hook( int, void* ) diff --git a/kdeui/karrowbutton.h b/kdeui/karrowbutton.h index e20278692..9c0c1f032 100644 --- a/kdeui/karrowbutton.h +++ b/kdeui/karrowbutton.h @@ -28,14 +28,14 @@ class KArrowButtonPrivate; * @short Draws a button with an arrow. * * Draws a button which shows an arrow pointing into a certain direction. The - * arrow's alignment on the button depends on the direction it's pointing to, + * arrow's tqalignment on the button depends on the direction it's pointing to, * e.g. a left arrow is aligned at the left border, a upwards arrow at the top * border. This class honors the currently configured KStyle when drawing * the arrow. * * @author Frerich Raabe */ -class KDEUI_EXPORT KArrowButton : public QPushButton +class KDEUI_EXPORT KArrowButton : public TQPushButton { Q_OBJECT Q_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp ) @@ -59,7 +59,7 @@ class KDEUI_EXPORT KArrowButton : public QPushButton /** * Reimplemented from TQPushButton. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Returns the arrow type @@ -67,12 +67,12 @@ class KDEUI_EXPORT KArrowButton : public QPushButton */ Qt::ArrowType arrowType() const; - // hacks for moc braindamages with enums + // hacks for tqmoc braindamages with enums int arrowTp() const { return (int) arrowType(); } void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); } public slots: /** - * Defines in what direction the arrow is pointing to. Will repaint the + * Defines in what direction the arrow is pointing to. Will tqrepaint the * button if necessary. * * @param a The direction this arrow should be pointing in diff --git a/kdeui/kauthicon.cpp b/kdeui/kauthicon.cpp index d4c18a114..fa49a1d26 100644 --- a/kdeui/kauthicon.cpp +++ b/kdeui/kauthicon.cpp @@ -102,7 +102,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) lockBox = new TQLabel(this); lockBox->setFrameStyle(TQFrame::WinPanel|TQFrame::Raised); lockBox->setPixmap(lockPM); - lockBox->setFixedSize(lockBox->sizeHint()); + lockBox->setFixedSize(lockBox->tqsizeHint()); lockLabel = new TQLabel(this); lockLabel->setFrameStyle(TQFrame::NoFrame); @@ -113,8 +113,8 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) lockLabel->setText(lockText); else lockLabel->setText(openLockText); - lockLabel->setAlignment(AlignCenter); - lockLabel->setMinimumSize(lockLabel->sizeHint()); + lockLabel->tqsetAlignment(AlignCenter); + lockLabel->setMinimumSize(lockLabel->tqsizeHint()); lockLabel->setText(lockText); layout = new TQHBoxLayout(this); @@ -124,7 +124,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name) layout->addWidget(lockLabel, 0, AlignRight|AlignVCenter); layout->activate(); - resize(sizeHint()); + resize(tqsizeHint()); } KAuthIcon::~KAuthIcon() @@ -132,9 +132,9 @@ KAuthIcon::~KAuthIcon() } -TQSize KAuthIcon::sizeHint() const +TQSize KAuthIcon::tqsizeHint() const { - return layout->minimumSize(); + return layout->tqminimumSize(); } diff --git a/kdeui/kauthicon.h b/kdeui/kauthicon.h index 0bfe0cc22..6c473c9dd 100644 --- a/kdeui/kauthicon.h +++ b/kdeui/kauthicon.h @@ -44,7 +44,7 @@ class KAuthIconPrivate; * @see KRootPermsIcon, KWritePermsIcon * @author Preston Brown <pbrown@kde.org> */ -class KDEUI_EXPORT KAuthIcon : public QWidget +class KDEUI_EXPORT KAuthIcon : public TQWidget { Q_OBJECT @@ -55,7 +55,7 @@ public: KAuthIcon(TQWidget *parent = 0, const char *name = 0); ~KAuthIcon(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * return the status of whatever is being monitored. */ diff --git a/kdeui/kbugreport.cpp b/kdeui/kbugreport.cpp index 3d7898861..f90ce28fb 100644 --- a/kdeui/kbugreport.cpp +++ b/kdeui/kbugreport.cpp @@ -88,7 +88,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD TQWidget * parent = plainPage(); d->submitBugButton = 0; - //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.pearsoncomputing.net") ) + //if ( m_aboutData->bugAddress() == TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") ) //{ // // This is a core KDE application -> redirect to the web form // Always redirect to the Web form for Trinity @@ -122,7 +122,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD parent ); connect( m_configureEmail, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotConfigureEmail() ) ); - glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, AlignTop|AlignRight ); + glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, (TQ_Alignment)(AlignTop|AlignRight) ); // To qwtstr = i18n( "The email address this bug report is sent to." ); @@ -153,9 +153,9 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD TQWhatsThis::add( d->appcombo, qwtstr ); d->appcombo->insertStrList((const char**)packages); connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int))); - d->appname = TQString::fromLatin1( m_aboutData + d->appname = TQString::tqfromLatin1( m_aboutData ? m_aboutData->productName() - : qApp->name() ); + : tqApp->name() ); glay->addWidget( d->appcombo, row, 1 ); int index = 0; for (; index < d->appcombo->count(); index++) { @@ -179,8 +179,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD m_strVersion = m_aboutData->version(); else m_strVersion = i18n("no version set (programmer error!)"); - d->kde_version = TQString::fromLatin1( KDE_VERSION_STRING ); - d->kde_version += ", " + TQString::fromLatin1( KDE_DISTRIBUTION_TEXT ); + d->kde_version = TQString::tqfromLatin1( KDE_VERSION_STRING ); + d->kde_version += ", " + TQString::tqfromLatin1( KDE_DISTRIBUTION_TEXT ); if ( !d->submitBugButton ) m_strVersion += " " + d->kde_version; m_version = new TQLabel( m_strVersion, parent ); @@ -193,16 +193,16 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD struct utsname unameBuf; uname( &unameBuf ); - d->os = TQString::fromLatin1( unameBuf.sysname ) + - " (" + TQString::fromLatin1( unameBuf.machine ) + ") " - "release " + TQString::fromLatin1( unameBuf.release ); + d->os = TQString::tqfromLatin1( unameBuf.sysname ) + + " (" + TQString::tqfromLatin1( unameBuf.machine ) + ") " + "release " + TQString::tqfromLatin1( unameBuf.release ); tmpLabel = new TQLabel(d->os, parent); glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 ); tmpLabel = new TQLabel(i18n("Compiler:"), parent); glay->addWidget( tmpLabel, ++row, 0 ); - tmpLabel = new TQLabel(TQString::fromLatin1(KDE_COMPILER_VERSION), parent); + tmpLabel = new TQLabel(TQString::tqfromLatin1(KDE_COMPILER_VERSION), parent); glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 ); if ( !d->submitBugButton ) @@ -259,7 +259,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD updateURL(); d->submitBugButton->setText( i18n("&Launch Bug Report Wizard") ); - d->submitBugButton->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + d->submitBugButton->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); lay->addWidget( d->submitBugButton ); lay->addSpacing(10); @@ -289,7 +289,7 @@ void KBugReport::updateURL() void KBugReport::appChanged(int i) { TQString appName = d->appcombo->text(i); - int index = appName.find( '/' ); + int index = appName.tqfind( '/' ); if ( index > 0 ) appName = appName.left( index ); kdDebug() << "appName " << appName << endl; @@ -311,7 +311,7 @@ void KBugReport::slotConfigureEmail() { if (m_process) return; m_process = new KProcess; - *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); + *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount"); connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom())); if (!m_process->start()) { @@ -330,24 +330,24 @@ void KBugReport::slotSetFrom() m_configureEmail->setEnabled(true); // ### KDE4: why oh why is KEmailSettings in kio? - KConfig emailConf( TQString::fromLatin1("emaildefaults") ); + KConfig emailConf( TQString::tqfromLatin1("emaildefaults") ); // find out the default profile - emailConf.setGroup( TQString::fromLatin1("Defaults") ); - TQString profile = TQString::fromLatin1("PROFILE_"); - profile += emailConf.readEntry( TQString::fromLatin1("Profile"), - TQString::fromLatin1("Default") ); + emailConf.setGroup( TQString::tqfromLatin1("Defaults") ); + TQString profile = TQString::tqfromLatin1("PROFILE_"); + profile += emailConf.readEntry( TQString::tqfromLatin1("Profile"), + TQString::tqfromLatin1("Default") ); emailConf.setGroup( profile ); - TQString fromaddr = emailConf.readEntry( TQString::fromLatin1("EmailAddress") ); + TQString fromaddr = emailConf.readEntry( TQString::tqfromLatin1("EmailAddress") ); if (fromaddr.isEmpty()) { struct passwd *p; p = getpwuid(getuid()); - fromaddr = TQString::fromLatin1(p->pw_name); + fromaddr = TQString::tqfromLatin1(p->pw_name); } else { - TQString name = emailConf.readEntry( TQString::fromLatin1("FullName")); + TQString name = emailConf.readEntry( TQString::tqfromLatin1("FullName")); if (!name.isEmpty()) - fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">"); + fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">"); } m_from->setText( fromaddr ); } @@ -438,9 +438,9 @@ TQString KBugReport::text() const { kdDebug() << m_bgSeverity->selected()->name() << endl; // Prepend the pseudo-headers to the contents of the mail - TQString severity = TQString::fromLatin1(m_bgSeverity->selected()->name()); + TQString severity = TQString::tqfromLatin1(m_bgSeverity->selected()->name()); TQString appname = d->appcombo->currentText(); - TQString os = TQString::fromLatin1("OS: %1 (%2)\n"). + TQString os = TQString::tqfromLatin1("OS: %1 (%2)\n"). arg(KDE_COMPILING_OS). arg(KDE_DISTRIBUTION_TEXT); TQString bodyText; @@ -452,25 +452,25 @@ TQString KBugReport::text() const bodyText += line; } - if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { + if (severity == TQString::tqfromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) { // Case 1 : i18n bug - TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language()); - package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); - return TQString::fromLatin1("Package: %1").arg(package) + - TQString::fromLatin1("\n" + TQString package = TQString::tqfromLatin1("i18n_%1").arg(KGlobal::locale()->language()); + package = package.replace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-")); + return TQString::tqfromLatin1("Package: %1").arg(package) + + TQString::tqfromLatin1("\n" "Application: %1\n" // not really i18n's version, so better here IMHO "Version: %2\n").arg(appname).arg(m_strVersion)+ - os+TQString::fromLatin1("\n")+bodyText; + os+TQString::tqfromLatin1("\n")+bodyText; } else { - appname = appname.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-")); + appname = appname.replace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-")); // Case 2 : normal bug - return TQString::fromLatin1("Package: %1\n" + return TQString::tqfromLatin1("Package: %1\n" "Version: %2\n" "Severity: %3\n") .arg(appname).arg(m_strVersion).arg(severity)+ - TQString::fromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+ - os+TQString::fromLatin1("\n")+bodyText; + TQString::tqfromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+ + os+TQString::tqfromLatin1("\n")+bodyText; } } @@ -478,12 +478,12 @@ bool KBugReport::sendBugReport() { TQString recipient ( m_aboutData ? m_aboutData->bugAddress() : - TQString::fromLatin1("submit@bugs.pearsoncomputing.net") ); + TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") ); TQString command; command = locate("exe", "ksendbugmail"); if (command.isEmpty()) - command = KStandardDirs::findExe( TQString::fromLatin1("ksendbugmail") ); + command = KStandardDirs::findExe( TQString::tqfromLatin1("ksendbugmail") ); KTempFile outputfile; outputfile.close(); diff --git a/kdeui/kbuttonbox.cpp b/kdeui/kbuttonbox.cpp index eb0e27827..25bd6c71b 100644 --- a/kdeui/kbuttonbox.cpp +++ b/kdeui/kbuttonbox.cpp @@ -39,7 +39,7 @@ * which makes the buttons look better. * * 01/17/98 Mario Weilguni <mweilguni@sime.com> - * Fixed a bug in sizeHint() + * Fixed a bug in tqsizeHint() * Improved the handling of Motif default buttons * * 01/09/98 Mario Weilguni <mweilguni@sime.com> @@ -178,12 +178,12 @@ void KButtonBox::layout() { ++itr; } - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } void KButtonBox::placeButtons() { - if(data->orientation == Horizontal) { + if(data->orientation == Qt::Horizontal) { // calculate free size and stretches int fs = width() - 2 * data->border; int stretch = 0; @@ -300,7 +300,7 @@ TQSize KButtonBox::bestButtonSize() const { return s; } -TQSize KButtonBox::sizeHint() const { +TQSize KButtonBox::tqsizeHint() const { unsigned int dw; if(data->buttons.isEmpty()) @@ -323,7 +323,7 @@ TQSize KButtonBox::sizeHint() const { else s = bs; - if(data->orientation == Horizontal) + if(data->orientation == Qt::Horizontal) dw += s.width(); else dw += s.height(); @@ -335,7 +335,7 @@ TQSize KButtonBox::sizeHint() const { ++itr; } - if(data->orientation == Horizontal) + if(data->orientation == Qt::Horizontal) return TQSize(dw, bs.height() + 2 * data->border); else return TQSize(bs.width() + 2 * data->border, dw); @@ -344,7 +344,7 @@ TQSize KButtonBox::sizeHint() const { TQSizePolicy KButtonBox::sizePolicy() const { - return data->orientation == Horizontal? + return data->orientation == Qt::Horizontal? TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) : TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); } @@ -355,8 +355,8 @@ TQSizePolicy KButtonBox::sizePolicy() const * as minimum width */ TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const { - TQSize s = b->sizeHint(); - const TQSize ms = b->minimumSize(); + TQSize s = b->tqsizeHint(); + const TQSize ms = b->tqminimumSize(); if(s.width() < minButtonWidth) s.setWidth(minButtonWidth); diff --git a/kdeui/kbuttonbox.h b/kdeui/kbuttonbox.h index 7eda45577..03de09008 100644 --- a/kdeui/kbuttonbox.h +++ b/kdeui/kbuttonbox.h @@ -39,7 +39,7 @@ class KButtonBoxPrivate; * @version $Id$ **/ -class KDEUI_EXPORT KButtonBox : public QWidget +class KDEUI_EXPORT KButtonBox : public TQWidget { Q_OBJECT @@ -51,7 +51,7 @@ public: * addButton() are laid out from top to bottom, otherwise they * are laid out from left to right. */ - KButtonBox(TQWidget *parent, Orientation _orientation = Horizontal, + KButtonBox(TQWidget *parent, Orientation _orientation = Qt::Horizontal, int border = 0, int _autoborder = 6); /** @@ -65,7 +65,7 @@ public: * This size is * calculated by the width/height of all buttons plus border/autoborder. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual TQSizePolicy sizePolicy() const; virtual void resizeEvent(TQResizeEvent *); diff --git a/kdeui/kcharselect.cpp b/kdeui/kcharselect.cpp index 1eb707c4d..9f3d76dd2 100644 --- a/kdeui/kcharselect.cpp +++ b/kdeui/kcharselect.cpp @@ -45,7 +45,7 @@ class KCharSelect::KCharSelectPrivate { public: - TQLineEdit *unicodeLine; + TQLineEdit *tqunicodeLine; }; TQFontDatabase * KCharSelect::fontDataBase = 0; @@ -66,7 +66,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ : TQGridView( parent, name ), vFont( _font ), vChr( _chr ), vTableNum( _tableNum ), vPos( 0, 0 ), focusItem( _chr ), focusPos( 0, 0 ), d(0) { - setBackgroundColor( colorGroup().base() ); + setBackgroundColor( tqcolorGroup().base() ); setCellWidth( 20 ); setCellHeight( 25 ); @@ -74,11 +74,11 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ setNumCols( 32 ); setNumRows( 8 ); - repaintContents( false ); + tqrepaintContents( false ); setToolTips(); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setBackgroundMode( TQWidget::NoBackground ); } @@ -86,7 +86,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ void KCharSelectTable::setFont( const TQString &_font ) { vFont = _font; - repaintContents( false ); + tqrepaintContents( false ); setToolTips(); } @@ -95,7 +95,7 @@ void KCharSelectTable::setFont( const TQString &_font ) void KCharSelectTable::setChar( const TQChar &_chr ) { vChr = _chr; - repaintContents( false ); + tqrepaintContents( false ); } //================================================================== @@ -104,13 +104,13 @@ void KCharSelectTable::setTableNum( int _tableNum ) focusItem = TQChar( _tableNum * 256 ); vTableNum = _tableNum; - repaintContents( false ); + tqrepaintContents( false ); setToolTips(); } //================================================================== -TQSize KCharSelectTable::sizeHint() const +TQSize KCharSelectTable::tqsizeHint() const { int w = cellWidth(); int h = cellHeight(); @@ -155,26 +155,26 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col ) c += row * numCols(); c += col; - if ( c == vChr.unicode() ) { - p->setBrush( TQBrush( colorGroup().highlight() ) ); + if ( c == vChr.tqunicode() ) { + p->setBrush( TQBrush( tqcolorGroup().highlight() ) ); p->setPen( NoPen ); p->drawRect( 0, 0, w, h ); - p->setPen( colorGroup().highlightedText() ); + p->setPen( tqcolorGroup().highlightedText() ); vPos = TQPoint( col, row ); } else { TQFontMetrics fm = TQFontMetrics( font ); if( fm.inFont( c ) ) - p->setBrush( TQBrush( colorGroup().base() ) ); + p->setBrush( TQBrush( tqcolorGroup().base() ) ); else - p->setBrush( TQBrush( colorGroup().button() ) ); + p->setBrush( TQBrush( tqcolorGroup().button() ) ); p->setPen( NoPen ); p->drawRect( 0, 0, w, h ); - p->setPen( colorGroup().text() ); + p->setPen( tqcolorGroup().text() ); } - if ( c == focusItem.unicode() && hasFocus() ) { - style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), - colorGroup() ); + if ( c == focusItem.tqunicode() && hasFocus() ) { + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), + tqcolorGroup() ); focusPos = TQPoint( col, row ); } @@ -182,7 +182,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col ) p->drawText( 0, 0, x2, y2, AlignHCenter | AlignVCenter, TQString( TQChar( c ) ) ); - p->setPen( colorGroup().text() ); + p->setPen( tqcolorGroup().text() ); p->drawLine( x2, 0, x2, y2 ); p->drawLine( 0, y2, x2, y2 ); @@ -210,9 +210,9 @@ void KCharSelectTable::mouseMoveEvent( TQMouseEvent *e ) focusPos = vPos; focusItem = vChr; - repaintCell( oldFocus.y(), oldFocus.x(), true ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( vPos.y(), vPos.x(), true ); + tqrepaintCell( oldFocus.y(), oldFocus.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( vPos.y(), vPos.x(), true ); emit highlighted( vChr ); emit highlighted(); @@ -256,8 +256,8 @@ void KCharSelectTable::keyPressEvent( TQKeyEvent *e ) vPos = focusPos; vChr = focusItem; - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( vPos.y(), vPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( vPos.y(), vPos.x(), true ); emit activated( vChr ); emit activated(); @@ -277,8 +277,8 @@ void KCharSelectTable::gotoLeft() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( focusPos.y(), focusPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -295,8 +295,8 @@ void KCharSelectTable::gotoRight() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( focusPos.y(), focusPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -313,8 +313,8 @@ void KCharSelectTable::gotoUp() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( focusPos.y(), focusPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -331,8 +331,8 @@ void KCharSelectTable::gotoDown() focusItem = TQChar( vTableNum * 256 + numCols() * focusPos.y() + focusPos.x() ); - repaintCell( oldPos.y(), oldPos.x(), true ); - repaintCell( focusPos.y(), focusPos.x(), true ); + tqrepaintCell( oldPos.y(), oldPos.x(), true ); + tqrepaintCell( focusPos.y(), focusPos.x(), true ); emit focusItemChanged( vChr ); emit focusItemChanged(); @@ -381,43 +381,43 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f bar->setSpacing( KDialog::spacingHint() ); TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); - lFont->resize( lFont->sizeHint() ); - lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lFont->setMaximumWidth( lFont->sizeHint().width() ); + lFont->resize( lFont->tqsizeHint() ); + lFont->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lFont->setMaximumWidth( lFont->tqsizeHint().width() ); fontCombo = new TQComboBox( true, bar ); fillFontCombo(); - fontCombo->resize( fontCombo->sizeHint() ); + fontCombo->resize( fontCombo->tqsizeHint() ); connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); - lTable->resize( lTable->sizeHint() ); - lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lTable->setMaximumWidth( lTable->sizeHint().width() ); + lTable->resize( lTable->tqsizeHint() ); + lTable->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lTable->setMaximumWidth( lTable->tqsizeHint().width() ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); - tableSpinBox->resize( tableSpinBox->sizeHint() ); + tableSpinBox->resize( tableSpinBox->tqsizeHint() ); connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); - lUnicode->resize( lUnicode->sizeHint() ); - lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); - lUnicode->setMaximumWidth( lUnicode->sizeHint().width() ); + lUnicode->resize( lUnicode->tqsizeHint() ); + lUnicode->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); + lUnicode->setMaximumWidth( lUnicode->tqsizeHint().width() ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); - TQValidator* const validator = new TQRegExpValidator( rx, this ); + TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); - d->unicodeLine = new KLineEdit( bar ); - d->unicodeLine->setValidator(validator); - lUnicode->setBuddy(d->unicodeLine); - d->unicodeLine->resize( d->unicodeLine->sizeHint() ); + d->tqunicodeLine = new KLineEdit( bar ); + d->tqunicodeLine->setValidator(validator); + lUnicode->setBuddy(d->tqunicodeLine); + d->tqunicodeLine->resize( d->tqunicodeLine->tqsizeHint() ); slotUpdateUnicode(_chr); - connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); + connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); - charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQVBox::font().family() : _font, _chr, _tableNum ); + charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQString(TQVBox::font().family()) : _font, _chr, _tableNum ); const TQSize sz( charTable->contentsWidth() + 4 , charTable->contentsHeight() + 4 ); charTable->resize( sz ); @@ -426,7 +426,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f charTable->setHScrollBarMode( TQScrollView::AlwaysOff ); charTable->setVScrollBarMode( TQScrollView::AlwaysOff ); - setFont( _font.isEmpty() ? TQVBox::font().family() : _font ); + setFont( _font.isEmpty() ? TQString(TQVBox::font().family()) : _font ); setTableNum( _tableNum ); connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( slotUpdateUnicode( const TQChar & ) ) ); @@ -442,7 +442,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f connect( charTable, TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(slotDoubleClicked())); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setFocusProxy( charTable ); } @@ -452,15 +452,15 @@ KCharSelect::~KCharSelect() } //================================================================== -TQSize KCharSelect::sizeHint() const +TQSize KCharSelect::tqsizeHint() const { - return TQVBox::sizeHint(); + return TQVBox::tqsizeHint(); } //================================================================== void KCharSelect::setFont( const TQString &_font ) { - const TQValueList<TQString>::Iterator it = fontList.find( _font ); + const TQValueList<TQString>::Iterator it = fontList.tqfind( _font ); if ( it != fontList.end() ) { TQValueList<TQString>::Iterator it2 = fontList.begin(); int pos = 0; @@ -493,7 +493,7 @@ void KCharSelect::fillFontCombo() fontDataBase = new TQFontDatabase(); qAddPostRoutine( cleanupFontDatabase ); } - fontList=fontDataBase->families(); + fontList=fontDataBase->tqfamilies(); fontCombo->insertStringList( fontList ); } @@ -513,7 +513,7 @@ void KCharSelect::tableChanged( int _value ) //================================================================== void KCharSelect::slotUnicodeEntered( ) { - const TQString s = d->unicodeLine->text(); + const TQString s = d->tqunicodeLine->text(); if (s.isEmpty()) return; @@ -532,10 +532,10 @@ void KCharSelect::slotUnicodeEntered( ) void KCharSelect::slotUpdateUnicode( const TQChar &c ) { - const int uc = c.unicode(); + const int uc = c.tqunicode(); TQString s; s.sprintf("%04X", uc); - d->unicodeLine->setText(s); + d->tqunicodeLine->setText(s); } void KCharSelectTable::virtual_hook( int, void*) diff --git a/kdeui/kcharselect.h b/kdeui/kcharselect.h index 526d594b6..5e1532fb6 100644 --- a/kdeui/kcharselect.h +++ b/kdeui/kcharselect.h @@ -48,7 +48,7 @@ class KCharSelectPrivate; * @author Reginald Stadlbauer <reggie@kde.org> */ -class KDEUI_EXPORT KCharSelectTable : public QGridView +class KDEUI_EXPORT KCharSelectTable : public TQGridView { Q_OBJECT @@ -56,7 +56,7 @@ public: KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font, const TQChar &_chr, int _tableNum ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void resizeEvent( TQResizeEvent * ); virtual void setFont( const TQString &_font ); @@ -137,7 +137,7 @@ private: * @author Reginald Stadlbauer <reggie@kde.org> */ -class KDEUI_EXPORT KCharSelect : public QVBox +class KDEUI_EXPORT KCharSelect : public TQVBox { Q_OBJECT Q_PROPERTY( TQString fontFamily READ font WRITE setFont ) @@ -157,7 +157,7 @@ public: /** * Reimplemented. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Sets the font which is displayed to @p font diff --git a/kdeui/kcmenumngr.cpp b/kdeui/kcmenumngr.cpp index 9cd9d6288..2288a5963 100644 --- a/kdeui/kcmenumngr.cpp +++ b/kdeui/kcmenumngr.cpp @@ -35,10 +35,10 @@ KContextMenuManager* KContextMenuManager::manager = 0; KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name ) : TQObject( parent, name) { - KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ; - menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt(); - saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ; - showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true ); + KConfigGroupSaver saver ( KGlobal::config(), TQString::tqfromLatin1("Shortcuts") ) ; + menuKey = KShortcut( saver.config()->readEntry(TQString::tqfromLatin1("PopupContextMenu"), TQString::tqfromLatin1("Menu") ) ).keyCodeQt(); + saver.config()->setGroup( TQString::tqfromLatin1("ContextMenus") ) ; + showOnPress = saver.config()->readBoolEntry(TQString::tqfromLatin1("ShowOnPress"), true ); } KContextMenuManager::~KContextMenuManager() @@ -70,7 +70,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) TQPoint pos; switch ( e->type() ) { case TQEvent::MouseButtonPress: - if (((TQMouseEvent*) e )->button() != RightButton ) + if (((TQMouseEvent*) e )->button() != Qt::RightButton ) break; if ( !showOnPress ) return true; // eat event for safety @@ -78,7 +78,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) pos = ((TQMouseEvent*) e )->globalPos(); break; case TQEvent::MouseButtonRelease: - if ( showOnPress || ((TQMouseEvent*) e )->button() != RightButton ) + if ( showOnPress || ((TQMouseEvent*) e )->button() != Qt::RightButton ) break; popup = menus[o]; pos = ((TQMouseEvent*) e )->globalPos(); @@ -122,7 +122,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) void KContextMenuManager::widgetDestroyed() { - if ( menus.find( (TQObject*)sender() ) ) + if ( menus.tqfind( (TQObject*)sender() ) ) menus.remove( (TQObject*)sender() ); } diff --git a/kdeui/kcmenumngr.h b/kdeui/kcmenumngr.h index cd478e494..ce05f6b9d 100644 --- a/kdeui/kcmenumngr.h +++ b/kdeui/kcmenumngr.h @@ -20,7 +20,7 @@ #ifndef KCMENUMNGR_H #define KCMENUMNGR_H -#include <tqt.h> +// #include <tqt.h> #include <tqobject.h> #include <tqptrdict.h> @@ -75,7 +75,7 @@ If the popup menu is invoked with the keyboard shortcut, it's shown at the position of the micro focus hint of the widget ( TQWidget::microFocusHint() ). */ -class KDEUI_EXPORT KContextMenuManager : public QObject +class KDEUI_EXPORT KContextMenuManager : public TQObject { Q_OBJECT public: diff --git a/kdeui/kcmodule.h b/kdeui/kcmodule.h index 3791f950a..268c3800a 100644 --- a/kdeui/kcmodule.h +++ b/kdeui/kcmodule.h @@ -66,7 +66,7 @@ class KInstance; * * @author Matthias Hoelzer-Kluepfel <hoelzer@kde.org> */ -class KDEUI_EXPORT KCModule : public QWidget +class KDEUI_EXPORT KCModule : public TQWidget { Q_OBJECT diff --git a/kdeui/kcolorbutton.cpp b/kdeui/kcolorbutton.cpp index 3cccbe1df..847b6816b 100644 --- a/kdeui/kcolorbutton.cpp +++ b/kdeui/kcolorbutton.cpp @@ -85,7 +85,7 @@ void KColorButton::setColor( const TQColor &c ) { if ( col != c ) { col = c; - repaint( false ); + tqrepaint( false ); emit changed( col ); } } @@ -105,34 +105,34 @@ void KColorButton::setDefaultColor( const TQColor &c ) void KColorButton::drawButtonLabel( TQPainter *painter ) { int x, y, w, h; - TQRect r = style().subRect( TQStyle::SR_PushButtonContents, this ); + TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this ); r.rect(&x, &y, &w, &h); - int margin = style().pixelMetric( TQStyle::PM_ButtonMargin, this ); + int margin = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this ); x += margin; y += margin; w -= 2*margin; h -= 2*margin; if (isOn() || isDown()) { - x += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); - y += style().pixelMetric( TQStyle::PM_ButtonShiftVertical, this ); + x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this ); + y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this ); } TQColor fillCol = isEnabled() ? col : backgroundColor(); - qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL); + qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL); if ( fillCol.isValid() ) painter->fillRect( x+1, y+1, w-2, h-2, fillCol ); if ( hasFocus() ) { - TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this ); - style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() ); + TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() ); } } -TQSize KColorButton::sizeHint() const +TQSize KColorButton::tqsizeHint() const { - return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). + return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). expandedTo(TQApplication::globalStrut()); } @@ -155,11 +155,11 @@ void KColorButton::keyPressEvent( TQKeyEvent *e ) if ( KStdAccel::copy().contains( key ) ) { TQMimeSource* mime = new KColorDrag( color() ); - TQApplication::clipboard()->setData( mime, QClipboard::Clipboard ); + TQApplication::tqclipboard()->setData( mime, TQClipboard::Clipboard ); } else if ( KStdAccel::paste().contains( key ) ) { TQColor color; - KColorDrag::decode( TQApplication::clipboard()->data( QClipboard::Clipboard ), color ); + KColorDrag::decode( TQApplication::tqclipboard()->data( QClipboard::Clipboard ), color ); setColor( color ); } else @@ -174,7 +174,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e) void KColorButton::mouseMoveEvent( TQMouseEvent *e) { - if( (e->state() & LeftButton) && + if( (e->state() & Qt::LeftButton) && (e->pos()-mPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { // Drag color object diff --git a/kdeui/kcolorbutton.h b/kdeui/kcolorbutton.h index cff929156..e1a9b1dc8 100644 --- a/kdeui/kcolorbutton.h +++ b/kdeui/kcolorbutton.h @@ -34,7 +34,7 @@ class KColorButtonPrivate; * * \image html kcolorbutton.png "KDE Color Button" */ -class KDEUI_EXPORT KColorButton : public QPushButton +class KDEUI_EXPORT KColorButton : public TQPushButton { Q_OBJECT Q_PROPERTY( TQColor color READ color WRITE setColor ) @@ -80,7 +80,7 @@ public: */ void setDefaultColor( const TQColor &c ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; signals: /** diff --git a/kdeui/kcolorcombo.cpp b/kdeui/kcolorcombo.cpp index c418b6a81..a7dd90ac7 100644 --- a/kdeui/kcolorcombo.cpp +++ b/kdeui/kcolorcombo.cpp @@ -175,7 +175,7 @@ void KColorCombo::slotActivated( int index ) TQRect rect( 0, 0, width(), TQFontMetrics(painter.font()).height()+4); TQPixmap pixmap( rect.width(), rect.height() ); - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -228,7 +228,7 @@ void KColorCombo::addColors() if ( i == STANDARD_PAL_SIZE ) customColor = internalcolor; - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); diff --git a/kdeui/kcolorcombo.h b/kdeui/kcolorcombo.h index 8ef33f5c9..aefac504f 100644 --- a/kdeui/kcolorcombo.h +++ b/kdeui/kcolorcombo.h @@ -36,7 +36,7 @@ class KColorComboInternal; /** * Combobox for colors. */ -class KDEUI_EXPORT KColorCombo : public QComboBox +class KDEUI_EXPORT KColorCombo : public TQComboBox { Q_OBJECT Q_PROPERTY( TQColor color READ color WRITE setColor ) diff --git a/kdeui/kcolordialog.cpp b/kdeui/kcolordialog.cpp index 64decd2c5..990e9df9e 100644 --- a/kdeui/kcolordialog.cpp +++ b/kdeui/kcolordialog.cpp @@ -93,7 +93,7 @@ const ColorPaletteNameType colorPaletteName[]= const int recentColorIndex = 0; const int customColorIndex = 1; -class KColorSpinBox : public QSpinBox +class KColorSpinBox : public TQSpinBox { public: KColorSpinBox(int minValue, int maxValue, int step, TQWidget* parent) @@ -260,7 +260,7 @@ void KHSSelector::drawPalette( TQPixmap *pixmap ) //----------------------------------------------------------------------------- KValueSelector::KValueSelector( TQWidget *parent, const char *name ) - : KSelector( KSelector::Vertical, parent, name ), _hue(0), _sat(0) + : KSelector( Qt::Vertical, parent, name ), _hue(0), _sat(0) { setRange( 0, 255 ); pixmap.setOptimization( TQPixmap::BestOptim ); @@ -297,7 +297,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap ) uint *p; QRgb rgb; - if ( orientation() == KSelector::Horizontal ) + if ( orientation() == Qt::Horizontal ) { for ( int v = 0; v < ySize; v++ ) { @@ -312,7 +312,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap ) } } - if( orientation() == KSelector::Vertical ) + if( orientation() == Qt::Vertical ) { for ( int v = 0; v < ySize; v++ ) { @@ -376,7 +376,7 @@ void KColorCells::paintCell( TQPainter *painter, int row, int col ) if (shade) { qDrawShadePanel( painter, 1, 1, cellWidth()-2, - cellHeight()-2, colorGroup(), true, 1, &brush ); + cellHeight()-2, tqcolorGroup(), true, 1, &brush ); w = 2; } TQColor color = colors[ row * numCols() + col ]; @@ -426,7 +426,7 @@ int KColorCells::posToCell(const TQPoint &pos, bool ignoreBorders) void KColorCells::mouseMoveEvent( TQMouseEvent *e ) { - if( !(e->state() & LeftButton)) return; + if( !(e->state() & Qt::LeftButton)) return; if(inMouse) { int delay = KGlobalSettings::dndEventDelay(); @@ -530,7 +530,7 @@ void KColorPatch::drawContents( TQPainter *painter ) void KColorPatch::mouseMoveEvent( TQMouseEvent *e ) { // Drag color object - if( !(e->state() & LeftButton)) return; + if( !(e->state() & Qt::LeftButton)) return; KColorDrag *d = new KColorDrag( color, this); d->dragCopy(); } @@ -597,7 +597,7 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )), this, TQT_SLOT( slotColorTextSelected( const TQString & )) ); - setFixedSize( sizeHint()); + setFixedSize( tqsizeHint()); connect( combo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetPalette( const TQString &))); } @@ -608,7 +608,7 @@ KPaletteTable::~KPaletteTable() delete d; } -QString +TQString KPaletteTable::palette() const { return combo->currentText(); @@ -674,8 +674,8 @@ KPaletteTable::readNamedColor( void ) // that start with "gray". // TQString name = line.mid(pos).stripWhiteSpace(); - if( name.isNull() || name.find(' ') != -1 || - name.find( "gray" ) != -1 || name.find( "grey" ) != -1 ) + if( name.isNull() || name.tqfind(' ') != -1 || + name.tqfind( "gray" ) != -1 || name.tqfind( "grey" ) != -1 ) { continue; } @@ -981,7 +981,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) l_left->addSpacing(10); TQGridLayout *l_lbot = new TQGridLayout(3, 6); - l_left->addLayout(l_lbot); + l_left->addLayout(TQT_TQLAYOUT(l_lbot)); // // the palette and value selector go into the H-box @@ -1003,28 +1003,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) // add the HSV fields // label = new TQLabel( i18n("H:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 2); d->hedit = new KColorSpinBox( 0, 359, 1, page ); - d->hedit->setValidator( new TQIntValidator( d->hedit ) ); + d->hedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->hedit) ) ); l_lbot->addWidget(d->hedit, 0, 3); connect( d->hedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("S:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 1, 2); d->sedit = new KColorSpinBox( 0, 255, 1, page ); - d->sedit->setValidator( new TQIntValidator( d->sedit ) ); + d->sedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->sedit) ) ); l_lbot->addWidget(d->sedit, 1, 3); connect( d->sedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("V:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 2); d->vedit = new KColorSpinBox( 0, 255, 1, page ); - d->vedit->setValidator( new TQIntValidator( d->vedit ) ); + d->vedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->vedit) ) ); l_lbot->addWidget(d->vedit, 2, 3); connect( d->vedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotHSVChanged() ) ); @@ -1033,28 +1033,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) // add the RGB fields // label = new TQLabel( i18n("R:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 0, 4); d->redit = new KColorSpinBox( 0, 255, 1, page ); - d->redit->setValidator( new TQIntValidator( d->redit ) ); + d->redit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->redit) ) ); l_lbot->addWidget(d->redit, 0, 5); connect( d->redit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("G:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget( label, 1, 4); d->gedit = new KColorSpinBox( 0, 255,1, page ); - d->gedit->setValidator( new TQIntValidator( d->gedit ) ); + d->gedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->gedit) ) ); l_lbot->addWidget(d->gedit, 1, 5); connect( d->gedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("B:"), page ); - label->setAlignment(AlignRight | AlignVCenter); + label->tqsetAlignment(AlignRight | AlignVCenter); l_lbot->addWidget(label, 2, 4); d->bedit = new KColorSpinBox( 0, 255, 1, page ); - d->bedit->setValidator( new TQIntValidator( d->bedit ) ); + d->bedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->bedit) ) ); l_lbot->addWidget(d->bedit, 2, 5); connect( d->bedit, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotRGBChanged() ) ); @@ -1131,33 +1131,33 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) label = new TQLabel( page ); label->setText(i18n("Name:")); - l_grid->addWidget(label, 0, 1, AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, Qt::AlignLeft); d->colorName = new TQLabel( page ); - l_grid->addWidget(d->colorName, 0, 2, AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, Qt::AlignLeft); label = new TQLabel( page ); label->setText(i18n("HTML:")); - l_grid->addWidget(label, 1, 1, AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, Qt::AlignLeft); d->htmlName = new KLineEdit( page ); d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size - w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD")); + w = d->htmlName->fontMetrics().width(TQString::tqfromLatin1("#DDDDDDD")); d->htmlName->setFixedWidth(w); - l_grid->addWidget(d->htmlName, 1, 2, AlignLeft); + l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, Qt::AlignLeft); connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( slotHtmlChanged() ) ); d->patch = new KColorPatch( page ); d->patch->setFixedSize(48, 48); - l_grid->addMultiCellWidget(d->patch, 0, 1, 0, 0, AlignHCenter | AlignVCenter); + l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter); connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), TQT_SLOT( setColor( const TQColor&))); tl_layout->activate(); - page->setMinimumSize( page->sizeHint() ); + page->setMinimumSize( page->tqsizeHint() ); readSettings(); d->bRecursion = false; @@ -1187,7 +1187,7 @@ KColorDialog::~KColorDialog() bool KColorDialog::eventFilter( TQObject *obj, TQEvent *ev ) { - if ((obj == d->htmlName) || (obj == d->hsSelector)) + if ((TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->htmlName)) || (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->hsSelector))) switch(ev->type()) { case TQEvent::DragEnter: @@ -1195,7 +1195,7 @@ KColorDialog::eventFilter( TQObject *obj, TQEvent *ev ) case TQEvent::DragLeave: case TQEvent::Drop: case TQEvent::DragResponse: - qApp->sendEvent(d->patch, ev); + tqApp->sendEvent(d->patch, ev); return true; default: break; @@ -1223,7 +1223,7 @@ KColorDialog::setDefaultColor( const TQColor& col ) mainWidget()->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); // cancel setFixedSize() d->tl_layout->activate(); - mainWidget()->setMinimumSize( mainWidget()->sizeHint() ); + mainWidget()->setMinimumSize( mainWidget()->tqsizeHint() ); disableResize(); connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) ); @@ -1277,7 +1277,7 @@ KColorDialog::slotWriteSettings() } } -QColor +TQColor KColorDialog::color() const { if ( d->cbDefaultColor && d->cbDefaultColor->isChecked() ) @@ -1479,7 +1479,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name ) d->valuePal->setValue( v ); d->valuePal->updateContents(); d->valuePal->blockSignals(false); - d->valuePal->repaint( false ); + d->valuePal->tqrepaint( false ); d->bRecursion = false; } @@ -1507,7 +1507,7 @@ KColorDialog::slotColorPicker() d->oldfilter = qt_set_x11_event_filter(kde_color_dlg_handler); #endif kde_color_dlg_widget = this; - grabMouse( crossCursor ); + grabMouse( tqcrossCursor ); grabKeyboard(); } @@ -1529,10 +1529,10 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e ) KDialogBase::mouseReleaseEvent( e ); } -QColor +TQColor KColorDialog::grabColor(const TQPoint &p) { - TQWidget *desktop = TQApplication::desktop(); + TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop()); TQPixmap pm = TQPixmap::grabWindow( desktop->winId(), p.x(), p.y(), 1, 1); TQImage i = pm.convertToImage(); return i.pixel(0,0); diff --git a/kdeui/kcolordialog.h b/kdeui/kcolordialog.h index c3a6fabf3..7a1a66d6d 100644 --- a/kdeui/kcolordialog.h +++ b/kdeui/kcolordialog.h @@ -161,7 +161,7 @@ private: * * @author Waldo Bastian <bastian@kde.org> **/ -class KDEUI_EXPORT KColor : public QColor +class KDEUI_EXPORT KColor : public TQColor { public: KColor(); @@ -195,7 +195,7 @@ private: * * @author Waldo Bastian <bastian@kde.org> **/ -class KDEUI_EXPORT KPaletteTable : public QWidget +class KDEUI_EXPORT KPaletteTable : public TQWidget { Q_OBJECT public: @@ -250,7 +250,7 @@ private: * * @author Martin Jones <mjones@kde.org> */ -class KDEUI_EXPORT KColorCells : public QGridView +class KDEUI_EXPORT KColorCells : public TQGridView { Q_OBJECT public: @@ -308,7 +308,7 @@ private: * automatically handles drag and drop from and on the widget. * */ -class KDEUI_EXPORT KColorPatch : public QFrame +class KDEUI_EXPORT KColorPatch : public TQFrame { Q_OBJECT public: diff --git a/kdeui/kcolordrag.cpp b/kdeui/kcolordrag.cpp index 1c56d9ccd..978130fcd 100644 --- a/kdeui/kcolordrag.cpp +++ b/kdeui/kcolordrag.cpp @@ -40,7 +40,7 @@ void KColorDrag::setColor( const TQColor &color) { TQColorDrag tmp(color, 0, 0); - setEncodedData(tmp.encodedData(color_mime_string)); + setEncodedData(tmp.tqencodedData(color_mime_string)); TQPixmap colorpix( 25, 20); colorpix.fill( color); @@ -59,17 +59,17 @@ const char *KColorDrag::format(int i) const return TQStoredDrag::format(i); } -TQByteArray KColorDrag::encodedData ( const char * m ) const +TQByteArray KColorDrag::tqencodedData ( const char * m ) const { if (!qstrcmp(m, text_mime_string) ) { TQColor color; TQColorDrag::decode(const_cast<KColorDrag *>(this), color); - TQCString result = color.name().latin1(); + TQCString result = TQString(color.name()).latin1(); ((TQByteArray&)result).resize(result.length()); return result; } - return TQStoredDrag::encodedData(m); + return TQStoredDrag::tqencodedData(m); } bool @@ -91,8 +91,8 @@ KColorDrag::decode( TQMimeSource *e, TQColor &color) if (TQColorDrag::decode(e, color)) return true; - TQByteArray data = e->encodedData( text_mime_string); - TQString colorName = TQString::fromLatin1(data.data(), data.size()); + TQByteArray data = e->tqencodedData( text_mime_string); + TQString colorName = TQString::tqfromLatin1(data.data(), data.size()); if ((colorName.length() < 4) || (colorName[0] != '#')) return false; color.setNamedColor(colorName); diff --git a/kdeui/kcolordrag.h b/kdeui/kcolordrag.h index 7f0cd1ba3..e33e5796f 100644 --- a/kdeui/kcolordrag.h +++ b/kdeui/kcolordrag.h @@ -48,7 +48,7 @@ public: virtual ~KColorDrag() {} virtual const char *format(int i) const; - virtual TQByteArray encodedData ( const char * m ) const; + virtual TQByteArray tqencodedData ( const char * m ) const; /** * Sets the color of the drag to @p col. diff --git a/kdeui/kcombobox.cpp b/kdeui/kcombobox.cpp index c3cc4c402..94df22190 100644 --- a/kdeui/kcombobox.cpp +++ b/kdeui/kcombobox.cpp @@ -163,7 +163,7 @@ void KComboBox::makeCompletion( const TQString& text ) if( text.isNull() || !listBox() ) return; - const int index = listBox()->index( listBox()->findItem( text ) ); + const int index = listBox()->index( listBox()->tqfindItem( text ) ); if( index >= 0 ) setCurrentItem( index ); } @@ -764,14 +764,14 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget new TQListViewItem( m_pListView, *it ); } - m_pListView->setMinimumSize( m_pListView->sizeHint() ); + m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); enableButton( KDialogBase::User1, false ); - resize( sizeHint() ); + resize( tqsizeHint() ); } KHistoryComboEditor::~KHistoryComboEditor() diff --git a/kdeui/kcommand.cpp b/kdeui/kcommand.cpp index 2c76b21cd..4960c8016 100644 --- a/kdeui/kcommand.cpp +++ b/kdeui/kcommand.cpp @@ -133,7 +133,7 @@ void KCommandHistory::addCommand(KCommand *command, bool execute) { return; int index; - if(d->m_present && (index=m_commands.findRef(d->m_present))!=-1) { + if(d->m_present && (index=m_commands.tqfindRef(d->m_present))!=-1) { if (m_first) --index; m_commands.insert(index+1, command); @@ -192,7 +192,7 @@ void KCommandHistory::undo() { m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name())); } int index; - if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()) { + if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.prev()) { d->m_present=m_commands.current(); if (m_undo) { m_undo->setEnabled(true); @@ -226,7 +226,7 @@ void KCommandHistory::redo() { if(!d->m_savedAt) emit documentRestored(); } - else if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.next()) { + else if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.next()) { d->m_present=m_commands.current(); d->m_present->execute(); emit commandExecuted(); @@ -257,7 +257,7 @@ void KCommandHistory::redo() { void KCommandHistory::documentSaved() { if(d->m_present && !m_first) - d->m_savedAt=m_commands.findRef(d->m_present); + d->m_savedAt=m_commands.tqfindRef(d->m_present); else if(!d->m_present && !m_first) d->m_savedAt=-42; // this value signals that the document has // been saved with an empty history. @@ -287,7 +287,7 @@ void KCommandHistory::clipCommands() { if(count<=m_undoLimit && count<=m_redoLimit) return; - int index=m_commands.findRef(d->m_present); + int index=m_commands.tqfindRef(d->m_present); if(index>=m_undoLimit) { for(int i=0; i<=(index-m_undoLimit); ++i) { m_commands.removeFirst(); @@ -295,7 +295,7 @@ void KCommandHistory::clipCommands() { if(d->m_savedAt==-1) d->m_savedAt=-42; } - index=m_commands.findRef(d->m_present); // calculate the new + index=m_commands.tqfindRef(d->m_present); // calculate the new count=m_commands.count(); // values (for the redo-branch :) // make it easier for us... d->m_savedAt==-1 -> invalid if(d->m_savedAt!=-42 && d->m_savedAt<-1) @@ -316,7 +316,7 @@ void KCommandHistory::slotUndoAboutToShow() { m_undoPopup->clear(); int i = 0; - if (m_commands.findRef(d->m_present)!=-1) + if (m_commands.tqfindRef(d->m_present)!=-1) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { m_undoPopup->insertItem( i18n("Undo: %1").arg(m_commands.current()->name()), i++ ); @@ -340,7 +340,7 @@ void KCommandHistory::slotRedoAboutToShow() d->m_present = m_commands.first(); m_redoPopup->insertItem( i18n("Redo: %1").arg(d->m_present->name()), i++ ); } - if (m_commands.findRef(d->m_present)!=-1 && m_commands.next()) + if (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next()) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { m_redoPopup->insertItem( i18n("Redo: %1").arg(m_commands.current()->name()), i++ ); @@ -360,7 +360,7 @@ void KCommandHistory::updateActions() if ( m_undo && m_redo ) { m_undo->setEnabled( !m_first && ( d->m_present ) ); - m_redo->setEnabled(m_first || (m_commands.findRef(d->m_present)!=-1 && m_commands.next())); + m_redo->setEnabled(m_first || (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next())); } } diff --git a/kdeui/kcommand.h b/kdeui/kcommand.h index 97fa3c2e2..a9b8e4f6c 100644 --- a/kdeui/kcommand.h +++ b/kdeui/kcommand.h @@ -180,7 +180,7 @@ public: /** * Erases all the undo/redo history. - * Use this when reloading the data, for instance, since this invalidates + * Use this when reloading the data, for instance, since this tqinvalidates * all the commands. */ void clear(); diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp index ed75ecd21..1349b7d8c 100644 --- a/kdeui/kcompletionbox.cpp +++ b/kdeui/kcompletionbox.cpp @@ -45,7 +45,7 @@ public: }; KCompletionBox::KCompletionBox( TQWidget *parent, const char *name ) - :KListBox( parent, name, WType_Popup ), d(new KCompletionBoxPrivate) + :KListBox( parent, name, (WFlags)WType_Popup ), d(new KCompletionBoxPrivate) { d->m_parent = parent; @@ -61,7 +61,7 @@ KCompletionBox::KCompletionBox( TQWidget *parent, const char *name ) if ( parent ) setFocusProxy( parent ); else - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); setVScrollBarMode( Auto ); setHScrollBarMode( AlwaysOff ); @@ -109,13 +109,13 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) { int type = e->type(); - if ( o == d->m_parent ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_parent) ) { if ( isVisible() ) { if ( type == TQEvent::KeyPress ) { - TQKeyEvent *ev = static_cast<TQKeyEvent *>( e ); + TQKeyEvent *ev = TQT_TQKEYEVENT( e ); switch ( ev->key() ) { case Key_BackTab: - if ( d->tabHandling && (ev->state() == NoButton || + if ( d->tabHandling && (ev->state() == Qt::NoButton || (ev->state() & ShiftButton)) ) { up(); ev->accept(); @@ -123,7 +123,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) } break; case Key_Tab: - if ( d->tabHandling && (ev->state() == NoButton) ) { + if ( d->tabHandling && (ev->state() == Qt::NoButton) ) { down(); // Only on TAB!! ev->accept(); return true; @@ -185,7 +185,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) else if ( type == TQEvent::AccelOverride ) { // Override any acceleartors that match // the key sequences we use here... - TQKeyEvent *ev = static_cast<TQKeyEvent *>( e ); + TQKeyEvent *ev = TQT_TQKEYEVENT( e ); switch ( ev->key() ) { case Key_Down: case Key_Up: @@ -199,7 +199,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) break; case Key_Tab: case Key_BackTab: - if ( ev->state() == NoButton || + if ( ev->state() == Qt::NoButton || (ev->state() & ShiftButton)) { ev->accept(); @@ -230,11 +230,11 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e ) // any mouse-click on something else than "this" makes us hide else if ( type == TQEvent::MouseButtonPress ) { - TQMouseEvent *ev = static_cast<TQMouseEvent *>( e ); + TQMouseEvent *ev = TQT_TQMOUSEEVENT( e ); if ( !rect().contains( ev->pos() )) // this widget hide(); - if ( !d->emitSelected && currentItem() && !::qt_cast<TQScrollBar*>(o) ) + if ( !d->emitSelected && currentItem() && !::tqqt_cast<TQScrollBar*>(o) ) { emit highlighted( currentText() ); hide(); @@ -260,7 +260,7 @@ void KCompletionBox::popup() clearSelection(); if ( !isVisible() ) show(); - else if ( size().height() != sizeHint().height() ) + else if ( size().height() != tqsizeHint().height() ) sizeAndPosition(); } } @@ -302,7 +302,7 @@ void KCompletionBox::show() d->upwardBox = false; if ( d->m_parent ) { sizeAndPosition(); - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); } // ### we shouldn't need to call this, but without this, the scrollbars @@ -317,14 +317,14 @@ void KCompletionBox::show() // The problem is, KCompletionBox::eventFilter() detects resizing // of the parent, and calls hide() - and this hide() happen in the middle // of show(), causing inconsistent state. I'll try to submit a Qt patch too. - qApp->sendPostedEvents(); + tqApp->sendPostedEvents(); KListBox::show(); } void KCompletionBox::hide() { if ( d->m_parent ) - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); d->cancelText = TQString::null; KListBox::hide(); } @@ -335,17 +335,17 @@ TQRect KCompletionBox::calculateGeometry() const int ih = itemHeight(); int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth(); - int w = (d->m_parent) ? d->m_parent->width() : KListBox::minimumSizeHint().width(); - w = QMAX( KListBox::minimumSizeHint().width(), w ); + int w = (d->m_parent) ? d->m_parent->width() : KListBox::tqminimumSizeHint().width(); + w = QMAX( KListBox::tqminimumSizeHint().width(), w ); //If we're inside a combox, Qt by default makes the dropdown // as wide as the combo, and gives the style a chance // to adjust it. Do that here as well, for consistency const TQObject* combo; - if ( d->m_parent && (combo = d->m_parent->parent() ) && + if ( d->m_parent && (combo = d->m_parent->tqparent() ) && combo->inherits("QComboBox") ) { - const TQComboBox* cb = static_cast<const TQComboBox*>(combo); + const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo)); //Expand to the combo width w = QMAX( w, cb->width() ); @@ -361,7 +361,7 @@ TQRect KCompletionBox::calculateGeometry() const comboCorner.y() - parentCorner.y(); //Ask the style to refine this a bit - TQRect styleAdj = style().querySubControlMetrics(TQStyle::CC_ComboBox, + TQRect styleAdj = tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, cb, TQStyle::SC_ComboBoxListBoxPopup, TQStyleOption(x, y, w, h)); //TQCommonStyle returns TQRect() by default, so this is what we get if the @@ -373,7 +373,7 @@ TQRect KCompletionBox::calculateGeometry() const return TQRect(x, y, w, h); } -TQSize KCompletionBox::sizeHint() const +TQSize KCompletionBox::tqsizeHint() const { return calculateGeometry().size(); } @@ -451,7 +451,7 @@ void KCompletionBox::canceled() hide(); } -class KCompletionBoxItem : public QListBoxItem +class KCompletionBoxItem : public TQListBoxItem { public: //Returns true if dirty. @@ -485,7 +485,7 @@ void KCompletionBox::setItems( const TQStringList& items ) } else { //Keep track of whether we need to change anything, - //so we can avoid a repaint for identical updates, + //so we can avoid a tqrepaint for identical updates, //to reduce flicker bool dirty = false; @@ -520,7 +520,7 @@ void KCompletionBox::setItems( const TQStringList& items ) triggerUpdate( false ); } - if ( isVisible() && size().height() != sizeHint().height() ) + if ( isVisible() && size().height() != tqsizeHint().height() ) sizeAndPosition(); blockSignals( block ); diff --git a/kdeui/kcompletionbox.h b/kdeui/kcompletionbox.h index 4e981bf86..9ae7d124b 100644 --- a/kdeui/kcompletionbox.h +++ b/kdeui/kcompletionbox.h @@ -61,7 +61,7 @@ public: */ ~KCompletionBox(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * @returns true if selecting an item results in the emition of the selected signal. diff --git a/kdeui/kconfigdialog.cpp b/kdeui/kconfigdialog.cpp index 3d5bfd697..d0cb6aaa7 100644 --- a/kdeui/kconfigdialog.cpp +++ b/kdeui/kconfigdialog.cpp @@ -52,7 +52,7 @@ KConfigDialog::KConfigDialog( TQWidget *parent, const char *name, int dialogButtons, ButtonCode defaultButton, bool modal ) : - KDialogBase( dialogType, Qt::WStyle_DialogBorder, + KDialogBase( dialogType, (WFlags)TQt::WStyle_DialogBorder, parent, name, modal, i18n("Configure"), dialogButtons, defaultButton ), d(new KConfigDialogPrivate(dialogType)) { @@ -160,7 +160,7 @@ void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager) KConfigDialog* KConfigDialog::exists(const char* name) { - return openDialogs.find(name); + return openDialogs.tqfind(name); } bool KConfigDialog::showDialog(const char* name) diff --git a/kdeui/kcursor.cpp b/kdeui/kcursor.cpp index 02f8723f5..0ee90bb1e 100644 --- a/kdeui/kcursor.cpp +++ b/kdeui/kcursor.cpp @@ -145,72 +145,72 @@ TQCursor KCursor::workingCursor() */ TQCursor KCursor::arrowCursor() { - return Qt::arrowCursor; + return tqarrowCursor; } TQCursor KCursor::upArrowCursor() { - return Qt::upArrowCursor; + return tqupArrowCursor; } TQCursor KCursor::crossCursor() { - return Qt::crossCursor; + return tqcrossCursor; } TQCursor KCursor::waitCursor() { - return Qt::waitCursor; + return tqwaitCursor; } TQCursor KCursor::ibeamCursor() { - return Qt::ibeamCursor; + return tqibeamCursor; } TQCursor KCursor::sizeVerCursor() { - return Qt::sizeVerCursor; + return tqsizeVerCursor; } TQCursor KCursor::sizeHorCursor() { - return Qt::sizeHorCursor; + return tqsizeHorCursor; } TQCursor KCursor::sizeBDiagCursor() { - return Qt::sizeBDiagCursor; + return tqsizeBDiagCursor; } TQCursor KCursor::sizeFDiagCursor() { - return Qt::sizeFDiagCursor; + return tqsizeFDiagCursor; } TQCursor KCursor::sizeAllCursor() { - return Qt::sizeAllCursor; + return tqsizeAllCursor; } TQCursor KCursor::blankCursor() { - return Qt::blankCursor; + return tqblankCursor; } TQCursor KCursor::whatsThisCursor() { - return Qt::whatsThisCursor; + return tqwhatsThisCursor; } // auto-hide cursor stuff @@ -317,7 +317,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const bool KCursorPrivateAutoHideEventFilter::eventFilter( TQObject *o, TQEvent *e ) { - Q_ASSERT( o == m_widget ); + Q_ASSERT( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_widget) ); switch ( e->type() ) { @@ -370,9 +370,9 @@ KCursorPrivate::KCursorPrivate() hideCursorDelay = 5000; // 5s default value KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") ); + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("KDE") ); enabled = kc->readBoolEntry( - TQString::fromLatin1("Autohiding cursor enabled"), true ); + TQString::tqfromLatin1("Autohiding cursor enabled"), true ); } KCursorPrivate::~KCursorPrivate() @@ -386,7 +386,7 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve if ( enable ) { - if ( m_eventFilters.find( w ) != NULL ) + if ( m_eventFilters.tqfind( w ) != NULL ) return; KCursorPrivateAutoHideEventFilter* filter = new KCursorPrivateAutoHideEventFilter( w ); m_eventFilters.insert( w, filter ); @@ -412,7 +412,7 @@ bool KCursorPrivate::eventFilter( TQObject *o, TQEvent *e ) if ( !enabled ) return false; - KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.find( o ); + KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.tqfind( o ); Q_ASSERT( filter != NULL ); if ( filter == NULL ) diff --git a/kdeui/kcursor.h b/kdeui/kcursor.h index ddef7a1cf..19bcd2348 100644 --- a/kdeui/kcursor.h +++ b/kdeui/kcursor.h @@ -33,7 +33,7 @@ class TQWidget; * * A wrapper around TQCursor that allows for "themed" cursors. * - * Currently, the only themed cursor is a hand shaped cursor. + * Currently, the only themed cursor is a hand tqshaped cursor. * * A typical usage would be * \code @@ -42,7 +42,7 @@ class TQWidget; * * @author Kurt Granroth <granroth@kde.org> */ -class KDEUI_EXPORT KCursor : public Qt +class KDEUI_EXPORT KCursor : public TQt { public: /** diff --git a/kdeui/kcursor_private.h b/kdeui/kcursor_private.h index 839350c8c..0ed1789e6 100644 --- a/kdeui/kcursor_private.h +++ b/kdeui/kcursor_private.h @@ -36,7 +36,7 @@ class TQWidget; * @author John Firebaugh <jfirebaugh@kde.org> * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KCursorPrivateAutoHideEventFilter : public QObject +class KCursorPrivateAutoHideEventFilter : public TQObject { Q_OBJECT @@ -68,7 +68,7 @@ private: * @author Carsten Pfeiffer <pfeiffer@kde.org> * @author John Firebaugh <jfirebaugh@kde.org> */ -class KCursorPrivate : public QObject +class KCursorPrivate : public TQObject { friend class KCursor; // to shut up the compiler Q_OBJECT diff --git a/kdeui/kdatepicker.cpp b/kdeui/kdatepicker.cpp index af9dede01..ab41fec15 100644 --- a/kdeui/kdatepicker.cpp +++ b/kdeui/kdatepicker.cpp @@ -92,7 +92,7 @@ void KDatePicker::fillWeeksCombo(const TQDate &date) // make sure that the week of the lastDay is always inserted: in Chinese calendar // system, this is not always the case if(day < lastDay && day.daysTo(lastDay) < 7 && calendar->weekNumber(day) != calendar->weekNumber(lastDay)) - day = lastDay.addDays(-7); + day = TQT_TQDATE_OBJECT(lastDay.addDays(-7)); } } @@ -175,17 +175,17 @@ void KDatePicker::init( const TQDate &dt ) line->installEventFilter( this ); if ( TQApplication::reverseLayout() ) { - yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); - monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); + yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); + monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); } else { - yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); - monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); + yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); + monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); } connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -223,8 +223,8 @@ KDatePicker::eventFilter(TQObject *o, TQEvent *e ) if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *k = (TQKeyEvent *)e; - if ( (k->key() == Qt::Key_Prior) || - (k->key() == Qt::Key_Next) || + if ( (k->key() == TQt::Key_Prior) || + (k->key() == TQt::Key_Next) || (k->key() == Qt::Key_Up) || (k->key() == Qt::Key_Down) ) { @@ -371,7 +371,7 @@ KDatePicker::selectMonthClicked() int day = calendar->day(date); // ----- construct a valid date in this month: calendar->setYMD(date, calendar->year(date), month, 1); - date = date.addDays(QMIN(day, calendar->daysInMonth(date)) - 1); + date = TQT_TQDATE_OBJECT(date.addDays(QMIN(day, calendar->daysInMonth(date)) - 1)); // ----- set this month setDate(date); } @@ -390,7 +390,7 @@ KDatePicker::selectYearClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalYearSelector* picker = new KDateInternalYearSelector(popup); // ----- - picker->resize(picker->sizeHint()); + picker->resize(picker->tqsizeHint()); picker->setYear( table->getDate().year() ); picker->selectAll(); popup->setMainWidget(picker); @@ -466,10 +466,10 @@ KDatePicker::todayButtonClicked() setDate(TQDate::currentDate()); } -QSize -KDatePicker::sizeHint() const +TQSize +KDatePicker::tqsizeHint() const { - return TQWidget::sizeHint(); + return TQWidget::tqsizeHint(); } void @@ -507,7 +507,7 @@ KDatePicker::setFontSize(int s) maxMonthRect.setHeight(QMAX(r.height(), maxMonthRect.height())); } - TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, + TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); selectMonth->setMinimumSize(metricBound); @@ -529,7 +529,7 @@ KDatePicker::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + tqtopLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kdeui/kdatepicker.h b/kdeui/kdatepicker.h index 6a4e93537..fb51732f3 100644 --- a/kdeui/kdatepicker.h +++ b/kdeui/kdatepicker.h @@ -48,7 +48,7 @@ class KDateTable; * @author Tim Gilman, Mirko Boehm * **/ -class KDEUI_EXPORT KDatePicker: public QFrame +class KDEUI_EXPORT KDatePicker: public TQFrame { Q_OBJECT Q_PROPERTY( TQDate date READ date WRITE setDate) @@ -60,7 +60,7 @@ public: * initially. **/ KDatePicker(TQWidget *parent=0, - QDate=TQDate::currentDate(), + TQDate=TQDate::currentDate(), const char *name=0); /** The usual constructor. The given date will be displayed @@ -90,7 +90,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * Sets the date. @@ -136,7 +136,7 @@ public: /** * By calling this method with @p enable = true, KDatePicker will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the KDatePicker's topLevelWidget()'s close() + * close-button will cause the KDatePicker's tqtopLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see hasCloseButton diff --git a/kdeui/kdatetbl.cpp b/kdeui/kdatetbl.cpp index bbf673a15..f5adc48d7 100644 --- a/kdeui/kdatetbl.cpp +++ b/kdeui/kdatetbl.cpp @@ -84,7 +84,7 @@ public: KDateValidator::KDateValidator(TQWidget* parent, const char* name) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { } @@ -124,7 +124,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags kdDebug() << "KDateTable ctor: WARNING: Given date is invalid, using current date." << endl; date_=TQDate::currentDate(); } - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -140,7 +140,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f) { d = new KDateTablePrivate; setFontSize(10); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -158,12 +158,12 @@ KDateTable::~KDateTable() void KDateTable::initAccels() { KAccel* accel = new KAccel(this, "date table accel"); - accel->insert(KStdAccel::Next, this, TQT_SLOT(nextMonth())); - accel->insert(KStdAccel::Prior, this, TQT_SLOT(previousMonth())); - accel->insert(KStdAccel::Home, this, TQT_SLOT(beginningOfMonth())); - accel->insert(KStdAccel::End, this, TQT_SLOT(endOfMonth())); - accel->insert(KStdAccel::BeginningOfLine, this, TQT_SLOT(beginningOfWeek())); - accel->insert(KStdAccel::EndOfLine, this, TQT_SLOT(endOfWeek())); + accel->insert(KStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth())); + accel->insert(KStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth())); + accel->insert(KStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth())); + accel->insert(KStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth())); + accel->insert(KStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek())); + accel->insert(KStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek())); accel->readSettings(); } @@ -233,7 +233,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) ( daynum == 6 && calendar->calendarName() == "gregorian" ) ) normalday=false; - TQBrush brushInvertTitle(colorGroup().base()); + TQBrush brushInvertTitle(tqcolorGroup().base()); TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); if (!normalday) @@ -250,7 +250,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } painter->drawText(0, 0, w, h-1, AlignCenter, calendar->weekDayName(daynum, true), -1, &rect); - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); painter->moveTo(0, h-1); painter->lineTo(w-1, h-1); // ----- draw the weekday: @@ -267,7 +267,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) // ° painting a day of the previous month or // ° painting a day of the following month // TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text. - painter->setPen( colorGroup().mid() ); + painter->setPen( tqcolorGroup().mid() ); // painter->setPen(gray); } else { // paint a day of the current month if ( d->useCustomColors ) @@ -292,9 +292,9 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) } painter->setPen( mode->fgColor ); } else - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all! - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); } pen=painter->pen(); @@ -308,25 +308,25 @@ KDateTable::paintCell(TQPainter *painter, int row, int col) // draw the currently selected date if (isEnabled()) { - painter->setPen(colorGroup().highlight()); - painter->setBrush(colorGroup().highlight()); + painter->setPen(tqcolorGroup().highlight()); + painter->setBrush(tqcolorGroup().highlight()); } else { - painter->setPen(colorGroup().text()); - painter->setBrush(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); + painter->setBrush(tqcolorGroup().text()); } - pen=colorGroup().highlightedText(); + pen=TQPen(tqcolorGroup().highlightedText()); } else { painter->setBrush(paletteBackgroundColor()); painter->setPen(paletteBackgroundColor()); -// painter->setBrush(colorGroup().base()); -// painter->setPen(colorGroup().base()); +// painter->setBrush(tqcolorGroup().base()); +// painter->setPen(tqcolorGroup().base()); } if ( pCellDate == TQDate::currentDate() ) { - painter->setPen(colorGroup().text()); + painter->setPen(tqcolorGroup().text()); } if ( paintRect ) painter->drawRect(0, 0, w, h); @@ -351,22 +351,22 @@ void KDateTable::previousMonth() void KDateTable::beginningOfMonth() { - setDate(date.addDays(1 - date.day())); + setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.day()))); } void KDateTable::endOfMonth() { - setDate(date.addDays(date.daysInMonth() - date.day())); + setDate(TQT_TQDATE_OBJECT(date.addDays(date.daysInMonth() - date.day()))); } void KDateTable::beginningOfWeek() { - setDate(date.addDays(1 - date.dayOfWeek())); + setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.dayOfWeek()))); } void KDateTable::endOfWeek() { - setDate(date.addDays(7 - date.dayOfWeek())); + setDate(TQT_TQDATE_OBJECT(date.addDays(7 - date.dayOfWeek()))); } void @@ -374,22 +374,22 @@ KDateTable::keyPressEvent( TQKeyEvent *e ) { switch( e->key() ) { case Key_Up: - setDate(date.addDays(-7)); + setDate(TQT_TQDATE_OBJECT(date.addDays(-7))); break; case Key_Down: - setDate(date.addDays(7)); + setDate(TQT_TQDATE_OBJECT(date.addDays(7))); break; case Key_Left: - setDate(date.addDays(-1)); + setDate(TQT_TQDATE_OBJECT(date.addDays(-1))); break; case Key_Right: - setDate(date.addDays(1)); + setDate(TQT_TQDATE_OBJECT(date.addDays(1))); break; case Key_Minus: - setDate(date.addDays(-1)); + setDate(TQT_TQDATE_OBJECT(date.addDays(-1))); break; case Key_Plus: - setDate(date.addDays(1)); + setDate(TQT_TQDATE_OBJECT(date.addDays(1))); break; case Key_N: setDate(TQDate::currentDate()); @@ -439,7 +439,7 @@ KDateTable::setFontSize(int size) maxCell.setHeight(QMAX(maxCell.height(), rect.height())); } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::fromLatin1("88")); + rect=metrics.boundingRect(TQString::tqfromLatin1("88")); maxCell.setWidth(QMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(QMAX(maxCell.height()+4, rect.height())); } @@ -447,7 +447,7 @@ KDateTable::setFontSize(int size) void KDateTable::wheelEvent ( TQWheelEvent * e ) { - setDate(date.addMonths( -(int)(e->delta()/120)) ); + setDate(TQT_TQDATE_OBJECT(date.addMonths( -(int)(e->delta()/120)) )); e->accept(); } @@ -536,7 +536,7 @@ KDateTable::setDate(const TQDate& date_) numDaysPrevMonth=calendar->daysInMonth(temp); if(changed) { - repaintContents(false); + tqrepaintContents(false); } return true; } @@ -547,28 +547,28 @@ KDateTable::getDate() const return date; } -// what are those repaintContents() good for? (pfeiffer) +// what are those tqrepaintContents() good for? (pfeiffer) void KDateTable::focusInEvent( TQFocusEvent *e ) { -// repaintContents(false); +// tqrepaintContents(false); TQGridView::focusInEvent( e ); } void KDateTable::focusOutEvent( TQFocusEvent *e ) { -// repaintContents(false); +// tqrepaintContents(false); TQGridView::focusOutEvent( e ); } -QSize -KDateTable::sizeHint() const +TQSize +KDateTable::tqsizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - kdDebug() << "KDateTable::sizeHint: obscure failure - " << endl; + kdDebug() << "KDateTable::tqsizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -596,7 +596,7 @@ void KDateTable::setCustomDatePainting(const TQDate &date, const TQColor &fgColo mode->fgColor=fgColor; mode->bgColor=bgColor; - d->customPaintingModes.replace( date.toString(), mode ); + d->customPaintingModes.tqreplace( date.toString(), mode ); d->useCustomColors=true; update(); } @@ -609,7 +609,7 @@ void KDateTable::unsetCustomDatePainting( const TQDate &date ) KDateInternalWeekSelector::KDateInternalWeekSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(this)), + val(new TQIntValidator(TQT_TQOBJECT(this))), result(0) { TQFont font; @@ -712,8 +712,8 @@ KDateInternalMonthPicker::KDateInternalMonthPicker } } -QSize -KDateInternalMonthPicker::sizeHint() const +TQSize +KDateInternalMonthPicker::tqsizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); @@ -756,7 +756,7 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) void KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) { - if(!isEnabled() || e->button() != LeftButton) + if(!isEnabled() || e->button() != Qt::LeftButton) { KNotifyClient::beep(); return; @@ -783,7 +783,7 @@ KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) void KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) { - if (e->state() & LeftButton) + if (e->state() & Qt::LeftButton) { int row, col; TQPoint mouseCoord; @@ -815,7 +815,7 @@ KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) updateCell( row, col /*, false */ ); // mark the new active cell } } - if ( tmpRow > -1 ) // repaint the former active cell + if ( tmpRow > -1 ) // tqrepaint the former active cell updateCell( tmpRow, tmpCol /*, true */ ); } } @@ -850,7 +850,7 @@ KDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) KDateInternalYearSelector::KDateInternalYearSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(this)), + val(new TQIntValidator(TQT_TQOBJECT(this))), result(0) { TQFont font; @@ -914,7 +914,7 @@ class KPopupFrame::KPopupFramePrivate }; KPopupFrame::KPopupFrame(TQWidget* parent, const char* name) - : TQFrame(parent, name, WType_Popup), + : TQFrame(parent, name, (WFlags)WType_Popup), result(0), // rejected main(0), d(new KPopupFramePrivate) @@ -935,7 +935,7 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e) { result=0; // rejected d->exec = false; - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -944,7 +944,7 @@ KPopupFrame::close(int r) { result=r; d->exec = false; - qApp->exit_loop(); + tqApp->exit_loop(); } void @@ -954,7 +954,7 @@ KPopupFrame::hide() if (d->exec) { d->exec = false; - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -1006,10 +1006,10 @@ int KPopupFrame::exec(TQPoint pos) { popup(pos); - repaint(); + tqrepaint(); d->exec = true; - const TQGuardedPtr<TQObject> that = this; - qApp->enter_loop(); + const TQGuardedPtr<TQObject> that = TQT_TQOBJECT(this); + tqApp->enter_loop(); if ( !that ) return TQDialog::Rejected; hide(); diff --git a/kdeui/kdatetbl.h b/kdeui/kdatetbl.h index 8827c0a00..8e7ca0022 100644 --- a/kdeui/kdatetbl.h +++ b/kdeui/kdatetbl.h @@ -37,7 +37,7 @@ class KPopupMenu; * @version $Id$ * @author Stephan Binner */ -class KDEUI_EXPORT KDateInternalWeekSelector : public QLineEdit +class KDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit { Q_OBJECT protected: @@ -64,7 +64,7 @@ private: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class KDEUI_EXPORT KDateInternalMonthPicker : public QGridView +class KDEUI_EXPORT KDateInternalMonthPicker : public TQGridView { Q_OBJECT protected: @@ -98,7 +98,7 @@ public: /** * The size hint. */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -137,7 +137,7 @@ private: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class KDEUI_EXPORT KDateInternalYearSelector : public QLineEdit +class KDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit { Q_OBJECT protected: @@ -163,7 +163,7 @@ private: * @author Tim Gilman, Mirko Boehm * @version $Id$ */ -class KDEUI_EXPORT KPopupFrame : public QFrame +class KDEUI_EXPORT KPopupFrame : public TQFrame { Q_OBJECT protected: @@ -238,7 +238,7 @@ private: /** * Validates user-entered dates. */ -class KDEUI_EXPORT KDateValidator : public QValidator +class KDEUI_EXPORT KDateValidator : public TQValidator { public: KDateValidator(TQWidget* parent=0, const char* name=0); @@ -260,7 +260,7 @@ public: * @version $Id$ * @author Tim Gilman, Mirko Boehm */ -class KDEUI_EXPORT KDateTable : public QGridView +class KDEUI_EXPORT KDateTable : public TQGridView { Q_OBJECT Q_PROPERTY( TQDate date READ getDate WRITE setDate ) @@ -289,9 +289,9 @@ public: * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * sizeHint() simply returns a multiple of maxCell. + * tqsizeHint() simply returns a multiple of maxCell. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Set the font size of the date table. */ diff --git a/kdeui/kdatetimewidget.cpp b/kdeui/kdatetimewidget.cpp index 76d92edd2..d7b677af9 100644 --- a/kdeui/kdatetimewidget.cpp +++ b/kdeui/kdatetimewidget.cpp @@ -52,8 +52,8 @@ void KDateTimeWidget::init() void KDateTimeWidget::setDateTime(const TQDateTime & datetime) { - d->dateWidget->setDate(datetime.date()); - d->timeWidget->setTime(datetime.time()); + d->dateWidget->setDate(TQT_TQDATE_OBJECT(datetime.date())); + d->timeWidget->setTime(TQT_TQTIME_OBJECT(datetime.time())); } TQDateTime KDateTimeWidget::dateTime() const diff --git a/kdeui/kdatetimewidget.h b/kdeui/kdatetimewidget.h index 5505f21af..5f14ddcef 100644 --- a/kdeui/kdatetimewidget.h +++ b/kdeui/kdatetimewidget.h @@ -37,7 +37,7 @@ * @version $Id$ * @since 3.2 */ -class KDEUI_EXPORT KDateTimeWidget : public QWidget +class KDEUI_EXPORT KDateTimeWidget : public TQWidget { Q_OBJECT Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime ) diff --git a/kdeui/kdatewidget.cpp b/kdeui/kdatewidget.cpp index ad6683e7f..5636c6596 100644 --- a/kdeui/kdatewidget.cpp +++ b/kdeui/kdatewidget.cpp @@ -31,13 +31,13 @@ #include "kdatewidget.h" -class KDateWidgetSpinBox : public QSpinBox +class KDateWidgetSpinBox : public TQSpinBox { public: KDateWidgetSpinBox(int min, int max, TQWidget *parent) : TQSpinBox(min, max, 1, parent) { - editor()->setAlignment(AlignRight); + editor()->tqsetAlignment(TQt::AlignRight); } }; diff --git a/kdeui/kdatewidget.h b/kdeui/kdatewidget.h index 3a7f04d05..63c5b1eea 100644 --- a/kdeui/kdatewidget.h +++ b/kdeui/kdatewidget.h @@ -33,7 +33,7 @@ * * @version $Id$ */ -class KDEUI_EXPORT KDateWidget : public QWidget +class KDEUI_EXPORT KDateWidget : public TQWidget { Q_OBJECT Q_PROPERTY( TQDate date READ date WRITE setDate ) diff --git a/kdeui/kdcopactionproxy.cpp b/kdeui/kdcopactionproxy.cpp index 15e431da3..2b20e8bd3 100644 --- a/kdeui/kdcopactionproxy.cpp +++ b/kdeui/kdcopactionproxy.cpp @@ -132,7 +132,7 @@ bool KDCOPActionProxy::processAction( const TQCString &, const TQCString &fun, c { replyType = "bool"; TQDataStream reply( replyData, IO_WriteOnly ); - reply << (Q_INT8)action->isPlugged(); + reply << (TQ_INT8)action->isPlugged(); return true; } diff --git a/kdeui/kdetrayproxy/kdetrayproxy.cpp b/kdeui/kdetrayproxy/kdetrayproxy.cpp index e49f3a148..bf2298fd3 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/kdeui/kdetrayproxy/kdetrayproxy.cpp @@ -57,11 +57,11 @@ void KDETrayProxy::windowAdded( WId w ) if ( !trayWinFor ) // not a KDE tray window return; // kdDebug() << "New tray window:" << w << endl; - if( !tray_windows.contains( w )) + if( !tray_windows.tqcontains( w )) tray_windows.append( w ); withdrawWindow( w ); // window will be removed from pending_windows when after docked - if( !pending_windows.contains( w )) + if( !pending_windows.tqcontains( w )) pending_windows.append( w ); docked_windows.remove( w ); Window owner = selection.owner(); @@ -87,21 +87,21 @@ bool KDETrayProxy::x11Event( XEvent* e ) { if( tray_windows.isEmpty()) return false; - if( e->type == DestroyNotify && tray_windows.contains( e->xdestroywindow.window )) + if( e->type == DestroyNotify && tray_windows.tqcontains( e->xdestroywindow.window )) { tray_windows.remove( e->xdestroywindow.window ); pending_windows.remove( e->xdestroywindow.window ); docked_windows.remove( e->xdestroywindow.window ); } - if( e->type == ReparentNotify && tray_windows.contains( e->xreparent.window )) + if( e->type == ReparentNotify && tray_windows.tqcontains( e->xreparent.window )) { if( e->xreparent.parent == qt_xrootwin()) { - if( !docked_windows.contains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) + if( !docked_windows.tqcontains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) { // kdDebug() << "Window released:" << e->xreparent.window << endl; docked_windows.remove( e->xreparent.window ); - if( !pending_windows.contains( e->xreparent.window )) + if( !pending_windows.tqcontains( e->xreparent.window )) pending_windows.append( e->xreparent.window ); } } @@ -111,9 +111,9 @@ bool KDETrayProxy::x11Event( XEvent* e ) pending_windows.remove( e->xreparent.window ); } } - if( e->type == UnmapNotify && tray_windows.contains( e->xunmap.window )) + if( e->type == UnmapNotify && tray_windows.tqcontains( e->xunmap.window )) { - if( docked_windows.contains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) + if( docked_windows.tqcontains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) { // kdDebug() << "Window unmapped:" << e->xunmap.window << endl; XReparentWindow( qt_xdisplay(), e->xunmap.window, qt_xrootwin(), 0, 0 ); diff --git a/kdeui/kdetrayproxy/kdetrayproxy.h b/kdeui/kdetrayproxy/kdetrayproxy.h index 49a7164cc..8500bcb4f 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.h +++ b/kdeui/kdetrayproxy/kdetrayproxy.h @@ -26,7 +26,7 @@ #include <tqwidget.h> class KDETrayProxy - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/kdeui/kdialog.cpp b/kdeui/kdialog.cpp index 5963a415d..53ca255bb 100644 --- a/kdeui/kdialog.cpp +++ b/kdeui/kdialog.cpp @@ -62,7 +62,7 @@ void KDialog::keyPressEvent(TQKeyEvent *e) case Key_Enter: case Key_Return: { - if(testWFlags(WType_Dialog | WShowModal)) + if(testWFlags((WFlags)(WType_Dialog | WShowModal))) { TQDialog::keyPressEvent(e); } @@ -134,13 +134,13 @@ void KDialog::resizeLayout( TQWidget *w, int margin, int spacing ) { if( w->layout() ) { - resizeLayout( w->layout(), margin, spacing ); + resizeLayout( TQT_TQLAYOUTITEM(w->layout()), margin, spacing ); } - if( w->children() ) + if( !w->childrenListObject().isEmpty() ) { - const TQObjectList * const l = w->children(); - TQObjectListIterator itr(*l); + const TQObjectList l = w->childrenListObject(); + TQObjectListIterator itr(l); TQObject *o; while ((o = itr.current()) != 0) { if( o->isWidgetType() ) diff --git a/kdeui/kdialog.h b/kdeui/kdialog.h index d74b232ce..cea1532e7 100644 --- a/kdeui/kdialog.h +++ b/kdeui/kdialog.h @@ -48,7 +48,7 @@ class TQLayoutItem; * @see KDialogBase * @author Thomas Tanghus <tanghus@earthling.net>, Espen Sand <espensa@online.no> */ -class KDEUI_EXPORT KDialog : public QDialog +class KDEUI_EXPORT KDialog : public TQDialog { Q_OBJECT @@ -185,7 +185,7 @@ class KDEUI_EXPORT KDialog : public QDialog * @author Waldo Bastian <bastian@kde.org> */ class KDialogQueuePrivate; -class KDEUI_EXPORT KDialogQueue : public QObject +class KDEUI_EXPORT KDialogQueue : public TQObject { Q_OBJECT diff --git a/kdeui/kdialogbase.cpp b/kdeui/kdialogbase.cpp index 202de5f9b..264a9992e 100644 --- a/kdeui/kdialogbase.cpp +++ b/kdeui/kdialogbase.cpp @@ -60,7 +60,7 @@ template class TQPtrList<KDialogBaseButton>; */ namespace { -struct SButton : public Qt +struct SButton : public TQt { SButton() { @@ -101,10 +101,10 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal, ButtonCode defaultButton, bool separator, const KGuiItem &user1, const KGuiItem &user2, const KGuiItem &user3 ) - :KDialog( parent, name, modal, WStyle_DialogBorder ), + :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); @@ -123,10 +123,10 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption, TQWidget *parent, const char *name, bool modal, bool separator, const KGuiItem &user1, const KGuiItem &user2, const KGuiItem &user3 ) - :KDialog( parent, name, modal, WStyle_DialogBorder ), + :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); @@ -155,7 +155,7 @@ KDialogBase::KDialogBase( KDialogBase::DialogType dialogFace, WFlags f, TQWidge :KDialog( parent, name, modal, f ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(false), - mButtonOrientation(Horizontal), d(new KDialogBasePrivate) + mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate) { setCaption( caption ); @@ -180,10 +180,10 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask, TQWidget *parent, const char *name, bool modal, bool separator, const KGuiItem &yes, const KGuiItem &no, const KGuiItem &cancel ) - :KDialog( parent, name, modal, WStyle_DialogBorder ), + :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ), mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0), mIsActivated(false), mShowTile(false), mMessageBoxMode(true), - mButtonOrientation(Horizontal),mEscapeButton(escapeButton), + mButtonOrientation(Qt::Horizontal),mEscapeButton(escapeButton), d(new KDialogBasePrivate) { setCaption( caption ); @@ -230,16 +230,16 @@ void SButton::resize( bool sameWidth, int margin, for( p = list.first(); p; p = list.next() ) { - const TQSize s( p->sizeHint() ); + const TQSize s( p->tqsizeHint() ); if( s.height() > h ) { h = s.height(); } if( s.width() > w ) { w = s.width(); } } - if( orientation == Horizontal ) + if( orientation == Qt::Horizontal ) { for( p = list.first(); p; p = list.next() ) { - TQSize s( p->sizeHint() ); + TQSize s( p->tqsizeHint() ); if( sameWidth ) { s.setWidth( w ); } p->setFixedWidth( s.width() ); t += s.width() + spacing; @@ -253,7 +253,7 @@ void SButton::resize( bool sameWidth, int margin, // sameWidth has no effect here for( p = list.first(); p; p = list.next() ) { - TQSize s( p->sizeHint() ); + TQSize s( p->tqsizeHint() ); s.setWidth( w ); p->setFixedSize( s ); t += s.height() + spacing; @@ -299,7 +299,7 @@ void KDialogBase::setupLayout() // mTopLayout = new TQVBoxLayout( this, marginHint(), spacingHint() ); - if( mButtonOrientation == Horizontal ) + if( mButtonOrientation == Qt::Horizontal ) { mTopLayout = new TQBoxLayout( this, TQBoxLayout::TopToBottom, marginHint(), spacingHint() ); @@ -349,10 +349,10 @@ void KDialogBase::setButtonBoxOrientation( int orientation ) mButtonOrientation = orientation; if( mActionSep ) { - mActionSep->setOrientation( mButtonOrientation == Horizontal ? + mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); } - if( mButtonOrientation == Vertical ) + if( mButtonOrientation == Qt::Vertical ) { enableLinkedHelp(false); // 2000-06-18 Espen: No support for this yet. } @@ -381,7 +381,7 @@ void KDialogBase::makeRelay() if( mTile ) { connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); - connect( qApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); + connect( tqApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); } } @@ -395,8 +395,8 @@ void KDialogBase::enableButtonSeparator( bool state ) return; } mActionSep = new KSeparator( this ); - mActionSep->setFocusPolicy(TQWidget::NoFocus); - mActionSep->setOrientation( mButtonOrientation == Horizontal ? + mActionSep->setFocusPolicy(TQ_NoFocus); + mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); mActionSep->show(); } @@ -429,17 +429,17 @@ void KDialogBase::adjustSize() // if (layout()) // layout()->activate(); if( d->bFixed ) - setFixedSize( sizeHint() ); + setFixedSize( tqsizeHint() ); else - resize( sizeHint() ); + resize( tqsizeHint() ); } -TQSize KDialogBase::sizeHint() const +TQSize KDialogBase::tqsizeHint() const { - return d->minSize.expandedTo( minimumSizeHint() ) + d->incSize; + return d->minSize.expandedTo( tqminimumSizeHint() ) + d->incSize; } -TQSize KDialogBase::minimumSizeHint() const +TQSize KDialogBase::tqminimumSizeHint() const { const int m = marginHint(); const int s = spacingHint(); @@ -454,7 +454,7 @@ TQSize KDialogBase::minimumSizeHint() const // if( mUrlHelp ) { - s2 = mUrlHelp->minimumSize() + zeroByS; + s2 = mUrlHelp->tqminimumSize() + zeroByS; } s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); @@ -464,13 +464,13 @@ TQSize KDialogBase::minimumSizeHint() const // if( mJanus ) { - s2 = mJanus->minimumSizeHint() + zeroByS; + s2 = mJanus->tqminimumSizeHint() + zeroByS; } else if( mMainWidget ) { - s2 = mMainWidget->sizeHint() + zeroByS; - s2 = s2.expandedTo( mMainWidget->minimumSize() ); - s2 = s2.expandedTo( mMainWidget->minimumSizeHint() ); + s2 = mMainWidget->tqsizeHint() + zeroByS; + s2 = s2.expandedTo( mMainWidget->tqminimumSize() ); + s2 = s2.expandedTo( mMainWidget->tqminimumSizeHint() ); if( s2.isEmpty() ) { s2 = TQSize( 100, 100+s ); @@ -485,9 +485,9 @@ TQSize KDialogBase::minimumSizeHint() const if (d->detailsWidget && d->bDetails) { - s2 = d->detailsWidget->sizeHint() + zeroByS; - s2 = s2.expandedTo( d->detailsWidget->minimumSize() ); - s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() ); + s2 = d->detailsWidget->tqsizeHint() + zeroByS; + s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() ); + s2 = s2.expandedTo( d->detailsWidget->tqminimumSizeHint() ); s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); } @@ -497,7 +497,7 @@ TQSize KDialogBase::minimumSizeHint() const // if( mActionSep ) { - s1.rheight() += mActionSep->minimumSize().height() + s; + s1.rheight() += mActionSep->tqminimumSize().height() + s; } // @@ -505,8 +505,8 @@ TQSize KDialogBase::minimumSizeHint() const // if( d->mButton.box ) { - s2 = d->mButton.box->minimumSize(); - if( mButtonOrientation == Horizontal ) + s2 = d->mButton.box->tqminimumSize(); + if( mButtonOrientation == Qt::Horizontal ) { s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rheight() += s2.rheight(); @@ -530,7 +530,7 @@ TQSize KDialogBase::minimumSizeHint() const void KDialogBase::disableResize() { - setFixedSize( sizeHint() ); + setFixedSize( tqsizeHint() ); } @@ -586,7 +586,7 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, } if( d->mButton.mask & Details ) { - KPushButton *pb = d->mButton.append( Details, TQString::null ); + KPushButton *pb = d->mButton.append( Details, TQString() ); connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()) ); setDetails(false); } @@ -686,7 +686,7 @@ void KDialogBase::setButtonStyle( int style ) layoutMax = 6; layout = layoutRule[ d->mButton.style ]; } - else if (mButtonOrientation == Horizontal) + else if (mButtonOrientation == Qt::Horizontal) { static const int layoutRule[5][10] = { @@ -720,7 +720,7 @@ void KDialogBase::setButtonStyle( int style ) } TQBoxLayout *lay; - if( mButtonOrientation == Horizontal ) + if( mButtonOrientation == Qt::Horizontal ) { lay = new TQBoxLayout( d->mButton.box, TQBoxLayout::LeftToRight, 0, spacingHint()); @@ -748,7 +748,7 @@ void KDialogBase::setButtonStyle( int style ) { newButton = actionButton( (ButtonCode) (layout[i] & ~(Stretch | Filler))); if (newButton) - lay->addSpacing(newButton->sizeHint().width()); + lay->addSpacing(newButton->tqsizeHint().width()); } continue; } @@ -1113,7 +1113,7 @@ void KDialogBase::setDetailsWidget(TQWidget *detailsWidget) { delete d->detailsWidget; d->detailsWidget = detailsWidget; - if (d->detailsWidget->parentWidget() != this) + if (d->detailsWidget->tqparentWidget() != this) d->detailsWidget->reparent(this, TQPoint(0,0)); d->detailsWidget->hide(); if( mIsActivated ) @@ -1492,10 +1492,10 @@ TQRect KDialogBase::getContentsRect() const r.setLeft( marginHint() ); r.setTop( marginHint() + (mUrlHelp ? mUrlHelp->height() : 0) ); r.setRight( width() - marginHint() ); - int h = (!mActionSep ? 0 : mActionSep->minimumSize().height()+marginHint()); + int h = (!mActionSep ? 0 : mActionSep->tqminimumSize().height()+marginHint()); if( d->mButton.box ) { - r.setBottom( height() - d->mButton.box->minimumSize().height() - h ); + r.setBottom( height() - d->mButton.box->tqminimumSize().height() - h ); } else { @@ -1513,14 +1513,14 @@ void KDialogBase::getBorderWidths(int& ulx, int& uly, int& lrx, int& lry) const uly = marginHint(); if( mUrlHelp ) { - uly += mUrlHelp->minimumSize().height(); + uly += mUrlHelp->tqminimumSize().height(); } lrx = marginHint(); - lry = d->mButton.box ? d->mButton.box->minimumSize().height() : 0; + lry = d->mButton.box ? d->mButton.box->tqminimumSize().height() : 0; if( mActionSep ) { - lry += mActionSep->minimumSize().height() + marginHint(); + lry += mActionSep->tqminimumSize().height() + marginHint(); } } @@ -1748,15 +1748,15 @@ TQSize KDialogBase::configDialogSize( KConfig& config, const TQString& groupName ) const { int w, h; - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); - w = sizeHint().width(); - h = sizeHint().height(); + w = tqsizeHint().width(); + h = tqsizeHint().height(); KConfigGroupSaver cs(&config, groupName); - w = config.readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w ); - h = config.readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h ); + w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w ); + h = config.readNumEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), h ); return TQSize( w, h ); } @@ -1771,15 +1771,15 @@ void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName, bool global ) const { - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); KConfigGroupSaver cs(&config, groupName); TQSize sizeToSave = size(); - config.writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()), + config.writeEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), TQString::number( sizeToSave.width()), true, global); - config.writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()), + config.writeEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), TQString::number( sizeToSave.height()), true, global); } diff --git a/kdeui/kdialogbase.h b/kdeui/kdialogbase.h index ea4b21955..bd49764bb 100644 --- a/kdeui/kdialogbase.h +++ b/kdeui/kdialogbase.h @@ -100,7 +100,7 @@ class KDialogBaseTile; * signals that are related to the standard action buttons will be used * when you don't use these buttons. * - * <b>Dialog shapes:</b>\n + * <b>Dialog tqshapes:</b>\n * * You can either use one of the prebuilt, easy to use, faces or * define your own main widget. The dialog provides ready to use @@ -426,8 +426,8 @@ class KDEUI_EXPORT KDialogBase : public KDialog * resized before showing it. **/ virtual void adjustSize(); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * Retrieve the empty page when the predefined layout is used in @p Plain @@ -733,7 +733,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * Sets the page with @p index to be displayed. * * This method will only - * work when the dialog is using the predefined shape of TreeList, + * work when the dialog is using the predefined tqshape of TreeList, * IconList or Tabbed. * * @param index Index of the page to be shown. @@ -745,7 +745,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * Returns the index of the active page. * * This method will only work when the dialog is using the - * predefined shape of Tabbed, TreeList or IconList. + * predefined tqshape of Tabbed, TreeList or IconList. * * @return The page index or -1 if there is no active page. */ @@ -828,7 +828,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog /** * read the dialogs size from the configuration according to the screen size. - * If no size is saved for one dimension of the screen, sizeHint() is returned. + * If no size is saved for one dimension of the screen, tqsizeHint() is returned. * * @param groupName Name of the group to read from. The old group * of KGlobal::config is preserved. @@ -837,7 +837,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog /** * read the dialogs size from the configuration according to the screen size. - * If no size is saved for one dimension of the screen, sizeHint() is returned. + * If no size is saved for one dimension of the screen, tqsizeHint() is returned. * * @param config The KConfig object to read from * @param groupName Name of the group to read from. The old group @@ -1167,7 +1167,7 @@ class KDEUI_EXPORT KDialogBase : public KDialog * set it as a minimum size for the resulting dialog. * * You should not need to use this method and never if you use one of - * the predefined shapes. + * the predefined tqshapes. * * @param w The width of you special widget. * @param h The height of you special widget. diff --git a/kdeui/kdialogbase_priv.h b/kdeui/kdialogbase_priv.h index a5bbf31be..d38ef884a 100644 --- a/kdeui/kdialogbase_priv.h +++ b/kdeui/kdialogbase_priv.h @@ -45,7 +45,7 @@ class KDEUI_EXPORT KDialogBaseButton : public KPushButton * Used internally by KDialogBase. * @internal */ -class KDEUI_EXPORT KDialogBaseTile : public QObject +class KDEUI_EXPORT KDialogBaseTile : public TQObject { Q_OBJECT diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index dc5213c3c..5629d5cf8 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); paint.end(); } @@ -219,7 +219,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #ifdef BORDERLESS_WINDOWS setCursor(TQCursor(ArrowCursor)); #endif - d = new KDockWidgetHeaderPrivate( this ); + d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); layout = new TQHBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); @@ -228,7 +228,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) closeButton = new KDockButton_Private( this, "DockCloseButton" ); TQToolTip::add( closeButton, i18n("Close") ); - closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); + closeButton->setPixmap( tqstyle().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); @@ -266,7 +266,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) layout->addWidget( closeButton ); layout->activate(); d->dummy->hide(); - drag->setFixedHeight( layout->minimumSize().height() ); + drag->setFixedHeight( layout->tqminimumSize().height() ); } void KDockWidgetHeader::setTopLevel( bool isTopLevel ) @@ -323,7 +323,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) delete drag; drag = nd; - if (drag->parentWidget()!=this) { + if (drag->tqparentWidget()!=this) { drag->reparent(this,TQPoint(0,0)); } @@ -343,19 +343,19 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); layout->addWidget( closeButton ); layout->activate(); - kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl; + kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->tqminimumSize().height()<<endl; //FIXME somebody left this here, but we don't know what the hell it's for. - drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() ); + drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/tqsizeHint().height() ); } void KDockWidgetHeader::addButton(KDockButton_Private* btn) { if (!btn) return; - if (btn->parentWidget()!=this) { + if (btn->tqparentWidget()!=this) { btn->reparent(this,TQPoint(0,0)); } btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - if (!d->btns.containsRef(btn)) d->btns.append(btn); + if (!d->btns.tqcontainsRef(btn)) d->btns.append(btn); btn->show(); @@ -378,12 +378,12 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); layout->addWidget( closeButton ); layout->activate(); - drag->setFixedHeight( layout->minimumSize().height() ); + drag->setFixedHeight( layout->tqminimumSize().height() ); } void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { - if (btn->parentWidget()==this) { - if (d->btns.containsRef(btn)) d->btns.removeRef(btn); + if (btn->tqparentWidget()==this) { + if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn); delete btn; } } @@ -422,12 +422,12 @@ void KDockWidgetHeader::setDragEnabled(bool b) #ifndef NO_KDE2 void KDockWidgetHeader::saveConfig( KConfig* c ) { - c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() ); + c->writeEntry( TQString("%1%2").arg(tqparent()->name()).arg(":stayButton"), stayButton->isOn() ); } void KDockWidgetHeader::loadConfig( KConfig* c ) { - setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) ); + setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(tqparent()->name()).arg(":stayButton"), false ) ); } #endif @@ -498,7 +498,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( this ); + manager->childDock->append( TQT_TQOBJECT(this) ); installEventFilter( manager ); eDocking = DockFullDocking; @@ -562,8 +562,8 @@ KDockWidget::~KDockWidget() } } emit iMBeingClosed(); - if (manager->d) manager->d->containerDocks.remove(this); - manager->childDock->remove( this ); + if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this)); + manager->childDock->remove(TQT_TQOBJECT(this)); delete pix; delete d; // destroy private data d=0; @@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe) TQWidget::paintEvent(pe); TQPainter paint; paint.begin( this ); - style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); + tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup()); paint.end(); } @@ -601,7 +601,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme) int styleheight; TQPoint mp; mp=mme->pos(); - styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); + styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this); bbottom=mp.y()>=height()-styleheight; btop=mp.y()<=styleheight; bleft=mp.x()<=styleheight; @@ -689,7 +689,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme) int styleheight; TQPoint mp; mp=mme->pos(); - styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); + styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this); bbottom=mp.y()>=height()-styleheight; btop=mp.y()<=styleheight; bleft=mp.x()<=styleheight; @@ -791,7 +791,7 @@ void KDockWidget::updateHeader() header->setTopLevel( true ); header->show(); #ifdef BORDERLESS_WINDOWS - layout->setMargin(2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this)); + layout->setMargin(2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this)); setMouseTracking(true); #endif } @@ -858,7 +858,7 @@ void KDockWidget::show() void KDockWidget::setDockWindowType (NET::WindowType windowType) { d->windowType = windowType; - applyToWidget( parentWidget(), TQPoint(0,0) ); + applyToWidget( tqparentWidget(), TQPoint(0,0) ); } #endif @@ -867,7 +867,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnable { d->_parent = parent; d->transient = transientEnabled; - applyToWidget( parentWidget(), TQPoint(0,0) ); + applyToWidget( tqparentWidget(), TQPoint(0,0) ); } TQWidget *KDockWidget::transientTo() { @@ -898,7 +898,7 @@ bool KDockWidget::event( TQEvent *event ) emit manager->change(); break; case TQEvent::CaptionChange: - if ( parentWidget() ){ + if ( tqparentWidget() ){ if ( parent()->inherits("KDockSplitter") ){ ((KDockSplitter*)(parent()))->updateName(); } @@ -921,7 +921,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) { if (!parent()) return 0; if (!parent()->inherits("KDockSplitter")) return 0; - Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? Vertical:Horizontal; + Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? Qt::Vertical:Qt::Horizontal; if (((KDockSplitter*)(parent()))->orientation()==orientation) { KDockWidget *neighbor= @@ -932,7 +932,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) if (neighbor==this) return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos)); else - if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup"))) + if (neighbor->getWidget() && (neighbor->getWidget()->tqqt_cast("KDockTabGroup"))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); else return neighbor; @@ -1091,8 +1091,8 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, } // create a new dockwidget that will contain the target and this - TQWidget* parentDock = target->parentWidget(); - KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(""), parentDock ); + TQWidget* parentDock = target->tqparentWidget(); + KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock ); newDock->currentDockPos = target->currentDockPos; if ( dockPos == KDockWidget::DockCenter ){ @@ -1161,13 +1161,13 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, // if to dock not to the center of the target dockwidget, // dock to newDock KDockSplitter* panner = 0L; - if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", Horizontal, spliPos ); - if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", Vertical , spliPos ); + if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Horizontal, spliPos ); + if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Vertical , spliPos ); newDock->setWidget( panner ); panner->setOpaqueResize(manager->splitterOpaqueResize()); panner->setKeepSize(manager->splitterKeepSize()); - panner->setFocusPolicy( NoFocus ); + panner->setFocusPolicy( TQ_NoFocus ); target->applyToWidget( panner ); applyToWidget( panner ); target->formerDockPos = target->currentDockPos; @@ -1218,7 +1218,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, KDockTabGroup* KDockWidget::parentDockTabGroup() const { if ( !parent() ) return 0L; - TQWidget* candidate = parentWidget()->parentWidget(); + TQWidget* candidate = tqparentWidget()->tqparentWidget(); if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate; return 0L; } @@ -1226,7 +1226,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const TQWidget *KDockWidget::parentDockContainer() const { if (!parent()) return 0L; - TQWidget* candidate = parentWidget()->parentWidget(); + TQWidget* candidate = tqparentWidget()->tqparentWidget(); if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate; return 0L; } @@ -1238,7 +1238,7 @@ void KDockWidget::setForcedFixedWidth(int w) setFixedWidth(w); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); + static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); } void KDockWidget::setForcedFixedHeight(int h) @@ -1247,7 +1247,7 @@ void KDockWidget::setForcedFixedHeight(int h) setFixedHeight(h); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); + static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); } int KDockWidget::forcedFixedWidth() @@ -1270,7 +1270,7 @@ void KDockWidget::restoreFromForcedFixedSize() setMaximumHeight(32000); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); + static_cast<KDockSplitter*>(tqparent()->tqqt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); } void KDockWidget::toDesktop() @@ -1295,7 +1295,7 @@ void KDockWidget::undock() manager->d->dragRect = TQRect (); manager->drawDragRectangle (); - TQWidget* parentW = parentWidget(); + TQWidget* parentW = tqparentWidget(); if ( !parentW ){ hide(); if (!d->blockHasUndockedSignal) @@ -1337,7 +1337,7 @@ void KDockWidget::undock() KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent(); delete parentTab; // KDockTabGroup - TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); + TQWidget* parentOfDockWidget = parentOfTab->tqparentWidget(); if ( !parentOfDockWidget ){ if ( isV ) lastTab->show(); } else { @@ -1347,13 +1347,13 @@ void KDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation == Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation == Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); @@ -1396,16 +1396,16 @@ void KDockWidget::undock() d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this ); - KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->parentWidget(); + KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->tqparentWidget(); setFormerBrotherDockWidget(secondWidget); applyToWidget( 0L ); group->hide(); - if ( !group->parentWidget() ){ + if ( !group->tqparentWidget() ){ secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() ); secondWidget->resize( group->width(), group->height() ); } else { - TQWidget* obj = group->parentWidget(); + TQWidget* obj = group->tqparentWidget(); secondWidget->applyToWidget( obj ); if ( obj->inherits("KDockSplitter") ){ KDockSplitter* parentOfGroup = (KDockSplitter*)obj; @@ -1466,7 +1466,7 @@ void KDockWidget::setWidget( TQWidget* mw ) if (dc) { d->isContainer=true; - manager->d->containerDocks.append(this); + manager->d->containerDocks.append(TQT_TQOBJECT(this)); } else { @@ -1494,13 +1494,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) listOfCaption.remove( listOfCaption.length()-1, 1 ); listOfName.remove( listOfName.length()-1, 1 ); - tab->parentWidget()->setName( listOfName.utf8() ); - tab->parentWidget()->setCaption( listOfCaption ); + tab->tqparentWidget()->setName( listOfName.utf8() ); + tab->tqparentWidget()->setCaption( listOfCaption ); - tab->parentWidget()->repaint( false ); // KDockWidget->repaint - if ( tab->parentWidget()->parent() ) - if ( tab->parentWidget()->parent()->inherits("KDockSplitter") ) - ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName(); + tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint + if ( tab->tqparentWidget()->parent() ) + if ( tab->tqparentWidget()->parent()->inherits("KDockSplitter") ) + ((KDockSplitter*)(tab->tqparentWidget()->parent()))->updateName(); } bool KDockWidget::mayBeHide() const @@ -1545,11 +1545,11 @@ void KDockWidget::makeDockVisible() } if ( isVisible() ) return; - TQWidget* p = parentWidget(); + TQWidget* p = tqparentWidget(); while ( p ){ if ( !p->isVisible() ) p->show(); - p = p->parentWidget(); + p = p->tqparentWidget(); } if( !parent() ) // is undocked dockBack(); @@ -1570,7 +1570,7 @@ void KDockWidget::loseFormerBrotherDockWidget() TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), this, TQT_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; - repaint(); + tqrepaint(); } void KDockWidget::dockBack() @@ -1719,11 +1719,11 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; case TQEvent::MouseButtonPress: - if ( ((TQMouseEvent*)event)->button() == LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ if ( curdw->eDocking != (int)KDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); - qApp->processOneEvent(); + tqApp->processOneEvent(); currentDragWidget = curdw; currentMoveWidget = 0L; @@ -1744,7 +1744,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) } break; case TQEvent::MouseButtonRelease: - if ( ((TQMouseEvent*)event)->button() == LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ if ( dragging ){ if ( !dropCancel ) drop(); @@ -1822,7 +1822,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; } - if ( (((TQMouseEvent*)event)->state() == LeftButton) && + if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) && (curdw->eDocking != (int)KDockWidget::DockNone) ) { startDrag( curdw); } @@ -1850,7 +1850,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) return 0L; } #if defined(_OS_WIN32_) || defined(Q_OS_WIN32) - p = p->topLevelWidget(); + p = p->tqtopLevelWidget(); #endif TQWidget* w = 0L; findChildDockWidget( w, p, p->mapFromGlobal(pos) ); @@ -1860,12 +1860,12 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( qt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( qt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; if (dynamic_cast<KDockContainer*>(w)) return 0L; if (!childDockWidgetList) return 0L; - if ( childDockWidgetList->find(w) != -1 ) return 0L; + if ( childDockWidgetList->tqfind(w) != -1 ) return 0L; if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L; KDockWidget* www = (KDockWidget*)w; @@ -1903,14 +1903,14 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const TQPoint& pos ) { - if ( p->children() ) { + if ( !p->childrenListObject().isEmpty() ) { TQWidget *w; - TQObjectListIt it( *p->children() ); + TQObjectListIt it( p->childrenListObject() ); it.toLast(); while ( it.current() ) { if ( it.current()->isWidgetType() ) { w = (TQWidget*)it.current(); - if ( w->isVisible() && w->geometry().contains(pos) ) { + if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) { if ( w->inherits("KDockWidget") ) ww = w; findChildDockWidget( ww, w, w->mapFromParent(pos) ); return; @@ -1924,9 +1924,9 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const void KDockManager::findChildDockWidget( const TQWidget* p, TQWidgetList*& list ) { - if ( p->children() ) { + if ( !p->childrenListObject().isEmpty() ) { TQWidget *w; - TQObjectListIt it( *p->children() ); + TQObjectListIt it( p->childrenListObject() ); it.toLast(); while ( it.current() ) { if ( it.current()->isWidgetType() ) { @@ -1948,8 +1948,8 @@ void KDockManager::startDrag( KDockWidget* w ) || ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) { w->prevSideDockPosBeforeDrag = w->currentDockPos; - if ( w->parentWidget()->inherits("KDockSplitter") ){ - KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget()); + if ( w->tqparentWidget()->inherits("KDockSplitter") ){ + KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget()); w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); } } @@ -1957,7 +1957,7 @@ void KDockManager::startDrag( KDockWidget* w ) curPos = KDockWidget::DockDesktop; dragging = true; - TQApplication::setOverrideCursor(TQCursor(sizeAllCursor)); + TQApplication::setOverrideCursor(TQCursor(tqsizeAllCursor)); } void KDockManager::dragMove( KDockWidget* dw, TQPoint pos ) @@ -2105,7 +2105,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b) { - return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false")); + return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false")); } @@ -2144,7 +2144,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName, TQStrListIterator it(list); for (; it.current(); ++it) { TQDomElement subel = doc.createElement(subTagName); - subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current()))); + subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current()))); el.appendChild(subel); } @@ -2214,7 +2214,7 @@ void KDockManager::writeConfig(TQDomElement &base) KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { if ( obj1->parent() == main ) - mainWidgetStr = TQString::fromLatin1(obj1->name()); + mainWidgetStr = TQString::tqfromLatin1(obj1->name()); nList.append(obj1->name()); ++it; } @@ -2230,8 +2230,8 @@ void KDockManager::writeConfig(TQDomElement &base) TQStringList::Iterator nListIt=nList.begin(); while ( nListIt!=nList.end() ) { KDockWidget *obj = getDockWidgetFromName( *nListIt); - if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1 - || nameList.find(obj->lastName.latin1()) == -1)) { + if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.tqfind( obj->firstName.latin1() ) == -1 + || nameList.tqfind(obj->lastName.latin1()) == -1)) { // Skip until children are saved (why?) ++nListIt; // nList.next(); @@ -2279,7 +2279,7 @@ void KDockManager::writeConfig(TQDomElement &base) } } - groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name()))); + groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name()))); groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent())); if ( !obj->parent() ) { groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); @@ -2401,7 +2401,7 @@ void KDockManager::readConfig(TQDomElement &base) KDockWidget *second = getDockWidgetFromName(secondName); if (first && second) { obj = first->manualDock(second, - (orientation == (int)Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, + (orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, separatorPos); if (obj) obj->setName(name.latin1()); @@ -2512,7 +2512,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget) { if (!autoCreateDock) return; autoCreateDock->setAutoDelete(false); - autoCreateDock->removeRef(pDockWidget); + autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget)); autoCreateDock->setAutoDelete(true); } @@ -2578,7 +2578,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } /*************************************************************************************************/ if ( obj->isGroup ){ - if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){ + if ( (findList.tqfind( obj->firstName ) != findList.end()) && (findList.tqfind( obj->lastName ) != findList.end() )){ c->writeEntry( cname+":type", "GROUP"); if ( !obj->parent() ){ @@ -2601,9 +2601,9 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } else { /*************************************************************************************************/ //debug(" Skip %s", nList.current()); - //if ( findList.find( obj->firstName ) == -1 ) + //if ( findList.tqfind( obj->firstName ) == -1 ) // debug(" ? Not found %s", obj->firstName); - //if ( findList.find( obj->lastName ) == -1 ) + //if ( findList.tqfind( obj->lastName ) == -1 ) // debug(" ? Not found %s", obj->lastName); ++nListIt; // if ( !nList.current() ) nList.first(); @@ -2758,7 +2758,7 @@ void KDockManager::readConfig( KConfig* c, TQString group ) Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" ); if ( first && last ){ - obj = first->manualDock( last, ( p == Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); + obj = first->manualDock( last, ( p == Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); if (obj){ obj->setName( oname.latin1() ); } @@ -2889,8 +2889,8 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName ) KDockWidget* autoCreate = 0L; if ( autoCreateDock ){ kdDebug(282)<<"Autocreating dock: "<<dockName<<endl; - autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap("") ); - autoCreateDock->append( autoCreate ); + autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) ); + autoCreateDock->append( TQT_TQOBJECT(autoCreate) ); } return autoCreate; } @@ -2936,13 +2936,13 @@ void KDockManager::slotMenuPopup() ++it; if ( obj->mayBeHide() ) { - menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Hide %1").arg(obj->caption()), numerator++ ); + menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), TQString(i18n("Hide %1").arg(obj->caption())), numerator++ ); menuData->append( new MenuDockData( obj, true ) ); } if ( obj->mayBeShow() ) { - menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Show %1").arg(obj->caption()), numerator++ ); + menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), TQString(i18n("Show %1").arg(obj->caption())), numerator++ ); menuData->append( new MenuDockData( obj, false ) ); } } @@ -2994,14 +2994,14 @@ void KDockManager::drawDragRectangle() KDockMainWindow* pMain = 0L; KDockWidget* pTLDockWdg = 0L; TQWidget* topWdg; - if (pDockWdgAtRect->topLevelWidget() == main) { + if (pDockWdgAtRect->tqtopLevelWidget() == main) { isOverMainWdg = true; topWdg = pMain = (KDockMainWindow*) main; unclipped = pMain->testWFlags( WPaintUnclipped ); pMain->setWFlags( WPaintUnclipped ); } else { - topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget(); + topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget(); unclipped = pTLDockWdg->testWFlags( WPaintUnclipped ); pTLDockWdg->setWFlags( WPaintUnclipped ); } @@ -3016,7 +3016,7 @@ void KDockManager::drawDragRectangle() pTLDockWdg->clearWFlags(WPaintUnclipped); } // draw the rectangle - p.setRasterOp(Qt::NotXorROP); + p.setRasterOp(TQt::NotXorROP); TQRect r = oldAndNewDragRect[i]; r.moveTopLeft( r.topLeft() - topWdg->mapToGlobal(TQPoint(0,0)) ); p.drawRect(r.x(), r.y(), r.width(), r.height()); @@ -3101,7 +3101,7 @@ void KDockArea::slotDockWidgetUndocked() void KDockArea::resizeEvent(TQResizeEvent *rsize) { TQWidget::resizeEvent(rsize); - if (children()){ + if (!childrenListObject().isEmpty()){ #ifndef NO_KDE2 // kdDebug(282)<<"KDockArea::resize"<<endl; #endif @@ -3180,7 +3180,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) { if (parentDockWidget() && parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl; KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + tqparent()->tqqt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } @@ -3192,7 +3192,7 @@ void KDockContainer::deactivateOverlapMode() { if (parentDockWidget() && parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl; KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + tqparent()->tqqt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } @@ -3280,7 +3280,7 @@ void KDockContainer::prepareSave(TQStringList &names) TQWidget *KDockTabGroup::transientTo() { TQWidget *tT=0; for (int i=0;i<count();i++) { - KDockWidget *dw=static_cast<KDockWidget*>(page(i)->qt_cast("KDockWidget")); + KDockWidget *dw=static_cast<KDockWidget*>(page(i)->tqqt_cast("KDockWidget")); TQWidget *tmp; if ((tmp=dw->transientTo())) { if (!tT) tT=tmp; @@ -3326,6 +3326,6 @@ void KDockArea::virtual_hook( int, void* ) { /*KMainWindow::virtual_hook( id, data );*/ } -#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name #include "kdockwidget.moc" #endif diff --git a/kdeui/kdockwidget.h b/kdeui/kdockwidget.h index 4f1605c8c..3fb373dd7 100644 --- a/kdeui/kdockwidget.h +++ b/kdeui/kdockwidget.h @@ -100,7 +100,7 @@ namespace KMDI * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidgetAbstractHeader : public QFrame +class KDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame { Q_OBJECT public: @@ -149,7 +149,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public QFrame +class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame { Q_OBJECT public: @@ -360,7 +360,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockTabGroup : public QTabWidget +class KDEUI_EXPORT KDockTabGroup : public TQTabWidget { Q_OBJECT public: @@ -420,7 +420,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidget: public QWidget +class KDEUI_EXPORT KDockWidget: public TQWidget { Q_OBJECT friend class KDockManager; @@ -446,7 +446,7 @@ public: */ KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null, - const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0); + const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0); /** * Destructs a dockwidget. @@ -906,7 +906,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockManager: public QObject +class KDEUI_EXPORT KDockManager: public TQObject { Q_OBJECT friend class KDockWidget; @@ -1324,7 +1324,7 @@ public: * @param name internal object name * @param f Qt::WidgetFlags widget flags */ - KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); + KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); /** * Destructs a dockmainwindow. @@ -1365,7 +1365,7 @@ public: * @return a pointer to the new created dockwidget */ KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, - const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); + const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); /** * Saves the current dock window layout into a DOM tree below the given element. @@ -1470,7 +1470,7 @@ private: KDockMainWindowPrivate *d; }; -class KDEUI_EXPORT KDockArea : public QWidget +class KDEUI_EXPORT KDockArea : public TQWidget { Q_OBJECT @@ -1490,7 +1490,7 @@ public: KDockWidget* getMainDockWidget(){ return mainDockWidget; } KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, - const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); + const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) ); void writeDockConfig(TQDomElement &base); void readDockConfig(TQDomElement &base); diff --git a/kdeui/kdockwidget_private.cpp b/kdeui/kdockwidget_private.cpp index 9c98ae69a..c049d6fb1 100644 --- a/kdeui/kdockwidget_private.cpp +++ b/kdeui/kdockwidget_private.cpp @@ -61,10 +61,10 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->setLineWidth(1); divider->raise(); - if (m_orientation == Horizontal) - divider->setCursor(TQCursor(sizeVerCursor)); + if (m_orientation == Qt::Horizontal) + divider->setCursor(TQCursor(tqsizeVerCursor)); else - divider->setCursor(TQCursor(sizeHorCursor)); + divider->setCursor(TQCursor(tqsizeHorCursor)); divider->installEventFilter(this); initialised= true; @@ -173,7 +173,7 @@ void KDockSplitter::setupMinMaxSize() { // Set the minimum and maximum sizes for the KDockSplitter (this) int minx, maxx, miny, maxy; - if (m_orientation == Horizontal) { + if (m_orientation == Qt::Horizontal) { miny = child0->minimumHeight() + child1->minimumHeight() + 4; maxy = child0->maximumHeight() + child1->maximumHeight() + 4; minx = (child0->minimumWidth() > child1->minimumWidth()) ? child0->minimumWidth() : child1->minimumWidth(); @@ -266,13 +266,13 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // if (ev && isVisible() && divider->isVisible()) { // real resize event. -// kdDebug(282)<<"mKeepSize : "<< ((m_orientation == Horizontal) ? "Horizontal":"Vertical") <<endl; +// kdDebug(282)<<"mKeepSize : "<< ((m_orientation == Qt::Horizontal) ? "Horizontal":"Vertical") <<endl; if (mKeepSize) { // keep the splitter on a fixed position. This may be a bit inaccurate, because // xpos saves a proportional value, which means there might occur rounding errors. // However, this works surprising well! - if (m_orientation == Horizontal) { + if (m_orientation == Qt::Horizontal) { if (ev->oldSize().height() != ev->size().height()) { if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { // dockwidget is on the bottom. move xpos so that the size from child1 stays @@ -281,7 +281,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // xpos should not change, the docking is on the top // checkValue is *fuzzy* here, it leads to ugly rounding bugs // In truth, it is not needed, because it is called when calculating the "position". - xpos = qRound(((double)xpos) * ev->oldSize().height() / height()); + xpos = tqRound(((double)xpos) * ev->oldSize().height() / height()); } } } else { @@ -291,7 +291,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } else { // xpos should not change // checkValue is *fuzzy* here, it leads to ugly rounding bugs - xpos = qRound(((double)xpos) * ev->oldSize().width() / width()); + xpos = tqRound(((double)xpos) * ev->oldSize().width() / width()); } } } @@ -307,7 +307,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // values. // if ( isVisible()) { - if (m_orientation == Horizontal) { + if (m_orientation == Qt::Horizontal) { if (fixedHeight0!=-1) xpos = checkValue(fixedHeight0) * factor / height(); else if (fixedHeight1!=-1) @@ -327,7 +327,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) /* // --- debugging information --- kdDebug(282) << "isVisible() is : " << isVisible() << endl; - kdDebug(282) << "Orientation : " << (m_orientation==Horizontal?"Horizontal":"Vertical") + kdDebug(282) << "Orientation : " << (m_orientation==Qt::Horizontal?"Horizontal":"Vertical") << endl; kdDebug(282) << "Splitter visibility : " << divider->isVisible() << endl;; kdDebug(282) << "Splitter procentual pos: " << xpos << endl; @@ -346,8 +346,8 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // // handle overlapped widgets only. // - if( ( (m_orientation==Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || - ( (m_orientation==Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { + if( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || + ( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget())) && (dc->isOverlapMode())) { // child0 ist a KDockContainer @@ -355,7 +355,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) child0->show(); child0->raise(); divider->raise(); - if (m_orientation == Horizontal) { + if (m_orientation == Qt::Horizontal) { position = checkValueOverlapped( height() * xpos / factor, child0 ); child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, dc->m_nonOverlapSize, width(), height()-dc->m_nonOverlapSize); @@ -374,7 +374,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) child1->show(); child1->raise(); divider->raise(); - if (m_orientation == Horizontal) { + if (m_orientation == Qt::Horizontal) { position = checkValueOverlapped( height() * xpos / factor, child1 ); child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize); child1->setGeometry(0, position+4, width(), height()-position-4); @@ -399,10 +399,10 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) // the child0 and child1 adjoin. // if (stdHandling) { - int position = checkValue( (m_orientation == Vertical ? width() : height()) * xpos / factor ); + int position = checkValue( (m_orientation == Qt::Vertical ? width() : height()) * xpos / factor ); int diff = 0; - if (m_orientation == Horizontal) { + if (m_orientation == Qt::Horizontal) { if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) { // bottom is dockcontainer if( divider->isVisible() ) { @@ -442,7 +442,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const { if (initialised) { - if (m_orientation == Vertical) { + if (m_orientation == Qt::Vertical) { if (child0==overlappingWidget) { if (position < child0->minimumWidth() || position > width()) position = child0->minimumWidth(); @@ -450,7 +450,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge if (position > (width()-child1->minimumWidth()-4) || position < 0) position = width()-child1->minimumWidth()-4; } - } else {// orientation == Horizontal + } else {// orientation == Qt::Horizontal if (child0==overlappingWidget) { if (position < (child0->minimumHeight()) || position > height()) position = child0->minimumHeight(); @@ -466,7 +466,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge int KDockSplitter::checkValue( int position ) const { if (initialised) { - if (m_orientation == Vertical) { + if (m_orientation == Qt::Vertical) { if (position < child0->minimumWidth()) position = child0->minimumWidth(); if ((width()-4-position) < (child1->minimumWidth())) @@ -481,9 +481,9 @@ int KDockSplitter::checkValue( int position ) const if (position < 0) position = 0; - if ((m_orientation == Vertical) && (position > width())) + if ((m_orientation == Qt::Vertical) && (position > width())) position = width(); - if ((m_orientation == Horizontal) && (position > height())) + if ((m_orientation == Qt::Horizontal) && (position > height())) position = height(); return position; @@ -499,7 +499,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) mev= (TQMouseEvent*)e; child0->setUpdatesEnabled(mOpaqueResize); child1->setUpdatesEnabled(mOpaqueResize); - if (m_orientation == Horizontal) { + if (m_orientation == Qt::Horizontal) { if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; @@ -513,7 +513,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) if (tmp_xpos != xpos) { xpos = tmp_xpos; resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } } } else { @@ -529,7 +529,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) if (tmp_xpos != xpos) { xpos = tmp_xpos; resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } } } @@ -539,14 +539,14 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) child0->setUpdatesEnabled(true); child1->setUpdatesEnabled(true); mev= (TQMouseEvent*)e; - if (m_orientation == Horizontal){ + if (m_orientation == Qt::Horizontal){ if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } else { if ((fixedWidth0!=-1) || (fixedWidth1!=-1)) { @@ -554,7 +554,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width(); resizeEvent(0); - divider->repaint(true); + divider->tqrepaint(true); } handled= true; break; @@ -585,15 +585,15 @@ void KDockSplitter::updateName() if ( !initialised ) return; TQString new_name = TQString( child0->name() ) + "," + child1->name(); - parentWidget()->setName( new_name.latin1() ); - parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); - parentWidget()->repaint( false ); + tqparentWidget()->setName( new_name.latin1() ); + tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() ); + tqparentWidget()->tqrepaint( false ); - ((KDockWidget*)parentWidget())->firstName = child0->name(); - ((KDockWidget*)parentWidget())->lastName = child1->name(); - ((KDockWidget*)parentWidget())->splitterOrientation = m_orientation; + ((KDockWidget*)tqparentWidget())->firstName = child0->name(); + ((KDockWidget*)tqparentWidget())->lastName = child1->name(); + ((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation; - TQWidget* p = parentWidget()->parentWidget(); + TQWidget* p = tqparentWidget()->tqparentWidget(); if ( p && p->inherits("KDockSplitter" ) ) ((KDockSplitter*)p)->updateName(); } @@ -625,7 +625,7 @@ KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name ) :TQPushButton( parent, name ) { moveMouse = false; - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); } KDockButton_Private::~KDockButton_Private() @@ -634,7 +634,7 @@ KDockButton_Private::~KDockButton_Private() void KDockButton_Private::drawButton( TQPainter* p ) { - p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) ); + p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) ); p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() ); if ( moveMouse && !isDown() ){ p->setPen( white ); @@ -642,12 +642,12 @@ void KDockButton_Private::drawButton( TQPainter* p ) p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->lineTo( width() - 1, height() - 1 ); p->lineTo( 0, height() - 1 ); } if ( isOn() || isDown() ){ - p->setPen( colorGroup().dark() ); + p->setPen( tqcolorGroup().dark() ); p->moveTo( 0, height() - 1 ); p->lineTo( 0, 0 ); p->lineTo( width() - 1, 0 ); @@ -661,13 +661,13 @@ void KDockButton_Private::drawButton( TQPainter* p ) void KDockButton_Private::enterEvent( TQEvent * ) { moveMouse = true; - repaint(); + tqrepaint(); } void KDockButton_Private::leaveEvent( TQEvent * ) { moveMouse = false; - repaint(); + tqrepaint(); } /*************************************************************************/ @@ -701,12 +701,12 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) { if (w) { TQWidget* embeddedWdg = ((KDockWidget*)w)->getWidget(); - if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) { + if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) { embeddedWdg->setFocus(); } } } -#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name #include "kdockwidget_private.moc" #endif diff --git a/kdeui/kdockwidget_private.h b/kdeui/kdockwidget_private.h index c017f1d14..8e7323a7a 100644 --- a/kdeui/kdockwidget_private.h +++ b/kdeui/kdockwidget_private.h @@ -41,7 +41,7 @@ class KDockContainer; * * @author Max Judin. */ -class KDEUI_EXPORT KDockSplitter : public QWidget +class KDEUI_EXPORT KDockSplitter : public TQWidget { // NOTE: in theory the KDEUI_EXPORT above shouldn't be there, but it's needed for kexi, // which copies the whole definition of the class to be able to access separatorPosInPercent etc. @@ -56,7 +56,7 @@ public: * @param orient orientation. Either @p Vertical or @p Horizontal * @param pos procentual position of the splitter. Must be int [0...100]. */ - KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Vertical, int pos= 50); + KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Qt::Vertical, int pos= 50); virtual ~KDockSplitter(){} /** @@ -245,7 +245,7 @@ private: * * @author Max Judin. */ -class KDEUI_EXPORT KDockButton_Private : public QPushButton +class KDEUI_EXPORT KDockButton_Private : public TQPushButton { Q_OBJECT public: @@ -270,7 +270,7 @@ private: /** * additional KDockWidget stuff (private) */ -class KDockWidgetPrivate : public QObject +class KDockWidgetPrivate : public TQObject { Q_OBJECT public: @@ -311,7 +311,7 @@ public: }; class KDockWidgetHeaderPrivate - : public QObject + : public TQObject { public: KDockWidgetHeaderPrivate( TQObject* parent ) diff --git a/kdeui/kdualcolorbutton.cpp b/kdeui/kdualcolorbutton.cpp index 2b4c2ecfd..a02c2ead4 100644 --- a/kdeui/kdualcolorbutton.cpp +++ b/kdeui/kdualcolorbutton.cpp @@ -46,13 +46,13 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget* (const unsigned char *)dcolorarrow_bits, true); arrowBitmap->setMask(*arrowBitmap); // heh resetPixmap = new TQPixmap((const char **)dcolorreset_xpm); - fg = TQBrush(Qt::black, SolidPattern); - bg = TQBrush(Qt::white, SolidPattern); + fg = TQBrush(Qt::black, Qt::SolidPattern); + bg = TQBrush(Qt::white, Qt::SolidPattern); curColor = Foreground; dragFlag = false; miniCtlFlag = false; - if(sizeHint().isValid()) - setMinimumSize(sizeHint()); + if(tqsizeHint().isValid()) + setMinimumSize(tqsizeHint()); setAcceptDrops(true); } @@ -67,13 +67,13 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo (const unsigned char *)dcolorarrow_bits, true); arrowBitmap->setMask(*arrowBitmap); resetPixmap = new TQPixmap((const char **)dcolorreset_xpm); - fg = TQBrush(fgColor, SolidPattern); - bg = TQBrush(bgColor, SolidPattern); + fg = TQBrush(fgColor, Qt::SolidPattern); + bg = TQBrush(bgColor, Qt::SolidPattern); curColor = Foreground; dragFlag = false; miniCtlFlag = false; - if(sizeHint().isValid()) - setMinimumSize(sizeHint()); + if(tqsizeHint().isValid()) + setMinimumSize(tqsizeHint()); setAcceptDrops(true); } @@ -104,23 +104,23 @@ TQColor KDualColorButton::currentColor() const return (curColor == Background ? bg.color() : fg.color()); } -TQSize KDualColorButton::sizeHint() const +TQSize KDualColorButton::tqsizeHint() const { return TQSize(34, 34); } void KDualColorButton::setForeground(const TQColor &c) { - fg = TQBrush(c, SolidPattern); - repaint(false); + fg = TQBrush(c, Qt::SolidPattern); + tqrepaint(false); emit fgChanged(fg.color()); } void KDualColorButton::setBackground(const TQColor &c) { - bg = TQBrush(c, SolidPattern); - repaint(false); + bg = TQBrush(c, Qt::SolidPattern); + tqrepaint(false); emit bgChanged(bg.color()); } @@ -128,16 +128,16 @@ void KDualColorButton::setBackground(const TQColor &c) void KDualColorButton::setCurrentColor(const TQColor &c) { if(curColor == Background) - bg = TQBrush(c, SolidPattern); + bg = TQBrush(c, Qt::SolidPattern); else - fg = TQBrush(c, SolidPattern); - repaint(false); + fg = TQBrush(c, Qt::SolidPattern); + tqrepaint(false); } void KDualColorButton::setCurrent(DualColor s) { curColor = s; - repaint(false); + tqrepaint(false); } void KDualColorButton::metrics(TQRect &fgRect, TQRect &bgRect) @@ -152,13 +152,13 @@ void KDualColorButton::paintEvent(TQPaintEvent *) TQPainter p(this); metrics(fgRect, bgRect); - TQBrush defBrush = colorGroup().brush(TQColorGroup::Button); + TQBrush defBrush = tqcolorGroup().brush(TQColorGroup::Button); - qDrawShadeRect(&p, bgRect, colorGroup(), curColor == Background, 2, 0, + qDrawShadeRect(&p, bgRect, tqcolorGroup(), curColor == Background, 2, 0, isEnabled() ? &bg : &defBrush); - qDrawShadeRect(&p, fgRect, colorGroup(), curColor == Foreground, 2, 0, + qDrawShadeRect(&p, fgRect, tqcolorGroup(), curColor == Foreground, 2, 0, isEnabled() ? &fg : &defBrush); - p.setPen(colorGroup().shadow()); + p.setPen(tqcolorGroup().shadow()); p.drawPixmap(fgRect.right()+2, 0, *arrowBitmap); p.drawPixmap(0, fgRect.bottom()+2, *resetPixmap); @@ -181,7 +181,7 @@ void KDualColorButton::dropEvent(TQDropEvent *ev) bg.setColor(c); emit(bgChanged(c)); } - repaint(false); + tqrepaint(false); } } @@ -217,7 +217,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) emit bgChanged(bg.color()); miniCtlFlag = true; } - repaint(false); + tqrepaint(false); } @@ -270,7 +270,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev) } } } - repaint(false); + tqrepaint(false); dragFlag = false; } else diff --git a/kdeui/kdualcolorbutton.h b/kdeui/kdualcolorbutton.h index 7b08ec0e3..a78b6a82a 100644 --- a/kdeui/kdualcolorbutton.h +++ b/kdeui/kdualcolorbutton.h @@ -45,7 +45,7 @@ class TQBitmap; * * @author Daniel M. Duley <mosfet@kde.org> */ -class KDEUI_EXPORT KDualColorButton : public QWidget +class KDEUI_EXPORT KDualColorButton : public TQWidget { Q_OBJECT Q_ENUMS( DualColor ) @@ -94,7 +94,7 @@ public: * Returns the minimum size needed to display the widget and all its * controls. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: /** * Sets the foreground color. diff --git a/kdeui/keditcl.h b/kdeui/keditcl.h index 19f828c2b..289919b3e 100644 --- a/kdeui/keditcl.h +++ b/kdeui/keditcl.h @@ -168,7 +168,7 @@ private: * @author Bernd Johannes Wuebben <wuebben@math.cornell.edu>, Waldo Bastian <bastian@kde.org> **/ -class KDEUI_EXPORT_DEPRECATED KEdit : public QMultiLineEdit +class KDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit { Q_OBJECT @@ -401,7 +401,7 @@ protected: void contentsDropEvent(TQDropEvent* e); private: - TQTimer* repaintTimer; + TQTimer* tqrepaintTimer; QString killbufferstring; TQWidget *parent; diff --git a/kdeui/keditcl1.cpp b/kdeui/keditcl1.cpp index a77e1c523..e32081fa9 100644 --- a/kdeui/keditcl1.cpp +++ b/kdeui/keditcl1.cpp @@ -104,7 +104,7 @@ KEdit::insertText(TQTextStream *stream) // MS: read everything at once if file <= 1MB, // else read in 5000-line chunks to keep memory usage acceptable. - TQIODevice *dev=stream->device(); + TQIODevice *dev=stream->tqdevice(); if (dev && dev->size()>(1024*1024)) { while(1) { int i; @@ -128,7 +128,7 @@ KEdit::insertText(TQTextStream *stream) setCursorPosition(saveline, savecol); // setAutoUpdate(true); -// repaint(); +// tqrepaint(); setModified(true); setFocus(); @@ -140,7 +140,7 @@ KEdit::insertText(TQTextStream *stream) // TQString str = text(); // for (int i = 0; i < (int) str.length(); i++) - // printf("KEdit: U+%04X\n", str[i].unicode()); + // printf("KEdit: U+%04X\n", str[i].tqunicode()); } @@ -164,7 +164,7 @@ KEdit::cleanWhiteSpace() if (line.isEmpty()) { if (addSpace) - newText += TQString::fromLatin1("\n\n"); + newText += TQString::tqfromLatin1("\n\n"); if (firstLine) { if (firstChar.isSpace()) @@ -200,7 +200,7 @@ KEdit::cleanWhiteSpace() { deselect(); d->autoUpdate = true; - repaint(); + tqrepaint(); return; } if (wordWrap() == NoWrap) @@ -225,7 +225,7 @@ KEdit::cleanWhiteSpace() insert(newText); d->autoUpdate = true; - repaint(); + tqrepaint(); setModified(true); setFocus(); @@ -359,7 +359,7 @@ void KEdit::computePosition() while(find >=0 && find <= coltemp- 1 ){ - find = linetext.find('\t', find+start_of_line, true )-start_of_line; + find = linetext.tqfind('\t', find+start_of_line, true )-start_of_line; if( find >=0 && find <= coltemp - 1 ){ found_one = true; pos = pos + find - mem; @@ -471,7 +471,7 @@ void KEdit::keyPressEvent ( TQKeyEvent *e) else if ( isReadOnly() ) TQMultiLineEdit::keyPressEvent( e ); // If this is an unmodified printable key, send it directly to TQMultiLineEdit. - else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && e->text().unicode()->isPrint() ) + else if ( !(key.keyCodeQt() & (CTRL | ALT)) && !e->text().isEmpty() && TQString(e->text()).tqunicode()->isPrint() ) TQMultiLineEdit::keyPressEvent( e ); else if ( KStdAccel::paste().contains( key ) ) { paste(); diff --git a/kdeui/keditcl2.cpp b/kdeui/keditcl2.cpp index 36d1b8f3b..c885b6b27 100644 --- a/kdeui/keditcl2.cpp +++ b/kdeui/keditcl2.cpp @@ -162,7 +162,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive, string = textLine(i); - pos = string.find(s_pattern, i == line ? col : 0, case_sensitive); + pos = string.tqfind(s_pattern, i == line ? col : 0, case_sensitive); if( pos != -1){ @@ -191,7 +191,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive, string = textLine(i); int line_length = string.length(); - pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive); + pos = string.tqfindRev(s_pattern, line == i ? col : line_length , case_sensitive); if (pos != -1){ @@ -528,10 +528,10 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, string = textLine(line_counter); if (replace_all){ - pos = string.find(s_pattern, replace_all_col, case_sensitive); + pos = string.tqfind(s_pattern, replace_all_col, case_sensitive); } else{ - pos = string.find(s_pattern, line_counter == line ? col : 0, case_sensitive); + pos = string.tqfind(s_pattern, line_counter == line ? col : 0, case_sensitive); } if (pos == -1 ){ @@ -554,7 +554,7 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, replace_all_col = pos + replacement.length(); replace_all_line = line_counter; - pos = stringnew.find(s_pattern, replace_all_col, case_sensitive); + pos = stringnew.tqfind(s_pattern, replace_all_col, case_sensitive); } while( pos != -1); @@ -595,13 +595,13 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, if (replace_all_col < 0) pos = -1; else - pos = string.findRev(s_pattern, replace_all_col , case_sensitive); + pos = string.tqfindRev(s_pattern, replace_all_col , case_sensitive); } else{ if ((line == line_counter) && (col < 0)) pos = -1; else - pos = string.findRev(s_pattern, + pos = string.tqfindRev(s_pattern, line == line_counter ? col : line_length , case_sensitive); } @@ -834,7 +834,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) { setWFlags( WType_TopLevel ); - setButtonBoxOrientation( Vertical ); + setButtonBoxOrientation( Qt::Vertical ); TQFrame *page = makeMainWidget(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); diff --git a/kdeui/keditlistbox.cpp b/kdeui/keditlistbox.cpp index b58244e93..2960252d4 100644 --- a/kdeui/keditlistbox.cpp +++ b/kdeui/keditlistbox.cpp @@ -79,7 +79,7 @@ void KEditListBox::init( bool checkAtEntering, int buttons, d->m_checkAtEntering = checkAtEntering; servNewButton = servRemoveButton = servUpButton = servDownButton = 0L; - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); TQGridLayout * grid = new TQGridLayout(this, 7, 2, @@ -195,7 +195,7 @@ void KEditListBox::typedSomething(const TQString& text) else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - bool enable = (!m_listBox->findItem( text, mode )); + bool enable = (!m_listBox->tqfindItem( text, mode )); servNewButton->setEnabled( enable ); } } @@ -266,7 +266,7 @@ void KEditListBox::addItem() else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - alreadyInList =(m_listBox->findItem(currentTextLE, mode) ); + alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) ); } } diff --git a/kdeui/keditlistbox.h b/kdeui/keditlistbox.h index 1b5e0f086..50271a261 100644 --- a/kdeui/keditlistbox.h +++ b/kdeui/keditlistbox.h @@ -41,12 +41,13 @@ class KEditListBoxPrivate; * \image html keditlistbox.png "KDE Edit List Box Widget" * */ -class KDEUI_EXPORT KEditListBox : public QGroupBox +class KDEUI_EXPORT KEditListBox : public TQGroupBox { Q_OBJECT + TQ_OBJECT - Q_SETS( Button ) - Q_PROPERTY( Button buttons READ buttons WRITE setButtons ) + TQ_SETS( Button ) + TQ_PROPERTY( Button buttons READ buttons WRITE setButtons ) Q_PROPERTY( TQStringList items READ items WRITE setItems ) public: diff --git a/kdeui/kedittoolbar.cpp b/kdeui/kedittoolbar.cpp index 2d01dc469..cb21c2160 100644 --- a/kdeui/kedittoolbar.cpp +++ b/kdeui/kedittoolbar.cpp @@ -85,7 +85,7 @@ public: typedef TQValueList<XmlData> XmlDataList; -class ToolbarItem : public QListViewItem +class ToolbarItem : public TQListViewItem { public: ToolbarItem(KListView *parent, const TQString& tag = TQString::null, const TQString& name = TQString::null, const TQString& statusText = TQString::null) @@ -127,7 +127,7 @@ private: }; #define TOOLBARITEMMIMETYPE "data/x-kde.toolbar.item" -class ToolbarItemDrag : public QStoredDrag +class ToolbarItemDrag : public TQStoredDrag { public: ToolbarItemDrag(ToolbarItem *toolbarItem, @@ -155,7 +155,7 @@ public: if (!e) return false; - TQByteArray data = e->encodedData(TOOLBARITEMMIMETYPE); + TQByteArray data = e->tqencodedData(TOOLBARITEMMIMETYPE); if ( data.isEmpty() ) return false; @@ -378,7 +378,7 @@ const char *KEditToolbar::s_defaultToolbar = 0L; KEditToolbar::KEditToolbar(KActionCollection *collection, const TQString& file, bool global, TQWidget* parent, const char* name) : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name), - m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), collection, file, global, this)) + m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), collection, file, global, this)) { init(); d->m_global = global; @@ -400,7 +400,7 @@ KEditToolbar::KEditToolbar(const TQString& defaultToolbar, KActionCollection *co KEditToolbar::KEditToolbar(KXMLGUIFactory* factory, TQWidget* parent, const char* name) : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name), - m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), factory, this)) + m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), factory, this)) { init(); d->m_factory = factory; @@ -427,7 +427,7 @@ void KEditToolbar::init() connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); enableButtonApply(false); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); s_defaultToolbar = 0L; } @@ -467,7 +467,7 @@ void KEditToolbar::slotDefault() if (TQDir::isRelativePath(file)) { const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance(); - file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file); + file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + file); } else { @@ -485,10 +485,10 @@ void KEditToolbar::slotDefault() } else { - int slash = d->m_file.findRev('/')+1; + int slash = d->m_file.tqfindRev('/')+1; if (slash) d->m_file = d->m_file.mid(slash); - TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); + TQString xml_file = locateLocal("data", TQString::tqfromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); if ( TQFile::exists( xml_file ) ) if ( !TQFile::remove( xml_file ) ) @@ -547,7 +547,7 @@ KEditToolbarWidget::KEditToolbarWidget(KActionCollection *collection, // now load in our toolbar combo box loadToolbarCombo(); adjustSize(); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, @@ -561,7 +561,7 @@ KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, // now load in our toolbar combo box loadToolbarCombo(defaultToolbar); adjustSize(); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, @@ -573,7 +573,7 @@ KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, // now load in our toolbar combo box loadToolbarCombo(); adjustSize(); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, @@ -586,7 +586,7 @@ KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, // now load in our toolbar combo box loadToolbarCombo(defaultToolbar); adjustSize(); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } KEditToolbarWidget::~KEditToolbarWidget() @@ -816,7 +816,7 @@ void KEditToolbarWidget::setupLayout() // "change icon" button d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this ); - TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog")); + TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog")); d->m_hasKDialog = !kdialogExe.isEmpty(); d->m_changeIcon->setEnabled( d->m_hasKDialog ); @@ -853,7 +853,7 @@ void KEditToolbarWidget::setupLayout() connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton())); d->m_helpArea = new TQLabel(this); - d->m_helpArea->setAlignment( Qt::WordBreak ); + d->m_helpArea->tqsetAlignment( TQt::WordBreak ); // now start with our layouts TQVBoxLayout *top_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -891,7 +891,7 @@ void KEditToolbarWidget::setupLayout() changeIcon_layout->addStretch( 1 ); list_layout->addLayout(inactive_layout); - list_layout->addLayout(button_layout); + list_layout->addLayout(TQT_TQLAYOUT(button_layout)); list_layout->addLayout(active_layout); top_layout->addLayout(name_layout); @@ -975,7 +975,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) if (it.tagName() == tagSeparator) { ToolbarItem *act = new ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), TQString::null); - bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::fromLatin1("true") ); + bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::tqfromLatin1("true") ); if(isLineSep) act->setText(1, LINESEPARATORSTRING); else @@ -1034,7 +1034,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) KAction *action = actionCollection->action( i ); // skip our active ones - if (active_list.contains(action->name())) + if (active_list.tqcontains(action->name())) continue; ToolbarItem *act = new ToolbarItem(m_inactiveList, tagActionList, action->name(), action->toolTip()); @@ -1361,7 +1361,7 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem) continue; TQDomElement toolbar = (*xit).m_document.documentElement().toElement(); - toolbar.replaceChild(elem, (*it)); + toolbar.tqreplaceChild(elem, (*it)); return; } @@ -1382,10 +1382,10 @@ void KEditToolbarWidget::slotChangeIcon() return; d->m_kdialogProcess = new KProcIO; - TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog")); + TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog")); (*d->m_kdialogProcess) << kdialogExe; (*d->m_kdialogProcess) << "--embed"; - (*d->m_kdialogProcess) << TQString::number( (ulong)topLevelWidget()->winId() ); + (*d->m_kdialogProcess) << TQString::number( (ulong)tqtopLevelWidget()->winId() ); (*d->m_kdialogProcess) << "--geticon"; (*d->m_kdialogProcess) << "Toolbar"; (*d->m_kdialogProcess) << "Actions"; diff --git a/kdeui/kfontcombo.cpp b/kdeui/kfontcombo.cpp index c664d226e..173b08cff 100644 --- a/kdeui/kfontcombo.cpp +++ b/kdeui/kfontcombo.cpp @@ -65,7 +65,7 @@ struct KFontComboPrivate TQString defaultFamily; }; -class KFontListItem : public QListBoxItem +class KFontListItem : public TQListBoxItem { public: KFontListItem(const TQString &fontName, KFontCombo *combo); @@ -132,7 +132,7 @@ void KFontListItem::paint(TQPainter *p) if (m_canPaintName) p->setFont(*m_font); else - t = TQString::fromLatin1("(%1)").arg(m_fontName); + t = TQString::tqfromLatin1("(%1)").arg(m_fontName); } TQFontMetrics fm(p->fontMetrics()); p->drawText(3, (m_combo->d->lineSpacing + fm.ascent() + fm.leading() / 2) / 2, t); @@ -212,7 +212,7 @@ void KFontCombo::setCurrentFont(const TQString &family) return; } } - int x = lowerName.find(" ["); + int x = lowerName.tqfind(" ["); if (x>-1) { lowerName = lowerName.left(x); @@ -251,7 +251,7 @@ void KFontCombo::setCurrentFont(const TQString &family) FcConfigSubstitute (config, pattern, FcMatchPattern); pattern = FcFontMatch(NULL, pattern, NULL); realFamily = (char*)FcNameUnparse(pattern); - realFamily.remove(realFamily.find(regExp), realFamily.length()); + realFamily.remove(realFamily.tqfind(regExp), realFamily.length()); if ( !realFamily.isEmpty() && realFamily != family ) setCurrentFont( realFamily ); diff --git a/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp index 4044c7b68..c64892d8a 100644 --- a/kdeui/kfontdialog.cpp +++ b/kdeui/kfontdialog.cpp @@ -66,7 +66,7 @@ static int minimumListWidth( const TQListBox *list ) } if( w == 0 ) { w = 40; } w += list->frameWidth() * 2; - w += list->verticalScrollBar()->sizeHint().width(); + w += list->verticalScrollBar()->tqsizeHint().width(); return w; } @@ -284,7 +284,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(size_chosen_slot(const TQString&)) ); - sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. + sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(10)), true); // default to 10pt. row ++; @@ -295,7 +295,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, //i18n: This is a classical test phrase. (It contains all letters from A to Z.) sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() ); - sampleEdit->setAlignment(Qt::AlignCenter); + sampleEdit->tqsetAlignment(Qt::AlignCenter); gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2); TQString sampleEditWhatsThisText = i18n("This sample text illustrates the current settings. " @@ -331,8 +331,8 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, setSizeIsRelative( *sizeIsRelativeState ); KConfig *config = KGlobal::config(); - KConfigGroupSaver saver(config, TQString::fromLatin1("General")); - showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false)); + KConfigGroupSaver saver(config, TQString::tqfromLatin1("General")); + showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false)); } KFontChooser::~KFontChooser() @@ -403,9 +403,9 @@ TQButton::ToggleState KFontChooser::sizeIsRelative() const : TQButton::NoChange; } -TQSize KFontChooser::sizeHint( void ) const +TQSize KFontChooser::tqsizeHint( void ) const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -464,18 +464,18 @@ void KFontChooser::toggled_checkbox() void KFontChooser::family_chosen_slot(const TQString& family) { TQFontDatabase dbase; - TQStringList styles = TQStringList(dbase.styles(family)); + TQStringList styles = TQStringList(dbase.tqstyles(family)); styleListBox->clear(); currentStyles.clear(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString style = *it; - int pos = style.find("Plain"); + int pos = style.tqfind("Plain"); if(pos >=0) style = style.replace(pos,5,i18n("Regular")); - pos = style.find("Normal"); + pos = style.tqfind("Normal"); if(pos >=0) style = style.replace(pos,6,i18n("Regular")); - pos = style.find("Oblique"); + pos = style.tqfind("Oblique"); if(pos >=0) style = style.replace(pos,7,i18n("Italic")); - if(!styleListBox->findItem(style)) { + if(!styleListBox->tqfindItem(style)) { styleListBox->insertItem(i18n(style.utf8())); currentStyles.insert(i18n(style.utf8()), *it); } @@ -486,9 +486,9 @@ void KFontChooser::family_chosen_slot(const TQString& family) } styleListBox->blockSignals(true); - TQListBoxItem *item = styleListBox->findItem(selectedStyle); + TQListBoxItem *item = styleListBox->tqfindItem(selectedStyle); if (item) - styleListBox->setSelected(styleListBox->findItem(selectedStyle), true); + styleListBox->setSelected(styleListBox->tqfindItem(selectedStyle), true); else styleListBox->setSelected(0, true); styleListBox->blockSignals(false); @@ -526,7 +526,7 @@ void KFontChooser::style_chosen_slot(const TQString& style) fillSizeList(); } else { // is bitmap font. //sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO - TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); + TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]); if(sizes.count() > 0) { TQValueList<int>::iterator it; diff=1000; @@ -538,7 +538,7 @@ void KFontChooser::style_chosen_slot(const TQString& style) fillSizeList(); } sizeListBox->blockSignals(true); - sizeListBox->setSelected(sizeListBox->findItem(TQString::number(selectedSize)), true); + sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(selectedSize)), true); sizeListBox->blockSignals(false); sizeListBox->ensureCurrentVisible(); @@ -565,7 +565,7 @@ void KFontChooser::setupDisplay() { // Calling familyListBox->setCurrentItem() causes the value of selFont // to change, so we save the family, style and size beforehand. - TQString family = selFont.family().lower(); + TQString family = TQString(selFont.family()).lower(); int style = (selFont.bold() ? 2 : 0) + (selFont.italic() ? 1 : 0); int size = selFont.pointSize(); if (size == -1) @@ -587,7 +587,7 @@ void KFontChooser::setupDisplay() { if (family.contains('[')) { - family = family.left(family.find('[')).stripWhiteSpace(); + family = family.left(family.tqfind('[')).stripWhiteSpace(); for (i = 0; i < numEntries; i++) { if (family == familyListBox->text(i).lower()) { familyListBox->setCurrentItem(i); @@ -641,7 +641,7 @@ void KFontChooser::setupDisplay() void KFontChooser::getFontList( TQStringList &list, uint fontListCriteria) { TQFontDatabase dbase; - TQStringList lstSys(dbase.families()); + TQStringList lstSys(dbase.tqfamilies()); // if we have criteria; then check fonts before adding if (fontListCriteria) @@ -681,13 +681,13 @@ void KFontChooser::addFont( TQStringList &list, const char *xfont ) if ( !ptr ) return; - TQString font = TQString::fromLatin1(ptr + 1); + TQString font = TQString::tqfromLatin1(ptr + 1); int pos; - if ( ( pos = font.find( '-' ) ) > 0 ) { + if ( ( pos = font.tqfind( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 ) + if ( font.tqfind( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); @@ -711,11 +711,11 @@ void KFontChooser::showXLFDArea(bool show) { if( show ) { - xlfdEdit->parentWidget()->show(); + xlfdEdit->tqparentWidget()->show(); } else { - xlfdEdit->parentWidget()->hide(); + xlfdEdit->tqparentWidget()->hide(); } } diff --git a/kdeui/kfontdialog.h b/kdeui/kfontdialog.h index 266090c37..bc5b817eb 100644 --- a/kdeui/kfontdialog.h +++ b/kdeui/kfontdialog.h @@ -51,7 +51,7 @@ class KIntNumInput; * @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org> * @version $Id$ */ -class KDEUI_EXPORT KFontChooser : public QWidget +class KDEUI_EXPORT KFontChooser : public TQWidget { Q_OBJECT Q_PROPERTY( TQFont font READ font WRITE setFont ) @@ -252,7 +252,7 @@ public: /** * Reimplemented for internal reasons. */ - virtual TQSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; signals: /** diff --git a/kdeui/kfontrequester.cpp b/kdeui/kfontrequester.cpp index 293f9d546..748a0654d 100644 --- a/kdeui/kfontrequester.cpp +++ b/kdeui/kfontrequester.cpp @@ -72,7 +72,7 @@ void KFontRequester::setTitle( const TQString &title ) void KFontRequester::buttonClicked() { - int result = KFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() ); + int result = KFontDialog::getFont( m_selFont, m_onlyFixed, tqparentWidget() ); if ( result == KDialog::Accepted ) { diff --git a/kdeui/kfontrequester.h b/kdeui/kfontrequester.h index bb554d2ba..859c61499 100644 --- a/kdeui/kfontrequester.h +++ b/kdeui/kfontrequester.h @@ -41,7 +41,7 @@ class TQPushButton; * @author Nadeem Hasan <nhasan@kde.org> * */ -class KDEUI_EXPORT KFontRequester : public QWidget +class KDEUI_EXPORT KFontRequester : public TQWidget { Q_OBJECT diff --git a/kdeui/kguiitem.cpp b/kdeui/kguiitem.cpp index 7b73c7401..abcc3868a 100644 --- a/kdeui/kguiitem.cpp +++ b/kdeui/kguiitem.cpp @@ -135,7 +135,7 @@ TQString KGuiItem::plainText() const int resultLength = 0; stripped.setLength(len); - const TQChar* data = d->m_text.unicode(); + const TQChar* data = d->m_text.tqunicode(); for ( int pos = 0; pos < len; ++pos ) { if ( data[ pos ] != '&' ) diff --git a/kdeui/khelpmenu.cpp b/kdeui/khelpmenu.cpp index c6557f044..093d46714 100644 --- a/kdeui/khelpmenu.cpp +++ b/kdeui/khelpmenu.cpp @@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu() // compatible. // const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); - TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(qApp->name()); + TQString appName = (aboutData)? aboutData->programName() : TQString::tqfromLatin1(tqApp->name()); mMenu = new KPopupMenu(); connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed())); @@ -127,7 +127,7 @@ KPopupMenu* KHelpMenu::menu() if (kapp->authorizeKAction("help_contents")) { mMenu->insertItem( BarIcon( "contents", KIcon::SizeSmall), - i18n( "%1 &Handbook" ).arg( appName) ,menuHelpContents ); + TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents ); mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) ); mMenu->setAccel( KStdAccel::shortcut(KStdAccel::Help), menuHelpContents ); need_separator = true; @@ -167,7 +167,7 @@ KPopupMenu* KHelpMenu::menu() if (kapp->authorizeKAction("help_about_app")) { mMenu->insertItem( kapp->miniIcon(), - i18n( "&About %1" ).arg(appName), menuAboutApp ); + TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp ); mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) ); } @@ -306,7 +306,7 @@ void KHelpMenu::contextHelpActivated() TQWhatsThis::enterWhatsThisMode(); TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true ); while ( w && !w->isTopLevel() && !w->inherits("QXEmbed") ) - w = w->parentWidget(); + w = w->tqparentWidget(); #ifdef Q_WS_X11 if ( w && w->inherits("QXEmbed") ) (( QXEmbed*) w )->enterWhatsThisMode(); diff --git a/kdeui/khelpmenu.h b/kdeui/khelpmenu.h index fdece6510..331ef0875 100644 --- a/kdeui/khelpmenu.h +++ b/kdeui/khelpmenu.h @@ -128,7 +128,7 @@ class KHelpMenuPrivate; * @author Espen Sand (espen@kde.org) */ -class KDEUI_EXPORT KHelpMenu : public QObject +class KDEUI_EXPORT KHelpMenu : public TQObject { Q_OBJECT diff --git a/kdeui/kiconview.cpp b/kdeui/kiconview.cpp index 13b6183ad..357d6b2c4 100644 --- a/kdeui/kiconview.cpp +++ b/kdeui/kiconview.cpp @@ -217,7 +217,7 @@ void KIconView::slotAutoSelect() blockSignals( block ); viewport()->setUpdatesEnabled( update ); - repaintContents( redraw, false ); + tqrepaintContents( redraw, false ); emit selectionChanged(); @@ -258,7 +258,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) void KIconView::updateDragHoldItem( TQDropEvent *e ) { - TQIconViewItem *item = findItem( e->pos() ); + TQIconViewItem *item = tqfindItem( e->pos() ); if ( d->dragHoldItem != item) { @@ -307,10 +307,10 @@ void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { TQIconView::contentsMouseDoubleClickEvent( e ); - TQIconViewItem* item = findItem( e->pos() ); + TQIconViewItem* item = tqfindItem( e->pos() ); if( item ) { - if( (e->button() == LeftButton) && !m_bUseSingle ) + if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) emitExecute( item, e->globalPos() ); emit doubleClicked( item, e->globalPos() ); @@ -324,7 +324,7 @@ void KIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const TQP if( d->doubleClickIgnoreTimer.isActive() ) return; // Ignore double click - if( (btn == LeftButton) && item ) + if( (btn == Qt::LeftButton) && item ) emitExecute( item, pos ); } @@ -417,7 +417,7 @@ TQFontMetrics *KIconView::itemFontMetrics() const TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const { TQPixmap m; - if ( d->maskCache.find( TQString::number( pix->serialNumber() ), m ) ) + if ( d->maskCache.tqfind( TQString::number( pix->serialNumber() ), m ) ) return m; m = KPixmapEffect::selectedPixmap( KPixmap(*pix), col ); d->maskCache.insert( TQString::number( pix->serialNumber() ), m ); @@ -485,7 +485,7 @@ void KIconViewItem::calcRect( const TQString& text_ ) KIconView *view = static_cast<KIconView *>(iconView()); TQRect itemIconRect = pixmapRect(); TQRect itemTextRect = textRect(); - TQRect itemRect = rect(); + TQRect tqitemRect = rect(); int pw = 0; int ph = 0; @@ -507,9 +507,9 @@ void KIconViewItem::calcRect( const TQString& text_ ) itemIconRect.setWidth( pw ); #if 1 // FIXME // There is a bug in Qt which prevents the item from being placed - // properly when the pixmapRect is not at the top of the itemRect, so we + // properly when the pixmapRect is not at the top of the tqitemRect, so we // have to increase the height of the pixmapRect and leave it at the top - // of the itemRect... + // of the tqitemRect... if ( d && !d->m_pixmapSize.isNull() ) itemIconRect.setHeight( d->m_pixmapSize.height() + 2 ); else @@ -574,8 +574,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) h = itemTextRect.height() + itemIconRect.height() + 1; } - itemRect.setWidth( w ); - itemRect.setHeight( h ); + tqitemRect.setWidth( w ); + tqitemRect.setHeight( h ); int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width() int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height() itemTextRect = TQRect( ( width - itemTextRect.width() ) / 2, height - itemTextRect.height(), @@ -597,8 +597,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) h = QMAX( itemTextRect.height(), itemIconRect.height() ); w = itemTextRect.width() + itemIconRect.width() + 1; - itemRect.setWidth( w ); - itemRect.setHeight( h ); + tqitemRect.setWidth( w ); + tqitemRect.setHeight( h ); int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width() int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height() @@ -621,8 +621,8 @@ void KIconViewItem::calcRect( const TQString& text_ ) setPixmapRect( itemIconRect ); if ( itemTextRect != textRect() ) setTextRect( itemTextRect ); - if ( itemRect != rect() ) - setItemRect( itemRect ); + if ( tqitemRect != rect() ) + setItemRect( tqitemRect ); // Done by setPixmapRect, setTextRect and setItemRect ! [and useless if no rect changed] //view->updateItemContainer( this ); @@ -680,7 +680,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg ) #if 1 // FIXME // Move the pixmap manually because the pixmapRect is at the - // top of the itemRect + // top of the tqitemRect // (won't be needed anymore in future versions of qt) if ( d && !d->m_pixmapSize.isNull() ) { @@ -723,7 +723,7 @@ void KIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg ) } p->setPen( TQPen( cg.highlightedText() ) ); } else { - if ( iconView()->itemTextBackground() != NoBrush ) + if ( iconView()->itemTextBackground() != Qt::NoBrush ) p->fillRect( textRect( false ), iconView()->itemTextBackground() ); p->setPen( cg.text() ); } diff --git a/kdeui/kiconview.h b/kdeui/kiconview.h index 0b0c49515..5d2735d10 100644 --- a/kdeui/kiconview.h +++ b/kdeui/kiconview.h @@ -39,7 +39,7 @@ * TQIconView::selectionChanged() signal. * **/ -class KDEUI_EXPORT KIconView : public QIconView +class KDEUI_EXPORT KIconView : public TQIconView { friend class KIconViewItem; Q_OBJECT @@ -223,7 +223,7 @@ class KWordWrap; * * @author David Faure <david@mandrakesoft.com> */ -class KDEUI_EXPORT KIconViewItem : public QIconViewItem +class KDEUI_EXPORT KIconViewItem : public TQIconViewItem { public: // Need to redefine all the constructors - I want Java ! diff --git a/kdeui/kiconviewsearchline.cpp b/kdeui/kiconviewsearchline.cpp index 701e15428..1ee76c9df 100644 --- a/kdeui/kiconviewsearchline.cpp +++ b/kdeui/kiconviewsearchline.cpp @@ -224,7 +224,7 @@ bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item, return false; TQString itemtext = item->text(); - return ( itemtext.find( s, 0, caseSensitive() ) >= 0 ); + return ( itemtext.tqfind( s, 0, caseSensitive() ) >= 0 ); } void KIconViewSearchLine::init( TQIconView *iconView ) diff --git a/kdeui/kinputdialog.cpp b/kdeui/kinputdialog.cpp index 37f94e89e..06ceeecd4 100644 --- a/kdeui/kinputdialog.cpp +++ b/kdeui/kinputdialog.cpp @@ -17,6 +17,10 @@ Boston, MA 02110-1301, USA. */ +#ifdef USE_QT4 +#undef Status +#endif // USE_QT4 + #include <tqlayout.h> #include <tqlabel.h> #include <tqvalidator.h> @@ -225,7 +229,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, for ( TQStringList::ConstIterator it=select.begin(); it!=select.end(); ++it ) { - item = d->m_listBox->findItem( *it, CaseSensitive|ExactMatch ); + item = d->m_listBox->tqfindItem( *it, CaseSensitive|ExactMatch ); if ( item ) d->m_listBox->setSelected( item, true ); } @@ -238,7 +242,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, TQT_SLOT( slotOk() ) ); TQString text = select.first(); - item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch ); + item = d->m_listBox->tqfindItem( text, CaseSensitive|ExactMatch ); if ( item ) d->m_listBox->setSelected( item, true ); } diff --git a/kdeui/kinputdialog.h b/kdeui/kinputdialog.h index c675a280c..76a5db2dd 100644 --- a/kdeui/kinputdialog.h +++ b/kdeui/kinputdialog.h @@ -20,7 +20,7 @@ #ifndef KINPUTDIALOG_H #define KINPUTDIALOG_H -#include <tqt.h> +// #include <tqt.h> #include <kdialogbase.h> diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp index 4fb398395..cb7da4a4f 100644 --- a/kdeui/kjanuswidget.cpp +++ b/kdeui/kjanuswidget.cpp @@ -45,7 +45,7 @@ #include "kpushbutton.h" #include "kguiitem.h" -class KJanusWidget::IconListItem : public QListBoxItem +class KJanusWidget::IconListItem : public TQListBoxItem { public: IconListItem( TQListBox *listbox, const TQPixmap &pixmap, @@ -254,7 +254,7 @@ TQFrame *KJanusWidget::addPage( const TQStringList &items, const TQString &heade void KJanusWidget::pageGone( TQObject *obj ) { - removePage( static_cast<TQWidget*>( obj ) ); + removePage( TQT_TQWIDGET( obj ) ); } void KJanusWidget::slotReopen( TQListViewItem * item ) @@ -413,7 +413,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap curPath << name; TQString key = curPath.join("_/_"); - if (mFolderIconMap.contains(key)) { + if (mFolderIconMap.tqcontains(key)) { TQPixmap p = mFolderIconMap[key]; newChild->setPixmap(0,p); } @@ -459,8 +459,8 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, TQString itemName = items.last(); IconListItem *item = new IconListItem( mIconList, pixmap, itemName ); mIconListToPageStack.insert(item, page); - mIconList->invalidateHeight(); - mIconList->invalidateWidth(); + mIconList->tqinvalidateHeight(); + mIconList->tqinvalidateWidth(); if (mIconList->isVisible()) mIconList->updateWidth(); @@ -515,10 +515,10 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) // // Hide old children // - TQObjectList *l = (TQObjectList*)mSwallowPage->children(); // silence please - for( uint i=0; i < l->count(); i++ ) + TQObjectList l = mSwallowPage->childrenListObject(); // silence please + for( uint i=0; i < l.count(); i++ ) { - TQObject *o = l->at(i); + TQObject *o = l.at(i); if( o->isWidgetType() ) { ((TQWidget*)o)->hide(); @@ -542,7 +542,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) } gbox->addWidget(widget, 0, 0 ); gbox->activate(); - mSwallowPage->setMinimumSize( widget->minimumSize() ); + mSwallowPage->setMinimumSize( widget->tqminimumSize() ); } return true; @@ -686,7 +686,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const // if( widget->isA("TQFrame") ) { - return d->mPageToInt[widget->parentWidget()]; + return d->mPageToInt[widget->tqparentWidget()]; } else { @@ -714,8 +714,8 @@ void KJanusWidget::slotFontChanged() TQFont listFont( mIconList->font() ); listFont.setBold( true ); mIconList->setFont( listFont ); - mIconList->invalidateHeight(); - mIconList->invalidateWidth(); + mIconList->tqinvalidateHeight(); + mIconList->tqinvalidateWidth(); } } @@ -758,31 +758,31 @@ void KJanusWidget::setFocus() } -TQSize KJanusWidget::minimumSizeHint() const +TQSize KJanusWidget::tqminimumSizeHint() const { if( mFace == TreeList || mFace == IconList ) { TQSize s1( KDialog::spacingHint(), KDialog::spacingHint()*2 ); TQSize s2(0,0); TQSize s3(0,0); - TQSize s4( mPageStack->sizeHint() ); + TQSize s4( mPageStack->tqsizeHint() ); if( mFace == TreeList ) { - s1.rwidth() += style().pixelMetric( TQStyle::PM_SplitterWidth ); - s2 = mTreeList->minimumSize(); + s1.rwidth() += tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth ); + s2 = mTreeList->tqminimumSize(); } else { mIconList->updateMinimumHeight(); mIconList->updateWidth(); - s2 = mIconList->minimumSize(); + s2 = mIconList->tqminimumSize(); } if( mTitleLabel->isVisible() ) { - s3 += mTitleLabel->sizeHint(); - s3.rheight() += mTitleSep->minimumSize().height(); + s3 += mTitleLabel->tqsizeHint(); + s3.rheight() += mTitleSep->tqminimumSize().height(); } // @@ -795,15 +795,15 @@ TQSize KJanusWidget::minimumSizeHint() const } else if( mFace == Tabbed ) { - return mTabControl->sizeHint(); + return mTabControl->tqsizeHint(); } else if( mFace == Swallow ) { - return mSwallowPage->minimumSize(); + return mSwallowPage->tqminimumSize(); } else if( mFace == Plain ) { - return mPlainPage->sizeHint(); + return mPlainPage->tqsizeHint(); } else { @@ -813,9 +813,9 @@ TQSize KJanusWidget::minimumSizeHint() const } -TQSize KJanusWidget::sizeHint() const +TQSize KJanusWidget::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } @@ -914,7 +914,7 @@ bool KJanusWidget::eventFilter( TQObject *o, TQEvent *e ) if( item ) { int lw = item->width( mIconList ); - int sw = mIconList->verticalScrollBar()->sizeHint().width(); + int sw = mIconList->verticalScrollBar()->tqsizeHint().width(); mIconList->setFixedWidth( lw+sw+mIconList->frameWidth()*2 ); } } @@ -978,7 +978,7 @@ void KJanusWidget::IconListBox::updateWidth() if( verticalScrollBar()->isVisible() ) { - maxWidth += verticalScrollBar()->sizeHint().width(); + maxWidth += verticalScrollBar()->tqsizeHint().width(); } setFixedWidth( maxWidth + frameWidth()*2 ); @@ -987,13 +987,13 @@ void KJanusWidget::IconListBox::updateWidth() } -void KJanusWidget::IconListBox::invalidateHeight() +void KJanusWidget::IconListBox::tqinvalidateHeight() { mHeightValid = false; } -void KJanusWidget::IconListBox::invalidateWidth() +void KJanusWidget::IconListBox::tqinvalidateWidth() { mWidthValid = false; } @@ -1074,13 +1074,13 @@ void KJanusWidget::IconListItem::highlight( bool erase ) // For now, always disable highlighting erase = true; - TQRect r = listBox()->itemRect( this ); + TQRect r = listBox()->tqitemRect( this ); r.addCoords( 1, 1, -1, -1 ); TQPainter p( listBox()->viewport() ); p.setClipRegion( r ); - const TQColorGroup &cg = listBox()->colorGroup(); + const TQColorGroup &cg = listBox()->tqcolorGroup(); if ( erase ) { p.setPen( cg.base() ); @@ -1129,7 +1129,7 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap() void KJanusWidget::IconListItem::paint( TQPainter *painter ) { - TQRect itemPaintRegion( listBox()->itemRect( this ) ); + TQRect itemPaintRegion( listBox()->tqitemRect( this ) ); TQRect r( 1, 1, itemPaintRegion.width() - 2, itemPaintRegion.height() - 2); if ( isSelected() ) @@ -1137,7 +1137,7 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter ) painter->eraseRect( r ); painter->save(); - painter->setPen( listBox()->colorGroup().highlight().dark( 160 ) ); + painter->setPen( listBox()->tqcolorGroup().highlight().dark( 160 ) ); painter->drawRect( r ); painter->restore(); } @@ -1191,7 +1191,7 @@ void KJanusWidget::virtual_hook( int, void* ) // delete the node. void KJanusWidget::removePage( TQWidget *page ) { - if (!d || !d->mPageToInt.contains(page)) + if (!d || !d->mPageToInt.tqcontains(page)) return; int index = d->mPageToInt[page]; @@ -1237,7 +1237,7 @@ void KJanusWidget::removePage( TQWidget *page ) TQString KJanusWidget::pageTitle(int index) const { - if (!d || !d->mIntToTitle.contains(index)) + if (!d || !d->mIntToTitle.tqcontains(index)) return TQString::null; else return d->mIntToTitle[index]; @@ -1246,7 +1246,7 @@ TQString KJanusWidget::pageTitle(int index) const TQWidget *KJanusWidget::pageWidget(int index) const { - if (!d || !d->mIntToPage.contains(index)) + if (!d || !d->mIntToPage.tqcontains(index)) return 0; else return d->mIntToPage[index]; diff --git a/kdeui/kjanuswidget.h b/kdeui/kjanuswidget.h index cc22dc334..5f521612c 100644 --- a/kdeui/kjanuswidget.h +++ b/kdeui/kjanuswidget.h @@ -50,12 +50,12 @@ class KGuiItem; * This class provides KJanusWidget::TreeList, KJanusWidget::IconList, * KJanusWidget::Tabbed, KJanusWidget::Plain and KJanusWidget::Swallow layouts. * - * For all modes it is important that you specify the TQWidget::minimumSize() + * For all modes it is important that you specify the TQWidget::tqminimumSize() * on the page, plain widget or the swallowed widget. If you use a QLayout * on the page, plain widget or the swallowed widget this will be taken care * of automatically. The size is used when the KJanusWidget determines its * own minimum size. You get the minimum size by using the - * minimumSizeHint() or sizeHint() methods. + * tqminimumSizeHint() or tqsizeHint() methods. * * Pages that have been added in TreeList, IconList or Tabbed mode can be * removed by simply deleting the page. However, it would be preferable to use @@ -64,7 +64,7 @@ class KGuiItem; * * @author Espen Sand (espen@kde.org) */ -class KDEUI_EXPORT KJanusWidget : public QWidget +class KDEUI_EXPORT KJanusWidget : public TQWidget { Q_OBJECT @@ -77,8 +77,8 @@ class KDEUI_EXPORT KJanusWidget : public QWidget IconListBox( TQWidget *parent=0, const char *name=0, WFlags f=0 ); void updateMinimumHeight(); void updateWidth(); - void invalidateHeight(); - void invalidateWidth(); + void tqinvalidateHeight(); + void tqinvalidateWidth(); void setShowAll( bool showAll ); protected: @@ -186,7 +186,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * * @return The minimum size. */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * Returns the recommended size for the widget in order to be displayed @@ -194,7 +194,7 @@ class KDEUI_EXPORT KJanusWidget : public QWidget * * @return The recommended size. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * Returns the empty widget that is available in Plain mode. diff --git a/kdeui/kkeybutton.cpp b/kdeui/kkeybutton.cpp index 581d7bf40..27ae04c23 100644 --- a/kdeui/kkeybutton.cpp +++ b/kdeui/kkeybutton.cpp @@ -69,7 +69,7 @@ KKeyButton::KKeyButton(TQWidget *parent, const char *name) : TQPushButton( parent, name ) { d = new KKeyButtonPrivate; - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); m_bEditing = false; connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureShortcut()) ); setShortcut( KShortcut(), true ); @@ -85,7 +85,7 @@ void KKeyButton::setShortcut( const KShortcut& cut, bool bQtShortcut ) d->bQtShortcut = bQtShortcut; m_cut = cut; TQString keyStr = m_cut.toString(); - keyStr.replace('&', TQString::fromLatin1("&&")); + keyStr.replace('&', TQString::tqfromLatin1("&&")); setText( keyStr.isEmpty() ? i18n("None") : keyStr ); } @@ -98,7 +98,7 @@ void KKeyButton::setShortcut( const KShortcut& cut ) void KKeyButton::setText( const TQString& text ) { TQPushButton::setText( text ); - setFixedSize( sizeHint().width()+12, sizeHint().height()+8 ); + setFixedSize( tqsizeHint().width()+12, tqsizeHint().height()+8 ); } void KKeyButton::captureShortcut() @@ -106,7 +106,7 @@ void KKeyButton::captureShortcut() KShortcut cut; m_bEditing = true; - repaint(); + tqrepaint(); { KShortcutDialog dlg( m_cut, d->bQtShortcut, this ); @@ -117,7 +117,7 @@ void KKeyButton::captureShortcut() emit capturedShortcut( cut ); m_bEditing = false; - repaint(); + tqrepaint(); } void KKeyButton::drawButton( TQPainter *painter ) @@ -146,11 +146,11 @@ void KKeyButton::drawButton( TQPainter *painter ) painter->setClipping( false ); if( width() > 12 && height() > 8 ) qDrawShadePanel( painter, 6, 4, width() - 12, height() - 8, - colorGroup(), true, 1, 0L ); + tqcolorGroup(), true, 1, 0L ); if ( m_bEditing ) { - painter->setPen( colorGroup().base() ); - painter->setBrush( colorGroup().base() ); + painter->setPen( tqcolorGroup().base() ); + painter->setBrush( tqcolorGroup().base() ); } else { @@ -162,7 +162,7 @@ void KKeyButton::drawButton( TQPainter *painter ) drawButtonLabel( painter ); - painter->setPen( colorGroup().text() ); + painter->setPen( tqcolorGroup().text() ); painter->setBrush( NoBrush ); if( hasFocus() || m_bEditing ) { diff --git a/kdeui/kkeybutton.h b/kdeui/kkeybutton.h index 9e9b6265c..97895f8fe 100644 --- a/kdeui/kkeybutton.h +++ b/kdeui/kkeybutton.h @@ -37,7 +37,7 @@ * @author Mark Donohoe <donohoe@kde.org> * @internal */ -class KDEUI_EXPORT KKeyButton: public QPushButton +class KDEUI_EXPORT KKeyButton: public TQPushButton { Q_OBJECT diff --git a/kdeui/kkeydialog.cpp b/kdeui/kkeydialog.cpp index 13835b650..775f00661 100644 --- a/kdeui/kkeydialog.cpp +++ b/kdeui/kkeydialog.cpp @@ -106,7 +106,7 @@ class KKeyChooserItem : public KListViewItem }; // WhatsThis on KKeyChooserItems -class KKeyChooserWhatsThis : public QWhatsThis +class KKeyChooserWhatsThis : public TQWhatsThis { public: KKeyChooserWhatsThis( TQListView* listview ) @@ -340,7 +340,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) // fill up the split list box with the action/key pairs. // TQGridLayout *stackLayout = new TQGridLayout(2, 2, 2); - topLayout->addLayout( stackLayout, 10 ); + topLayout->addLayout( TQT_TQLAYOUT(stackLayout), 10 ); stackLayout->setRowStretch( 1, 10 ); // Only list will stretch d->pList = new KListView( this ); @@ -423,7 +423,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->pbtnShortcut = new KKeyButton(d->fCArea, "key"); d->pbtnShortcut->setEnabled( false ); connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), TQT_SLOT(capturedShortcut(const KShortcut&)) ); - grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 ); + grid->addRowSpacing( 1, d->pbtnShortcut->tqsizeHint().height() + 5 ); wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, " "you can press the key-combination which you would like to be assigned " @@ -439,7 +439,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->lInfo = new TQLabel(d->fCArea); //resize(0,0); - //d->lInfo->setAlignment( AlignCenter ); + //d->lInfo->tqsetAlignment( AlignCenter ); //d->lInfo->setEnabled( false ); //d->lInfo->hide(); grid->addMultiCellWidget( d->lInfo, 2, 2, 0, 3 ); @@ -532,7 +532,7 @@ void KKeyChooser::updateButtons() d->pbtnShortcut->setShortcut( pItem->shortcut(), bQtShortcut ); //item->setText( 1, keyStrCfg ); - pItem->repaint(); + pItem->tqrepaint(); d->lInfo->setText( i18n("Default key:") + TQString(" %1").arg(keyStrDef.isEmpty() ? i18n("None") : keyStrDef) ); // Select the appropriate radio button. @@ -601,7 +601,7 @@ void KKeyChooser::slotSettingsChanged( int category ) void KKeyChooser::fontChange( const TQFont & ) { - d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->sizeHint().height() ); + d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->tqsizeHint().height() ); int widget_width = 0; @@ -1010,7 +1010,7 @@ void KKeyChooserItem::setShortcut( const KShortcut& cut ) { m_cut = cut; m_bModified = (m_cut != m_pList->shortcut(m_iAction)); - listView()->repaintItem( this ); + listView()->tqrepaintItem( this ); } void KKeyChooserItem::commitChanges() diff --git a/kdeui/kkeydialog.h b/kdeui/kkeydialog.h index ab707ac8d..8b7390e0e 100644 --- a/kdeui/kkeydialog.h +++ b/kdeui/kkeydialog.h @@ -55,7 +55,7 @@ class KKeyChooserItem; * @see KKeyDialog * @author Nicolas Hadacek <hadacek@via.ecp.fr> */ -class KDEUI_EXPORT KKeyChooser : public QWidget +class KDEUI_EXPORT KKeyChooser : public TQWidget { Q_OBJECT public: diff --git a/kdeui/klanguagebutton.cpp b/kdeui/klanguagebutton.cpp index abbc4f5d3..469fef5a1 100644 --- a/kdeui/klanguagebutton.cpp +++ b/kdeui/klanguagebutton.cpp @@ -60,12 +60,12 @@ static void checkInsertPos( TQPopupMenu *popup, const TQString & str, static TQPopupMenu * checkInsertIndex( TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu ) { - int pos = tags->findIndex( submenu ); + int pos = tags->tqfindIndex( submenu ); TQPopupMenu *pi = 0; if ( pos != -1 ) { - TQMenuItem *p = popup->findItem( pos ); + TQMenuItem *p = popup->tqfindItem( pos ); pi = p ? p->popup() : 0; } if ( !pi ) @@ -131,12 +131,12 @@ KLanguageButton::~KLanguageButton() void KLanguageButton::insertLanguage( const TQString& path, const TQString& name, const TQString&, const TQString &submenu, int index ) { - TQString output = name + TQString::fromLatin1( " (" ) + path + - TQString::fromLatin1( ")" ); + TQString output = name + TQString::tqfromLatin1( " (" ) + path + + TQString::tqfromLatin1( ")" ); #if 0 // Nooooo ! Country != language TQPixmap flag( locate( "locale", sub + path + - TQString::fromLatin1( "/flag.png" ) ) ); + TQString::tqfromLatin1( "/flag.png" ) ) ); #endif insertItem( output, path, submenu, index ); } @@ -232,7 +232,7 @@ void KLanguageButton::clear() bool KLanguageButton::contains( const TQString & id ) const { - return m_ids->contains( id ) > 0; + return m_ids->tqcontains( id ) > 0; } TQString KLanguageButton::current() const @@ -276,7 +276,7 @@ void KLanguageButton::setCurrentItem( int i ) void KLanguageButton::setCurrentItem( const TQString & id ) { - int i = m_ids->findIndex( id ); + int i = m_ids->tqfindIndex( id ); if ( id.isNull() ) i = 0; if ( i != -1 ) diff --git a/kdeui/klanguagebutton.h b/kdeui/klanguagebutton.h index c167930db..4b381abe9 100644 --- a/kdeui/klanguagebutton.h +++ b/kdeui/klanguagebutton.h @@ -44,7 +44,7 @@ class TQPopupMenu; * Combined version of KTagCombo and KLanguageCombo but using a QPushButton * instead. */ -class KDEUI_EXPORT KLanguageButton : public QWidget +class KDEUI_EXPORT KLanguageButton : public TQWidget { Q_OBJECT diff --git a/kdeui/kled.cpp b/kdeui/kled.cpp index b7980203b..aebf6ce26 100644 --- a/kdeui/kled.cpp +++ b/kdeui/kled.cpp @@ -51,7 +51,7 @@ KLed::KLed(TQWidget *parent, const char *name) : TQWidget( parent, name), led_state(On), led_look(Raised), - led_shape(Circular) + led_tqshape(Circular) { TQColor col(green); d = new KLed::KLedPrivate; @@ -68,7 +68,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name) : TQWidget( parent, name), led_state(On), led_look(Raised), - led_shape(Circular) + led_tqshape(Circular) { d = new KLed::KLedPrivate; d->dark_factor = 300; @@ -81,11 +81,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name) } KLed::KLed(const TQColor& col, KLed::State state, - KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name ) + KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name ) : TQWidget(parent, name), led_state(state), led_look(look), - led_shape(shape) + led_tqshape(tqshape) { d = new KLed::KLedPrivate; d->dark_factor = 300; @@ -93,7 +93,7 @@ KLed::KLed(const TQColor& col, KLed::State state, d->off_map = 0; d->on_map = 0; - //setShape(shape); + //setShape(tqshape); setColor(col); } @@ -114,7 +114,7 @@ KLed::paintEvent(TQPaintEvent *) t.start(); for (int i=0; i<rounds; i++) { #endif - switch(led_shape) + switch(led_tqshape) { case Rectangular: switch (led_look) @@ -129,7 +129,7 @@ KLed::paintEvent(TQPaintEvent *) paintRect(); break; default : - qWarning("%s: in class KLed: no KLed::Look set",qApp->argv()[0]); + qWarning("%s: in class KLed: no KLed::Look set",tqApp->argv()[0]); } break; case Circular: @@ -145,11 +145,11 @@ KLed::paintEvent(TQPaintEvent *) paintSunken(); break; default: - qWarning("%s: in class KLed: no KLed::Look set",qApp->argv()[0]); + qWarning("%s: in class KLed: no KLed::Look set",tqApp->argv()[0]); } break; default: - qWarning("%s: in class KLed: no KLed::Shape set",qApp->argv()[0]); + qWarning("%s: in class KLed: no KLed::Shape set",tqApp->argv()[0]); break; } #ifdef PAINT_BENCH @@ -225,11 +225,11 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn with a thin gray "border" (pen) - brush.setStyle( TQBrush::SolidPattern ); + brush.setStyle( Qt::SolidPattern ); brush.setColor( color ); pen.setWidth( scale ); - color = colorGroup().dark(); + color = tqcolorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing @@ -280,7 +280,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( TQBrush::SolidPattern ); + brush.setStyle( Qt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -325,10 +325,10 @@ KLed::paintRound() // paint a ROUND RAISED led lamp // avoid that the border can be erased by the bright spot of the LED pen.setWidth( 2 * scale + 1 ); - color = colorGroup().dark(); + color = tqcolorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing - brush.setStyle( TQBrush::NoBrush ); // Switch off the brush + brush.setStyle( Qt::NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse paint.drawEllipse( 2, 2, width, width ); @@ -376,7 +376,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( TQBrush::SolidPattern ); + brush.setStyle( Qt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -421,14 +421,14 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp // from the upper left. pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs? - brush.setStyle( TQBrush::NoBrush ); // Switch off the brush + brush.setStyle( (Qt::BrushStyle)NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse // Set the initial color value to colorGroup().light() (bright) and start // drawing the shadow border at 45° (45*16 = 720). int angle = -720; - color = colorGroup().light(); + color = tqcolorGroup().light(); for ( int arc = 120; arc < 2880; arc += 240 ) { pen.setColor( color ); @@ -525,12 +525,12 @@ KLed::state() const } KLed::Shape -KLed::shape() const +KLed::tqshape() const { - return led_shape; + return led_tqshape; } -QColor +TQColor KLed::color() const { return led_color; @@ -561,9 +561,9 @@ KLed::toggleState() void KLed::setShape(KLed::Shape s) { - if(led_shape!=s) + if(led_tqshape!=s) { - led_shape = s; + led_tqshape = s; update(); } } @@ -626,14 +626,14 @@ KLed::off() setState(Off); } -QSize -KLed::sizeHint() const +TQSize +KLed::tqsizeHint() const { return TQSize(16, 16); } -QSize -KLed::minimumSizeHint() const +TQSize +KLed::tqminimumSizeHint() const { return TQSize(16, 16 ); } diff --git a/kdeui/kled.h b/kdeui/kled.h index 580f01ab4..06683bbaa 100644 --- a/kdeui/kled.h +++ b/kdeui/kled.h @@ -42,12 +42,12 @@ class TQColor; * * @author Joerg Habenicht, Richard J. Moore (rich@kde.org) 1998, 1999 */ -class KDEUI_EXPORT KLed : public QWidget +class KDEUI_EXPORT KLed : public TQWidget { Q_OBJECT Q_ENUMS( State Shape Look ) Q_PROPERTY( State state READ state WRITE setState ) - Q_PROPERTY( Shape shape READ shape WRITE setShape ) + Q_PROPERTY( Shape tqshape READ tqshape WRITE setShape ) Q_PROPERTY( Look look READ look WRITE setLook ) Q_PROPERTY( TQColor color READ color WRITE setColor ) Q_PROPERTY( int darkFactor READ darkFactor WRITE setDarkFactor ) @@ -62,7 +62,7 @@ public: /** * Shades of the lamp. - * @short LED shape + * @short LED tqshape */ enum Shape { Rectangular, Circular }; @@ -114,12 +114,12 @@ public: * @param col Initial color of the LED. * @param state Sets the State. * @param look Sets the Look. - * @param shape Sets the Shape (rectangular or circular) + * @param tqshape Sets the Shape (rectangular or circular) * @param parent Will be handed over to TQWidget. * @param name Will be handed over to TQWidget. * @short Constructor */ - KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape shape, + KLed(const TQColor& col, KLed::State state, KLed::Look look, KLed::Shape tqshape, TQWidget *parent=0, const char *name=0); @@ -137,7 +137,7 @@ public: */ State state() const; - Shape shape() const; + Shape tqshape() const; /** * Returns the color of the widget @@ -175,13 +175,13 @@ public: void setState( State state ); /** - * Set the shape of the LED to @p s. + * Set the tqshape of the LED to @p s. */ void setShape(Shape s); /** * Toggle the state of the LED from Off to On and vice versa. * - * The widget will be repainted when returning to the main + * The widget will be tqrepainted when returning to the main * event loop. * @short Toggles LED on->off / off->on. * @deprecated, use #toggle() instead. @@ -249,15 +249,15 @@ public: */ void setLook( Look look ); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; public slots: /** * Toggles the state of the led from Off to On or vice versa. * - * The widget repaints itself immediately. + * The widget tqrepaints itself immediately. */ void toggle(); @@ -317,7 +317,7 @@ private: State led_state; TQColor led_color; Look led_look; - Shape led_shape; + Shape led_tqshape; protected: virtual void virtual_hook( int id, void* data ); diff --git a/kdeui/klineedit.cpp b/kdeui/klineedit.cpp index f89f4cf25..d3d50795c 100644 --- a/kdeui/klineedit.cpp +++ b/kdeui/klineedit.cpp @@ -273,7 +273,7 @@ void KLineEdit::setReadOnly(bool readOnly) if (readOnly) { d->bgMode = backgroundMode (); - setBackgroundMode (Qt::PaletteBackground); + setBackgroundMode (TQt::PaletteBackground); if (d->enableSqueezedText && d->squeezedText.isEmpty()) { d->squeezedText = text(); @@ -526,9 +526,9 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { KeyBindingMap keys = getKeyBindings(); KGlobalSettings::Completion mode = completionMode(); - bool noModifier = (e->state() == NoButton || - e->state() == ShiftButton || - e->state() == Keypad); + bool noModifier = (e->state() == Qt::NoButton || + e->state() == TQt::ShiftButton || + e->state() == TQt::Keypad); if ( (mode == KGlobalSettings::CompletionAuto || mode == KGlobalSettings::CompletionPopupAuto || @@ -536,7 +536,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) { if ( !d->userSelection && hasSelectedText() && ( e->key() == Key_Right || e->key() == Key_Left ) && - e->state()==NoButton ) + e->state()== Qt::NoButton ) { TQString old_txt = text(); d->disableRestoreSelection = true; @@ -575,7 +575,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) mode == KGlobalSettings::CompletionMan) && noModifier ) { TQString keycode = e->text(); - if ( !keycode.isEmpty() && (keycode.unicode()->isPrint() || + if ( !keycode.isEmpty() && (keycode.tqunicode()->isPrint() || e->key() == Key_Backspace || e->key() == Key_Delete ) ) { bool hasUserSelection=d->userSelection; @@ -658,7 +658,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) // as if there was no selection. After processing the key event, we // can set the new autocompletion again. if (hadSelection && !hasUserSelection && start>cPos && - ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) || + ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) || e->key() == Key_Backspace || e->key() == Key_Delete ) ) { del(); @@ -679,7 +679,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e ) int len = txt.length(); if ( txt != old_txt && len/* && ( cursorPosition() == len || force )*/ && - ( (!keycode.isEmpty() && keycode.unicode()->isPrint()) || + ( (!keycode.isEmpty() && keycode.tqunicode()->isPrint()) || e->key() == Key_Backspace || e->key() == Key_Delete) ) { if ( e->key() == Key_Backspace ) @@ -841,7 +841,7 @@ void KLineEdit::mouseReleaseEvent( TQMouseEvent* e ) { TQLineEdit::mouseReleaseEvent( e ); if (TQApplication::clipboard()->supportsSelection() ) { - if ( e->button() == LeftButton ) { + if ( e->button() == Qt::LeftButton ) { // Fix copying of squeezed text if needed copySqueezedText( false ); } @@ -1006,12 +1006,12 @@ void KLineEdit::dropEvent(TQDropEvent *e) bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) { - if( o == this ) + if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { - KCursor::autoHideEventFilter( this, ev ); + KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev ); if ( ev->type() == TQEvent::AccelOverride ) { - TQKeyEvent *e = static_cast<TQKeyEvent *>( ev ); + TQKeyEvent *e = TQT_TQKEYEVENT( ev ); if (overrideAccel (e)) { e->accept(); @@ -1020,15 +1020,15 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) } else if( ev->type() == TQEvent::KeyPress ) { - TQKeyEvent *e = static_cast<TQKeyEvent *>( ev ); + TQKeyEvent *e = TQT_TQKEYEVENT( ev ); if( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) { bool trap = d->completionBox && d->completionBox->isVisible(); bool stopEvent = trap || (d->grabReturnKeyEvents && - (e->state() == NoButton || - e->state() == Keypad)); + (e->state() == Qt::NoButton || + e->state() == TQt::Keypad)); // Qt will emit returnPressed() itself if we return false if ( stopEvent ) @@ -1182,7 +1182,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e) int key = e->key(); ButtonState state = e->state(); if ((key == Key_Backtab || key == Key_Tab) && - (state == NoButton || (state & ShiftButton))) + (state == Qt::NoButton || (state & TQt::ShiftButton))) { return true; } @@ -1219,7 +1219,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) bool wasSelected = d->completionBox->isSelected( d->completionBox->currentItem() ); const TQString currentSelection = d->completionBox->currentText(); d->completionBox->setItems( items ); - TQListBoxItem* item = d->completionBox->findItem( currentSelection, Qt::ExactMatch ); + TQListBoxItem* item = d->completionBox->tqfindItem( currentSelection, TQt::ExactMatch ); // If no item is selected, that means the listbox hasn't been manipulated by the user yet, // because it's not possible otherwise to have no selected item. In such case make // always the first item current and unselected, so that the current item doesn't jump. @@ -1246,7 +1246,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) if ( d->autoSuggest && autoSuggest ) { - int index = items.first().find( txt ); + int index = items.first().tqfind( txt ); TQString newText = items.first().mid( index ); setUserSelection(false); setCompletedText(newText,true); diff --git a/kdeui/klineeditdlg.cpp b/kdeui/klineeditdlg.cpp index 9551fc1f6..2df4a14ad 100644 --- a/kdeui/klineeditdlg.cpp +++ b/kdeui/klineeditdlg.cpp @@ -44,7 +44,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, topLayout->addWidget( label, 1 ); edit = new KLineEdit( plainPage(), 0L ); - edit->setMinimumWidth(edit->sizeHint().width() * 3); + edit->setMinimumWidth(edit->tqsizeHint().width() * 3); label->setBuddy(edit); // please "scheck" style // connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); connect( edit, TQT_SIGNAL(textChanged(const TQString&)), @@ -75,7 +75,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, layout->addWidget(label, 0, 0, AlignLeft); edit = new KLineEdit( this, 0L ); - edit->setMinimumWidth(edit->sizeHint().width() * 3); + edit->setMinimumWidth(edit->tqsizeHint().width() * 3); connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); if ( _file_mode ) { diff --git a/kdeui/klineeditdlg.h b/kdeui/klineeditdlg.h index 6e6fc2d89..ac8d834e4 100644 --- a/kdeui/klineeditdlg.h +++ b/kdeui/klineeditdlg.h @@ -20,7 +20,7 @@ #ifndef __klineeditdlg_h__ #define __klineeditdlg_h__ -#include <tqt.h> +// #include <tqt.h> #include <kdialogbase.h> diff --git a/kdeui/klistbox.cpp b/kdeui/klistbox.cpp index 73a08b89a..13c5ab325 100644 --- a/kdeui/klistbox.cpp +++ b/kdeui/klistbox.cpp @@ -249,14 +249,14 @@ void KListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) if( item ) { emit doubleClicked( item, e->globalPos() ); - if( (e->button() == LeftButton) && !m_bUseSingle ) + if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) emitExecute( item, e->globalPos() ); } } void KListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos ) { - if( (btn == LeftButton) && item ) + if( (btn == Qt::LeftButton) && item ) emitExecute( item, pos ); } diff --git a/kdeui/klistbox.h b/kdeui/klistbox.h index b19819c79..48d8cd1dc 100644 --- a/kdeui/klistbox.h +++ b/kdeui/klistbox.h @@ -37,7 +37,7 @@ * settings. If you want to get informed when the user selects * something connect to the TQListBox::selectionChanged() signal. **/ -class KDEUI_EXPORT KListBox : public QListBox +class KDEUI_EXPORT KListBox : public TQListBox { Q_OBJECT diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp index 332bc4e8c..2e9253ac7 100644 --- a/kdeui/klistview.cpp +++ b/kdeui/klistview.cpp @@ -37,7 +37,7 @@ #include "klistview.h" #include "klistviewlineedit.h" -class KListView::Tooltip : public QToolTip +class KListView::Tooltip : public TQToolTip { public: Tooltip (KListView* parent, TQToolTipGroup* group = 0L); @@ -197,7 +197,7 @@ void KListViewLineEdit::load(TQListViewItem *i, int c) item=i; col=c; - TQRect rect(p->itemRect(i)); + TQRect rect(p->tqitemRect(i)); setText(item->text(c)); home( true ); @@ -252,7 +252,7 @@ static TQListViewItem *prevItem (TQListViewItem *pi) /* Does what the TQListViewItem::previousSibling() * of my dreams would do. */ - if (pa && pa->parent() == pi->parent()) + if (pa && pa->tqparent() == pi->tqparent()) return pa; return 0; @@ -278,8 +278,8 @@ void KListViewLineEdit::selectNextCell (TQListViewItem *pitem, int column, bool const int ncols = p->columns(); const int dir = forward ? +1 : -1; const int restart = forward ? 0 : (ncols - 1); - TQListViewItem *top = (pitem && pitem->parent()) - ? pitem->parent()->firstChild() + TQListViewItem *top = (pitem && pitem->tqparent()) + ? pitem->tqparent()->firstChild() : p->firstChild(); TQListViewItem *pi = pitem; @@ -611,12 +611,12 @@ void KListView::slotAutoSelect() if( d->pCurrentItem ) { //Shift pressed? - if( (keybstate & Qt::ShiftButton) ) { + if( (keybstate & TQt::ShiftButton) ) { bool block = signalsBlocked(); blockSignals( true ); //No Ctrl? Then clear before! - if( !(keybstate & Qt::ControlButton) ) + if( !(keybstate & TQt::ControlButton) ) clearSelection(); bool select = !d->pCurrentItem->isSelected(); @@ -695,8 +695,8 @@ void KListView::emitExecute( TQListViewItem *item, const TQPoint &pos, int c ) d->autoSelect.stop(); - //Don´t emit executed if in SC mode and Shift or Ctrl are pressed - if( !( ((keybstate & Qt::ShiftButton) || (keybstate & Qt::ControlButton)) ) ) { + //Don't emit executed if in SC mode and Shift or Ctrl are pressed + if( !( ((keybstate & TQt::ShiftButton) || (keybstate & TQt::ControlButton)) ) ) { viewport()->unsetCursor(); emit executed( item ); emit executed( item, pos, c ); @@ -716,7 +716,7 @@ void KListView::focusInEvent( TQFocusEvent *fe ) && (currentItem())) { currentItem()->setSelected(true); - currentItem()->repaint(); + currentItem()->tqrepaint(); emit selectionChanged(); }; } @@ -736,7 +736,7 @@ void KListView::focusOutEvent( TQFocusEvent *fe ) && (!d->editor->isVisible())) { currentItem()->setSelected(false); - currentItem()->repaint(); + currentItem()->tqrepaint(); emit selectionChanged(); }; @@ -776,7 +776,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e ) if (currentItem()) { currentItem()->setSelected(false); - currentItem()->repaint(); + currentItem()->tqrepaint(); // emit selectionChanged(); } } @@ -790,7 +790,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e ) treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() ) && ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) ); - if (e->button() == LeftButton && !rootDecoClicked) + if (e->button() == Qt::LeftButton && !rootDecoClicked) { //Start a drag d->startDragPos = e->pos(); @@ -847,7 +847,7 @@ void KListView::contentsMouseMoveEvent( TQMouseEvent *e ) void KListView::contentsMouseReleaseEvent( TQMouseEvent *e ) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { // If the row was already selected, maybe we want to start an in-place editing if ( d->pressedOnSelected && itemsRenameable() ) @@ -865,7 +865,7 @@ void KListView::contentsMouseReleaseEvent( TQMouseEvent *e ) if (!rootDecoClicked) { int col = header()->mapToLogical( header()->cellAt( p.x() ) ); - if ( d->renameable.contains(col) ) + if ( d->renameable.tqcontains(col) ) rename(at, col); } } @@ -883,7 +883,7 @@ void KListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) // We don't want to call the parent method because it does setOpen, // whereas we don't do it in single click mode... (David) //TQListView::contentsMouseDoubleClickEvent( e ); - if ( !e || e->button() != LeftButton ) + if ( !e || e->button() != Qt::LeftButton ) return; TQPoint vp = contentsToViewport(e->pos()); @@ -895,14 +895,14 @@ void KListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e ) if( item ) { emit doubleClicked( item, e->globalPos(), col ); - if( (e->button() == LeftButton) && !d->bUseSingle ) + if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) emitExecute( item, e->globalPos(), col ); } } void KListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c ) { - if( (btn == LeftButton) && item ) + if( (btn == Qt::LeftButton) && item ) emitExecute(item, pos, c); } @@ -1008,7 +1008,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event) { cleanDropVisualizer(); d->mOldDropVisualizer=tmpRect; - viewport()->repaint(tmpRect); + viewport()->tqrepaint(tmpRect); } } if (dropHighlighter()) @@ -1018,7 +1018,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event) { cleanItemHighlighter(); d->mOldDropHighlighter=tmpRect; - viewport()->repaint(tmpRect); + viewport()->tqrepaint(tmpRect); } } } @@ -1045,7 +1045,7 @@ void KListView::cleanDropVisualizer() { TQRect rect=d->mOldDropVisualizer; d->mOldDropVisualizer = TQRect(); - viewport()->repaint(rect, true); + viewport()->tqrepaint(rect, true); } } @@ -1067,7 +1067,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView else { // Get the closest item before us ('atpos' or the one above, if any) - if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2)) + if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2)) above = atpos->itemAbove(); else above = atpos; @@ -1100,7 +1100,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView // Ok, there's one more level of complexity. We may want to become a new // sibling, but of an upper-level group, rather than the "above" item - TQListViewItem * betterAbove = above->parent(); + TQListViewItem * betterAbove = above->tqparent(); TQListViewItem * last = above; while ( betterAbove ) { @@ -1113,14 +1113,14 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView else break; // not enough on the left, so stop last = betterAbove; - betterAbove = betterAbove->parent(); // up one level + betterAbove = betterAbove->tqparent(); // up one level } else break; // we're among the child of betterAbove, not after the last one } } // set as sibling after = above; - parent = after ? after->parent() : 0L ; + parent = after ? after->tqparent() : 0L ; } TQListViewItem* KListView::lastChild () const @@ -1269,7 +1269,7 @@ void KListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListVie { if(i == item) return; - i = i->parent(); + i = i->tqparent(); } if (after) @@ -1280,8 +1280,8 @@ void KListView::moveItem(TQListViewItem *item, TQListViewItem *parent, TQListVie // Basically reimplementing the TQListViewItem(TQListViewItem*, TQListViewItem*) constructor // in here, without ever deleting the item. - if (item->parent()) - item->parent()->takeItem(item); + if (item->tqparent()) + item->tqparent()->takeItem(item); else takeItem(item); @@ -1327,12 +1327,12 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent, it = it->firstChild(); } - insertmarker = itemRect (it ? it : after); + insertmarker = tqitemRect (it ? it : after); level = after->depth(); } else if (parent) { - insertmarker = itemRect (parent); + insertmarker = tqitemRect (parent); level = parent->depth() + 1; } insertmarker.setLeft( treeStepSize() * ( level + (rootIsDecorated() ? 1 : 0) ) + itemMargin() ); @@ -1355,11 +1355,11 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) if (item) { - r = itemRect(item); + r = tqitemRect(item); r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize()); if (painter) - style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), - TQStyle::Style_FocusAtBorder, colorGroup().highlight()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(), + TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight()); } return r; @@ -1371,13 +1371,13 @@ void KListView::cleanItemHighlighter () { TQRect rect=d->mOldDropHighlighter; d->mOldDropHighlighter = TQRect(); - viewport()->repaint(rect, true); + viewport()->tqrepaint(rect, true); } } void KListView::rename(TQListViewItem *item, int c) { - if (d->renameable.contains(c)) + if (d->renameable.tqcontains(c)) { ensureItemVisible(item); d->editor->load(item,c); @@ -1386,7 +1386,7 @@ void KListView::rename(TQListViewItem *item, int c) bool KListView::isRenameable (int col) const { - return d->renameable.contains(col); + return d->renameable.tqcontains(col); } void KListView::setRenameable (int col, bool renameable) @@ -1482,7 +1482,7 @@ void KListView::activateAutomaticSelection() if (currentItem()) { currentItem()->setSelected(true); - currentItem()->repaint(); + currentItem()->tqrepaint(); emit selectionChanged(); }; } @@ -1519,8 +1519,8 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) TQListViewItem* item = currentItem(); if (!item) return; - TQListViewItem* repaintItem1 = item; - TQListViewItem* repaintItem2 = 0L; + TQListViewItem* tqrepaintItem1 = item; + TQListViewItem* tqrepaintItem2 = 0L; TQListViewItem* visItem = 0L; TQListViewItem* nextItem = 0L; @@ -1532,7 +1532,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) if (tmpItem->isSelected()) selectedItems++; if (((!selectedItems) || ((selectedItems==1) && (d->selectedUsingMouse))) - && (e_state==NoButton) + && (e_state==Qt::NoButton) && ((e->key()==Key_Down) || (e->key()==Key_Up) || (e->key()==Key_Next) @@ -1579,7 +1579,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) if (nextItem) { - repaintItem2=nextItem; + tqrepaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1614,7 +1614,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - repaintItem2=nextItem; + tqrepaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1649,7 +1649,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - repaintItem2=nextItem; + tqrepaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); }; @@ -1671,7 +1671,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { if (d->selectedBySimpleMove) nextItem->setSelected(true); - repaintItem2=nextItem; + tqrepaintItem2=nextItem; visItem=nextItem; setCurrentItem(nextItem); } @@ -1684,7 +1684,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) // move to the first item and toggle selection of all items inbetween nextItem = firstChild(); visItem = nextItem; - repaintItem2 = visItem; + tqrepaintItem2 = visItem; if (d->selectedBySimpleMove) item->setSelected(false); if (shiftOrCtrl) @@ -1797,7 +1797,7 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) currentItem()->setSelected(true); emitSelectionChanged=true; } - repaintItem2=currentItem(); + tqrepaintItem2=currentItem(); if (realKey) visItem=currentItem(); break; @@ -1807,21 +1807,21 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) ensureItemVisible(visItem); TQRect ir; - if (repaintItem1) - ir = ir.unite( itemRect(repaintItem1) ); - if (repaintItem2) - ir = ir.unite( itemRect(repaintItem2) ); + if (tqrepaintItem1) + ir = ir.unite( tqitemRect(tqrepaintItem1) ); + if (tqrepaintItem2) + ir = ir.unite( tqitemRect(tqrepaintItem2) ); if ( !ir.isEmpty() ) - { // rectangle to be repainted + { // rectangle to be tqrepainted if ( ir.x() < 0 ) ir.moveBy( -ir.x(), 0 ); - viewport()->repaint( ir, false ); + viewport()->tqrepaint( ir, false ); } - /*if (repaintItem1) - repaintItem1->repaint(); - if (repaintItem2) - repaintItem2->repaint();*/ + /*if (tqrepaintItem1) + tqrepaintItem1->tqrepaint(); + if (tqrepaintItem2) + tqrepaintItem2->tqrepaint();*/ update(); if (emitSelectionChanged) emit selectionChanged(); @@ -1895,7 +1895,7 @@ void KListView::emitContextMenu (KListView*, TQListViewItem* i) TQPoint p; if (i) - p = viewport()->mapToGlobal(itemRect(i).center()); + p = viewport()->mapToGlobal(tqitemRect(i).center()); else p = mapToGlobal(rect().center()); @@ -1940,7 +1940,7 @@ void KListView::viewportPaintEvent(TQPaintEvent *e) TQPainter painter(viewport()); // This is where we actually draw the drop-highlighter - style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, tqcolorGroup(), TQStyle::Style_FocusAtBorder); } d->painting = false; @@ -2001,13 +2001,13 @@ const TQColor &KListView::alternateBackground() const void KListView::setAlternateBackground(const TQColor &c) { d->alternateBackground = c; - repaint(); + tqrepaint(); } void KListView::setShadeSortColumn(bool shadeSortColumn) { d->shadeSortColumn = shadeSortColumn; - repaint(); + tqrepaint(); } bool KListView::shadeSortColumn() const @@ -2231,7 +2231,7 @@ const TQColor &KListViewItem::backgroundColor() { if (isAlternate()) return static_cast< KListView* >(listView())->alternateBackground(); - return listView()->viewport()->colorGroup().base(); + return listView()->viewport()->tqcolorGroup().base(); } TQColor KListViewItem::backgroundColor(int column) @@ -2239,7 +2239,7 @@ TQColor KListViewItem::backgroundColor(int column) KListView* view = static_cast< KListView* >(listView()); TQColor color = isAlternate() ? view->alternateBackground() : - view->viewport()->colorGroup().base(); + view->viewport()->tqcolorGroup().base(); // calculate a different color if the current column is sorted (only if more than 1 column) if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) ) @@ -2310,12 +2310,12 @@ bool KListViewItem::isAlternate() { KListViewItem *item; bool previous = true; - if (parent()) + if (tqparent()) { - item = dynamic_cast<KListViewItem *>(parent()); + item = dynamic_cast<KListViewItem *>(tqparent()); if (item) previous = item->m_odd; - item = dynamic_cast<KListViewItem *>(parent()->firstChild()); + item = dynamic_cast<KListViewItem *>(tqparent()->firstChild()); } else { @@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate() return false; } -void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup _cg = cg; TQListView* lv = listView(); @@ -2349,11 +2349,11 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, } else { - _cg.setColor((lv->viewport()->backgroundMode() == Qt::FixedColor) ? + _cg.setColor((lv->viewport()->backgroundMode() == TQt::FixedColor) ? TQColorGroup::Background : TQColorGroup::Base, backgroundColor(column)); } - TQListViewItem::paintCell(p, _cg, column, width, alignment); + TQListViewItem::paintCell(p, _cg, column, width, tqalignment); } void KListView::virtual_hook( int, void* ) diff --git a/kdeui/klistview.h b/kdeui/klistview.h index d78ec2724..a4e7d4b85 100644 --- a/kdeui/klistview.h +++ b/kdeui/klistview.h @@ -50,11 +50,12 @@ class KLineEdit; * Reimplement dragObject() and (possibly) startDrag(), * and setDragEnabled(true). */ -class KDEUI_EXPORT KListView : public QListView +class KDEUI_EXPORT KListView : public TQListView { friend class KListViewItem; Q_OBJECT + TQ_OBJECT Q_ENUMS( SelectionModeExt ) Q_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth ) Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable ) @@ -684,7 +685,7 @@ protected: */ inline bool below (TQListViewItem* i, const TQPoint& p) { - return below (itemRect(i), contentsToViewport(p)); + return below (tqitemRect(i), contentsToViewport(p)); } /** @@ -1006,7 +1007,7 @@ private: * * @short listview item with alternate background color support */ -class KDEUI_EXPORT KListViewItem : public QListViewItem +class KDEUI_EXPORT KListViewItem : public TQListViewItem { friend class KListView; public: @@ -1069,7 +1070,7 @@ public: TQColor backgroundColor(int column); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment); + int column, int width, int tqalignment); private: void init(); diff --git a/kdeui/klistviewsearchline.cpp b/kdeui/klistviewsearchline.cpp index 7bd26afc1..23fb14e18 100644 --- a/kdeui/klistviewsearchline.cpp +++ b/kdeui/klistviewsearchline.cpp @@ -145,7 +145,7 @@ void KListViewSearchLine::updateSearch(const TQString &s) it.current() && !currentItem; ++it) { - if(d->listView->itemRect(it.current()).isValid()) + if(d->listView->tqitemRect(it.current()).isValid()) currentItem = it.current(); } } @@ -214,14 +214,14 @@ bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString TQValueList<int>::ConstIterator it = d->searchColumns.begin(); for(; it != d->searchColumns.end(); ++it) { if(*it < item->listView()->columns() && - item->text(*it).find(s, 0, d->caseSensitive) >= 0) + item->text(*it).tqfind(s, 0, d->caseSensitive) >= 0) return true; } } else { for(int i = 0; i < item->listView()->columns(); i++) { if(item->listView()->columnWidth(i) > 0 && - item->text(i).find(s, 0, d->caseSensitive) >= 0) + item->text(i).tqfind(s, 0, d->caseSensitive) >= 0) { return true; } @@ -260,7 +260,7 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu() columnText = i18n("Column number %1","Column No. %1").arg(visiblePosition); } subMenu->insertItem(columnText, visibleColumns); - if(d->searchColumns.isEmpty() || d->searchColumns.find(i) != d->searchColumns.end()) + if(d->searchColumns.isEmpty() || d->searchColumns.tqfind(i) != d->searchColumns.end()) subMenu->setItemChecked(visibleColumns, true); else allColumnsAreSearchColumns = false; @@ -320,7 +320,7 @@ void KListViewSearchLine::searchColumnsMenuActivated(int id) d->searchColumns.clear(); } else { - if(d->searchColumns.find(id) != d->searchColumns.end()) + if(d->searchColumns.tqfind(id) != d->searchColumns.end()) d->searchColumns.remove(id); else { if(d->searchColumns.isEmpty()) { diff --git a/kdeui/klistviewsearchline.h b/kdeui/klistviewsearchline.h index 92e4a2b75..4b7427803 100644 --- a/kdeui/klistviewsearchline.h +++ b/kdeui/klistviewsearchline.h @@ -216,7 +216,7 @@ private: * * @since 3.4 */ -class KDEUI_EXPORT KListViewSearchLineWidget : public QHBox +class KDEUI_EXPORT KListViewSearchLineWidget : public TQHBox { Q_OBJECT diff --git a/kdeui/kmainwindow.cpp b/kdeui/kmainwindow.cpp index 94baa34e7..2a0bad08d 100644 --- a/kdeui/kmainwindow.cpp +++ b/kdeui/kmainwindow.cpp @@ -105,8 +105,8 @@ public: n++; it.current()->savePropertiesInternal(config, n); } - config->setGroup(TQString::fromLatin1("Number")); - config->writeEntry(TQString::fromLatin1("NumberOfWindows"), n ); + config->setGroup(TQString::tqfromLatin1("Number")); + config->writeEntry(TQString::tqfromLatin1("NumberOfWindows"), n ); return true; } @@ -120,7 +120,7 @@ public: for (it.toFirst(); it.current() && !canceled;){ KMainWindow *window = *it; ++it; // Update now, the current window might get deleted - if ( !window->testWState( Qt::WState_ForceHide ) ) { + if ( !window->testWState( TQt::WState_ForceHide ) ) { TQCloseEvent e; TQApplication::sendEvent( window, &e ); canceled = !e.isAccepted(); @@ -147,7 +147,7 @@ public: KMainWindow* last = 0; for (it.toFirst(); it.current() && !canceled; ++it){ KMainWindow *window = *it; - if ( !window->testWState( Qt::WState_ForceHide ) ) { + if ( !window->testWState( TQt::WState_ForceHide ) ) { last = window; } } @@ -212,7 +212,7 @@ void KMainWindow::initKMainWindow(const char *name, int cflags) unusedNumber = 0; // add numbers only when needed } for(;;) { - TQWidgetList* list = kapp->topLevelWidgets(); + TQWidgetList* list = kapp->tqtopLevelWidgets(); TQWidgetListIt it( *list ); bool found = false; for( TQWidget* w = it.current(); @@ -286,8 +286,8 @@ void KMainWindow::parseGeometry(bool parsewidth) int w, h; int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); if (parsewidth) { - TQSize minSize = minimumSize(); - TQSize maxSize = maximumSize(); + TQSize minSize = tqminimumSize(); + TQSize maxSize = tqmaximumSize(); if ( !(m & WidthValue) ) w = width(); if ( !(m & HeightValue) ) @@ -356,8 +356,8 @@ bool KMainWindow::canBeRestored( int number ) KConfig *config = kapp->sessionConfig(); if ( !config ) return false; - config->setGroup( TQString::fromLatin1("Number") ); - int n = config->readNumEntry( TQString::fromLatin1("NumberOfWindows") , 1 ); + config->setGroup( TQString::tqfromLatin1("Number") ); + int n = config->readNumEntry( TQString::tqfromLatin1("NumberOfWindows") , 1 ); return number >= 1 && number <= n; } @@ -370,12 +370,12 @@ const TQString KMainWindow::classNameOfToplevel( int number ) return TQString::null; TQString s; s.setNum( number ); - s.prepend( TQString::fromLatin1("WindowProperties") ); + s.prepend( TQString::tqfromLatin1("WindowProperties") ); config->setGroup( s ); - if ( !config->hasKey( TQString::fromLatin1("ClassName") ) ) + if ( !config->hasKey( TQString::tqfromLatin1("ClassName") ) ) return TQString::null; else - return config->readEntry( TQString::fromLatin1("ClassName") ); + return config->readEntry( TQString::tqfromLatin1("ClassName") ); } void KMainWindow::show() @@ -424,7 +424,7 @@ bool KMainWindow::restore( int number, bool show ) KXMLGUIFactory *KMainWindow::guiFactory() { if ( !factory_ ) - factory_ = new KXMLGUIFactory( this, this, "guifactory" ); + factory_ = new KXMLGUIFactory( this, TQT_TQOBJECT(this), "guifactory" ); return factory_; } @@ -458,7 +458,7 @@ void KMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xm if( options & ToolBar ){ setStandardToolBarMenuEnabled( true ); - KStdAction::configureToolbars(this, + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection()); } @@ -696,13 +696,13 @@ void KMainWindow::savePropertiesInternal( KConfig *config, int number ) TQString s; s.setNum(number); - s.prepend(TQString::fromLatin1("WindowProperties")); + s.prepend(TQString::tqfromLatin1("WindowProperties")); config->setGroup(s); // store objectName, className, Width and Height for later restoring // (Only useful for session management) - config->writeEntry(TQString::fromLatin1("ObjectName"), name()); - config->writeEntry(TQString::fromLatin1("ClassName"), className()); + config->writeEntry(TQString::tqfromLatin1("ObjectName"), name()); + config->writeEntry(TQString::tqfromLatin1("ClassName"), className()); saveMainWindowSettings(config); // Menubar, statusbar and Toolbar settings. @@ -738,7 +738,7 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &config TQMenuBar* mb = internalMenuBar(); if (mb) { - TQString MenuBar = TQString::fromLatin1("MenuBar"); + TQString MenuBar = TQString::tqfromLatin1("MenuBar"); if(!config->hasDefault("MenuBar") && !mb->isHidden() ) config->revertToDefault("MenuBar"); else @@ -795,7 +795,7 @@ bool KMainWindow::isStandardToolBarMenuEnabled() const void KMainWindow::createStandardStatusBarAction(){ if(!d->showStatusBarAction){ - d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection()); + d->showStatusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(setSettingsDirty()), actionCollection()); KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); d->showStatusBarAction->setChecked(sb->isHidden()); @@ -810,13 +810,13 @@ bool KMainWindow::readPropertiesInternal( KConfig *config, int number ) // in order they are in toolbar list TQString s; s.setNum(number); - s.prepend(TQString::fromLatin1("WindowProperties")); + s.prepend(TQString::tqfromLatin1("WindowProperties")); config->setGroup(s); // restore the object name (window role) - if ( config->hasKey(TQString::fromLatin1("ObjectName" )) ) - setName( config->readEntry(TQString::fromLatin1("ObjectName")).latin1()); // latin1 is right here + if ( config->hasKey(TQString::tqfromLatin1("ObjectName" )) ) + setName( config->readEntry(TQString::tqfromLatin1("ObjectName")).latin1()); // latin1 is right here applyMainWindowSettings(config); // Menubar, statusbar and toolbar settings. @@ -901,7 +901,7 @@ void KMainWindow::finalizeGUI( bool force ) void KMainWindow::saveWindowSize( KConfig * config ) const { - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); int w, h; #if defined Q_WS_X11 @@ -918,8 +918,8 @@ void KMainWindow::saveWindowSize( KConfig * config ) const #endif TQRect size( desk.width(), w, desk.height(), h ); bool defaultSize = (size == d->defaultWindowSize); - TQString widthString = TQString::fromLatin1("Width %1").arg(desk.width()); - TQString heightString = TQString::fromLatin1("Height %1").arg(desk.height()); + TQString widthString = TQString::tqfromLatin1("Width %1").arg(desk.width()); + TQString heightString = TQString::tqfromLatin1("Height %1").arg(desk.height()); if (!config->hasDefault(widthString) && defaultSize) config->revertToDefault(widthString); else @@ -937,20 +937,20 @@ void KMainWindow::restoreWindowSize( KConfig * config ) parseGeometry(true); } else { // restore the size - int scnum = TQApplication::desktop()->screenNumber(parentWidget()); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); if ( d->defaultWindowSize.isNull() ) // only once d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values - TQSize size( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ), - config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ) ); + TQSize size( config->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ), + config->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ) ); if (size.isEmpty()) { // try the KDE 2.0 way - size = TQSize( config->readNumEntry( TQString::fromLatin1("Width"), 0 ), - config->readNumEntry( TQString::fromLatin1("Height"), 0 ) ); + size = TQSize( config->readNumEntry( TQString::tqfromLatin1("Width"), 0 ), + config->readNumEntry( TQString::tqfromLatin1("Height"), 0 ) ); if (!size.isEmpty()) { // make sure the other resolutions don't get old settings - config->writeEntry( TQString::fromLatin1("Width"), 0 ); - config->writeEntry( TQString::fromLatin1("Height"), 0 ); + config->writeEntry( TQString::tqfromLatin1("Width"), 0 ); + config->writeEntry( TQString::tqfromLatin1("Height"), 0 ); } } if ( !size.isEmpty() ) { @@ -1188,16 +1188,16 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size) { case KToolBar::Top: case KToolBar::Bottom: - size += TQSize(0, tb->sizeHint().height()); + size += TQSize(0, tb->tqsizeHint().height()); break; case KToolBar::Left: case KToolBar::Right: - size += TQSize(toolBar()->sizeHint().width(), 0); + size += TQSize(toolBar()->tqsizeHint().width(), 0); break; case KToolBar::Flat: - size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent )); + size += TQSize(0, 3+kapp->tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent )); break; default: @@ -1207,12 +1207,12 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size) KMenuBar *mb = internalMenuBar(); if (mb && !mb->isHidden()) { size += TQSize(0,mb->heightForWidth(size.width())); - if (style().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this)) + if (tqstyle().tqstyleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this)) size += TQSize( 0, dockWindowsMovable() ? 1 : 2); } TQStatusBar *sb = internalStatusBar(); if( sb && !sb->isHidden() ) - size += TQSize(0, sb->sizeHint().height()); + size += TQSize(0, sb->tqsizeHint().height()); return size; } diff --git a/kdeui/kmainwindow.h b/kdeui/kmainwindow.h index fbadc0471..43f9845bf 100644 --- a/kdeui/kmainwindow.h +++ b/kdeui/kmainwindow.h @@ -133,7 +133,7 @@ public: * KMainWindow *kmw = new KMainWindow (...); * \endcode **/ - KMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); + KMainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); /** * Flags that can be passed in an argument to the constructor to @@ -155,7 +155,7 @@ public: * * @since 3.2 */ - KMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); + KMainWindow( int cflags, TQWidget* parent = 0, const char *name = 0, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); /** * \brief Destructor. @@ -444,10 +444,10 @@ public: * have been created and placed inside the main window (i.e. for 99% of * apps setCentralWidget()) * - Widgets that inherit from TQWidget (like game boards) should overload - * "virtual TQSize sizeHint() const;" to specify a default size rather + * "virtual TQSize tqsizeHint() const;" to specify a default size rather * than letting TQWidget::adjust use the default size of 0x0. */ - void setAutoSaveSettings( const TQString & groupName = TQString::fromLatin1("MainWindow"), + void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"), bool saveWindowSize = true ); /** @@ -649,10 +649,10 @@ public: * * @deprecated You normally don't need this, the recommended way to achieve a * certain central widget size is as follows: - * @li Override sizeHint() in the central widget so that it + * @li Override tqsizeHint() in the central widget so that it * returns the desired size. * @li Call updateGeometry() in the central widget whenever the - * desired size changes. This ensures that the new sizeHint() is properly + * desired size changes. This ensures that the new tqsizeHint() is properly * propagated to any parent layout. * @li Now call adjustSize() in the mainwindow to resize the * mainwindow such that the central widget will become the desired size. @@ -1028,7 +1028,7 @@ template <typename T> inline void kRestoreMainWindows() { for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::fromLatin1( T::staticMetaObject()->className() ) ) + if ( className == TQString::tqfromLatin1( T::staticMetaObject()->className() ) ) (new T)->restore( n ); } } @@ -1040,9 +1040,9 @@ inline void kRestoreMainWindows() { classNames[1] = T1::staticMetaObject()->className(); for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::fromLatin1( classNames[0] ) ) + if ( className == TQString::tqfromLatin1( classNames[0] ) ) (new T0)->restore( n ); - else if ( className == TQString::fromLatin1( classNames[1] ) ) + else if ( className == TQString::tqfromLatin1( classNames[1] ) ) (new T1)->restore( n ); } } @@ -1055,11 +1055,11 @@ inline void kRestoreMainWindows() { classNames[2] = T2::staticMetaObject()->className(); for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) { const TQString className = KMainWindow::classNameOfToplevel( n ); - if ( className == TQString::fromLatin1( classNames[0] ) ) + if ( className == TQString::tqfromLatin1( classNames[0] ) ) (new T0)->restore( n ); - else if ( className == TQString::fromLatin1( classNames[1] ) ) + else if ( className == TQString::tqfromLatin1( classNames[1] ) ) (new T1)->restore( n ); - else if ( className == TQString::fromLatin1( classNames[2] ) ) + else if ( className == TQString::tqfromLatin1( classNames[2] ) ) (new T2)->restore( n ); } } diff --git a/kdeui/kmainwindowiface.cpp b/kdeui/kmainwindowiface.cpp index d3117f0ec..0cee0f24b 100644 --- a/kdeui/kmainwindowiface.cpp +++ b/kdeui/kmainwindowiface.cpp @@ -33,7 +33,7 @@ KMainWindowInterface::KMainWindowInterface(KMainWindow * mainWindow) { m_MainWindow = mainWindow; m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this ); - m_dcopPropertyProxy = new KDCOPPropertyProxy(m_MainWindow); + m_dcopPropertyProxy = new KDCOPPropertyProxy(TQT_TQOBJECT(m_MainWindow)); } KMainWindowInterface::~KMainWindowInterface() diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp index d2accb61d..ceee8e222 100644 --- a/kdeui/kmenubar.cpp +++ b/kdeui/kmenubar.cpp @@ -48,6 +48,10 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> + +#ifndef None +#define None 0L +#endif #endif /* @@ -136,7 +140,7 @@ KMenuBar::KMenuBar(TQWidget *parent, const char *name) connect( &d->selection_timer, TQT_SIGNAL( timeout()), this, TQT_SLOT( selectionTimeout())); - connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); + connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); if ( kapp ) // toolbarAppearanceChanged(int) is sent when changing macstyle @@ -163,8 +167,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) top_level = true; d->wasTopLevel = top_level; - if( parentWidget() - && parentWidget()->topLevelWidget()->isFullScreen()) + if( tqparentWidget() + && tqparentWidget()->tqtopLevelWidget()->isFullScreen()) top_level = false; if ( isTopLevelMenu() == top_level ) @@ -185,19 +189,19 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) d->margin = margin(); d->fallback_mode = false; bool wasShown = !isHidden(); - reparent( parentWidget(), WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder, TQPoint(0,0), false ); + reparent( tqparentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false ); #ifdef Q_WS_X11 KWin::setType( winId(), NET::TopMenu ); - if( parentWidget()) - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + if( tqparentWidget()) + XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); #endif TQMenuBar::setFrameStyle( NoFrame ); TQMenuBar::setLineWidth( 0 ); TQMenuBar::setMargin( 0 ); updateFallbackSize(); d->min_size = TQSize( 0, 0 ); - if( parentWidget() && !parentWidget()->isTopLevel()) - setShown( parentWidget()->isVisible()); + if( tqparentWidget() && !tqparentWidget()->isTopLevel()) + setShown( tqparentWidget()->isVisible()); else if ( wasShown ) show(); } else @@ -213,8 +217,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) setMinimumSize( 0, 0 ); setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); updateMenuBarSize(); - if ( parentWidget() ) - reparent( parentWidget(), TQPoint(0,0), !isHidden()); + if ( tqparentWidget() ) + reparent( tqparentWidget(), TQPoint(0,0), !isHidden()); } } @@ -240,34 +244,34 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) { if ( d->topLevel ) { - if ( parentWidget() && obj == parentWidget()->topLevelWidget() ) + if ( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget()) ) { if( ev->type() == TQEvent::Resize ) return false; // ignore resizing of parent, TQMenuBar would try to adjust size if ( ev->type() == TQEvent::Accel || ev->type() == TQEvent::AccelAvailable ) { - if ( TQApplication::sendEvent( topLevelWidget(), ev ) ) + if ( TQApplication::sendEvent( tqtopLevelWidget(), ev ) ) return true; } if(ev->type() == TQEvent::ShowFullScreen ) // will update the state properly setTopLevelMenuInternal( d->topLevel ); } - if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent ) + if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()) && ev->type() == TQEvent::Reparent ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); #else //TODO: WIN32? #endif - setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible()); + setShown( tqparentWidget()->isTopLevel() || tqparentWidget()->isVisible()); } - if( parentWidget() && !parentWidget()->isTopLevel() && obj == parentWidget()) + if( tqparentWidget() && !tqparentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget())) { // if the parent is not toplevel, KMenuBar needs to match its visibility status if( ev->type() == TQEvent::Show ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); #else //TODO: WIN32? #endif @@ -279,10 +283,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) } else { - if( parentWidget() && obj == parentWidget()->topLevelWidget()) + if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget())) { if( ev->type() == TQEvent::WindowStateChange - && !parentWidget()->topLevelWidget()->isFullScreen() ) + && !tqparentWidget()->tqtopLevelWidget()->isFullScreen() ) setTopLevelMenuInternal( d->wasTopLevel ); } } @@ -390,7 +394,7 @@ void KMenuBar::checkSize( int& w, int& h ) { if( !d->topLevel || d->fallback_mode ) return; - TQSize s = sizeHint(); + TQSize s = tqsizeHint(); w = s.width(); h = s.height(); // This is not done as setMinimumSize(), because that would set the minimum @@ -400,17 +404,17 @@ void KMenuBar::checkSize( int& w, int& h ) h = KMAX( h, d->min_size.height()); } -// QMenuBar's sizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet -TQSize KMenuBar::sizeHint() const +// QMenuBar's tqsizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet +TQSize KMenuBar::tqsizeHint() const { if( !d->topLevel || block_resize > 0 ) - return TQMenuBar::sizeHint(); - // Since TQMenuBar::sizeHint() may indirectly call resize(), + return TQMenuBar::tqsizeHint(); + // Since TQMenuBar::tqsizeHint() may indirectly call resize(), // avoid infinite recursion. ++block_resize; // find the minimum useful height, and enlarge the width until the menu fits in that height (one row) int h = heightForWidth( 1000000 ); - int w = TQMenuBar::sizeHint().width(); + int w = TQMenuBar::tqsizeHint().width(); // optimization - don't call heightForWidth() too many times while( heightForWidth( w + 12 ) > h ) w += 12; @@ -444,7 +448,7 @@ bool KMenuBar::x11Event( XEvent* ev ) void KMenuBar::updateMenuBarSize() { menuContentsChanged(); // trigger invalidating calculated size - resize( sizeHint()); // and resize to preferred size + resize( tqsizeHint()); // and resize to preferred size } void KMenuBar::setFrameStyle( int style ) @@ -509,25 +513,25 @@ void KMenuBar::drawContents( TQPainter* p ) p->eraseRect( rect() ); erase(); - TQColorGroup g = colorGroup(); + TQColorGroup g = tqcolorGroup(); bool e; for ( int i=0; i<(int)count(); i++ ) { - TQMenuItem *mi = findItem( idAt( i ) ); + TQMenuItem *mi = tqfindItem( idAt( i ) ); if ( !mi->text().isNull() || mi->pixmap() ) { - TQRect r = itemRect(i); + TQRect r = tqitemRect(i); if(r.isEmpty() || !mi->isVisible()) continue; e = mi->isEnabledAndVisible(); if ( e ) - g = isEnabled() ? ( isActiveWindow() ? palette().active() : - palette().inactive() ) : palette().disabled(); + g = isEnabled() ? ( isActiveWindow() ? tqpalette().active() : + tqpalette().inactive() ) : tqpalette().disabled(); else - g = palette().disabled(); + g = tqpalette().disabled(); bool item_active = ( actItem == i ); @@ -544,12 +548,12 @@ void KMenuBar::drawContents( TQPainter* p ) flags |= TQStyle::Style_Down; flags |= TQStyle::Style_HasFocus; - style().drawControl(TQStyle::CE_MenuBarItem, p, this, + tqstyle().tqdrawControl(TQStyle::CE_MenuBarItem, p, this, r, g, flags, TQStyleOption(mi)); } else { - style().drawItem(p, r, AlignCenter | AlignVCenter | ShowPrefix, + tqstyle().drawItem(p, r, AlignCenter | AlignVCenter | ShowPrefix, g, e, mi->pixmap(), mi->text()); } } diff --git a/kdeui/kmenubar.h b/kdeui/kmenubar.h index 548a0c12f..5dcf56484 100644 --- a/kdeui/kmenubar.h +++ b/kdeui/kmenubar.h @@ -39,7 +39,7 @@ * @version $Id$ */ -class KDEUI_EXPORT KMenuBar : public QMenuBar +class KDEUI_EXPORT KMenuBar : public TQMenuBar { Q_OBJECT @@ -84,7 +84,7 @@ public: virtual void setFrameStyle( int ); virtual void setLineWidth( int ); virtual void setMargin( int ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected slots: void slotReadConfig(); protected: diff --git a/kdeui/kmessagebox.cpp b/kdeui/kmessagebox.cpp index 8e9256677..87fa9d555 100644 --- a/kdeui/kmessagebox.cpp +++ b/kdeui/kmessagebox.cpp @@ -247,7 +247,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, if ( details.length() < 512 ) { KActiveLabel *label3 = new KActiveLabel(qrichtextify(details), detailsGroup); - label3->setMinimumSize(label3->sizeHint()); + label3->setMinimumSize(label3->tqsizeHint()); if (!(options & KMessageBox::AllowLink)) { TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)), @@ -288,7 +288,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, btn->setFocus(); if ( (options & KMessageBox::Notify) ) - sendNotification( text, strlist, notifyType, dialog->topLevelWidget()->winId()); + sendNotification( text, strlist, notifyType, dialog->tqtopLevelWidget()->winId()); if (KMessageBox_queue) { @@ -342,7 +342,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName, ButtonCode &result) { if ( dontShowAgainName.isEmpty() ) return true; - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); TQString dontAsk = config->readEntry(dontShowAgainName).lower(); @@ -361,7 +361,7 @@ bool KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return true; - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); return config->readBoolEntry(dontShowAgainName, true); @@ -372,7 +372,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName, ButtonCode result) { if ( dontShowAgainName.isEmpty() ) return; - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':')); @@ -383,7 +383,7 @@ void KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName) { if ( dontShowAgainName.isEmpty() ) return; - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfig *config = againConfig ? againConfig : KGlobal::config(); KConfigGroupSaver saver( config, grpNotifMsgs ); config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':')); @@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No, @@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Question") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownContinue(dontAskAgainName) ) return Continue; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No, @@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text, if ( !shouldBeShownYesNo(dontAskAgainName, res) ) return res; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Warning") : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, @@ -755,7 +755,7 @@ void KMessageBox::errorListWId(WId parent_id, const TQString &text, const TQStringList &strlist, const TQString &caption, int options) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes, @@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Error") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -832,7 +832,7 @@ void KMessageBox::sorryWId(WId parent_id, const TQString &text, const TQString &caption, int options) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes, @@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text, const TQString &details, const TQString &caption, int options) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Sorry") : caption, KDialogBase::Yes | KDialogBase::Details, @@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri if ( !shouldBeShownContinue(dontShowAgainName) ) return; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n("Information") : caption, KDialogBase::Yes, @@ -936,7 +936,7 @@ void KMessageBox::enableAllMessages() { KConfig *config = againConfig ? againConfig : KGlobal::config(); - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; @@ -956,7 +956,7 @@ void KMessageBox::enableMessage(const TQString &dontShowAgainName) { KConfig *config = againConfig ? againConfig : KGlobal::config(); - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); if (!config->hasGroup(grpNotifMsgs)) return; diff --git a/kdeui/knuminput.cpp b/kdeui/knuminput.cpp index 4d3075bb2..3db1bcf2b 100644 --- a/kdeui/knuminput.cpp +++ b/kdeui/knuminput.cpp @@ -86,7 +86,7 @@ void KNumInput::init() m_label = 0; m_slider = 0; - m_alignment = 0; + m_tqalignment = 0; } KNumInput::~KNumInput() @@ -103,17 +103,17 @@ void KNumInput::setLabel(const TQString & label, int a) if(label.isEmpty()) { delete m_label; m_label = 0; - m_alignment = 0; + m_tqalignment = 0; } else { if (m_label) m_label->setText(label); else m_label = new TQLabel(label, this, "KNumInput::TQLabel"); - m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) + m_label->tqsetAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) | AlignVCenter); - // if no vertical alignment set, use Top alignment + // if no vertical tqalignment set, use Top tqalignment if(!(a & (AlignTop|AlignBottom|AlignVCenter))) a |= AlignTop; - m_alignment = a; + m_tqalignment = a; } layout(true); @@ -130,16 +130,16 @@ void KNumInput::layout(bool deep) int w1 = m_colw1; int w2 = m_colw2; - // label sizeHint - m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0)); + // label tqsizeHint + m_sizeLabel = (m_label ? m_label->tqsizeHint() : TQSize(0,0)); - if(m_label && (m_alignment & AlignVCenter)) + if(m_label && (m_tqalignment & AlignVCenter)) m_colw1 = m_sizeLabel.width() + 4; else m_colw1 = 0; - // slider sizeHint - m_sizeSlider = (m_slider ? m_slider->sizeHint() : TQSize(0, 0)); + // slider tqsizeHint + m_sizeSlider = (m_slider ? m_slider->tqsizeHint() : TQSize(0, 0)); doLayout(); @@ -187,9 +187,9 @@ TQSizePolicy KNumInput::sizePolicy() const return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } -TQSize KNumInput::sizeHint() const +TQSize KNumInput::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } void KNumInput::setSteps(int minor, int major) @@ -204,7 +204,7 @@ void KNumInput::setSteps(int minor, int major) KIntSpinBox::KIntSpinBox(TQWidget *parent, const char *name) : TQSpinBox(0, 99, 1, parent, name) { - editor()->setAlignment(AlignRight); + editor()->tqsetAlignment(AlignRight); val_base = 10; setValue(0); } @@ -217,7 +217,7 @@ KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base, TQWidget* parent, const char* name) : TQSpinBox(lower, upper, step, parent, name) { - editor()->setAlignment(AlignRight); + editor()->tqsetAlignment(AlignRight); val_base = base; setValue(value); } @@ -339,7 +339,7 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider) m_slider->setRange(lower, upper); else { m_slider = new TQSlider(lower, upper, step, m_spin->value(), - TQSlider::Horizontal, this); + Qt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); connect(m_slider, TQT_SIGNAL(valueChanged(int)), m_spin, TQT_SLOT(setValue(int))); @@ -412,7 +412,7 @@ void KIntNumInput::setEditFocus(bool mark) m_spin->setEditFocus(mark); } -TQSize KIntNumInput::minimumSizeHint() const +TQSize KIntNumInput::tqminimumSizeHint() const { constPolish(); @@ -422,16 +422,16 @@ TQSize KIntNumInput::minimumSizeHint() const h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height()); // if in extra row, then count it here - if(m_label && (m_alignment & (AlignBottom|AlignTop))) + if(m_label && (m_tqalignment & (AlignBottom|AlignTop))) h += 4 + m_sizeLabel.height(); else // label is in the same row as the other widgets h = QMAX(h, m_sizeLabel.height() + 2); - w = m_slider ? m_slider->sizeHint().width() + 8 : 0; + w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; - if(m_alignment & (AlignTop|AlignBottom)) + if(m_tqalignment & (AlignTop|AlignBottom)) w = QMAX(w, m_sizeLabel.width() + 4); return TQSize(w, h); @@ -439,7 +439,7 @@ TQSize KIntNumInput::minimumSizeHint() const void KIntNumInput::doLayout() { - m_sizeSpin = m_spin->sizeHint(); + m_sizeSpin = m_spin->tqsizeHint(); m_colw2 = m_sizeSpin.width(); if (m_label) @@ -451,15 +451,15 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e) int w = m_colw1; int h = 0; - if(m_label && (m_alignment & AlignTop)) { + if(m_label && (m_tqalignment & AlignTop)) { m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height()); h += m_sizeLabel.height() + KDialog::spacingHint(); } - if(m_label && (m_alignment & AlignVCenter)) + if(m_label && (m_tqalignment & AlignVCenter)) m_label->setGeometry(0, 0, w, m_sizeSpin.height()); - if (qApp->reverseLayout()) + if (tqApp->reverseLayout()) { m_spin->setGeometry(w, h, m_slider ? m_colw2 : QMAX(m_colw2, e->size().width() - w), m_sizeSpin.height()); w += m_colw2 + 8; @@ -477,7 +477,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e) h += m_sizeSpin.height() + 2; - if(m_label && (m_alignment & AlignBottom)) + if(m_label && (m_tqalignment & AlignBottom)) m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height()); } @@ -653,7 +653,7 @@ void KDoubleNumInput::slotEmitRelativeValueChanged( double value ) emit relativeValueChanged( value / d->referencePoint ); } -TQSize KDoubleNumInput::minimumSizeHint() const +TQSize KDoubleNumInput::tqminimumSizeHint() const { constPolish(); @@ -663,16 +663,16 @@ TQSize KDoubleNumInput::minimumSizeHint() const h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height()); // if in extra row, then count it here - if(m_label && (m_alignment & (AlignBottom|AlignTop))) + if(m_label && (m_tqalignment & (AlignBottom|AlignTop))) h += 4 + m_sizeLabel.height(); else // label is in the same row as the other widgets h = QMAX(h, m_sizeLabel.height() + 2); - w = m_slider ? m_slider->sizeHint().width() + 8 : 0; + w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; - if(m_alignment & (AlignTop|AlignBottom)) + if(m_tqalignment & (AlignTop|AlignBottom)) w = QMAX(w, m_sizeLabel.width() + 4); return TQSize(w, h); @@ -683,15 +683,15 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) int w = m_colw1; int h = 0; - if(m_label && (m_alignment & AlignTop)) { + if(m_label && (m_tqalignment & AlignTop)) { m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height()); h += m_sizeLabel.height() + 4; } - if(m_label && (m_alignment & AlignVCenter)) + if(m_label && (m_tqalignment & AlignVCenter)) m_label->setGeometry(0, 0, w, m_sizeEdit.height()); - if (qApp->reverseLayout()) + if (tqApp->reverseLayout()) { d->spin->setGeometry(w, h, m_slider ? m_colw2 : e->size().width() - w, m_sizeEdit.height()); @@ -713,13 +713,13 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) h += m_sizeEdit.height() + 2; - if(m_label && (m_alignment & AlignBottom)) + if(m_label && (m_tqalignment & AlignBottom)) m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height()); } void KDoubleNumInput::doLayout() { - m_sizeEdit = d->spin->sizeHint(); + m_sizeEdit = d->spin->tqsizeHint(); m_colw2 = m_sizeEdit.width(); } @@ -767,7 +767,7 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, m_slider->setValue(slvalue); } else { m_slider = new TQSlider(slmin, slmax, slstep, slvalue, - TQSlider::Horizontal, this); + Qt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); // feedback line: when one moves, the other moves, too: connect(m_slider, TQT_SIGNAL(valueChanged(int)), @@ -886,7 +886,7 @@ class KDoubleSpinBoxValidator : public KDoubleValidator { public: KDoubleSpinBoxValidator( double bottom, double top, int decimals, KDoubleSpinBox* sb, const char *name ) - : KDoubleValidator( bottom, top, decimals, sb, name ), spinBox( sb ) { } + : KDoubleValidator( bottom, top, decimals, TQT_TQOBJECT(sb), name ), spinBox( sb ) { } virtual State validate( TQString& str, int& pos ) const; @@ -996,7 +996,7 @@ public: KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->setAlignment( Qt::AlignRight ); + editor()->tqsetAlignment( Qt::AlignRight ); d = new Private(); updateValidator(); connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); @@ -1007,7 +1007,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, TQWidget * parent, const char * name ) : TQSpinBox( parent, name ) { - editor()->setAlignment( Qt::AlignRight ); + editor()->tqsetAlignment( Qt::AlignRight ); d = new Private(); setRange( lower, upper, step, precision ); setValue( value ); diff --git a/kdeui/knuminput.h b/kdeui/knuminput.h index 4c4c90732..60be51bde 100644 --- a/kdeui/knuminput.h +++ b/kdeui/knuminput.h @@ -46,7 +46,7 @@ class KIntSpinBox; * for a different variable type * */ -class KDEUI_EXPORT KNumInput : public QWidget +class KDEUI_EXPORT KNumInput : public TQWidget { Q_OBJECT Q_PROPERTY( TQString label READ label WRITE setLabel ) @@ -67,7 +67,7 @@ public: ~KNumInput(); /** - * Sets the text and alignment of the main description label. + * Sets the text and tqalignment of the main description label. * * @param label The text of the label. * Use TQString::null to remove an existing one. @@ -76,7 +76,7 @@ public: * @p AlignTop, @p AlignVCenter, @p AlignBottom. * default is @p AlignLeft | @p AlignTop. * - * The vertical alignment flags have special meaning with this + * The vertical tqalignment flags have special meaning with this * widget: * * @li @p AlignTop The label is placed above the edit/slider @@ -116,7 +116,7 @@ public: * * @return the preferred size necessary to show the control */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: /** @@ -143,7 +143,7 @@ protected: TQSlider* m_slider; TQSize m_sizeSlider, m_sizeLabel; - int m_alignment; + int m_tqalignment; private: void init(); @@ -312,11 +312,11 @@ public: /** * This method returns the minimum size necessary to display the * control. The minimum size is enough to show all the labels - * in the current font (font change may invalidate the return value). + * in the current font (font change may tqinvalidate the return value). * * @return the minimum size necessary to show the control */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; public slots: /** @@ -596,7 +596,7 @@ public: void setSpecialValueText(const TQString& text); virtual void setLabel(const TQString & label, int a = AlignLeft | AlignTop); - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; virtual bool eventFilter(TQObject*, TQEvent*); public slots: @@ -701,7 +701,7 @@ private: * The class provides an easy interface to use other * numeric systems than the decimal. */ -class KDEUI_EXPORT KIntSpinBox : public QSpinBox +class KDEUI_EXPORT KIntSpinBox : public TQSpinBox { Q_OBJECT Q_PROPERTY( int base READ base WRITE setBase ) @@ -871,7 +871,7 @@ public: int precision() const; /** Equivalent to setPrecision( @p precision, @p false ); Needed - since Qt's moc doesn't ignore trailing parameters with default + since Qt's tqmoc doesn't ignore trailing parameters with default args when searching for a property setter method. */ void setPrecision( int precision ); diff --git a/kdeui/knumvalidator.cpp b/kdeui/knumvalidator.cpp index 436f95431..4dba9d796 100644 --- a/kdeui/knumvalidator.cpp +++ b/kdeui/knumvalidator.cpp @@ -35,7 +35,7 @@ // KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { _base = base; if (_base < 2) _base = 2; @@ -45,7 +45,7 @@ KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) } KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { _base = base; if (_base > 36) _base = 36; @@ -67,7 +67,7 @@ TQValidator::State KIntValidator::validate ( TQString &str, int & ) const if (_base > 10) newStr = newStr.upper(); - if (newStr == TQString::fromLatin1("-")) // a special case + if (newStr == TQString::tqfromLatin1("-")) // a special case if ((_min || _max) && _min >= 0) ok = false; else @@ -162,7 +162,7 @@ public: KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -170,7 +170,7 @@ KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) } KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -179,7 +179,7 @@ KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, } KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers = localeAware; @@ -209,12 +209,12 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const TQString newStr; newStr = str.stripWhiteSpace(); - if (newStr == TQString::fromLatin1("-")) // a special case + if (newStr == TQString::tqfromLatin1("-")) // a special case if ((_min || _max) && _min >= 0) ok = false; else return TQValidator::Acceptable; - else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case + else if (newStr == TQString::tqfromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case return TQValidator::Acceptable; else if (newStr.length()) { @@ -339,17 +339,17 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const t = l->thousandsSeparator(); // first, delete p's and t's: if ( !p.isEmpty() ) - for ( int idx = s.find( p ) ; idx >= 0 ; idx = s.find( p, idx ) ) + for ( int idx = s.tqfind( p ) ; idx >= 0 ; idx = s.tqfind( p, idx ) ) s.remove( idx, p.length() ); if ( !t.isEmpty() ) - for ( int idx = s.find( t ) ; idx >= 0 ; idx = s.find( t, idx ) ) + for ( int idx = s.tqfind( t ) ; idx >= 0 ; idx = s.tqfind( t, idx ) ) s.remove( idx, t.length() ); // then, replace the d's and n's - if ( ( !n.isEmpty() && n.find('.') != -1 ) || - ( !d.isEmpty() && d.find('-') != -1 ) ) { + if ( ( !n.isEmpty() && n.tqfind('.') != -1 ) || + ( !d.isEmpty() && d.tqfind('-') != -1 ) ) { // make sure we don't replace something twice: kdWarning() << "KDoubleValidator: decimal symbol contains '-' or " "negative sign contains '.' -> improve algorithm" << endl; @@ -357,11 +357,11 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const } if ( !d.isEmpty() && d != "." ) - for ( int idx = s.find( d ) ; idx >= 0 ; idx = s.find( d, idx + 1 ) ) + for ( int idx = s.tqfind( d ) ; idx >= 0 ; idx = s.tqfind( d, idx + 1 ) ) s.replace( idx, d.length(), '.'); if ( !n.isEmpty() && n != "-" ) - for ( int idx = s.find( n ) ; idx >= 0 ; idx = s.find( n, idx + 1 ) ) + for ( int idx = s.tqfind( n ) ; idx >= 0 ; idx = s.tqfind( n, idx + 1 ) ) s.replace( idx, n.length(), '-' ); } diff --git a/kdeui/kpanelapplet.cpp b/kdeui/kpanelapplet.cpp index 817d9de60..d592f35cc 100644 --- a/kdeui/kpanelapplet.cpp +++ b/kdeui/kpanelapplet.cpp @@ -47,7 +47,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type, : TQFrame(parent, name, f) , _type(type) , _position( pBottom ) - , _alignment( LeftTop ) + , _tqalignment( LeftTop ) , _config(0) , _actions(actions) , d(new KPanelApplet::KPanelAppletPrivate()) @@ -78,11 +78,11 @@ void KPanelApplet::setPosition( Position p ) positionChange( p ); } -void KPanelApplet::setAlignment( Alignment a ) +void KPanelApplet::tqsetAlignment( Alignment a ) { - if( _alignment == a ) return; - _alignment = a; - alignmentChange( a ); + if( _tqalignment == a ) return; + _tqalignment = a; + tqalignmentChange( a ); } // FIXME: Remove implementation for KDE 4 @@ -97,9 +97,9 @@ void KPanelApplet::positionChange( Position ) Qt::Orientation KPanelApplet::orientation() const { if( _position == pTop || _position == pBottom ) { - return Horizontal; + return Qt::Horizontal; } else { - return Vertical; + return Qt::Vertical; } } @@ -146,15 +146,15 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch) if (watch) { - if (d->watchedForFocus.find(widget) == -1) + if (d->watchedForFocus.tqfind(TQT_TQOBJECT(widget)) == -1) { - d->watchedForFocus.append(widget); + d->watchedForFocus.append(TQT_TQOBJECT(widget)); widget->installEventFilter(this); } } - else if (d->watchedForFocus.find(widget) != -1) + else if (d->watchedForFocus.tqfind(TQT_TQOBJECT(widget)) != -1) { - d->watchedForFocus.remove(widget); + d->watchedForFocus.remove(TQT_TQOBJECT(widget)); widget->removeEventFilter(this); } } @@ -172,7 +172,7 @@ void KPanelApplet::needsFocus(bool focus) bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e) { - if (d->watchedForFocus.find(o) != -1) + if (d->watchedForFocus.tqfind(o) != -1) { if (e->type() == TQEvent::MouseButtonRelease || e->type() == TQEvent::FocusIn) diff --git a/kdeui/kpanelapplet.h b/kdeui/kpanelapplet.h index 7719c7b68..c53fb50ca 100644 --- a/kdeui/kpanelapplet.h +++ b/kdeui/kpanelapplet.h @@ -94,7 +94,7 @@ class TQPopupMenu; * * @author Matthias Elter <elter@kde.org> **/ -class KDEUI_EXPORT KPanelApplet : public QFrame +class KDEUI_EXPORT KPanelApplet : public TQFrame { Q_OBJECT @@ -224,7 +224,7 @@ public: /** * @internal **/ - void setAlignment( Alignment a ); + void tqsetAlignment( Alignment a ); signals: /** @@ -308,9 +308,9 @@ protected: **/ Position position() const { return _position; } /** - * @return the applet's alignment. (top/left, center, or bottom/right) + * @return the applet's tqalignment. (top/left, center, or bottom/right) **/ - Alignment alignment() const { return _alignment; } + Alignment tqalignment() const { return _tqalignment; } /** * The panel on which this applet resides has changed its position. @@ -320,11 +320,11 @@ protected: virtual void positionChange( Position p ); /** - * The panel on which this applet resides has changed its alignment. + * The panel on which this applet resides has changed its tqalignment. * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void alignmentChange( Alignment /*a*/ ) {} + virtual void tqalignmentChange( Alignment /*a*/ ) {} /** * Use this method to set the custom menu for this applet so that it can be shown @@ -383,7 +383,7 @@ protected: private: Type _type; Position _position; - Alignment _alignment; + Alignment _tqalignment; KConfig* _config; int _actions; protected: diff --git a/kdeui/kpanelappmenu.cpp b/kdeui/kpanelappmenu.cpp index 68783a339..4cc77b5fe 100644 --- a/kdeui/kpanelappmenu.cpp +++ b/kdeui/kpanelappmenu.cpp @@ -39,7 +39,7 @@ KPanelAppMenu::KPanelAppMenu(const TQString &title, TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject() { - init(TQString::null, title); + init(TQString(), title); } KPanelAppMenu::KPanelAppMenu(const TQPixmap &icon, const TQString &title, diff --git a/kdeui/kpanelextension.cpp b/kdeui/kpanelextension.cpp index 538756758..0a5ee11a7 100644 --- a/kdeui/kpanelextension.cpp +++ b/kdeui/kpanelextension.cpp @@ -49,7 +49,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type, : TQFrame(parent, name) , _type(type) , _position( Top ) - , _alignment( LeftTop ) + , _tqalignment( LeftTop ) , _config(0) , _actions(actions) { @@ -71,11 +71,11 @@ void KPanelExtension::setPosition( Position p ) positionChange( p ); } -void KPanelExtension::setAlignment( Alignment a ) +void KPanelExtension::tqsetAlignment( Alignment a ) { - if( _alignment == a ) return; - _alignment = a; - alignmentChange( a ); + if( _tqalignment == a ) return; + _tqalignment = a; + tqalignmentChange( a ); } void KPanelExtension::setSize( Size size, int customSize ) @@ -101,9 +101,9 @@ void KPanelExtension::action( Action a ) Qt::Orientation KPanelExtension::orientation() { if (_position == Left || _position == Right) - return Vertical; + return Qt::Vertical; else - return Horizontal; + return Qt::Horizontal; } KPanelExtension::Size KPanelExtension::sizeSetting() const diff --git a/kdeui/kpanelextension.h b/kdeui/kpanelextension.h index 8fe97956d..486aa6fc5 100644 --- a/kdeui/kpanelextension.h +++ b/kdeui/kpanelextension.h @@ -94,7 +94,7 @@ class KPanelExtensionPrivate; * * @author Matthias Elter <elter@kde.org> **/ -class KDEUI_EXPORT KPanelExtension : public QFrame +class KDEUI_EXPORT KPanelExtension : public TQFrame { Q_OBJECT @@ -136,7 +136,7 @@ public: * location in the Window Manager Dock. Please note that the size can not be larger than the * maxsize given by the handler. **/ - virtual TQSize sizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } + virtual TQSize tqsizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } /** * Always use this KConfig object to save/load your extensions configuration. @@ -189,7 +189,7 @@ public: /** * @internal **/ - void setAlignment( Alignment a ); + void tqsetAlignment( Alignment a ); /** * @internal * @since 3.1 @@ -282,9 +282,9 @@ protected: Position position() const { return _position; } /** - * @return the extension's alignment. (left/top, center, or right/bottom) + * @return the extension's tqalignment. (left/top, center, or right/bottom) **/ - Alignment alignment() const { return _alignment; } + Alignment tqalignment() const { return _tqalignment; } /** * @return the extensions orientation. (horizontal or vertical) @@ -305,11 +305,11 @@ protected: virtual void positionChange( Position ) {} /** - * This extension has changed its alignment. + * This extension has changed its tqalignment. * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void alignmentChange( Alignment ) {} + virtual void tqalignmentChange( Alignment ) {} /** * Use this method to set the custom menu for this extensions so that it can be shown @@ -333,7 +333,7 @@ protected: private: Type _type; Position _position; - Alignment _alignment; + Alignment _tqalignment; KConfig* _config; int _actions; protected: diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp index 11db31eb5..37333ad21 100644 --- a/kdeui/kpassdlg.cpp +++ b/kdeui/kpassdlg.cpp @@ -69,10 +69,10 @@ static int * ourMaxLength( const KPasswordEdit* const e ) { d_ptr->setAutoDelete(true); qAddPostRoutine( cleanup_d_ptr ); } - int* ret = d_ptr->find( (void*) e ); + int* ret = d_ptr->tqfind( (void*) e ); if ( ! ret ) { ret = new int; - d_ptr->replace( (void*) e, ret ); + d_ptr->tqreplace( (void*) e, ret ); } return ret; } @@ -213,7 +213,7 @@ void KPasswordEdit::keyPressEvent(TQKeyEvent *e) } break; default: - const unsigned char ke = e->text().local8Bit()[0]; + const unsigned char ke = TQString(e->text()).local8Bit()[0]; if (ke >= 32) { insert(e->text()); } else @@ -339,7 +339,7 @@ void KPasswordDialog::init() KConfig* const cfg = KGlobal::config(); const KConfigGroupSaver saver(cfg, "Passwords"); - bool def = ( qstrcmp( qAppName(), "kdesu" ) == 0 ? defKeep : false ); + bool def = ( qstrcmp( tqAppName(), "kdesu" ) == 0 ? defKeep : false ); if (m_Keep && cfg->readBoolEntry("Keep", def)) ++m_Keep; @@ -354,14 +354,14 @@ void KPasswordDialog::init() if (!pix.isNull()) { lbl = new TQLabel(m_pMain); lbl->setPixmap(pix); - lbl->setAlignment(AlignHCenter|AlignVCenter); - lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 0, 0, AlignCenter); + lbl->tqsetAlignment(AlignHCenter|AlignVCenter); + lbl->setFixedSize(lbl->tqsizeHint()); + m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter); } m_pHelpLbl = new TQLabel(m_pMain); - m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak); - m_pGrid->addWidget(m_pHelpLbl, 0, 2, AlignLeft); + m_pHelpLbl->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); + m_pGrid->addWidget(m_pHelpLbl, 0, 2, (TQ_Alignment)AlignLeft); m_pGrid->addRowSpacing(1, 10); m_pGrid->setRowStretch(1, 12); @@ -371,17 +371,17 @@ void KPasswordDialog::init() // Row 3: Password editor #1 lbl = new TQLabel(m_pMain); - lbl->setAlignment(AlignLeft|AlignVCenter); + lbl->tqsetAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Password:")); - lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 7, 0, AlignLeft); + lbl->setFixedSize(lbl->tqsizeHint()); + m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft); TQHBoxLayout *h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 7, 2); m_pEdit = new KPasswordEdit(m_pMain); m_pEdit2 = 0; lbl->setBuddy(m_pEdit); - TQSize size = m_pEdit->sizeHint(); + TQSize size = m_pEdit->tqsizeHint(); m_pEdit->setFixedHeight(size.height()); m_pEdit->setMinimumWidth(size.width()); h_lay->addWidget(m_pEdit); @@ -392,26 +392,26 @@ void KPasswordDialog::init() m_pGrid->addRowSpacing(8, 10); m_pGrid->setRowStretch(8, 12); TQCheckBox* const cb = new TQCheckBox(i18n("&Keep password"), m_pMain); - cb->setFixedSize(cb->sizeHint()); + cb->setFixedSize(cb->tqsizeHint()); if (m_Keep > 1) cb->setChecked(true); else m_Keep = 0; connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool))); - m_pGrid->addWidget(cb, 9, 2, AlignLeft|AlignVCenter); + m_pGrid->addWidget(cb, 9, 2, (TQ_Alignment)(AlignLeft|AlignVCenter)); } else if (m_Type == NewPassword) { m_pGrid->addRowSpacing(8, 10); lbl = new TQLabel(m_pMain); - lbl->setAlignment(AlignLeft|AlignVCenter); + lbl->tqsetAlignment(AlignLeft|AlignVCenter); lbl->setText(i18n("&Verify:")); - lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, 9, 0, AlignLeft); + lbl->setFixedSize(lbl->tqsizeHint()); + m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft); h_lay = new TQHBoxLayout(); m_pGrid->addLayout(h_lay, 9, 2); m_pEdit2 = new KPasswordEdit(m_pMain); lbl->setBuddy(m_pEdit2); - size = m_pEdit2->sizeHint(); + size = m_pEdit2->tqsizeHint(); m_pEdit2->setFixedHeight(size.height()); m_pEdit2->setMinimumWidth(size.width()); h_lay->addWidget(m_pEdit2); @@ -424,7 +424,7 @@ void KPasswordDialog::init() strengthBox->setSpacing(10); m_pGrid->addMultiCellWidget(strengthBox, 11, 11, 0, 2); TQLabel* const passStrengthLabel = new TQLabel(strengthBox); - passStrengthLabel->setAlignment(AlignLeft|AlignVCenter); + passStrengthLabel->tqsetAlignment(AlignLeft|AlignVCenter); passStrengthLabel->setText(i18n("Password strength meter:")); d->m_strengthBar = new KProgress(100, strengthBox, "PasswordStrengthMeter"); d->m_strengthBar->setPercentageVisible(false); @@ -443,7 +443,7 @@ void KPasswordDialog::init() m_pGrid->setRowStretch(12, 12); d->m_MatchLabel = new TQLabel(m_pMain); - d->m_MatchLabel->setAlignment(AlignLeft|AlignVCenter|WordBreak); + d->m_MatchLabel->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); m_pGrid->addMultiCellWidget(d->m_MatchLabel, 13, 13, 0, 2); d->m_MatchLabel->setText(i18n("Passwords do not match")); @@ -490,14 +490,14 @@ void KPasswordDialog::addLine(TQString key, TQString value) return; TQLabel *lbl = new TQLabel(key, m_pMain); - lbl->setAlignment(AlignLeft|AlignTop); - lbl->setFixedSize(lbl->sizeHint()); - m_pGrid->addWidget(lbl, m_Row+2, 0, AlignLeft); + lbl->tqsetAlignment(AlignLeft|AlignTop); + lbl->setFixedSize(lbl->tqsizeHint()); + m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft); lbl = new TQLabel(value, m_pMain); - lbl->setAlignment(AlignTop|WordBreak); + lbl->tqsetAlignment(AlignTop|WordBreak); lbl->setFixedSize(275, lbl->heightForWidth(275)); - m_pGrid->addWidget(lbl, m_Row+2, 2, AlignLeft); + m_pGrid->addWidget(lbl, m_Row+2, 2, (TQ_Alignment)AlignLeft); ++m_Row; } @@ -634,15 +634,15 @@ void KPasswordDialog::enableOkBtn() if (pwlength > 5) pwlength = 5; const TQRegExp numRxp("[0-9]", true, false); - int numeric = (int) (pass.contains(numRxp) / lengthFactor); + int numeric = (int) (pass.tqcontains(numRxp) / lengthFactor); if (numeric > 3) numeric = 3; const TQRegExp symbRxp("\\W", false, false); - int numsymbols = (int) (pass.contains(symbRxp) / lengthFactor); + int numsymbols = (int) (pass.tqcontains(symbRxp) / lengthFactor); if (numsymbols > 3) numsymbols = 3; const TQRegExp upperRxp("[A-Z]", true, false); - int upper = (int) (pass.contains(upperRxp) / lengthFactor); + int upper = (int) (pass.tqcontains(upperRxp) / lengthFactor); if (upper > 3) upper = 3; int pwstrength=((pwlength*10)-20) + (numeric*10) + (numsymbols*15) + (upper*10); diff --git a/kdeui/kpassdlg.h b/kdeui/kpassdlg.h index ab6156979..91a861f40 100644 --- a/kdeui/kpassdlg.h +++ b/kdeui/kpassdlg.h @@ -37,7 +37,7 @@ class TQWidget; */ class KDEUI_EXPORT KPasswordEdit - : public QLineEdit + : public TQLineEdit { Q_OBJECT diff --git a/kdeui/kpassivepopup.cpp b/kdeui/kpassivepopup.cpp index 4b870c794..95dd48546 100644 --- a/kdeui/kpassivepopup.cpp +++ b/kdeui/kpassivepopup.cpp @@ -43,11 +43,11 @@ public: static const int DEFAULT_POPUP_TYPE = KPassivePopup::Boxed; static const int DEFAULT_POPUP_TIME = 6*1000; -static const int POPUP_FLAGS = Qt::WStyle_Customize | Qt::WDestructiveClose | Qt::WX11BypassWM - | Qt::WStyle_StaysOnTop | Qt::WStyle_Tool | Qt::WStyle_NoBorder; +static const int POPUP_FLAGS = TQt::WStyle_Customize | TQt::WDestructiveClose | TQt::WX11BypassWM + | TQt::WStyle_StaysOnTop | TQt::WStyle_Tool | TQt::WStyle_NoBorder; KPassivePopup::KPassivePopup( TQWidget *parent, const char *name, WFlags f ) - : TQFrame( 0, name, f ? f : POPUP_FLAGS ), + : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ), window( parent ? parent->winId() : 0L ), msgView( 0 ), topLayout( 0 ), hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ), m_autoDelete( false ) @@ -56,7 +56,7 @@ KPassivePopup::KPassivePopup( TQWidget *parent, const char *name, WFlags f ) } KPassivePopup::KPassivePopup( WId win, const char *name, WFlags f ) - : TQFrame( 0, name, f ? f : POPUP_FLAGS ), + : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ), window( win ), msgView( 0 ), topLayout( 0 ), hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ), m_autoDelete( false ) @@ -65,7 +65,7 @@ KPassivePopup::KPassivePopup( WId win, const char *name, WFlags f ) } KPassivePopup::KPassivePopup( int popupStyle, TQWidget *parent, const char *name, WFlags f ) - : TQFrame( 0, name, f ? f : POPUP_FLAGS ), + : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ), window( parent ? parent->winId() : 0L ), msgView( 0 ), topLayout( 0 ), hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ), m_autoDelete( false ) @@ -74,7 +74,7 @@ KPassivePopup::KPassivePopup( int popupStyle, TQWidget *parent, const char *name } KPassivePopup::KPassivePopup( int popupStyle, WId win, const char *name, WFlags f ) - : TQFrame( 0, name, f ? f : POPUP_FLAGS ), + : TQFrame( 0, name, (WFlags)(f ? (int)f : POPUP_FLAGS) ), window( win ), msgView( 0 ), topLayout( 0 ), hideDelay( DEFAULT_POPUP_TIME ), hideTimer( new TQTimer( this, "hide_timer" ) ), m_autoDelete( false ) @@ -138,7 +138,7 @@ TQVBox * KPassivePopup::standardView( const TQString& caption, hb->setSpacing( KDialog::spacingHint() ); ttlIcon = new TQLabel( hb, "title_icon" ); ttlIcon->setPixmap( icon ); - ttlIcon->setAlignment( AlignLeft ); + ttlIcon->tqsetAlignment( AlignLeft ); } if ( !caption.isEmpty() ) { @@ -146,14 +146,14 @@ TQVBox * KPassivePopup::standardView( const TQString& caption, TQFont fnt = ttl->font(); fnt.setBold( true ); ttl->setFont( fnt ); - ttl->setAlignment( Qt::AlignHCenter ); + ttl->tqsetAlignment( Qt::AlignHCenter ); if ( hb ) hb->setStretchFactor( ttl, 10 ); // enforce centering } if ( !text.isEmpty() ) { msg = new TQLabel( text, vb, "msg_label" ); - msg->setAlignment( AlignLeft ); + msg->tqsetAlignment( AlignLeft ); } return vb; @@ -194,8 +194,8 @@ void KPassivePopup::mouseReleaseEvent( TQMouseEvent *e ) void KPassivePopup::show() { - if ( size() != sizeHint() ) - resize( sizeHint() ); + if ( size() != tqsizeHint() ) + resize( tqsizeHint() ); if ( d->fixedPosition.isNull() ) positionSelf(); diff --git a/kdeui/kpassivepopup.h b/kdeui/kpassivepopup.h index 326c995cb..ecac2a90b 100644 --- a/kdeui/kpassivepopup.h +++ b/kdeui/kpassivepopup.h @@ -65,7 +65,7 @@ class TQVBox; * @author Richard Moore, rich@kde.org * @author Sascha Cunz, sascha.cunz@tiscali.de */ -class KDEUI_EXPORT KPassivePopup : public QFrame +class KDEUI_EXPORT KPassivePopup : public TQFrame { Q_OBJECT Q_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete ) diff --git a/kdeui/kpixmapio.cpp b/kdeui/kpixmapio.cpp index 74c68b82e..4d1e3c06a 100644 --- a/kdeui/kpixmapio.cpp +++ b/kdeui/kpixmapio.cpp @@ -468,7 +468,7 @@ TQImage KPixmapIO::convertFromXImage() cmap, ncells); image.setNumColors(ncells); for (i=0; i<ncells; i++) - image.setColor(i, qRgb(cmap[i].red, cmap[i].green, cmap[i].blue >> 8)); + image.setColor(i, tqRgb(cmap[i].red, cmap[i].green, cmap[i].blue >> 8)); } else image.create(width, height, 32); @@ -485,12 +485,12 @@ TQImage KPixmapIO::convertFromXImage() case bo16_RGB_565: case bo16_BGR_565: { - Q_INT32 pixel, *src; - QRgb *dst, val; + TQ_INT32 pixel, *src; + TQRgb *dst, val; for (y=0; y<height; y++) { - src = (Q_INT32 *) (data + y*bpl); - dst = (QRgb *) image.scanLine(y); + src = (TQ_INT32 *) (data + y*bpl); + dst = (TQRgb *) image.scanLine(y); for (x=0; x<width/2; x++) { pixel = *src++; @@ -516,12 +516,12 @@ TQImage KPixmapIO::convertFromXImage() case bo16_RGB_555: case bo16_BGR_555: { - Q_INT32 pixel, *src; - QRgb *dst, val; + TQ_INT32 pixel, *src; + TQRgb *dst, val; for (y=0; y<height; y++) { - src = (Q_INT32 *) (data + y*bpl); - dst = (QRgb *) image.scanLine(y); + src = (TQ_INT32 *) (data + y*bpl); + dst = (TQRgb *) image.scanLine(y); for (x=0; x<width/2; x++) { pixel = *src++; @@ -547,18 +547,18 @@ TQImage KPixmapIO::convertFromXImage() case bo24_RGB: { char *src; - QRgb *dst; + TQRgb *dst; int w1 = width/4; - Q_INT32 d1, d2, d3; + TQ_INT32 d1, d2, d3; for (y=0; y<height; y++) { src = data + y*bpl; - dst = (QRgb *) image.scanLine(y); + dst = (TQRgb *) image.scanLine(y); for (x=0; x<w1; x++) { - d1 = *((Q_INT32 *)src); - d2 = *((Q_INT32 *)src + 1); - d3 = *((Q_INT32 *)src + 2); + d1 = *((TQ_INT32 *)src); + d2 = *((TQ_INT32 *)src + 1); + d3 = *((TQ_INT32 *)src + 2); src += 12; *dst++ = d1; *dst++ = (d1 >> 24) | (d2 << 8); @@ -579,18 +579,18 @@ TQImage KPixmapIO::convertFromXImage() case bo24_BGR: { char *src; - QRgb *dst; + TQRgb *dst; int w1 = width/4; - Q_INT32 d1, d2, d3; + TQ_INT32 d1, d2, d3; for (y=0; y<height; y++) { src = data + y*bpl; - dst = (QRgb *) image.scanLine(y); + dst = (TQRgb *) image.scanLine(y); for (x=0; x<w1; x++) { - d1 = *((Q_INT32 *)src); - d2 = *((Q_INT32 *)src + 1); - d3 = *((Q_INT32 *)src + 2); + d1 = *((TQ_INT32 *)src); + d2 = *((TQ_INT32 *)src + 1); + d3 = *((TQ_INT32 *)src + 2); src += 12; *dst++ = d1; *dst++ = (d1 >> 24) | (d2 << 8); @@ -637,12 +637,12 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (img.depth() == 32) { - QRgb *src, pixel; - Q_INT32 *dst, val; + TQRgb *src, pixel; + TQ_INT32 *dst, val; for (y=0; y<height; y++) { - src = (QRgb *) img.scanLine(y); - dst = (Q_INT32 *) (data + y*bpl); + src = (TQRgb *) img.scanLine(y); + dst = (TQ_INT32 *) (data + y*bpl); for (x=0; x<width/2; x++) { pixel = *src++; @@ -656,19 +656,19 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (width%2) { pixel = *src++; - *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 9) | + *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 9) | ((pixel & 0xf800) >> 6) | ((pixel & 0xff) >> 3); } } } else { uchar *src; - Q_INT32 val, *dst; - QRgb pixel, *clut = img.colorTable(); + TQ_INT32 val, *dst; + TQRgb pixel, *clut = img.tqcolorTable(); for (y=0; y<height; y++) { - src = img.scanLine(y); - dst = (Q_INT32 *) (data + y*bpl); + src = const_cast<TQImage&>(img).scanLine(y); + dst = (TQ_INT32 *) (data + y*bpl); for (x=0; x<width/2; x++) { pixel = clut[*src++]; @@ -682,7 +682,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (width%2) { pixel = clut[*src++]; - *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 9) | + *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 9) | ((pixel & 0xf800) >> 6) | ((pixel & 0xff) >> 3); } } @@ -694,12 +694,12 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (img.depth() == 32) { - QRgb *src, pixel; - Q_INT32 *dst, val; + TQRgb *src, pixel; + TQ_INT32 *dst, val; for (y=0; y<height; y++) { - src = (QRgb *) img.scanLine(y); - dst = (Q_INT32 *) (data + y*bpl); + src = (TQRgb *) img.scanLine(y); + dst = (TQ_INT32 *) (data + y*bpl); for (x=0; x<width/2; x++) { pixel = *src++; @@ -713,19 +713,19 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (width%2) { pixel = *src++; - *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 8) | + *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 8) | ((pixel & 0xfc00) >> 5) | ((pixel & 0xff) >> 3); } } } else { uchar *src; - Q_INT32 val, *dst; - QRgb pixel, *clut = img.colorTable(); + TQ_INT32 val, *dst; + TQRgb pixel, *clut = img.tqcolorTable(); for (y=0; y<height; y++) { - src = img.scanLine(y); - dst = (Q_INT32 *) (data + y*bpl); + src = const_cast<TQImage&>(img).scanLine(y); + dst = (TQ_INT32 *) (data + y*bpl); for (x=0; x<width/2; x++) { pixel = clut[*src++]; @@ -739,7 +739,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (width%2) { pixel = clut[*src++]; - *((Q_INT16 *)dst) = ((pixel & 0xf80000) >> 8) | + *((TQ_INT16 *)dst) = ((pixel & 0xf80000) >> 8) | ((pixel & 0xfc00) >> 5) | ((pixel & 0xff) >> 3); } } @@ -752,10 +752,10 @@ void KPixmapIO::convertToXImage(const TQImage &img) { char *dst; int w1 = width/4; - QRgb *src, d1, d2, d3, d4; + TQRgb *src, d1, d2, d3, d4; for (y=0; y<height; y++) { - src = (QRgb *) img.scanLine(y); + src = (TQRgb *) img.scanLine(y); dst = data + y*bpl; for (x=0; x<w1; x++) { @@ -763,27 +763,27 @@ void KPixmapIO::convertToXImage(const TQImage &img) d2 = (*src++ & 0xffffff); d3 = (*src++ & 0xffffff); d4 = (*src++ & 0xffffff); - *((Q_INT32 *)dst) = d1 | (d2 << 24); - *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); - *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); + *((TQ_INT32 *)dst) = d1 | (d2 << 24); + *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); + *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); dst += 12; } for (x=w1*4; x<width; x++) { d1 = *src++; - *dst++ = qRed(d1); - *dst++ = qGreen(d1); - *dst++ = qBlue(d1); + *dst++ = tqRed(d1); + *dst++ = tqGreen(d1); + *dst++ = tqBlue(d1); } } } else { uchar *src, *dst; int w1 = width/4; - QRgb *clut = img.colorTable(), d1, d2, d3, d4; + TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4; for (y=0; y<height; y++) { - src = img.scanLine(y); + src = const_cast<TQImage&>(img).scanLine(y); dst = (uchar *) data + y*bpl; for (x=0; x<w1; x++) { @@ -791,17 +791,17 @@ void KPixmapIO::convertToXImage(const TQImage &img) d2 = (clut[*src++] & 0xffffff); d3 = (clut[*src++] & 0xffffff); d4 = (clut[*src++] & 0xffffff); - *((Q_INT32 *)dst) = d1 | (d2 << 24); - *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); - *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); + *((TQ_INT32 *)dst) = d1 | (d2 << 24); + *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); + *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); dst += 12; } for (x=w1*4; x<width; x++) { d1 = clut[*src++]; - *dst++ = qRed(d1); - *dst++ = qGreen(d1); - *dst++ = qBlue(d1); + *dst++ = tqRed(d1); + *dst++ = tqGreen(d1); + *dst++ = tqBlue(d1); } } } @@ -812,11 +812,11 @@ void KPixmapIO::convertToXImage(const TQImage &img) if (img.depth() == 32) { char *dst; - QRgb *src, d1, d2, d3, d4; + TQRgb *src, d1, d2, d3, d4; int w1 = width/4; for (y=0; y<height; y++) { - src = (QRgb *) img.scanLine(y); + src = (TQRgb *) img.scanLine(y); dst = data + y*bpl; for (x=0; x<w1; x++) { @@ -824,27 +824,27 @@ void KPixmapIO::convertToXImage(const TQImage &img) d2 = (*src++ & 0xffffff); d3 = (*src++ & 0xffffff); d4 = (*src++ & 0xffffff); - *((Q_INT32 *)dst) = d1 | (d2 << 24); - *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); - *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); + *((TQ_INT32 *)dst) = d1 | (d2 << 24); + *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); + *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); dst += 12; } for (x=w1*4; x<width; x++) { d1 = *src++; - *dst++ = qBlue(d1); - *dst++ = qGreen(d1); - *dst++ = qRed(d1); + *dst++ = tqBlue(d1); + *dst++ = tqGreen(d1); + *dst++ = tqRed(d1); } } } else { uchar *src, *dst; int w1 = width/4; - QRgb *clut = img.colorTable(), d1, d2, d3, d4; + TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4; for (y=0; y<height; y++) { - src = img.scanLine(y); + src = const_cast<TQImage&>(img).scanLine(y); dst = (uchar *) data + y*bpl; for (x=0; x<w1; x++) { @@ -852,17 +852,17 @@ void KPixmapIO::convertToXImage(const TQImage &img) d2 = (clut[*src++] & 0xffffff); d3 = (clut[*src++] & 0xffffff); d4 = (clut[*src++] & 0xffffff); - *((Q_INT32 *)dst) = d1 | (d2 << 24); - *((Q_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); - *((Q_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); + *((TQ_INT32 *)dst) = d1 | (d2 << 24); + *((TQ_INT32 *)dst+1) = (d2 >> 8) | (d3 << 16); + *((TQ_INT32 *)dst+2) = (d4 << 8) | (d3 >> 16); dst += 12; } for (x=w1*4; x<width; x++) { d1 = clut[*src++]; - *dst++ = qBlue(d1); - *dst++ = qGreen(d1); - *dst++ = qRed(d1); + *dst++ = tqBlue(d1); + *dst++ = tqGreen(d1); + *dst++ = tqRed(d1); } } } @@ -878,11 +878,11 @@ void KPixmapIO::convertToXImage(const TQImage &img) } else { uchar *src; - QRgb *dst, *clut = img.colorTable(); + TQRgb *dst, *clut = img.tqcolorTable(); for (y=0; y<height; y++) { - src = img.scanLine(y); - dst = (QRgb *) (data + y*bpl); + src = const_cast<TQImage&>(img).scanLine(y); + dst = (TQRgb *) (data + y*bpl); for (x=0; x<width; x++) *dst++ = clut[*src++]; } diff --git a/kdeui/kpixmapregionselectorwidget.cpp b/kdeui/kpixmapregionselectorwidget.cpp index ada867bba..320f6569e 100644 --- a/kdeui/kpixmapregionselectorwidget.cpp +++ b/kdeui/kpixmapregionselectorwidget.cpp @@ -47,7 +47,7 @@ KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, vboxLayout->addStretch(); m_label = new TQLabel(this, "pixmapHolder"); - m_label->setBackgroundMode( Qt::NoBackground ); + m_label->setBackgroundMode( TQt::NoBackground ); m_label->installEventFilter( this ); vboxLayout->addWidget(m_label); @@ -108,7 +108,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_linedPixmap = m_originalPixmap; painter.begin(&m_linedPixmap); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), TQBrush( TQColor(255,255,255), Qt::BDiagPattern) ); painter.end(); @@ -125,7 +125,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_originalPixmap, m_selectedRegion ); painter.setPen( TQColor(255,255,255) ); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.drawRect( m_selectedRegion ); @@ -141,13 +141,13 @@ KPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); KAction *action = new KAction(i18n("&Rotate Clockwise"), "rotate_cw", - 0, this, TQT_SLOT(rotateClockwise()), - popup, "rotateclockwise"); + 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), + TQT_TQOBJECT(popup), "rotateclockwise"); action->plug(popup); action = new KAction(i18n("Rotate &Counterclockwise"), "rotate_ccw", - 0, this, TQT_SLOT(rotateCounterclockwise()), - popup, "rotatecounterclockwise"); + 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), + TQT_TQOBJECT(popup), "rotatecounterclockwise"); action->plug(popup); /* @@ -213,7 +213,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQMouseEvent *mev= (TQMouseEvent *)(ev); //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; - if ( mev->button() == RightButton ) + if ( mev->button() == Qt::RightButton ) { KPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); @@ -426,7 +426,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) { /* We have to resize the pixmap to get it complete on the screen */ TQImage image=m_originalPixmap.convertToImage(); - m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) ); + m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) ); double oldZoomFactor = m_zoomFactor; m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width(); diff --git a/kdeui/kpixmapregionselectorwidget.h b/kdeui/kpixmapregionselectorwidget.h index f88119755..647f6d76e 100644 --- a/kdeui/kpixmapregionselectorwidget.h +++ b/kdeui/kpixmapregionselectorwidget.h @@ -41,7 +41,7 @@ class KPopupMenu; * @author Antonio Larrosa <larrosa@kde.org> * @since 3.4 */ -class KDEUI_EXPORT KPixmapRegionSelectorWidget : public QWidget +class KDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeui/kpopupmenu.cpp b/kdeui/kpopupmenu.cpp index 6765216b4..6b63a951c 100644 --- a/kdeui/kpopupmenu.cpp +++ b/kdeui/kpopupmenu.cpp @@ -20,6 +20,11 @@ #include <tqpainter.h> #include <tqtimer.h> #include <tqfontmetrics.h> + +#ifdef USE_QT4 +#undef None +#endif // USE_QT4 + #include <tqstyle.h> #include "kpopupmenu.h" @@ -85,14 +90,14 @@ void KPopupTitle::paintEvent(TQPaintEvent *) { TQRect r(rect()); TQPainter p(this); - kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active()); + kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, tqpalette().active()); if (!miniicon.isNull()) p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon); if (!titleStr.isNull()) { - p.setPen(palette().active().text()); + p.setPen(tqpalette().active().text()); TQFont f = p.font(); f.setBold(true); p.setFont(f); @@ -110,9 +115,9 @@ void KPopupTitle::paintEvent(TQPaintEvent *) } } -TQSize KPopupTitle::sizeHint() const +TQSize KPopupTitle::tqsizeHint() const { - return minimumSize(); + return tqminimumSize(); } class KPopupMenu::KPopupMenuPrivate @@ -145,7 +150,7 @@ public: TQString originalText; int lastHitIndex; - Qt::ButtonState state; + TQt::ButtonState state; // support for RMB menus on menus TQPopupMenu* m_ctxMenu; @@ -198,7 +203,7 @@ int KPopupMenu::insertTitle(const TQPixmap &icon, const TQString &text, int id, void KPopupMenu::changeTitle(int id, const TQString &text) { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) ((KPopupTitle *)item->widget())->setTitle(text); @@ -215,7 +220,7 @@ void KPopupMenu::changeTitle(int id, const TQString &text) void KPopupMenu::changeTitle(int id, const TQPixmap &icon, const TQString &text) { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) ((KPopupTitle *)item->widget())->setTitle(text, &icon); @@ -234,7 +239,7 @@ TQString KPopupMenu::title(int id) const { if(id == -1) // obsolete return d->m_lastTitle; - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) return ((KPopupTitle *)item->widget())->title(); @@ -248,7 +253,7 @@ TQString KPopupMenu::title(int id) const TQPixmap KPopupMenu::titlePixmap(int id) const { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) return ((KPopupTitle *)item->widget())->icon(); @@ -277,7 +282,7 @@ void KPopupMenu::activateItemAt(int index) TQPopupMenu::activateItemAt(index); } -Qt::ButtonState KPopupMenu::state() const +TQt::ButtonState KPopupMenu::state() const { return d->state; } @@ -348,7 +353,7 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) // therefore the lastHitIndex is valid i = d->lastHitIndex; } - } else if (key == Key_Backspace && parentMenu) { + } else if (key == Key_Backspace && tqparentMenu) { // backspace with no chars in the buffer... go back a menu. hide(); resetKeyboardVars(); @@ -377,13 +382,13 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) // if there is an accelerator present, remove it if ((int)accel(j) != 0) - thisText = thisText.replace("&", TQString::null); + thisText = thisText.tqreplace("&", TQString()); // chop text to the search length thisText = thisText.left(seqLen); // do the search - if (!thisText.find(d->keySeq, 0, false)) { + if (!thisText.tqfind(d->keySeq, 0, false)) { if (firstpass) { // match @@ -424,8 +429,8 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) activateItemAt(d->lastHitIndex); resetKeyboardVars(); - } else if (findItem(idAt(d->lastHitIndex)) && - findItem(idAt(d->lastHitIndex))->popup()) { + } else if (tqfindItem(idAt(d->lastHitIndex)) && + tqfindItem(idAt(d->lastHitIndex))->popup()) { // only activate sub-menus activateItemAt(d->lastHitIndex); resetKeyboardVars(); @@ -502,7 +507,7 @@ void KPopupMenu::mousePressEvent(TQMouseEvent* e) void KPopupMenu::mouseReleaseEvent(TQMouseEvent* e) { // Save the button, and the modifiers from state() - d->state = Qt::ButtonState(e->button() | (e->state() & KeyButtonMask)); + d->state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask)); if ( !d->m_ctxMenu || !d->m_ctxMenu->isVisible() ) TQPopupMenu::mouseReleaseEvent(e); @@ -552,7 +557,7 @@ void KPopupMenu::itemHighlighted(int /* whichItem */) void KPopupMenu::showCtxMenu(TQPoint pos) { - TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem); + TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem); if (item) { TQPopupMenu* subMenu = item->popup(); @@ -572,7 +577,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos) emit aboutToShowContextMenu(this, KPopupMenuPrivate::s_highlightedItem, d->m_ctxMenu); - TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup(); + TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu())); @@ -596,7 +601,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos) */ void KPopupMenu::ctxMenuHideShowingMenu() { - TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem); + TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem); if (item) { TQPopupMenu* subMenu = item->popup(); @@ -611,7 +616,7 @@ void KPopupMenu::ctxMenuHiding() { if (KPopupMenuPrivate::s_highlightedItem) { - TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup(); + TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); diff --git a/kdeui/kpopupmenu.h b/kdeui/kpopupmenu.h index 55ebbad8d..c6dc61191 100644 --- a/kdeui/kpopupmenu.h +++ b/kdeui/kpopupmenu.h @@ -35,7 +35,7 @@ * * @author Daniel M. Duley <mosfet@kde.org> */ -class KDEUI_EXPORT KPopupTitle : public QWidget +class KDEUI_EXPORT KPopupTitle : public TQWidget { Q_OBJECT @@ -74,7 +74,7 @@ public: */ TQPixmap icon() const { return miniicon; } - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: /// @since 3.1 @@ -239,7 +239,7 @@ public: * when the last menuitem was activated. * @since 3.4 */ - Qt::ButtonState state() const; + TQt::ButtonState state() const; signals: /** diff --git a/kdeui/kprogress.cpp b/kdeui/kprogress.cpp index 17994eb88..e10cb0f7b 100644 --- a/kdeui/kprogress.cpp +++ b/kdeui/kprogress.cpp @@ -132,9 +132,9 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps) if (!totalSteps) return false; TQString newString(mFormat); - newString.replace(TQString::fromLatin1("%v"), + newString.replace(TQString::tqfromLatin1("%v"), TQString::number(progress)); - newString.replace(TQString::fromLatin1("%m"), + newString.replace(TQString::tqfromLatin1("%m"), TQString::number(totalSteps)); if (totalSteps > INT_MAX / 1000) { @@ -142,7 +142,7 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps) totalSteps /= 1000; } - newString.replace(TQString::fromLatin1("%p"), + newString.replace(TQString::tqfromLatin1("%p"), TQString::number((progress * 100) / totalSteps)); if (newString != indicator) diff --git a/kdeui/kprogress.h b/kdeui/kprogress.h index b86e28598..e17cf0040 100644 --- a/kdeui/kprogress.h +++ b/kdeui/kprogress.h @@ -43,7 +43,7 @@ * * @author Aaron Seigo */ -class KDEUI_EXPORT KProgress : public QProgressBar +class KDEUI_EXPORT KProgress : public TQProgressBar { Q_OBJECT diff --git a/kdeui/kpushbutton.cpp b/kdeui/kpushbutton.cpp index 52679c0e5..57011da3b 100644 --- a/kdeui/kpushbutton.cpp +++ b/kdeui/kpushbutton.cpp @@ -98,7 +98,7 @@ void KPushButton::init( const KGuiItem &item ) setIconSet( d->item.iconSet() ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); TQToolTip::add( this, item.toolTip() ); @@ -193,7 +193,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e ) return; } - if ( (e->state() & LeftButton) && + if ( (e->state() & Qt::LeftButton) && (e->pos() - startPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) { diff --git a/kdeui/kpushbutton.h b/kdeui/kpushbutton.h index 7cf2b20e1..b0664c807 100644 --- a/kdeui/kpushbutton.h +++ b/kdeui/kpushbutton.h @@ -34,7 +34,7 @@ class TQDragObject; * @short A TQPushButton with drag-support and KGuiItem support * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KDEUI_EXPORT KPushButton : public QPushButton +class KDEUI_EXPORT KPushButton : public TQPushButton { Q_OBJECT Q_PROPERTY(int stdItem READ guiItm WRITE setGuiItm ) diff --git a/kdeui/krootpixmap.cpp b/kdeui/krootpixmap.cpp index cf6af3fdf..d583a243d 100644 --- a/kdeui/krootpixmap.cpp +++ b/kdeui/krootpixmap.cpp @@ -66,7 +66,7 @@ void KRootPixmap::init() m_bCustomPaint = false; connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); + connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint())); #ifdef Q_WS_X11 connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); @@ -75,7 +75,7 @@ void KRootPixmap::init() connect(d->kwin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int))); #endif - d->toplevel = m_pWidget->topLevelWidget(); + d->toplevel = m_pWidget->tqtopLevelWidget(); d->toplevel->installEventFilter(this); m_pWidget->installEventFilter(this); } @@ -113,7 +113,7 @@ void KRootPixmap::start() return; } if (m_bInit) - repaint(true); + tqrepaint(true); } @@ -134,7 +134,7 @@ void KRootPixmap::setFadeEffect(double fade, const TQColor &color) m_Fade = fade; m_FadeColor = color; - if ( m_bActive && m_bInit ) repaint(true); + if ( m_bActive && m_bInit ) tqrepaint(true); } @@ -163,7 +163,7 @@ bool KRootPixmap::eventFilter(TQObject *, TQEvent *event) case TQEvent::Reparent: d->toplevel->removeEventFilter(this); - d->toplevel = m_pWidget->topLevelWidget(); + d->toplevel = m_pWidget->tqtopLevelWidget(); d->toplevel->installEventFilter(this); break; @@ -181,31 +181,31 @@ void KRootPixmap::desktopChanged(int desktop) return; #ifdef Q_WS_X11 - if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops && + if (KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop() == NET::OnAllDesktops && pixmapName(m_Desk) != pixmapName(desktop)) #endif - repaint(true); + tqrepaint(true); } void KRootPixmap::desktopChanged( WId window, unsigned int properties ) { #ifdef Q_WS_X11 if( !(properties & NET::WMDesktop) || - (window != m_pWidget->topLevelWidget()->winId())) + (window != m_pWidget->tqtopLevelWidget()->winId())) return; #endif kdDebug() << k_funcinfo << endl; - repaint(true); + tqrepaint(true); } -void KRootPixmap::repaint() +void KRootPixmap::tqrepaint() { - repaint(false); + tqrepaint(false); } -void KRootPixmap::repaint(bool force) +void KRootPixmap::tqrepaint(bool force) { TQPoint p1 = m_pWidget->mapToGlobal(m_pWidget->rect().topLeft()); TQPoint p2 = m_pWidget->mapToGlobal(m_pWidget->rect().bottomRight()); @@ -226,7 +226,7 @@ void KRootPixmap::repaint(bool force) } m_Rect = TQRect(p1, p2); #ifdef Q_WS_X11 - m_Desk = KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop(); + m_Desk = KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop(); if (m_Desk == NET::OnAllDesktops) m_Desk = currentDesktop(); @@ -326,7 +326,7 @@ void KRootPixmap::slotBackgroundChanged(int desk) return; if (desk == m_Desk) - repaint(true); + tqrepaint(true); } #include "krootpixmap.moc" diff --git a/kdeui/krootpixmap.h b/kdeui/krootpixmap.h index d714c93ef..60f9ac549 100644 --- a/kdeui/krootpixmap.h +++ b/kdeui/krootpixmap.h @@ -43,7 +43,7 @@ class KRootPixmapData; * @author Geert Jansen <jansen@kde.org> * @version $Id$ */ -class KDEUI_EXPORT KRootPixmap: public QObject +class KDEUI_EXPORT KRootPixmap: public TQObject { Q_OBJECT @@ -137,16 +137,16 @@ public slots: * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. * - * @param force Force a repaint, even if the contents did not change. + * @param force Force a tqrepaint, even if the contents did not change. */ - void repaint( bool force ); + void tqrepaint( bool force ); /** * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. This is equivalent to calling - * repaint( false ). + * tqrepaint( false ). */ - void repaint(); + void tqrepaint(); /** * Enables custom handling of the background painting. If custom diff --git a/kdeui/kruler.cpp b/kdeui/kruler.cpp index c50cf9620..56d3703d8 100644 --- a/kdeui/kruler.cpp +++ b/kdeui/kruler.cpp @@ -94,7 +94,7 @@ public: KRuler::KRuler(TQWidget *parent, const char *name) : TQFrame(parent, name), range(INIT_MIN_VALUE, INIT_MAX_VALUE, 1, 10, INIT_VALUE), - dir(Horizontal) + dir(Qt::Horizontal) { init(); setFixedHeight(FIX_WIDTH); @@ -108,7 +108,7 @@ KRuler::KRuler(Orientation orient, dir(orient) { init(); - if (orient == Horizontal) + if (orient == Qt::Horizontal) setFixedHeight(FIX_WIDTH); else setFixedWidth(FIX_WIDTH); @@ -123,7 +123,7 @@ KRuler::KRuler(Orientation orient, int widgetWidth, { init(); - if (orient == Horizontal) + if (orient == Qt::Horizontal) setFixedHeight(widgetWidth); else setFixedWidth(widgetWidth); @@ -362,7 +362,7 @@ KRuler::setEndLabel(const TQString& label) endlabel = label; // premeasure the fontwidth and save it - if (dir == Vertical) { + if (dir == Qt::Vertical) { TQFont font = this->font(); font.setPointSize(LABEL_SIZE); TQFontMetrics fm(font); @@ -432,19 +432,19 @@ KRuler::setRulerMetricStyle(KRuler::MetricStyle style) } switch (style) { case Pixel: - setEndLabel(TQString::fromLatin1("pixel")); + setEndLabel(TQString::tqfromLatin1("pixel")); break; case Inch: - setEndLabel(TQString::fromLatin1("inch")); + setEndLabel(TQString::tqfromLatin1("inch")); break; case Millimetres: - setEndLabel(TQString::fromLatin1("mm")); + setEndLabel(TQString::tqfromLatin1("mm")); break; case Centimetres: - setEndLabel(TQString::fromLatin1("cm")); + setEndLabel(TQString::tqfromLatin1("cm")); break; case Metres: - setEndLabel(TQString::fromLatin1("m")); + setEndLabel(TQString::tqfromLatin1("m")); default: /* never reached, see above switch */ /* empty command */; } @@ -550,16 +550,16 @@ KRuler::slotNewValue(int _value) return; } // get the rectangular of the old and the new ruler pointer - // and repaint only him - if (dir == Horizontal) { + // and tqrepaint only him + if (dir == Qt::Horizontal) { TQRect oldrec(-5+oldvalue,10, 11,6); TQRect newrec(-5+_value,10, 11,6); - repaint( oldrec.unite(newrec) ); + tqrepaint( oldrec.unite(newrec) ); } else { TQRect oldrec(10,-5+oldvalue, 6,11); TQRect newrec(10,-5+_value, 6,11); - repaint( oldrec.unite(newrec) ); + tqrepaint( oldrec.unite(newrec) ); } } @@ -569,7 +569,7 @@ KRuler::slotNewOffset(int _offset) if (offset_ != _offset) { //setOffset(_offset); offset_ = _offset; - repaint(contentsRect()); + tqrepaint(contentsRect()); } } @@ -586,7 +586,7 @@ KRuler::slotEndOffset(int offset) } if (d->endOffset_length != tmp) { d->endOffset_length = tmp; - repaint(contentsRect()); + tqrepaint(contentsRect()); } } @@ -604,7 +604,7 @@ KRuler::drawContents(TQPainter *p) int value = range.value(), minval = range.minValue(), maxval; - if (dir == Horizontal) { + if (dir == Qt::Horizontal) { maxval = range.maxValue() + offset_ - (d->lengthFix?(height()-d->endOffset_length):d->endOffset_length); @@ -636,7 +636,7 @@ KRuler::drawContents(TQPainter *p) // draw endlabel if (d->showEndL) { - if (dir == Horizontal) { + if (dir == Qt::Horizontal) { p->translate( fontOffset, 0 ); p->drawText( END_LABEL_X, END_LABEL_Y, endlabel ); } @@ -659,7 +659,7 @@ KRuler::drawContents(TQPainter *p) if (showtm) { fend = ppm*tmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Horizontal) { + if (dir == Qt::Horizontal) { p->drawLine((int)f, BASE_MARK_X1, (int)f, BASE_MARK_X2); } else { @@ -671,7 +671,7 @@ KRuler::drawContents(TQPainter *p) // draw the little marks fend = ppm*lmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Horizontal) { + if (dir == Qt::Horizontal) { p->drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2); } else { @@ -683,7 +683,7 @@ KRuler::drawContents(TQPainter *p) // draw medium marks fend = ppm*mmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Horizontal) { + if (dir == Qt::Horizontal) { p->drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2); } else { @@ -695,7 +695,7 @@ KRuler::drawContents(TQPainter *p) // draw big marks fend = ppm*bmDist; for ( f=offsetmin; f<offsetmax; f+=fend ) { - if (dir == Horizontal) { + if (dir == Qt::Horizontal) { p->drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2); } else { @@ -705,7 +705,7 @@ KRuler::drawContents(TQPainter *p) } if (showem) { // draw end marks - if (dir == Horizontal) { + if (dir == Qt::Horizontal) { p->drawLine(minval-offset_, END_MARK_X1, minval-offset_, END_MARK_X2); p->drawLine(maxval-offset_, END_MARK_X1, maxval-offset_, END_MARK_X2); } @@ -718,7 +718,7 @@ KRuler::drawContents(TQPainter *p) // draw pointer if (d->showpointer) { TQPointArray pa(4); - if (dir == Horizontal) { + if (dir == Qt::Horizontal) { pa.setPoints(3, value-5, 10, value+5, 10, value/*+0*/,15); } else { diff --git a/kdeui/kruler.h b/kdeui/kruler.h index 997eb5c36..1abeb5985 100644 --- a/kdeui/kruler.h +++ b/kdeui/kruler.h @@ -55,12 +55,12 @@ * To receive mouse clicks or mouse moves, * the class has to be overloaded. * - * For performance reasons, the public methods don't call TQWidget::repaint(). + * For performance reasons, the public methods don't call TQWidget::tqrepaint(). * (Slots do, see documentation below.) * All the changed settings will be painted once after leaving * to the main event loop. * For performance painting the slot methods should be used, - * they do a fast TQWidget::repaint() call after changing the values. + * they do a fast TQWidget::tqrepaint() call after changing the values. * For setting multiple values like minValue(), maxValue(), offset() etc. * using the public methods is recommended * so the widget will be painted only once when entering the main event loop. @@ -68,7 +68,7 @@ * @short A ruler widget. * @author Jörg Habenicht */ -class KDEUI_EXPORT KRuler : public QFrame +class KDEUI_EXPORT KRuler : public TQFrame { Q_OBJECT Q_PROPERTY( int minValue READ minValue WRITE setMinValue ) @@ -428,7 +428,7 @@ public slots: * Sets the pointer to a new position. * * The offset is NOT updated. - * TQWidget::repaint() is called afterwards. + * TQWidget::tqrepaint() is called afterwards. **/ void slotNewValue(int); @@ -436,7 +436,7 @@ public slots: * Sets the ruler marks to a new position. * * The pointer is NOT updated. - * TQWidget::repaint() is called afterwards. + * TQWidget::tqrepaint() is called afterwards. **/ void slotNewOffset(int); diff --git a/kdeui/ksconfig.cpp b/kdeui/ksconfig.cpp index a8849e8fe..807917ca5 100644 --- a/kdeui/ksconfig.cpp +++ b/kdeui/ksconfig.cpp @@ -266,7 +266,7 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, TQString extension; - int i = dname.find('-'); + int i = dname.tqfind('-'); if ( i != -1 ) { extension = dname.mid(i+1); @@ -363,8 +363,8 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, } //We have explicitly chosen English as the default here. - if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") && - lname==TQString::fromLatin1("en") ) || + if ( ( KGlobal::locale()->language() == TQString::tqfromLatin1("C") && + lname==TQString::tqfromLatin1("en") ) || KGlobal::locale()->language() == lname ) return true; @@ -406,9 +406,9 @@ KSpellConfig::fillInDialog () int whichelement=-1; if ( dictFromList() ) - whichelement = langfnames.findIndex(dictionary()); + whichelement = langfnames.tqfindIndex(dictionary()); - dictcombo->setMinimumWidth (dictcombo->sizeHint().width()); + dictcombo->setMinimumWidth (dictcombo->tqsizeHint().width()); if (dictionary().isEmpty() || whichelement!=-1) { @@ -742,7 +742,7 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries ) } } } - int whichelement = langfnames.findIndex(qsdict); + int whichelement = langfnames.tqfindIndex(qsdict); if ( whichelement >= 0 ) { box->setCurrentItem( whichelement ); } @@ -788,7 +788,7 @@ KSpellConfig::setDictionary (const TQString s) qsdict=s; //.copy(); if (qsdict.length()>5) - if ((signed)qsdict.find(".hash")==(signed)qsdict.length()-5) + if ((signed)qsdict.tqfind(".hash")==(signed)qsdict.length()-5) qsdict.remove (qsdict.length()-5,5); @@ -797,7 +797,7 @@ KSpellConfig::setDictionary (const TQString s) int whichelement=-1; if (dictFromList()) { - whichelement = langfnames.findIndex(s); + whichelement = langfnames.tqfindIndex(s); if(whichelement >= 0) { @@ -1003,7 +1003,7 @@ KSpellConfig::setIgnoreList (TQStringList _ignorelist) ignorelist=_ignorelist; } -QStringList +TQStringList KSpellConfig::ignoreList () const { return ignorelist; @@ -1016,7 +1016,7 @@ KSpellConfig::setReplaceAllList (TQStringList _replacelist) d->replacelist=_replacelist; } -QStringList +TQStringList KSpellConfig::replaceAllList() const { return d->replacelist; diff --git a/kdeui/ksconfig.h b/kdeui/ksconfig.h index 0c688d459..7663a2c5f 100644 --- a/kdeui/ksconfig.h +++ b/kdeui/ksconfig.h @@ -84,7 +84,7 @@ enum KSpellClients { * @see KSpell */ -class KDEUI_EXPORT KSpellConfig : public QWidget +class KDEUI_EXPORT KSpellConfig : public TQWidget { Q_OBJECT diff --git a/kdeui/kscrollview.h b/kdeui/kscrollview.h index cca289e75..5611e6c3e 100644 --- a/kdeui/kscrollview.h +++ b/kdeui/kscrollview.h @@ -27,7 +27,7 @@ * * **/ -class KDEUI_EXPORT KScrollView : public QScrollView +class KDEUI_EXPORT KScrollView : public TQScrollView { Q_OBJECT diff --git a/kdeui/kselect.cpp b/kdeui/kselect.cpp index a5fd0f613..8801f5570 100644 --- a/kdeui/kselect.cpp +++ b/kdeui/kselect.cpp @@ -53,7 +53,7 @@ KXYSelector::~KXYSelector() void KXYSelector::setRange( int _minX, int _minY, int _maxX, int _maxY ) { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); px = w; py = w; minX = _minX; @@ -74,7 +74,7 @@ void KXYSelector::setYValue( int _yPos ) void KXYSelector::setValues( int _xPos, int _yPos ) { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) w = 5; xPos = _xPos; @@ -98,7 +98,7 @@ void KXYSelector::setValues( int _xPos, int _yPos ) TQRect KXYSelector::contentsRect() const { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) { w = 5; } @@ -113,7 +113,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev ) TQRect paintRect = ev->rect(); TQRect borderRect = rect(); - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) { w = 5 - w; } @@ -122,8 +122,8 @@ void KXYSelector::paintEvent( TQPaintEvent *ev ) TQPainter painter; painter.begin( this ); - style().drawPrimitive(TQStyle::PE_Panel, &painter, - borderRect, colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter, + borderRect, tqcolorGroup(), TQStyle::Style_Sunken); drawContents( &painter ); @@ -135,7 +135,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev ) } else if (paintRect.intersects(cursorRect)) { - repaint( cursorRect, false); + tqrepaint( cursorRect, false); } painter.end(); @@ -150,7 +150,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e ) { int xVal, yVal; - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); valuesFromPosition( e->pos().x() - w, e->pos().y() - w, xVal, yVal ); setValues( xVal, yVal ); @@ -170,7 +170,7 @@ void KXYSelector::wheelEvent( TQWheelEvent *e ) void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) w = 5; xVal = ( (maxX-minX) * (x-w) ) / ( width()-2*w ); yVal = maxY - ( ( (maxY-minY) * (y-w) ) / ( height()-2*w ) ); @@ -188,7 +188,7 @@ void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const void KXYSelector::setPosition( int xp, int yp ) { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); if (w < 5) w = 5; if ( xp < w ) xp = w; @@ -238,7 +238,7 @@ void KXYSelector::drawCursor( TQPainter *p, int xp, int yp ) KSelector::KSelector( TQWidget *parent, const char *name ) : TQWidget( parent, name ), TQRangeControl() { - _orientation = Horizontal; + _orientation = Qt::Horizontal; _indent = true; } @@ -256,9 +256,9 @@ KSelector::~KSelector() TQRect KSelector::contentsRect() const { - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw ); else return TQRect( iw, w, width() - 2 * iw, height() - w * 2 - 5 ); @@ -267,7 +267,7 @@ TQRect KSelector::contentsRect() const void KSelector::paintEvent( TQPaintEvent * ) { TQPainter painter; - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; painter.begin( this ); @@ -277,12 +277,12 @@ void KSelector::paintEvent( TQPaintEvent * ) if ( indent() ) { TQRect r = rect(); - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) r.addCoords(0, iw - w, -iw, w - iw); else r.addCoords(iw - w, 0, w - iw, -iw); - style().drawPrimitive(TQStyle::PE_Panel, &painter, - r, colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter, + r, tqcolorGroup(), TQStyle::Style_Sunken); } @@ -329,10 +329,10 @@ void KSelector::valueChange() void KSelector::moveArrow( const TQPoint &pos ) { int val; - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) val = ( maxValue() - minValue() ) * (height()-pos.y()-5+w) / (height()-iw*2) + minValue(); else @@ -346,9 +346,9 @@ TQPoint KSelector::calcArrowPos( int val ) { TQPoint p; - int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth); + int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth); int iw = (w < 5) ? 5 : w; - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) { p.setY( height() - ( (height()-2*iw) * val / ( maxValue() - minValue() ) + 5 ) ); @@ -374,10 +374,10 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) TQPointArray array(3); painter->setPen( TQPen() ); - painter->setBrush( TQBrush( colorGroup().buttonText() ) ); + painter->setBrush( TQBrush( tqcolorGroup().buttonText() ) ); array.setPoint( 0, pos.x()+0, pos.y()+0 ); array.setPoint( 1, pos.x()+5, pos.y()+5 ); - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) { array.setPoint( 2, pos.x()+5, pos.y()-5 ); } @@ -390,13 +390,13 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) } else { - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) { - repaint(pos.x(), pos.y()-5, 6, 11, true); + tqrepaint(pos.x(), pos.y()-5, 6, 11, true); } else { - repaint(pos.x()-5, pos.y(), 11, 6, true); + tqrepaint(pos.x()-5, pos.y(), 11, 6, true); } } } @@ -442,7 +442,7 @@ void KGradientSelector::drawContents( TQPainter *painter ) int greenDiff = color2.green() - color1.green(); int blueDiff = color2.blue() - color1.blue(); - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) { for ( int y = 0; y < image.height(); y++ ) { @@ -488,7 +488,7 @@ void KGradientSelector::drawContents( TQPainter *painter ) painter->drawPixmap( contentsRect().x(), contentsRect().y(), p ); - if ( orientation() == Vertical ) + if ( orientation() == Qt::Vertical ) { int yPos = contentsRect().top() + painter->fontMetrics().ascent() + 2; int xPos = contentsRect().left() + (contentsRect().width() - diff --git a/kdeui/kselect.h b/kdeui/kselect.h index cc9d57d48..7a1c1ef4d 100644 --- a/kdeui/kselect.h +++ b/kdeui/kselect.h @@ -40,7 +40,7 @@ * A custom drawing routine for the widget surface has * to be provided by the subclass. */ -class KDEUI_EXPORT KXYSelector : public QWidget +class KDEUI_EXPORT KXYSelector : public TQWidget { Q_OBJECT Q_PROPERTY( int xValue READ xValue WRITE setXValue ) @@ -156,7 +156,7 @@ private: * A custom drawing routine for the widget surface has * to be provided by the subclass. */ -class KDEUI_EXPORT KSelector : public TQWidget, public QRangeControl +class KDEUI_EXPORT KSelector : public TQWidget, public TQRangeControl { Q_OBJECT Q_PROPERTY( int value READ value WRITE setValue ) @@ -351,8 +351,8 @@ public: protected: virtual void drawContents( TQPainter * ); - virtual TQSize minimumSize() const - { return sizeHint(); } + virtual TQSize tqminimumSize() const + { return tqsizeHint(); } private: void init(); diff --git a/kdeui/kseparator.cpp b/kdeui/kseparator.cpp index 3b6523917..1c1f43e96 100644 --- a/kdeui/kseparator.cpp +++ b/kdeui/kseparator.cpp @@ -49,7 +49,7 @@ void KSeparator::setOrientation(int orientation) { switch(orientation) { - case Vertical: + case Qt::Vertical: case VLine: setFrameStyle( TQFrame::VLine | TQFrame::Sunken ); setMinimumSize(2, 0); @@ -58,7 +58,7 @@ void KSeparator::setOrientation(int orientation) default: kdWarning() << "KSeparator::setOrientation(): invalid orientation, using default orientation HLine" << endl; - case Horizontal: + case Qt::Horizontal: case HLine: setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); setMinimumSize(0, 2); @@ -83,7 +83,7 @@ void KSeparator::drawFrame(TQPainter *p) { QPoint p1, p2; QRect r = frameRect(); - const TQColorGroup & g = colorGroup(); + const TQColorGroup & g = tqcolorGroup(); if ( frameStyle() & HLine ) { p1 = TQPoint( r.x(), r.height()/2 ); @@ -95,12 +95,12 @@ void KSeparator::drawFrame(TQPainter *p) } TQStyleOption opt( lineWidth(), midLineWidth() ); - style().drawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g, + tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g, TQStyle::Style_Sunken, opt ); } -TQSize KSeparator::sizeHint() const +TQSize KSeparator::tqsizeHint() const { if ( frameStyle() & VLine ) return TQSize(2, 0); diff --git a/kdeui/kseparator.h b/kdeui/kseparator.h index 008403a15..885f39ed5 100644 --- a/kdeui/kseparator.h +++ b/kdeui/kseparator.h @@ -30,7 +30,7 @@ * @author Michael Roth <mroth@wirlweb.de> * @version $Id$ */ -class KDEUI_EXPORT KSeparator : public QFrame +class KDEUI_EXPORT KSeparator : public TQFrame { Q_OBJECT Q_PROPERTY( int orientation READ orientation WRITE setOrientation ) @@ -70,7 +70,7 @@ class KDEUI_EXPORT KSeparator : public QFrame /** * The recommended height (width) for a horizontal (vertical) separator. **/ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: /** diff --git a/kdeui/ksharedpixmap.cpp b/kdeui/ksharedpixmap.cpp index 002b4290f..a062d2f8b 100644 --- a/kdeui/ksharedpixmap.cpp +++ b/kdeui/ksharedpixmap.cpp @@ -102,7 +102,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) // already active return false; - TQPixmap::resize(0, 0); // invalidate + TQPixmap::resize(0, 0); // tqinvalidate TQString str = TQString("KDESHPIXMAP:%1").arg(name); d->selection = XInternAtom(qt_xdisplay(), str.latin1(), true); diff --git a/kdeui/ksharedpixmap.h b/kdeui/ksharedpixmap.h index a4f4eb88c..4474cc3f5 100644 --- a/kdeui/ksharedpixmap.h +++ b/kdeui/ksharedpixmap.h @@ -16,6 +16,10 @@ #include <kpixmap.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 #include <tqstring.h> diff --git a/kdeui/kshortcutdialog.cpp b/kdeui/kshortcutdialog.cpp index 27d721626..fbdd46519 100644 --- a/kdeui/kshortcutdialog.cpp +++ b/kdeui/kshortcutdialog.cpp @@ -169,8 +169,8 @@ void KShortcutDialog::updateShortcutDisplay() this->setFocus(); } - s[0].replace('&', TQString::fromLatin1("&&")); - s[1].replace('&', TQString::fromLatin1("&&")); + s[0].replace('&', TQString::tqfromLatin1("&&")); + s[1].replace('&', TQString::tqfromLatin1("&&")); m_simple->m_txtShortcut->setText( s[0] ); m_adv->m_txtPrimary->setText( s[0] ); diff --git a/kdeui/kshortcutdialog_advanced.ui b/kdeui/kshortcutdialog_advanced.ui index 9c371523f..7caa7f9ed 100644 --- a/kdeui/kshortcutdialog_advanced.ui +++ b/kdeui/kshortcutdialog_advanced.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KShortcutDialogAdvanced</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KShortcutDialogAdvanced</cstring> </property> @@ -27,7 +27,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_frameMore</cstring> </property> @@ -47,7 +47,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>m_btnAlternate</cstring> </property> @@ -58,7 +58,7 @@ <string>Alternate shortcut:</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>m_btnPrimary</cstring> </property> @@ -69,7 +69,7 @@ <string>Primary shortcut:</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="2"> + <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> <cstring>layout6</cstring> </property> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -120,7 +120,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> <cstring>layout7</cstring> </property> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -174,7 +174,7 @@ </spacer> </hbox> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>m_btnClearPrimary</cstring> </property> @@ -188,7 +188,7 @@ <string>Clear shortcut</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_btnClearAlternate</cstring> </property> @@ -202,7 +202,7 @@ <string>Clear shortcut</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_btnMultiKey</cstring> </property> diff --git a/kdeui/kshortcutdialog_simple.ui b/kdeui/kshortcutdialog_simple.ui index a7fb651ff..8e43d618f 100644 --- a/kdeui/kshortcutdialog_simple.ui +++ b/kdeui/kshortcutdialog_simple.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KShortcutDialogSimple</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KShortcutDialogSimple</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -71,7 +71,7 @@ <bool>false</bool> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>m_btnClearShortcut</cstring> </property> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kdeui/kspell.cpp b/kdeui/kspell.cpp index c4ea85ec6..0df7b0842 100644 --- a/kdeui/kspell.cpp +++ b/kdeui/kspell.cpp @@ -393,7 +393,7 @@ bool KSpell::addPersonal( const TQString & word ) TQString qs = word.simplifyWhiteSpace(); //we'll let ispell do the work here b/c we can - if ( qs.find(' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ + if ( qs.tqfind(' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ return false; qs.prepend( "*" ); @@ -404,7 +404,7 @@ bool KSpell::addPersonal( const TQString & word ) bool KSpell::writePersonalDictionary() { - return proc->writeStdin("#"); + return proc->writeStdin(TQString("#")); } bool KSpell::ignore( const TQString & word ) @@ -412,7 +412,7 @@ bool KSpell::ignore( const TQString & word ) TQString qs = word.simplifyWhiteSpace(); //we'll let ispell do the work here b/c we can - if ( qs.find (' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ + if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ return false; qs.prepend( "@" ); @@ -483,7 +483,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) d->checking = true; TQString qs = buffer.simplifyWhiteSpace(); - if ( qs.find (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ + if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ d->checkNextTimer->start( 0, true ); return false; } @@ -505,7 +505,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) OUTPUT(checkWord2); // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); - proc->writeStdin( "%" ); // turn off terse mode + proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell return true; @@ -525,7 +525,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) d->checking = true; TQString qs = buffer.simplifyWhiteSpace(); - if ( qs.find (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ + if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ d->checkNextTimer->start( 0, true ); return false; } @@ -549,7 +549,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) OUTPUT(checkWord2); // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); - proc->writeStdin( "%" ); // turn off terse mode + proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell return true; @@ -660,7 +660,7 @@ TQString KSpell::funnyWord( const TQString & word ) i = j-1; - if ( !( k = qs.findRev(shorty) ) || k != -1 ) + if ( !( k = qs.tqfindRev(shorty) ) || k != -1 ) qs.remove( k, shorty.length() ); else { @@ -699,7 +699,7 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi int i,j; - word = buffer.mid( 2, buffer.find( ' ', 3 ) -2 ); + word = buffer.mid( 2, buffer.tqfind( ' ', 3 ) -2 ); //check() needs this orig=word; @@ -717,18 +717,18 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi //We don't take advantage of ispell's ignore function because //we can't interrupt ispell's output (when checking a large //buffer) to add a word to _it's_ ignore-list. - if ( ignorelist.findIndex( word.lower() ) != -1 ) + if ( ignorelist.tqfindIndex( word.lower() ) != -1 ) return IGNORE; //// Position in line /// TQString qs2; - if ( buffer.find( ':' ) != -1 ) - qs2 = buffer.left( buffer.find(':') ); + if ( buffer.tqfind( ':' ) != -1 ) + qs2 = buffer.left( buffer.tqfind(':') ); else qs2 = buffer; - posinline = qs2.right( qs2.length()-qs2.findRev(' ') ).toInt()-1; + posinline = qs2.right( qs2.length()-qs2.tqfindRev(' ') ).toInt()-1; ///// Replace-list stuff //// TQStringList::Iterator it = replacelist.begin(); @@ -745,14 +745,14 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi /////// Suggestions ////// if ( buffer[0] != '#' ) { - TQString qs = buffer.mid( buffer.find(':')+2, buffer.length() ); + TQString qs = buffer.mid( buffer.tqfind(':')+2, buffer.length() ); qs += ','; sugg.clear(); i = j = 0; while( (unsigned int)i < qs.length() ) { - TQString temp = qs.mid( i, (j=qs.find (',',i)) - i ); + TQString temp = qs.mid( i, (j=qs.tqfind (',',i)) - i ); sugg.append( funnyWord(temp) ); i=j+2; @@ -794,7 +794,7 @@ bool KSpell::checkList (TQStringList *_wordlist, bool _usedialog) //set the dialog signal handler dialog3slot = TQT_SLOT (checkList4 ()); - proc->writeStdin ("%"); // turn off terse mode & check one word at a time + proc->writeStdin (TQString("%")); // turn off terse mode & check one word at a time //lastpos now counts which *word number* we are at in checkListReplaceCurrent() lastpos = -1; @@ -1008,7 +1008,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) // KProcIO calls check2 when read from ispell OUTPUT( check2 ); - proc->writeStdin( "!" ); + proc->writeStdin(TQString("!")); //lastpos is a position in newbuffer (it has offset in it) offset = lastlastline = lastpos = lastline = 0; @@ -1016,7 +1016,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) emitProgress(); // send first buffer line - int i = origbuffer.find( '\n', 0 ) + 1; + int i = origbuffer.tqfind( '\n', 0 ) + 1; qs = origbuffer.mid( 0, i ); cleanFputs( qs, false ); @@ -1130,7 +1130,7 @@ void KSpell::check2( KProcIO * ) //kdDebug(750) << "[EOL](" << tempe << ")[" << temp << "]" << endl; lastpos = (lastlastline=lastline) + offset; //do we really want this? - i = origbuffer.find('\n', lastline) + 1; + i = origbuffer.tqfind('\n', lastline) + 1; qs = origbuffer.mid( lastline, i-lastline ); cleanFputs( qs, false ); lastline = i; @@ -1220,10 +1220,10 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl TQString marker( "_MARKER_" ); tmpBuf.replace( lastpos, word.length(), marker ); TQString context = tmpBuf.mid(QMAX(lastpos-18,0), 2*18+marker.length()); - context.replace( '\n',TQString::fromLatin1(" ")); - context.replace( '<', TQString::fromLatin1("<") ); - context.replace( '>', TQString::fromLatin1(">") ); - context.replace( marker, TQString::fromLatin1("<b>%1</b>").arg( word ) ); + context.replace( '\n',TQString::tqfromLatin1(" ")); + context.replace( '<', TQString::tqfromLatin1("<") ); + context.replace( '>', TQString::tqfromLatin1(">") ); + context.replace( marker, TQString::tqfromLatin1("<b>%1</b>").arg( word ) ); context = "<qt>" + context + "</qt>"; ksdlg->init( word, &sugg, context ); @@ -1419,7 +1419,7 @@ void KSpell::slotSpellCheckerCorrected( const TQString & oldText, const TQString void KSpell::slotModalReady() { - //kdDebug() << qApp->loopLevel() << endl; + //kdDebug() << tqApp->loopLevel() << endl; //kdDebug(750) << "MODAL READY------------------" << endl; Q_ASSERT( m_status == Running ); @@ -1439,7 +1439,7 @@ void KSpell::slotModalDone( const TQString &/*_buffer*/ ) cleanUp(); //kdDebug() << "ABOUT TO EXIT LOOP" << endl; - //qApp->exit_loop(); + //tqApp->exit_loop(); //modalWidgetHack->close(true); slotModalSpellCheckerFinished(); diff --git a/kdeui/kspell.h b/kdeui/kspell.h index 29ff7faf7..def1f4f3a 100644 --- a/kdeui/kspell.h +++ b/kdeui/kspell.h @@ -43,7 +43,7 @@ class KSpellDlg; * @see KSpellConfig, KSyntaxHighlighter */ -class KDEUI_EXPORT KSpell : public QObject +class KDEUI_EXPORT KSpell : public TQObject { Q_OBJECT diff --git a/kdeui/kspelldlg.cpp b/kdeui/kspelldlg.cpp index d21b6975e..fe428aad7 100644 --- a/kdeui/kspelldlg.cpp +++ b/kdeui/kspelldlg.cpp @@ -100,7 +100,7 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b TQT_SLOT(slotConfigChanged()) ); setHelp( "spelldlg", "kspell" ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); emit ready( false ); } diff --git a/kdeui/kspellui.ui b/kdeui/kspellui.ui index 496662797..2477e373e 100644 --- a/kdeui/kspellui.ui +++ b/kdeui/kspellui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSpellUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSpellUI</cstring> </property> @@ -30,7 +30,7 @@ <property name="resizeMode"> <enum>Minimum</enum> </property> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -44,7 +44,7 @@ </qt></string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>m_unknownWord</cstring> </property> @@ -61,7 +61,7 @@ </qt></string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -77,7 +77,7 @@ </qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="6"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>m_contextLabel</cstring> </property> @@ -87,7 +87,7 @@ <property name="text"> <string>... the <b>misspelled</b> word shown in context ...</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="toolTip" stdset="0"> @@ -99,7 +99,7 @@ </qt></string> </property> </widget> - <widget class="QPushButton" row="1" column="4" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>m_addBtn</cstring> </property> @@ -123,14 +123,14 @@ Click here if you consider that the unknown word is not misspelled and you want <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="4" column="5"> + <widget class="TQPushButton" row="4" column="5"> <property name="name"> <cstring>m_replaceAllBtn</cstring> </property> @@ -143,7 +143,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QListView" row="3" column="0" rowspan="5" colspan="5"> + <widget class="TQListView" row="3" column="0" rowspan="5" colspan="5"> <column> <property name="text"> <string>Suggested Words</string> @@ -171,7 +171,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QPushButton" row="3" column="5"> + <widget class="TQPushButton" row="3" column="5"> <property name="name"> <cstring>m_replaceBtn</cstring> </property> @@ -184,7 +184,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -201,7 +201,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QPushButton" row="5" column="5"> + <widget class="TQPushButton" row="5" column="5"> <property name="name"> <cstring>m_skipBtn</cstring> </property> @@ -215,7 +215,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QPushButton" row="6" column="5"> + <widget class="TQPushButton" row="6" column="5"> <property name="name"> <cstring>m_skipAllBtn</cstring> </property> @@ -229,7 +229,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="2" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>m_replacement</cstring> </property> @@ -240,7 +240,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QPushButton" row="2" column="5"> + <widget class="TQPushButton" row="2" column="5"> <property name="name"> <cstring>m_suggestBtn</cstring> </property> @@ -248,7 +248,7 @@ Click here if you consider that the unknown word is not misspelled and you want <string>S&uggest</string> </property> </widget> - <widget class="QComboBox" row="8" column="1" rowspan="1" colspan="4"> + <widget class="TQComboBox" row="8" column="1" rowspan="1" colspan="4"> <item> <property name="text"> <string>English</string> @@ -276,7 +276,7 @@ Click here if you consider that the unknown word is not misspelled and you want <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kdeui/ksplashscreen.h b/kdeui/ksplashscreen.h index 1e1f217af..38cee3413 100644 --- a/kdeui/ksplashscreen.h +++ b/kdeui/ksplashscreen.h @@ -38,7 +38,7 @@ class TQPixmap; * @author Chris Howells (howells@kde.org) * @since 3.2 */ -class KDEUI_EXPORT KSplashScreen : public QSplashScreen +class KDEUI_EXPORT KSplashScreen : public TQSplashScreen { Q_OBJECT diff --git a/kdeui/ksqueezedtextlabel.cpp b/kdeui/ksqueezedtextlabel.cpp index f44b38916..42d6776b9 100644 --- a/kdeui/ksqueezedtextlabel.cpp +++ b/kdeui/ksqueezedtextlabel.cpp @@ -22,30 +22,30 @@ KSqueezedTextLabel::KSqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); fullText = text; squeezeTextToLabel(); } KSqueezedTextLabel::KSqueezedTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); } void KSqueezedTextLabel::resizeEvent( TQResizeEvent * ) { squeezeTextToLabel(); } -TQSize KSqueezedTextLabel::minimumSizeHint() const +TQSize KSqueezedTextLabel::tqminimumSizeHint() const { - TQSize sh = TQLabel::minimumSizeHint(); + TQSize sh = TQLabel::tqminimumSizeHint(); sh.setWidth(-1); return sh; } -TQSize KSqueezedTextLabel::sizeHint() const +TQSize KSqueezedTextLabel::tqsizeHint() const { - return TQSize(contentsRect().width(), TQLabel::sizeHint().height()); + return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); } void KSqueezedTextLabel::setText( const TQString &text ) { @@ -73,11 +73,11 @@ void KSqueezedTextLabel::squeezeTextToLabel() { } } -void KSqueezedTextLabel::setAlignment( int alignment ) +void KSqueezedTextLabel::tqsetAlignment( int tqalignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::setAlignment(alignment); + TQLabel::tqsetAlignment(tqalignment); fullText = tmpFull; } diff --git a/kdeui/ksqueezedtextlabel.h b/kdeui/ksqueezedtextlabel.h index 9ad81d9dd..7d69e7ef1 100644 --- a/kdeui/ksqueezedtextlabel.h +++ b/kdeui/ksqueezedtextlabel.h @@ -53,12 +53,12 @@ public: KSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); KSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; /** * Overridden for internal reasons; the API remains unaffected. */ - virtual void setAlignment( int ); + virtual void tqsetAlignment( int ); public slots: void setText( const TQString & ); diff --git a/kdeui/kstatusbar.cpp b/kdeui/kstatusbar.cpp index b70c8ae9c..a04cbf875 100644 --- a/kdeui/kstatusbar.cpp +++ b/kdeui/kstatusbar.cpp @@ -42,7 +42,7 @@ KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id, setLineWidth (0); setFrameStyle (TQFrame::NoFrame); - setAlignment( AlignHCenter | AlignVCenter | SingleLine ); + tqsetAlignment( AlignHCenter | AlignVCenter | SingleLine ); connect (this, TQT_SIGNAL(itemPressed(int)), parent, TQT_SIGNAL(pressed(int))); connect (this, TQT_SIGNAL(itemReleased(int)), parent, TQT_SIGNAL(released(int))); @@ -65,8 +65,8 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name ) // ...but off by default (sven) KConfig *config = KGlobal::config(); TQString group(config->group()); - config->setGroup(TQString::fromLatin1("StatusBar style")); - bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false); + config->setGroup(TQString::tqfromLatin1("StatusBar style")); + bool grip_enabled = config->readBoolEntry(TQString::tqfromLatin1("SizeGripEnabled"), false); setSizeGripEnabled(grip_enabled); config->setGroup(group); } @@ -129,7 +129,7 @@ void KStatusBar::setItemAlignment (int id, int align) KStatusBarLabel *l = items[id]; if (l) { - l->setAlignment(align); + l->tqsetAlignment(align); } else kdDebug() << "KStatusBar::setItemAlignment: bad item id: " << id << endl; diff --git a/kdeui/kstatusbar.h b/kdeui/kstatusbar.h index 97ec7881d..bacc700bb 100644 --- a/kdeui/kstatusbar.h +++ b/kdeui/kstatusbar.h @@ -32,7 +32,7 @@ class KStatusBar; * Internal label class for use in KStatusBar * @internal */ -class KDEUI_EXPORT KStatusBarLabel : public QLabel +class KDEUI_EXPORT KStatusBarLabel : public TQLabel { Q_OBJECT @@ -84,7 +84,7 @@ signals: * @see KActionCollection */ -class KDEUI_EXPORT KStatusBar : public QStatusBar +class KDEUI_EXPORT KStatusBar : public TQStatusBar { Q_OBJECT @@ -167,8 +167,8 @@ public: void changeItem( const TQString& text, int id ); /** - * Sets the alignment of item @p id. By default all fields are aligned - * @p AlignHCenter | @p AlignVCenter. See TQLabel::setAlignment for details. + * Sets the tqalignment of item @p id. By default all fields are aligned + * @p AlignHCenter | @p AlignVCenter. See TQLabel::tqsetAlignment for details. * */ void setItemAlignment(int id, int align); diff --git a/kdeui/kstdaction.cpp b/kdeui/kstdaction.cpp index 3dae8f281..e9a87d71d 100644 --- a/kdeui/kstdaction.cpp +++ b/kdeui/kstdaction.cpp @@ -72,7 +72,7 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch else aboutData = KGlobal::instance()->aboutData(); */ - TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(qApp->name()); + TQString appName = (aboutData) ? aboutData->programName() : TQString::tqfromLatin1(tqApp->name()); sLabel = i18n(pInfo->psLabel).arg(appName); } break; diff --git a/kdeui/kstdguiitem.cpp b/kdeui/kstdguiitem.cpp index 8391819ed..fa9d99341 100644 --- a/kdeui/kstdguiitem.cpp +++ b/kdeui/kstdguiitem.cpp @@ -62,34 +62,34 @@ KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum ) TQString KStdGuiItem::stdItem( StdItem ui_enum ) { switch (ui_enum ) { - case Ok : return TQString::fromLatin1("ok"); - case Cancel : return TQString::fromLatin1("cancel"); - case Yes : return TQString::fromLatin1("yes"); - case No : return TQString::fromLatin1("no"); - case Discard : return TQString::fromLatin1("discard"); - case Save : return TQString::fromLatin1("save"); - case DontSave : return TQString::fromLatin1("dontSave"); - case SaveAs : return TQString::fromLatin1("saveAs"); - case Apply : return TQString::fromLatin1("apply"); - case Help : return TQString::fromLatin1("help"); - case Close : return TQString::fromLatin1("close"); - case Defaults : return TQString::fromLatin1("defaults"); - case Back : return TQString::fromLatin1("back"); - case Forward : return TQString::fromLatin1("forward"); - case Print : return TQString::fromLatin1("print"); - case Continue : return TQString::fromLatin1("continue"); - case Open : return TQString::fromLatin1("open"); - case Quit : return TQString::fromLatin1("quit"); - case AdminMode: return TQString::fromLatin1("adminMode"); - case Delete : return TQString::fromLatin1("delete"); - case Insert : return TQString::fromLatin1("insert"); - case Find : return TQString::fromLatin1("find"); - case Stop : return TQString::fromLatin1("stop"); - case Add : return TQString::fromLatin1("add"); - case Remove : return TQString::fromLatin1("remove"); - case Test : return TQString::fromLatin1("test"); - case Properties : return TQString::fromLatin1("properties"); - case Overwrite : return TQString::fromLatin1("overwrite"); + case Ok : return TQString::tqfromLatin1("ok"); + case Cancel : return TQString::tqfromLatin1("cancel"); + case Yes : return TQString::tqfromLatin1("yes"); + case No : return TQString::tqfromLatin1("no"); + case Discard : return TQString::tqfromLatin1("discard"); + case Save : return TQString::tqfromLatin1("save"); + case DontSave : return TQString::tqfromLatin1("dontSave"); + case SaveAs : return TQString::tqfromLatin1("saveAs"); + case Apply : return TQString::tqfromLatin1("apply"); + case Help : return TQString::tqfromLatin1("help"); + case Close : return TQString::tqfromLatin1("close"); + case Defaults : return TQString::tqfromLatin1("defaults"); + case Back : return TQString::tqfromLatin1("back"); + case Forward : return TQString::tqfromLatin1("forward"); + case Print : return TQString::tqfromLatin1("print"); + case Continue : return TQString::tqfromLatin1("continue"); + case Open : return TQString::tqfromLatin1("open"); + case Quit : return TQString::tqfromLatin1("quit"); + case AdminMode: return TQString::tqfromLatin1("adminMode"); + case Delete : return TQString::tqfromLatin1("delete"); + case Insert : return TQString::tqfromLatin1("insert"); + case Find : return TQString::tqfromLatin1("find"); + case Stop : return TQString::tqfromLatin1("stop"); + case Add : return TQString::tqfromLatin1("add"); + case Remove : return TQString::tqfromLatin1("remove"); + case Test : return TQString::tqfromLatin1("test"); + case Properties : return TQString::tqfromLatin1("properties"); + case Overwrite : return TQString::tqfromLatin1("overwrite"); default : return TQString::null; }; } @@ -197,9 +197,9 @@ KGuiItem KStdGuiItem::forward( BidiMode useBidi ) i18n( "Go forward one step" ) ); } -QPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward() +TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward() { - return qMakePair( back( UseRTL ), forward( UseRTL ) ); + return tqMakePair( back( UseRTL ), forward( UseRTL ) ); } KGuiItem KStdGuiItem::print() diff --git a/kdeui/kstdguiitem.h b/kdeui/kstdguiitem.h index bf2182191..438f419fe 100644 --- a/kdeui/kstdguiitem.h +++ b/kdeui/kstdguiitem.h @@ -141,7 +141,7 @@ public: * locales. If you have a reason for wanting the 'Western' back/forward * buttons, please use the back() and forward() items instead. */ - static QPair<KGuiItem, KGuiItem> backAndForward(); + static TQPair<KGuiItem, KGuiItem> backAndForward(); static KGuiItem quit(); diff --git a/kdeui/kstringvalidator.cpp b/kdeui/kstringvalidator.cpp index f783a4b9f..2e0d3b167 100644 --- a/kdeui/kstringvalidator.cpp +++ b/kdeui/kstringvalidator.cpp @@ -30,12 +30,12 @@ TQValidator::State KStringListValidator::validate( TQString & input, int& ) cons if ( input.isEmpty() ) return Intermediate; if ( isRejecting() ) // anything not in mStringList is acceptable: - if ( mStringList.find( input ) == mStringList.end() ) + if ( mStringList.tqfind( input ) == mStringList.end() ) return Acceptable; else return Intermediate; else // only what is in mStringList is acceptable: - if ( mStringList.find( input ) != mStringList.end() ) + if ( mStringList.tqfind( input ) != mStringList.end() ) return Acceptable; else for ( TQStringList::ConstIterator it = mStringList.begin() ; @@ -84,7 +84,7 @@ TQValidator::State KMimeTypeValidator::validate( TQString & input, int& ) const void KMimeTypeValidator::fixup( TQString & input ) const { TQRegExp invalidChars("[^/" ALLOWED_CHARS "]+"); - input.replace( invalidChars, TQString::null); + input.tqreplace( invalidChars, TQString()); } #include "kstringvalidator.moc" diff --git a/kdeui/kstringvalidator.h b/kdeui/kstringvalidator.h index 77b26d6db..37627abee 100644 --- a/kdeui/kstringvalidator.h +++ b/kdeui/kstringvalidator.h @@ -116,7 +116,7 @@ private: * * @author Marc Mutz <mutz@kde.org> **/ -class KDEUI_EXPORT KMimeTypeValidator : public QValidator +class KDEUI_EXPORT KMimeTypeValidator : public TQValidator { Q_OBJECT public: diff --git a/kdeui/kswitchlanguagedialog.cpp b/kdeui/kswitchlanguagedialog.cpp index 3cfcc011b..ee7a26e83 100644 --- a/kdeui/kswitchlanguagedialog.cpp +++ b/kdeui/kswitchlanguagedialog.cpp @@ -100,7 +100,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( topLayout->addLayout(languageHorizontalLayout); d->languagesLayout = new TQGridLayout(0 , 2); - languageHorizontalLayout->addLayout(d->languagesLayout); + languageHorizontalLayout->addLayout(TQT_TQLAYOUT(d->languagesLayout)); languageHorizontalLayout->addStretch(); TQStringList defaultLanguages = d->applicationLanguageList(); @@ -142,7 +142,7 @@ void KSwitchLanguageDialog::slotAddLanguageButton() void KSwitchLanguageDialog::removeButtonClicked() { - TQObject const *signalSender = sender(); + TQObject const *signalSender = TQT_TQOBJECT_CONST(sender()); if (signalSender == NULL) { @@ -150,7 +150,7 @@ void KSwitchLanguageDialog::removeButtonClicked() return; } - KPushButton *removeButton = const_cast<KPushButton*>(::qt_cast<const KPushButton*>(signalSender)); + KPushButton *removeButton = const_cast<KPushButton*>(::tqqt_cast<const KPushButton*>(signalSender)); if (removeButton == NULL) { @@ -158,7 +158,7 @@ void KSwitchLanguageDialog::removeButtonClicked() return; } - TQMap<KPushButton *, LanguageRowData>::iterator it = d->languageRows.find(removeButton); + TQMap<KPushButton *, LanguageRowData>::iterator it = d->languageRows.tqfind(removeButton); if (it == d->languageRows.end()) { @@ -323,12 +323,12 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo int numRows = languagesLayout->numRows(); TQLabel *languageLabel = new TQLabel(labelText, page); - languagesLayout->addWidget( languageLabel, numRows + 1, 1, Qt::AlignAuto ); - languagesLayout->addWidget( languageButton, numRows + 1, 2, Qt::AlignAuto ); + languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQ_Alignment)TQt::AlignAuto ); + languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQ_Alignment)TQt::AlignAuto ); if (primaryLanguage == false) { - languagesLayout->addWidget( removeButton, numRows + 1, 3, Qt::AlignAuto ); + languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQ_Alignment)TQt::AlignAuto ); languageRowData.setRowWidgets( languageLabel, diff --git a/kdeui/ksyntaxhighlighter.cpp b/kdeui/ksyntaxhighlighter.cpp index a5485841f..bd01ad2a9 100644 --- a/kdeui/ksyntaxhighlighter.cpp +++ b/kdeui/ksyntaxhighlighter.cpp @@ -148,14 +148,14 @@ int KSyntaxHighlighter::highlightParagraph( const TQString &text, int ) } TQString simplified = text; - simplified = simplified.replace( TQRegExp( "\\s" ), TQString::null ).replace( '|', TQString::fromLatin1(">") ); - while ( simplified.startsWith( TQString::fromLatin1(">>>>") ) ) + simplified = TQString(simplified.tqreplace( TQRegExp( "\\s" ), TQString() )).tqreplace( '|', TQString::tqfromLatin1(">") ); + while ( simplified.startsWith( TQString::tqfromLatin1(">>>>") ) ) simplified = simplified.mid(3); - if ( simplified.startsWith( TQString::fromLatin1(">>>") ) || simplified.startsWith( TQString::fromLatin1("> > >") ) ) + if ( simplified.startsWith( TQString::tqfromLatin1(">>>") ) || simplified.startsWith( TQString::tqfromLatin1("> > >") ) ) setFormat( 0, text.length(), d->col2 ); - else if ( simplified.startsWith( TQString::fromLatin1(">>") ) || simplified.startsWith( TQString::fromLatin1("> >") ) ) + else if ( simplified.startsWith( TQString::tqfromLatin1(">>") ) || simplified.startsWith( TQString::tqfromLatin1("> >") ) ) setFormat( 0, text.length(), d->col3 ); - else if ( simplified.startsWith( TQString::fromLatin1(">") ) ) + else if ( simplified.startsWith( TQString::tqfromLatin1(">") ) ) setFormat( 0, text.length(), d->col4 ); else setFormat( 0, text.length(), d->col5 ); @@ -189,7 +189,7 @@ int KSpellingHighlighter::highlightParagraph( const TQString &text, // leave #includes, diffs, and quoted replies alone TQString diffAndCo( ">|" ); - bool isCode = diffAndCo.find(text[0]) != -1; + bool isCode = diffAndCo.tqfind(text[0]) != -1; if ( !text.endsWith(" ") ) d->alwaysEndsWithSpace = false; @@ -375,7 +375,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) // get tricky... // For auto detection ignore signature and reply prefix if ( !d->autoReady ) - d->autoIgnoreDict.replace( word, Ignore ); + d->autoIgnoreDict.tqreplace( word, Ignore ); // "dict" is used as a cache to store the results of KSpell TQDict<int>* dict = ( d->globalConfig ? d->sDict() : d->mDict ); @@ -383,14 +383,14 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) if ( d->autoReady && ( d->autoDict[word] != NotOkay )) { if ( !d->autoIgnoreDict[word] ) ++d->errorCount; - d->autoDict.replace( word, NotOkay ); + d->autoDict.tqreplace( word, NotOkay ); } return d->active; } if ( !dict->isEmpty() && (*dict)[word] == Okay ) { if ( d->autoReady && !d->autoDict[word] ) { - d->autoDict.replace( word, Okay ); + d->autoDict.tqreplace( word, Okay ); } return false; } @@ -399,7 +399,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) int para, index; textEdit()->getCursorPosition( ¶, &index ); ++d->wordCount; - dict->replace( word, Unknown ); + dict->tqreplace( word, Unknown ); ++d->checksRequested; if (currentParagraph() != para) d->completeRehighlightRequired = true; @@ -425,9 +425,9 @@ void KDictSpellingHighlighter::slotMisspelling (const TQString &originalWord, co Q_UNUSED( suggestions ); // kdDebug() << suggestions.join( " " ).latin1() << endl; if ( d->globalConfig ) - d->sDict()->replace( originalWord, NotOkay ); + d->sDict()->tqreplace( originalWord, NotOkay ); else - d->mDict->replace( originalWord, NotOkay ); + d->mDict->tqreplace( originalWord, NotOkay ); //Emit this baby so that apps that want to have suggestions in a popup over //the misspelled word can catch them. @@ -441,7 +441,7 @@ void KDictSpellingHighlighter::slotCorrected(const TQString &word, { TQDict<int>* dict = ( d->globalConfig ? d->sDict() : d->mDict ); if ( !dict->isEmpty() && (*dict)[word] == Unknown ) { - dict->replace( word, Okay ); + dict->tqreplace( word, Okay ); } ++d->checksDone; if (d->checksDone == d->checksRequested) { @@ -609,7 +609,7 @@ void KDictSpellingHighlighter::slotKSpellNotResponding() bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) { - if (o == textEdit() && (e->type() == TQEvent::FocusIn)) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::FocusIn)) { if ( d->globalConfig ) { TQString skey = spellKey(); if ( d->spell && d->spellKey != skey ) { @@ -619,8 +619,8 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) } } - if (o == textEdit() && (e->type() == TQEvent::KeyPress)) { - TQKeyEvent *k = static_cast<TQKeyEvent *>(e); + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::KeyPress)) { + TQKeyEvent *k = TQT_TQKEYEVENT(e); d->autoReady = true; if (d->rehighlightRequest->isActive()) // try to stay out of the users way d->rehighlightRequest->changeInterval( 500 ); @@ -661,7 +661,7 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) } } - else if ( o == textEdit()->viewport() && + else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()->viewport()) && ( e->type() == TQEvent::MouseButtonPress )) { d->autoReady = true; if ( intraWordEditing() ) { diff --git a/kdeui/ksyntaxhighlighter.h b/kdeui/ksyntaxhighlighter.h index 2fd0d43a9..9f6e80158 100644 --- a/kdeui/ksyntaxhighlighter.h +++ b/kdeui/ksyntaxhighlighter.h @@ -39,7 +39,7 @@ class KSpellConfig; /** * \brief Syntax sensitive text highlighter */ -class KDEUI_EXPORT KSyntaxHighlighter : public QSyntaxHighlighter +class KDEUI_EXPORT KSyntaxHighlighter : public TQSyntaxHighlighter { public: enum SyntaxMode { diff --git a/kdeui/ksystemtray.cpp b/kdeui/ksystemtray.cpp index 5742eb174..c9bebc47d 100644 --- a/kdeui/ksystemtray.cpp +++ b/kdeui/ksystemtray.cpp @@ -57,7 +57,7 @@ public: }; KSystemTray::KSystemTray( TQWidget* parent, const char* name ) - : TQLabel( parent, name, WType_TopLevel ) + : TQLabel( parent, name, (WFlags)WType_TopLevel ) { #ifdef Q_WS_X11 QXEmbed::initialize(); @@ -67,7 +67,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->actionCollection = new KActionCollection(this); #ifdef Q_WS_X11 - KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): qt_xrootwin() ); + KWin::setSystemTrayWindowFor( winId(), parent?parent->tqtopLevelWidget()->winId(): qt_xrootwin() ); #endif setBackgroundMode(X11ParentRelative); setBackgroundOrigin(WindowOrigin); @@ -75,15 +75,15 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) menu = new KPopupMenu( this ); menu->insertTitle( kapp->miniIcon(), kapp->caption() ); move( -1000, -1000 ); - KStdAction::quit(this, TQT_SLOT(maybeQuit()), d->actionCollection); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); - if (parentWidget()) + if (tqparentWidget()) { new KAction(i18n("Minimize"), KShortcut(), - this, TQT_SLOT( minimizeRestoreAction() ), + TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 - KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId()); + KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId()); d->on_all_desktops = info.onAllDesktops(); #else d->on_all_desktops = false; @@ -94,7 +94,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->on_all_desktops = false; } setCaption( KGlobal::instance()->aboutData()->programName()); - setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); + tqsetAlignment( tqalignment() | Qt::AlignVCenter | Qt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications setScaledContents(true); @@ -146,15 +146,15 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e ) return; switch ( e->button() ) { - case LeftButton: + case Qt::LeftButton: toggleActive(); break; - case MidButton: + case Qt::MidButton: // fall through - case RightButton: - if ( parentWidget() ) { + case Qt::RightButton: + if ( tqparentWidget() ) { KAction* action = d->actionCollection->action("minimizeRestore"); - if ( parentWidget()->isVisible() ) + if ( tqparentWidget()->isVisible() ) action->setText( i18n("&Minimize") ); else action->setText( i18n("&Restore") ); @@ -182,8 +182,8 @@ void KSystemTray::contextMenuAboutToShow( KPopupMenu* ) // entry is "minimize", otherwise it's "restore" void KSystemTray::minimizeRestoreAction() { - if ( parentWidget() ) { - bool restore = !( parentWidget()->isVisible() ); + if ( tqparentWidget() ) { + bool restore = !( tqparentWidget()->isVisible() ); minimizeRestore( restore ); } } @@ -207,13 +207,13 @@ void KSystemTray::maybeQuit() // KDE4: stop closing the parent widget? it results in complex application code // instead make applications connect to the quitSelected() signal - if (parentWidget()) + if (tqparentWidget()) { - parentWidget()->close(); + tqparentWidget()->close(); } else { - qApp->closeAllWindows(); + tqApp->closeAllWindows(); } } @@ -237,7 +237,7 @@ void KSystemTray::setInactive() // (just like taskbar); otherwise hide it void KSystemTray::activateOrHide() { - TQWidget *pw = parentWidget(); + TQWidget *pw = tqparentWidget(); if ( !pw ) return; @@ -283,7 +283,7 @@ void KSystemTray::activateOrHide() void KSystemTray::minimizeRestore( bool restore ) { - TQWidget* pw = parentWidget(); + TQWidget* pw = tqparentWidget(); if( !pw ) return; #ifdef Q_WS_X11 diff --git a/kdeui/ksystemtray.h b/kdeui/ksystemtray.h index 861de3f3b..0e22b1d6a 100644 --- a/kdeui/ksystemtray.h +++ b/kdeui/ksystemtray.h @@ -60,7 +60,7 @@ class KSystemTrayPrivate; * * @author Matthias Ettrich <ettrich@kde.org> **/ -class KDEUI_EXPORT KSystemTray : public QLabel +class KDEUI_EXPORT KSystemTray : public TQLabel { Q_OBJECT public: @@ -163,7 +163,7 @@ protected: /** Reimplemented to provide the standard show/raise behavior - for the parentWidget() and the context menu. + for the tqparentWidget() and the context menu. Feel free to reimplement this if you need something special. */ @@ -171,7 +171,7 @@ protected: /** Reimplemented to provide the standard show/raise behavior - for the parentWidget() and the context menu. + for the tqparentWidget() and the context menu. Feel free to reimplement this if you need something special. */ diff --git a/kdeui/ktabbar.cpp b/kdeui/ktabbar.cpp index e95eb54ca..f5682ae3f 100644 --- a/kdeui/ktabbar.cpp +++ b/kdeui/ktabbar.cpp @@ -76,18 +76,18 @@ void KTabBar::setTabEnabled( int id, bool enabled ) if ( t->isEnabled() ) { r = r.unite( t->rect() ); - tablist->append( tablist->take( tablist->findRef( t ) ) ); + tablist->append( tablist->take( tablist->tqfindRef( t ) ) ); emit selected( t->identifier() ); } } - repaint( r ); + tqrepaint( r ); } } } void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != LeftButton ) + if( e->button() != Qt::LeftButton ) return; TQTab *tab = selectTab( e->pos() ); @@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabBar::mousePressEvent( TQMouseEvent *e ) { - if( e->button() == LeftButton ) { + if( e->button() == Qt::LeftButton ) { mEnableCloseButtonTimer->stop(); mDragStart = e->pos(); } - else if( e->button() == RightButton ) { + else if( e->button() == Qt::RightButton ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) ); @@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e ) void KTabBar::mouseMoveEvent( TQMouseEvent *e ) { - if ( e->state() == LeftButton ) { + if ( e->state() == Qt::LeftButton ) { TQTab *tab = selectTab( e->pos() ); if ( mDragSwitchTab && tab != mDragSwitchTab ) { mActivateDragSwitchTabTimer->stop(); @@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } } } - else if ( e->state() == MidButton ) { + else if ( e->state() == Qt::MidButton ) { if (mReorderStartTab==-1) { int delay = KGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); @@ -144,7 +144,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) TQTab *tab = selectTab( e->pos() ); if( tab && mTabReorderingEnabled ) { mReorderStartTab = indexOf( tab->identifier() ); - grabMouse( sizeAllCursor ); + grabMouse( tqsizeAllCursor ); return; } } @@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) int xoff = 0, yoff = 0; // The additional offsets were found by try and error, TODO: find the rational behind them if ( t == tab( currentTab() ) ) { - xoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3; - yoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4; + xoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3; + yoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4; } else { xoff = 7; @@ -181,7 +181,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } rect.moveLeft( t->rect().left() + 2 + xoff ); rect.moveTop( t->rect().center().y()-pixmap.height()/2 + yoff ); - if ( rect.contains( e->pos() ) ) { + if ( rect.tqcontains( e->pos() ) ) { if ( mHoverCloseButton ) { if ( mHoverCloseButtonTab == t ) return; @@ -230,7 +230,7 @@ void KTabBar::activateDragSwitchTab() void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) { - if( e->button() == MidButton ) { + if( e->button() == Qt::MidButton ) { if ( mReorderStartTab==-1 ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { @@ -240,7 +240,7 @@ void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) } else { releaseMouse(); - setCursor( arrowCursor ); + setCursor( tqarrowCursor ); mReorderStartTab=-1; mReorderPreviousTab=-1; } @@ -253,7 +253,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e ) TQTab *tab = selectTab( e->pos() ); if( tab ) { bool accept = false; - // The receivers of the testCanDecode() signal has to adjust + // The tqreceivers of the testCanDecode() signal has to adjust // 'accept' accordingly. emit testCanDecode( e, accept); if ( accept && tab != TQTabBar::tab( currentTab() ) ) { @@ -282,7 +282,7 @@ void KTabBar::dropEvent( TQDropEvent *e ) #ifndef QT_NO_WHEELEVENT void KTabBar::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Horizontal ) + if ( e->orientation() == Qt::Horizontal ) return; emit( wheelDelta( e->delta() ) ); @@ -294,16 +294,16 @@ void KTabBar::setTabColor( int id, const TQColor& color ) TQTab *t = tab( id ); if ( t ) { mTabColors.insert( id, color ); - repaint( t->rect(), false ); + tqrepaint( t->rect(), false ); } } const TQColor &KTabBar::tabColor( int id ) const { - if ( mTabColors.contains( id ) ) + if ( mTabColors.tqcontains( id ) ) return mTabColors[id]; - return colorGroup().foreground(); + return tqcolorGroup().foreground(); } int KTabBar::insertTab( TQTab *t, int index ) @@ -312,7 +312,7 @@ int KTabBar::insertTab( TQTab *t, int index ) if ( mTabCloseActivatePrevious && count() > 2 ) { TQPtrList<TQTab> *tablist = tabList(); - tablist->insert( count()-2, tablist->take( tablist->findRef( t ) ) ); + tablist->insert( count()-2, tablist->take( tablist->tqfindRef( t ) ) ); } return res; @@ -341,8 +341,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, r.setLeft( r.left() + pixw + 4 ); r.setRight( r.right() + 2 ); - int inactiveXShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ); - int inactiveYShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ); + int inactiveXShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ); + int inactiveYShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ); int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2; @@ -358,12 +358,12 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, if ( has_focus ) flags |= TQStyle::Style_HasFocus; - TQColorGroup cg( colorGroup() ); - if ( mTabColors.contains( t->identifier() ) ) + TQColorGroup cg( tqcolorGroup() ); + if ( mTabColors.tqcontains( t->identifier() ) ) cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] ); - style().drawControl( TQStyle::CE_TabBarLabel, p, this, r, - t->isEnabled() ? cg : palette().disabled(), + tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r, + t->isEnabled() ? cg : tqpalette().disabled(), flags, TQStyleOption(t) ); } diff --git a/kdeui/ktabbar.h b/kdeui/ktabbar.h index a1928aab7..4ec9822ef 100644 --- a/kdeui/ktabbar.h +++ b/kdeui/ktabbar.h @@ -32,7 +32,7 @@ class KTabBarPrivate; /** * @since 3.2 */ -class KDEUI_EXPORT KTabBar: public QTabBar +class KDEUI_EXPORT KTabBar: public TQTabBar { Q_OBJECT diff --git a/kdeui/ktabctl.cpp b/kdeui/ktabctl.cpp index a4b3c8ac8..5ec13f20e 100644 --- a/kdeui/ktabctl.cpp +++ b/kdeui/ktabctl.cpp @@ -56,8 +56,8 @@ void KTabCtl::resizeEvent(TQResizeEvent *) for (i=0; i<(int)pages.size(); i++) { pages[i]->setGeometry(r); } - if( ( tabs->shape() == TQTabBar::RoundedBelow ) || - ( tabs->shape() == TQTabBar::TriangularBelow ) ) { + if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) || + ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) { tabs->move( 0, height()-tabs->height()-4 ); } } @@ -104,7 +104,7 @@ bool KTabCtl::isTabEnabled(const TQString& name) unsigned int i; for(i = 0; i < pages.size(); i++) - if (TQString::fromLatin1(pages[i]->name()) == name) + if (TQString::tqfromLatin1(pages[i]->name()) == name) return tabs->isTabEnabled(i); /* return the enabled status */ return false; /* tab does not exist */ } @@ -117,7 +117,7 @@ void KTabCtl::setTabEnabled(const TQString& name, bool state) return; for (i = 0; i < pages.size(); i++) - if (TQString::fromLatin1(pages[i]->name()) == name) + if (TQString::tqfromLatin1(pages[i]->name()) == name) tabs->setTabEnabled(i, state); } @@ -125,11 +125,11 @@ void KTabCtl::setSizes() { unsigned i; - TQSize min(tabs->sizeHint()); /* the minimum required size for the tabbar */ + TQSize min(tabs->tqsizeHint()); /* the minimum required size for the tabbar */ tabs->resize(min); /* make sure that the tabbar does not require more space than actually needed. */ - TQSize max(QCOORD_MAX,QCOORD_MAX); + TQSize max(TQCOORD_MAX,TQCOORD_MAX); //int th = min.height(); /* the height of the tabbar itself (without pages and stuff) */ for (i = 0; i < pages.size(); i++) { @@ -138,14 +138,14 @@ void KTabCtl::setSizes() * check the actual minimum and maximum sizes */ - if (pages[i]->maximumSize().height() < max.height()) - max.setHeight(pages[i]->maximumSize().height()); - if (pages[i]->maximumSize().width() < max.width()) - max.setWidth( pages[i]->maximumSize().width()); - if ( pages[i]->minimumSize().height() > min.height()) - min.setHeight( pages[i]->minimumSize().height()); - if ( pages[i]->minimumSize().width() > min.width()) - min.setWidth( pages[i]->minimumSize().width()); + if (pages[i]->tqmaximumSize().height() < max.height()) + max.setHeight(pages[i]->tqmaximumSize().height()); + if (pages[i]->tqmaximumSize().width() < max.width()) + max.setWidth( pages[i]->tqmaximumSize().width()); + if ( pages[i]->tqminimumSize().height() > min.height()) + min.setHeight( pages[i]->tqminimumSize().height()); + if ( pages[i]->tqminimumSize().width() > min.width()) + min.setWidth( pages[i]->tqminimumSize().width()); } // BL: min and max are sizes of children, not tabcontrol @@ -184,22 +184,22 @@ void KTabCtl::setBorder( bool state ) blBorder = state; } -void KTabCtl::setShape( TQTabBar::Shape shape ) +void KTabCtl::setShape( TQTabBar::Shape tqshape ) { - tabs->setShape( shape ); + tabs->setShape( tqshape ); } -QSize -KTabCtl::sizeHint() const +TQSize +KTabCtl::tqsizeHint() const { /* desired size of the tabbar */ - TQSize hint(tabs->sizeHint()); + TQSize hint(tabs->tqsizeHint()); /* overall desired size of all pages */ TQSize pageHint; for (unsigned int i = 0; i < pages.size(); i++) { - TQSize sizeI(pages[i]->sizeHint()); + TQSize sizeI(pages[i]->tqsizeHint()); if (sizeI.isValid()) { @@ -229,7 +229,7 @@ KTabCtl::sizeHint() const } /* - * If not at least a one page has a valid sizeHint we have to return + * If not at least a one page has a valid tqsizeHint we have to return * an invalid size as well. */ return (pageHint); @@ -251,16 +251,16 @@ void KTabCtl::paintEvent(TQPaintEvent *) int x1 = getChildRect().right() + 2; int x0 = getChildRect().left() - 1; - p.setPen(colorGroup().light()); + p.setPen(tqcolorGroup().light()); p.drawLine(x0, y0 - 1, x1 - 1, y0 - 1); /* 1st top line */ - p.setPen(colorGroup().midlight()); + p.setPen(tqcolorGroup().midlight()); p.drawLine(x0, y0, x1 - 1, y0); /* 2nd top line */ - p.setPen(colorGroup().light()); + p.setPen(tqcolorGroup().light()); p.drawLine(x0, y0 + 1, x0, y1); /* left line */ p.setPen(black); p.drawLine(x1, y1, x0, y1); /* bottom line */ p.drawLine(x1, y1 - 1, x1, y0); - p.setPen(colorGroup().dark()); + p.setPen(tqcolorGroup().dark()); p.drawLine(x0 + 1, y1 - 1, x1 - 1, y1 - 1); /* bottom */ p.drawLine(x1 - 1, y1 - 2, x1 - 1, y0 + 1); p.end(); @@ -273,8 +273,8 @@ void KTabCtl::paintEvent(TQPaintEvent *) TQRect KTabCtl::getChildRect() const { - if( ( tabs->shape() == TQTabBar::RoundedBelow ) || - ( tabs->shape() == TQTabBar::TriangularBelow ) ) { + if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) || + ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) { return TQRect(2, 1, width() - 4, height() - tabs->height() - 4); } else { diff --git a/kdeui/ktabctl.h b/kdeui/ktabctl.h index 9c390351f..1151eb22e 100644 --- a/kdeui/ktabctl.h +++ b/kdeui/ktabctl.h @@ -45,7 +45,7 @@ * @author Alexander Sanda (alex@darkstar.ping.at) * @version $Id$ */ -class KDEUI_EXPORT KTabCtl : public QWidget +class KDEUI_EXPORT KTabCtl : public TQWidget { Q_OBJECT @@ -61,8 +61,8 @@ public: bool isTabEnabled(const TQString& ); void setTabEnabled(const TQString&, bool); void setBorder(bool); - void setShape( TQTabBar::Shape shape ); - virtual TQSize sizeHint() const; + void setShape( TQTabBar::Shape tqshape ); + virtual TQSize tqsizeHint() const; protected: void paintEvent(TQPaintEvent *); diff --git a/kdeui/ktabwidget.cpp b/kdeui/ktabwidget.cpp index 5a431ecd2..bc28b5d4d 100644 --- a/kdeui/ktabwidget.cpp +++ b/kdeui/ktabwidget.cpp @@ -163,8 +163,8 @@ bool KTabWidget::tabCloseActivatePrevious() const unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) { int hframe, overlap; - hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() ); - overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() ); + hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() ); + overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() ); TQFontMetrics fm = tabBar()->fontMetrics(); int x = 0; @@ -177,7 +177,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) int iw = 0; if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, + x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( QMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } @@ -253,7 +253,7 @@ void KTabWidget::resizeTabs( int changeTabIndex ) newMaxLength=d->m_maxLength; uint lcw=0, rcw=0; - int tabBarHeight = tabBar()->sizeHint().height(); + int tabBarHeight = tabBar()->tqsizeHint().height(); if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() ) lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight ); if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() ) @@ -301,7 +301,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e ) { if ( isEmptyTabbarSpace( e->pos() ) ) { bool accept = false; - // The receivers of the testCanDecode() signal has to adjust + // The tqreceivers of the testCanDecode() signal has to adjust // 'accept' accordingly. emit testCanDecode( e, accept); e->accept( accept ); @@ -323,7 +323,7 @@ void KTabWidget::dropEvent( TQDropEvent *e ) #ifndef QT_NO_WHEELEVENT void KTabWidget::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() == Horizontal ) + if ( e->orientation() == Qt::Horizontal ) return; if ( isEmptyTabbarSpace( e->pos() ) ) @@ -351,7 +351,7 @@ void KTabWidget::wheelDelta( int delta ) void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != LeftButton ) + if( e->button() != Qt::LeftButton ) return; if ( isEmptyTabbarSpace( e->pos() ) ) { @@ -363,12 +363,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == RightButton ) { + if ( e->button() == Qt::RightButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( contextMenu( mapToGlobal( e->pos() ) ) ); return; } - } else if ( e->button() == MidButton ) { + } else if ( e->button() == Qt::MidButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( mouseMiddleClick() ); return; @@ -451,7 +451,7 @@ void KTabWidget::removePage( TQWidget * w ) { bool KTabWidget::isEmptyTabbarSpace( const TQPoint &point ) const { - TQSize size( tabBar()->sizeHint() ); + TQSize size( tabBar()->tqsizeHint() ); if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) { TQWidget *rightcorner = cornerWidget( TopRight ); if ( rightcorner ) { diff --git a/kdeui/ktabwidget.h b/kdeui/ktabwidget.h index 2ce850744..9629eb9e8 100644 --- a/kdeui/ktabwidget.h +++ b/kdeui/ktabwidget.h @@ -33,7 +33,7 @@ class KTabWidgetPrivate; * * @since 3.2 */ -class KDEUI_EXPORT KTabWidget : public QTabWidget +class KDEUI_EXPORT KTabWidget : public TQTabWidget { Q_OBJECT Q_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled ) diff --git a/kdeui/ktextbrowser.cpp b/kdeui/ktextbrowser.cpp index 6b3685a81..dfd283455 100644 --- a/kdeui/ktextbrowser.cpp +++ b/kdeui/ktextbrowser.cpp @@ -60,7 +60,7 @@ void KTextBrowser::setSource( const TQString& name ) return; } - if( name.find('@') > -1 ) + if( name.tqfind('@') > -1 ) { if( !mNotifyClick ) { diff --git a/kdeui/ktextbrowser.h b/kdeui/ktextbrowser.h index fd20d9cef..9c9fd929d 100644 --- a/kdeui/ktextbrowser.h +++ b/kdeui/ktextbrowser.h @@ -39,7 +39,7 @@ * @author Espen Sand (espensa@online.no) */ -class KDEUI_EXPORT KTextBrowser : public QTextBrowser +class KDEUI_EXPORT KTextBrowser : public TQTextBrowser { Q_OBJECT Q_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick ) diff --git a/kdeui/ktextedit.cpp b/kdeui/ktextedit.cpp index 0951fe066..fda46df76 100644 --- a/kdeui/ktextedit.cpp +++ b/kdeui/ktextedit.cpp @@ -182,7 +182,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e ) // ignore Ctrl-Return so that KDialogs can close the dialog else if ( e->state() == ControlButton && (e->key() == Key_Return || e->key() == Key_Enter) && - topLevelWidget()->inherits( "KDialog" ) ) + tqtopLevelWidget()->inherits( "KDialog" ) ) { e->ignore(); return; @@ -351,7 +351,7 @@ void KTextEdit::checkSpelling() { delete d->spell; d->spell = new KSpell( this, i18n( "Spell Checking" ), - this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); connect( d->spell, TQT_SIGNAL( death() ), this, TQT_SLOT( spellCheckerFinished() ) ); diff --git a/kdeui/ktextedit.h b/kdeui/ktextedit.h index 7735beb34..a93d36fe1 100644 --- a/kdeui/ktextedit.h +++ b/kdeui/ktextedit.h @@ -40,7 +40,7 @@ class KSpell; * @author Carsten Pfeiffer <pfeiffer@kde.org> * @since 3.1 */ -class KDEUI_EXPORT KTextEdit : public QTextEdit +class KDEUI_EXPORT KTextEdit : public TQTextEdit { Q_OBJECT diff --git a/kdeui/ktimewidget.cpp b/kdeui/ktimewidget.cpp index 3a5ec3936..4d48b2129 100644 --- a/kdeui/ktimewidget.cpp +++ b/kdeui/ktimewidget.cpp @@ -9,7 +9,7 @@ class KTimeWidget::KTimeWidgetPrivate { public: - QTimeEdit * timeWidget; + TQTimeEdit * timeWidget; }; KTimeWidget::KTimeWidget(TQWidget * parent, const char * name) @@ -39,7 +39,7 @@ void KTimeWidget::init() TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); layout->setAutoAdd(true); - d->timeWidget = new QTimeEdit(this); + d->timeWidget = new TQTimeEdit(this); connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)), TQT_SIGNAL(valueChanged(const TQTime &))); diff --git a/kdeui/ktimewidget.h b/kdeui/ktimewidget.h index b9808f0e8..0d6f18873 100644 --- a/kdeui/ktimewidget.h +++ b/kdeui/ktimewidget.h @@ -34,7 +34,7 @@ * @author Hans Petter Bieker <bieker@kde.org> * @since 3.2 */ -class KDEUI_EXPORT KTimeWidget : public QWidget +class KDEUI_EXPORT KTimeWidget : public TQWidget { Q_OBJECT Q_PROPERTY( TQTime time READ time WRITE setTime ) diff --git a/kdeui/ktip.cpp b/kdeui/ktip.cpp index ae619a173..269a7c472 100644 --- a/kdeui/ktip.cpp +++ b/kdeui/ktip.cpp @@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile) { TQString tipFile = _tipFile; if (tipFile.isEmpty()) - tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; + tipFile = TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"; loadTips(tipFile); @@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles ) { if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) ) { - addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); + addTips(TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips"); } else { @@ -115,12 +115,12 @@ void KTipDatabase::addTips(const TQString& tipFile ) const TQRegExp rx("\\n+"); int pos = -1; - while ((pos = content.find("<html>", pos + 1, false)) != -1) + while ((pos = content.tqfind("<html>", pos + 1, false)) != -1) { // to make translations work, tip extraction here must exactly // match what is done by the preparetips script TQString tip = content - .mid(pos + 6, content.find("</html>", pos, false) - pos - 6) + .mid(pos + 6, content.tqfind("</html>", pos, false) - pos - 6) .replace(rx, "\n"); if (!tip.endsWith("\n")) tip += "\n"; @@ -191,7 +191,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) KIconEffect::colorize(img, mBlendedColor, 1.0); QRgb colPixel( img.pixel(0,0) ); - mBlendedColor = TQColor(qRed(colPixel),qGreen(colPixel),qBlue(colPixel)); + mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel)); } mBaseColor = KGlobalSettings::alternateBackgroundColor(); @@ -223,7 +223,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) titlePane->setBackgroundPixmap(locate("data", "kdeui/pics/ktip-background.png")); titlePane->setText(i18n("Did you know...?\n")); titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold)); - titlePane->setAlignment(TQLabel::AlignCenter); + titlePane->tqsetAlignment(TQLabel::AlignCenter); pl->addWidget(titlePane, 100); } @@ -268,7 +268,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQLabel *l = new TQLabel(hbox); l->setPixmap(img); l->setBackgroundColor(mBlendedColor); - l->setAlignment(Qt::AlignRight | Qt::AlignBottom); + l->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom); resize(550, 230); TQSize sh = size(); @@ -347,10 +347,10 @@ void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bo const int oneDay = 24*60*60; TQDateTime lastShown = configGroup.readDateTimeEntry("TipLastShown"); // Show tip roughly once a week - if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (kapp->random() % (10*oneDay)))) + if (lastShown.secsTo(TQDateTime::tqcurrentDateTime()) < (oneDay + (kapp->random() % (10*oneDay)))) return; } - configGroup.writeEntry("TipLastShown", TQDateTime::currentDateTime()); + configGroup.writeEntry("TipLastShown", TQDateTime::tqcurrentDateTime()); kapp->config()->sync(); if (!hasLastShown) return; // Don't show tip on first start @@ -384,7 +384,7 @@ static TQString fixTip(TQString tip) void KTipDialog::prevTip() { mDatabase->prevTip(); - TQString currentTip = TQString::fromLatin1( + TQString currentTip = TQString::tqfromLatin1( "<qt text=\"%1\" bgcolor=\"%2\">%3</qt>") .arg(mTextColor.name()) .arg(mBaseColor.name()) @@ -399,7 +399,7 @@ static TQString fixTip(TQString tip) void KTipDialog::nextTip() { mDatabase->nextTip(); - TQString currentTip = TQString::fromLatin1( + TQString currentTip = TQString::tqfromLatin1( "<qt text=\"%1\" bgcolor=\"%2\">%3</qt>") .arg(mTextColor.name()) .arg(mBaseColor.name()) @@ -425,7 +425,7 @@ static TQString fixTip(TQString tip) bool KTipDialog::eventFilter(TQObject *o, TQEvent *e) { - if (o == mTipText && e->type()== TQEvent::KeyPress && + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mTipText) && e->type()== TQEvent::KeyPress && (((TQKeyEvent *)e)->key() == Key_Return || ((TQKeyEvent *)e)->key() == Key_Space )) accept(); diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp index 79607099a..fc61ee2ff 100644 --- a/kdeui/ktoolbar.cpp +++ b/kdeui/ktoolbar.cpp @@ -90,7 +90,7 @@ public: m_xmlguiClient = 0; - oldPos = Qt::DockUnmanaged; + oldPos = TQt::DockUnmanaged; modified = m_isHorizontal = positioned = false; @@ -122,16 +122,16 @@ public: struct ToolBarInfo { - ToolBarInfo() : index( -1 ), offset( -1 ), newline( false ), dock( Qt::DockTop ) {} - ToolBarInfo( Qt::Dock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {} + ToolBarInfo() : index( -1 ), offset( -1 ), newline( false ), dock( TQt::DockTop ) {} + ToolBarInfo( TQt::Dock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {} int index, offset; bool newline; - Qt::Dock dock; + TQt::Dock dock; }; ToolBarInfo toolBarInfo; TQValueList<int> iconSizes; - TQTimer repaintTimer; + TQTimer tqrepaintTimer; // Default Values. bool HiddenDefault; @@ -166,11 +166,11 @@ void KToolBarSeparator::drawContents( TQPainter* p ) if ( line ) { TQStyle::SFlags flags = TQStyle::Style_Default; - if ( orientation() == Horizontal ) + if ( orientation() == Qt::Horizontal ) flags = flags | TQStyle::Style_Horizontal; - style().drawPrimitive(TQStyle::PE_DockWindowSeparator, p, - contentsRect(), colorGroup(), flags); + tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p, + contentsRect(), tqcolorGroup(), flags); } else { TQFrame::drawContents(p); } @@ -181,10 +181,10 @@ void KToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize KToolBarSeparator::sizeHint() const +TQSize KToolBarSeparator::tqsizeHint() const { - int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - return orientation() == Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); + int dim = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); + return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); } TQSizePolicy KToolBarSeparator::sizePolicy() const @@ -193,7 +193,7 @@ TQSizePolicy KToolBarSeparator::sizePolicy() const } KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig ) - : TQToolBar( TQString::fromLatin1( name ), + : TQToolBar( TQString::tqfromLatin1( name ), dynamic_cast<TQMainWindow*>(parent), parent, false, name ? name : "mainToolBar") @@ -202,7 +202,7 @@ KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool re } KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig ) - : TQToolBar( TQString::fromLatin1( name ), + : TQToolBar( TQString::tqfromLatin1( name ), parentWindow, dock, newLine, name ? name : "mainToolBar") { @@ -210,7 +210,7 @@ KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, } KToolBar::KToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig ) - : TQToolBar( TQString::fromLatin1( name ), + : TQToolBar( TQString::tqfromLatin1( name ), parentWindow, dock, newLine, name ? name : "mainToolBar") { @@ -232,7 +232,7 @@ void KToolBar::init( bool readConfig, bool honorStyle ) layoutTimer = new TQTimer( this ); connect( layoutTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( rebuildLayout() ) ); - connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ), + connect( &(d->tqrepaintTimer), TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRepaint() ) ); if ( kapp ) { // may be null when started inside designer @@ -427,7 +427,7 @@ int KToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slot, KAnimWidget *KToolBar::animatedWidget( int id ) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; KAnimWidget *aw = dynamic_cast<KAnimWidget *>(*it); @@ -610,7 +610,7 @@ TQString KToolBar::getComboItem (int id, int index) const KComboBox * KToolBar::getCombo(int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; return dynamic_cast<KComboBox *>( *it ); @@ -619,7 +619,7 @@ KComboBox * KToolBar::getCombo(int id) KLineEdit * KToolBar::getLined (int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; return dynamic_cast<KLineEdit *>( *it ); @@ -628,7 +628,7 @@ KLineEdit * KToolBar::getLined (int id) KToolBarButton * KToolBar::getButton (int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return 0; return dynamic_cast<KToolBarButton *>( *it ); @@ -637,7 +637,7 @@ KToolBarButton * KToolBar::getButton (int id) void KToolBar::alignItemRight (int id, bool right ) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) return; if ( rightAligned && !right && (*it) == rightAligned ) @@ -649,7 +649,7 @@ void KToolBar::alignItemRight (int id, bool right ) TQWidget *KToolBar::getWidget (int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); return ( it == id2widget.end() ) ? 0 : (*it); } @@ -677,7 +677,7 @@ void KToolBar::clear () void KToolBar::removeItem(int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) { kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl; @@ -693,7 +693,7 @@ void KToolBar::removeItem(int id) void KToolBar::removeItemDelayed(int id) { - Id2WidgetMap::Iterator it = id2widget.find( id ); + Id2WidgetMap::Iterator it = id2widget.tqfind( id ); if ( it == id2widget.end() ) { kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl; @@ -729,7 +729,7 @@ void KToolBar::showItem (int id) int KToolBar::itemIndex (int id) { TQWidget *w = getWidget(id); - return w ? widgets.findRef(w) : -1; + return w ? widgets.tqfindRef(w) : -1; } int KToolBar::idAt (int index) @@ -911,7 +911,7 @@ int KToolBar::iconSize() const int KToolBar::iconSizeDefault() const { - if (!::qstrcmp(TQObject::name(), "mainToolBar")) + if (!::qstrcmp(name(), "mainToolBar")) return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); return KGlobal::iconLoader()->currentSize(KIcon::Toolbar); @@ -1005,7 +1005,7 @@ void KToolBar::saveState() if ( curname == barname ) { just_append = false; - local.documentElement().replaceChild( current, elem ); + local.documentElement().tqreplaceChild( current, elem ); break; } } @@ -1158,7 +1158,7 @@ void KToolBar::mousePressEvent ( TQMouseEvent *m ) return; TQMainWindow *mw = mainWindow(); if ( mw->toolBarsMovable() && d->m_enableContext ) { - if ( m->button() == RightButton ) { + if ( m->button() == Qt::RightButton ) { TQGuardedPtr<KToolBar> guard( this ); int i = contextMenu()->exec( m->globalPos(), 0 ); // "Configure Toolbars" recreates toolbars, so we might not exist anymore. @@ -1239,7 +1239,7 @@ void KToolBar::rebuildLayout() continue; KToolBarSeparator *ktbs = dynamic_cast<KToolBarSeparator *>(w); if ( ktbs && !ktbs->showLine() ) { - l->addSpacing( orientation() == Vertical ? w->sizeHint().height() : w->sizeHint().width() ); + l->addSpacing( orientation() == Qt::Vertical ? w->tqsizeHint().height() : w->tqsizeHint().width() ); w->hide(); continue; } @@ -1247,7 +1247,7 @@ void KToolBar::rebuildLayout() continue; l->addWidget( w ); w->show(); - if ((orientation() == Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? + if ((orientation() == Qt::Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ? l->addSpacing(2); // A little bit extra spacing behind it. } if ( rightAligned ) { @@ -1262,7 +1262,7 @@ void KToolBar::rebuildLayout() if ( stretchableWidget ) l->setStretchFactor( stretchableWidget, 10 ); } - l->invalidate(); + l->tqinvalidate(); TQApplication::postEvent( this, new TQEvent( TQEvent::LayoutHint ) ); } @@ -1279,7 +1279,7 @@ void KToolBar::childEvent( TQChildEvent *e ) if ( !dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu // prevent items that have been explicitly inserted by insert*() from // being inserted again - if ( !widget2id.contains( w ) ) + if ( !widget2id.tqcontains( w ) ) { int dummy = -1; insertWidgetInternal( w, dummy, -1 ); @@ -1336,13 +1336,13 @@ void KToolBar::setStretchableWidget( TQWidget *w ) TQSizePolicy KToolBar::sizePolicy() const { - if ( orientation() == Horizontal ) + if ( orientation() == Qt::Horizontal ) return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); else return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); } -TQSize KToolBar::sizeHint() const +TQSize KToolBar::tqsizeHint() const { TQSize minSize(0,0); KToolBar *ncThis = const_cast<KToolBar *>(this); @@ -1356,13 +1356,13 @@ TQSize KToolBar::sizeHint() const case KToolBar::Bottom: for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() ) { - TQSize sh = w->sizeHint(); - if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) + TQSize sh = w->tqsizeHint(); + if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) sh.setWidth( 1 ); - if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) + if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) sh.setHeight( 1 ); - sh = sh.boundedTo( w->maximumSize() ) - .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) ); + sh = sh.boundedTo( w->tqmaximumSize() ) + .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) ); minSize = minSize.expandedTo(TQSize(0, sh.height())); minSize += TQSize(sh.width()+1, 0); @@ -1370,7 +1370,7 @@ TQSize KToolBar::sizeHint() const minSize += TQSize(2, 0); // A little bit extra spacing behind it. } - minSize += TQSize(TQApplication::style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0); + minSize += TQSize(TQApplication::tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0); minSize += TQSize(margin*2, margin*2); break; @@ -1378,36 +1378,36 @@ TQSize KToolBar::sizeHint() const case KToolBar::Right: for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() ) { - TQSize sh = w->sizeHint(); - if ( w->sizePolicy().horData() == TQSizePolicy::Ignored ) + TQSize sh = w->tqsizeHint(); + if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) sh.setWidth( 1 ); - if ( w->sizePolicy().verData() == TQSizePolicy::Ignored ) + if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) sh.setHeight( 1 ); - sh = sh.boundedTo( w->maximumSize() ) - .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) ); + sh = sh.boundedTo( w->tqmaximumSize() ) + .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) ); minSize = minSize.expandedTo(TQSize(sh.width(), 0)); minSize += TQSize(0, sh.height()+1); } - minSize += TQSize(0, TQApplication::style().pixelMetric( TQStyle::PM_DockWindowHandleExtent )); + minSize += TQSize(0, TQApplication::tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent )); minSize += TQSize(margin*2, margin*2); break; default: - minSize = TQToolBar::sizeHint(); + minSize = TQToolBar::tqsizeHint(); break; } return minSize; } -TQSize KToolBar::minimumSize() const +TQSize KToolBar::tqminimumSize() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } -TQSize KToolBar::minimumSizeHint() const +TQSize KToolBar::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } bool KToolBar::highlight() const @@ -1434,8 +1434,8 @@ void KToolBar::resizeEvent( TQResizeEvent *e ) { if (layoutTimer->isActive()) { - // Wait with repainting till layout is complete. - d->repaintTimer.start( 100, true ); + // Wait with tqrepainting till layout is complete. + d->tqrepaintTimer.start( 100, true ); } else { @@ -1481,25 +1481,25 @@ void KToolBar::slotAppearanceChanged() //static bool KToolBar::highlightSetting() { - TQString grpToolbar(TQString::fromLatin1("Toolbar style")); + TQString grpToolbar(TQString::tqfromLatin1("Toolbar style")); KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true); + return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("Highlighting"),true); } //static bool KToolBar::transparentSetting() { - TQString grpToolbar(TQString::fromLatin1("Toolbar style")); + TQString grpToolbar(TQString::tqfromLatin1("Toolbar style")); KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true); + return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("TransparentMoving"),true); } //static KToolBar::IconText KToolBar::iconTextSetting() { - TQString grpToolbar(TQString::fromLatin1("Toolbar style")); + TQString grpToolbar(TQString::tqfromLatin1("Toolbar style")); KConfigGroupSaver saver(KGlobal::config(), grpToolbar); - TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly")); + TQString icontext = KGlobal::config()->readEntry(TQString::tqfromLatin1("IconText"),TQString::tqfromLatin1("IconOnly")); if ( icontext == "IconTextRight" ) return IconTextRight; else if ( icontext == "IconTextBottom" ) @@ -1541,7 +1541,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG TQString iconText = d->IconTextDefault; // this is the first iteration - TQString grpToolbar(TQString::fromLatin1("Toolbar style")); + TQString grpToolbar(TQString::tqfromLatin1("Toolbar style")); { // start block for KConfigGroupSaver KConfigGroupSaver saver(gconfig, grpToolbar); @@ -1711,7 +1711,7 @@ void KToolBar::applySettings(KConfig *config, const TQString &_configGroup, bool bool KToolBar::event( TQEvent *e ) { if ( (e->type() == TQEvent::LayoutHint) && isUpdatesEnabled() ) - d->repaintTimer.start( 100, true ); + d->tqrepaintTimer.start( 100, true ); if (e->type() == TQEvent::ChildInserted ) { @@ -1735,7 +1735,7 @@ void KToolBar::slotRepaint() resizeEvent(&ev); TQApplication::sendPostedEvents( this, TQEvent::LayoutHint ); setUpdatesEnabled( true ); - repaint( true ); + tqrepaint( true ); } void KToolBar::toolBarPosChanged( TQToolBar *tb ) @@ -2061,7 +2061,7 @@ KPopupMenu *KToolBar::contextMenu() TQValueList<int> avSizes; if (theme) { - if (!::qstrcmp(TQObject::name(), "mainToolBar")) + if (!::qstrcmp(name(), "mainToolBar")) avSizes = theme->querySizes( KIcon::MainToolbar); else avSizes = theme->querySizes( KIcon::Toolbar); @@ -2151,7 +2151,7 @@ void KToolBar::slotContextAboutToShow() configureAction = kmw->actionCollection()->action(actionName); if ( configureAction ) configureAction->plug(context); - KEditToolbar::setDefaultToolbar(TQObject::name()); + KEditToolbar::setDefaultToolbar(name()); for(int i = CONTEXT_ICONS; i <= CONTEXT_TEXTUNDER; ++i) context->setItemChecked(i, false); @@ -2245,7 +2245,7 @@ void KToolBar::widgetDestroyed() void KToolBar::removeWidgetInternal( TQWidget * w ) { widgets.removeRef( w ); - TQMap< TQWidget*, int >::Iterator it = widget2id.find( w ); + TQMap< TQWidget*, int >::Iterator it = widget2id.tqfind( w ); if ( it == widget2id.end() ) return; id2widget.remove( *it ); diff --git a/kdeui/ktoolbar.h b/kdeui/ktoolbar.h index 9c85e5fc2..aff0331e6 100644 --- a/kdeui/ktoolbar.h +++ b/kdeui/ktoolbar.h @@ -55,13 +55,14 @@ class KXMLGUIClient; class KToolBarPrivate; -class KDEUI_EXPORT KToolBarSeparator : public QFrame +class KDEUI_EXPORT KToolBarSeparator : public TQFrame { Q_OBJECT + TQ_OBJECT public: KToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; Orientation orientation() const { return orient; } TQSizePolicy sizePolicy() const; bool showLine() const { return line; } @@ -90,7 +91,7 @@ private: * Once you have a KToolBar object, you can insert items into it with the * insert... methods, or remove them with the removeItem() method. This * can be done at any time; the toolbar will be automatically updated. - * There are also many methods to set per-child properties like alignment + * There are also many methods to set per-child properties like tqalignment * and toggle behavior. * * KToolBar uses a global config group to load toolbar settings on @@ -100,9 +101,10 @@ private: * @author Reginald Stadlbauer <reggie@kde.org>, Stephan Kulow <coolo@kde.org>, Sven Radej <radej@kde.org>. */ -class KDEUI_EXPORT KToolBar : public QToolBar +class KDEUI_EXPORT KToolBar : public TQToolBar { Q_OBJECT + TQ_OBJECT Q_ENUMS( IconText BarPosition ) Q_PROPERTY( IconText iconText READ iconText WRITE setIconText ) Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos ) @@ -943,9 +945,9 @@ public: void setStretchableWidget( TQWidget *w ); TQSizePolicy sizePolicy() const; bool highlight() const; - TQSize sizeHint() const; - TQSize minimumSizeHint() const; - TQSize minimumSize() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; + TQSize tqminimumSize() const; void hide(); void show(); diff --git a/kdeui/ktoolbarbutton.cpp b/kdeui/ktoolbarbutton.cpp index 765b2e433..42f0d9b90 100644 --- a/kdeui/ktoolbarbutton.cpp +++ b/kdeui/ktoolbarbutton.cpp @@ -124,7 +124,7 @@ KToolBarButton::KToolBarButton( const TQString& _icon, int _id, this, TQT_SLOT( modeChange() )); } - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); // connect all of our slots and start trapping events connect(this, TQT_SIGNAL( clicked() ), @@ -157,7 +157,7 @@ KToolBarButton::KToolBarButton( const TQPixmap& pixmap, int _id, this, TQT_SLOT( modeChange() )); } - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); // connect all of our slots and start trapping events connect(this, TQT_SIGNAL( clicked() ), @@ -246,7 +246,7 @@ void KToolBarButton::modeChange() break; } - mysize = style().sizeFromContents(TQStyle::CT_ToolButton, this, mysize). + mysize = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize). expandedTo(TQApplication::globalStrut()); // make sure that this isn't taller then it is wide @@ -263,7 +263,7 @@ void KToolBarButton::setTextLabel( const TQString& text, bool tipToo) return; TQString txt(text); - if (txt.endsWith(TQString::fromLatin1("..."))) + if (txt.endsWith(TQString::tqfromLatin1("..."))) txt.truncate(txt.length() - 3); TQToolButton::setTextLabel(txt, tipToo); @@ -376,7 +376,7 @@ void KToolBarButton::leaveEvent(TQEvent *) { d->m_isRaised = false; d->m_isActive = false; - repaint(false); + tqrepaint(false); } emit highlighted(d->m_id, false); @@ -398,7 +398,7 @@ void KToolBarButton::enterEvent(TQEvent *) d->m_isActive = false; } - repaint(false); + tqrepaint(false); } emit highlighted(d->m_id, true); } @@ -414,12 +414,12 @@ bool KToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { if (ev->type() == TQEvent::MouseButtonPress) { - TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); d->m_mousePressPos = mev->pos(); } else if (ev->type() == TQEvent::MouseMove) { - TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); + TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); if ((mev->pos() - d->m_mousePressPos).manhattanLength() > KGlobalSettings::dndEventDelay()) { @@ -450,10 +450,10 @@ void KToolBarButton::mousePressEvent( TQMouseEvent * e ) { d->m_buttonDown = true; - if ( e->button() == MidButton ) + if ( e->button() == Qt::MidButton ) { // Get TQToolButton to show the button being down while pressed - TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQToolButton::mousePressEvent(&ev); return; } @@ -462,10 +462,10 @@ void KToolBarButton::mousePressEvent( TQMouseEvent * e ) void KToolBarButton::mouseReleaseEvent( TQMouseEvent * e ) { - Qt::ButtonState state = Qt::ButtonState(e->button() | (e->state() & KeyButtonMask)); - if ( e->button() == MidButton ) + TQt::ButtonState state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask)); + if ( e->button() == Qt::MidButton ) { - TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQToolButton::mouseReleaseEvent(&ev); } else @@ -494,8 +494,8 @@ void KToolBarButton::drawButton( TQPainter *_painter ) if (hasFocus()) flags |= TQStyle::Style_HasFocus; // Draw a styled toolbutton - style().drawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(), - colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption()); + tqstyle().tqdrawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(), + tqcolorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption()); int dx, dy; TQFont tmp_font(KGlobalSettings::toolBarFont()); @@ -513,7 +513,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) { dx = ( width() - pixmap.width() ) / 2; dy = ( height() - pixmap.height() ) / 2; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -531,7 +531,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) { dx = 4; dy = ( height() - pixmap.height() ) / 2; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -547,7 +547,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) else dx = 4; dy = 0; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -562,7 +562,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) textFlags = AlignVCenter|AlignLeft; dx = (width() - fm.width(textLabel())) / 2; dy = (height() - fm.lineSpacing()) / 2; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -580,7 +580,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) { dx = (width() - pixmap.width()) / 2; dy = (height() - fm.lineSpacing() - pixmap.height()) / 2; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -594,7 +594,7 @@ void KToolBarButton::drawButton( TQPainter *_painter ) dx = (width() - fm.width(textLabel())) / 2; dy = height() - fm.lineSpacing() - 4; - if ( isDown() && style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) { ++dx; ++dy; @@ -608,11 +608,11 @@ void KToolBarButton::drawButton( TQPainter *_painter ) { _painter->setFont(KGlobalSettings::toolBarFont()); if (!isEnabled()) - _painter->setPen(palette().disabled().dark()); + _painter->setPen(tqpalette().disabled().dark()); else if(d->m_isRaised) _painter->setPen(KGlobalSettings::toolBarHighlightColor()); else - _painter->setPen( colorGroup().buttonText() ); + _painter->setPen( tqcolorGroup().buttonText() ); _painter->drawText(textRect, textFlags, textLabel()); } @@ -623,8 +623,8 @@ void KToolBarButton::drawButton( TQPainter *_painter ) if (isDown()) arrowFlags |= TQStyle::Style_Down; if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled; - style().drawPrimitive(TQStyle::PE_ArrowDown, _painter, - TQRect(width()-7, height()-7, 7, 7), colorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter, + TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(), arrowFlags, TQStyleOption() ); } } @@ -634,7 +634,7 @@ void KToolBarButton::paletteChange(const TQPalette &) if(!d->m_isSeparator) { modeChange(); - repaint(false); // no need to delete it first therefore only false + tqrepaint(false); // no need to delete it first therefore only false } } @@ -671,8 +671,8 @@ void KToolBarButton::slotClicked() // emit buttonClicked when the button was clicked while being in an extension popupmenu if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) { ButtonState state = KApplication::keyboardMouseState(); - if ( ( state & MouseButtonMask ) == NoButton ) - state = ButtonState( LeftButton | state ); + if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton ) + state = ButtonState( Qt::LeftButton | state ); emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton } } @@ -698,7 +698,7 @@ void KToolBarButton::setNoStyle(bool no_style) modeChange(); d->m_iconText = KToolBar::IconTextRight; - repaint(false); + tqrepaint(false); } void KToolBarButton::setRadio (bool f) @@ -716,13 +716,13 @@ void KToolBarButton::on(bool flag) setDown(flag); leaveEvent((TQEvent *) 0); } - repaint(); + tqrepaint(); } void KToolBarButton::toggle() { setOn(!isOn()); - repaint(); + tqrepaint(); } void KToolBarButton::setToggle(bool flag) @@ -734,17 +734,17 @@ void KToolBarButton::setToggle(bool flag) disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); } -TQSize KToolBarButton::sizeHint() const +TQSize KToolBarButton::tqsizeHint() const { return d->size; } -TQSize KToolBarButton::minimumSizeHint() const +TQSize KToolBarButton::tqminimumSizeHint() const { return d->size; } -TQSize KToolBarButton::minimumSize() const +TQSize KToolBarButton::tqminimumSize() const { return d->size; } diff --git a/kdeui/ktoolbarbutton.h b/kdeui/ktoolbarbutton.h index 2cb05d9ac..7abe34927 100644 --- a/kdeui/ktoolbarbutton.h +++ b/kdeui/ktoolbarbutton.h @@ -41,7 +41,7 @@ class TQPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class KDEUI_EXPORT KToolBarButton : public TQToolButton { Q_OBJECT @@ -263,7 +263,7 @@ signals: * and whether any keyboard modifiers were held. * @since 3.4 */ - void buttonClicked(int, Qt::ButtonState state); + void buttonClicked(int, TQt::ButtonState state); void doubleClicked(int); void pressed(int); void released(int); @@ -291,9 +291,9 @@ protected: /// @since 3.4 void mouseReleaseEvent( TQMouseEvent * ); void showMenu(); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; - TQSize minimumSize() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; + TQSize tqminimumSize() const; /// @since 3.1 bool isRaised() const; diff --git a/kdeui/ktoolbarhandler.cpp b/kdeui/ktoolbarhandler.cpp index 5d8a49d8f..f1bce69c6 100644 --- a/kdeui/ktoolbarhandler.cpp +++ b/kdeui/ktoolbarhandler.cpp @@ -55,7 +55,7 @@ namespace if ( !toolBar ) continue; - if ( oldToolBarList.findRef( toolBar ) == -1 ) + if ( oldToolBarList.tqfindRef( toolBar ) == -1 ) m_needsRebuild = true; m_toolBars.append( toolBar ); @@ -209,7 +209,7 @@ void ToolBarHandler::init( KMainWindow *mainWindow ) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ) + TQString completeDescription = TQString::tqfromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); diff --git a/kdeui/ktoolbarlabelaction.cpp b/kdeui/ktoolbarlabelaction.cpp index aab7717b8..005ce559e 100644 --- a/kdeui/ktoolbarlabelaction.cpp +++ b/kdeui/ktoolbarlabelaction.cpp @@ -68,7 +68,7 @@ KToolBarLabelAction::KToolBarLabelAction(TQLabel* label, : KWidgetAction(label, label->text(), cut, receiver, slot, parent, name), d(new KToolBarLabelActionPrivate) { - Q_ASSERT(TQString::fromLatin1("kde toolbar widget") == label->name()); + Q_ASSERT(TQString::tqfromLatin1("kde toolbar widget") == label->name()); init(); } @@ -83,10 +83,10 @@ void KToolBarLabelAction::init() d->m_label = static_cast<TQLabel*>(widget()); /* these lines were copied from Konqueror's KonqDraggableLabel class in konq_misc.cc */ - d->m_label->setBackgroundMode(Qt::PaletteButton); - d->m_label->setAlignment((TQApplication::reverseLayout() + d->m_label->setBackgroundMode(TQt::PaletteButton); + d->m_label->tqsetAlignment((TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | - Qt::AlignVCenter | Qt::ShowPrefix ); + Qt::AlignVCenter | TQt::ShowPrefix ); d->m_label->adjustSize(); } diff --git a/kdeui/ktoolbarradiogroup.cpp b/kdeui/ktoolbarradiogroup.cpp index ab8e50e08..190b1e395 100644 --- a/kdeui/ktoolbarradiogroup.cpp +++ b/kdeui/ktoolbarradiogroup.cpp @@ -53,15 +53,15 @@ void KToolBarRadioGroup::addButton (int id) void KToolBarRadioGroup::removeButton (int id) { - if (!buttons->find(id)) + if (!buttons->tqfind(id)) return; - buttons->find(id)->setRadio(false); + buttons->tqfind(id)->setRadio(false); buttons->remove(id); } void KToolBarRadioGroup::slotToggled(int id) { - if (buttons->find(id) && buttons->find(id)->isOn()) + if (buttons->tqfind(id) && buttons->tqfind(id)->isOn()) { TQIntDictIterator<KToolBarButton> it(*buttons); while (it.current()) diff --git a/kdeui/ktoolbarradiogroup.h b/kdeui/ktoolbarradiogroup.h index 2fbf08174..f0e793bf2 100644 --- a/kdeui/ktoolbarradiogroup.h +++ b/kdeui/ktoolbarradiogroup.h @@ -46,7 +46,7 @@ class KToolBarRadioGroupPrivate; * * @author Sven Radej <radej@kde.org> */ -class KDEUI_EXPORT KToolBarRadioGroup : public QObject +class KDEUI_EXPORT KToolBarRadioGroup : public TQObject { Q_OBJECT diff --git a/kdeui/kurllabel.cpp b/kdeui/kurllabel.cpp index d4d4ff7c0..884ff6a59 100644 --- a/kdeui/kurllabel.cpp +++ b/kdeui/kurllabel.cpp @@ -87,7 +87,7 @@ KURLLabel::KURLLabel (const TQString& url, const TQString& text, setFont (font()); setUseCursor (true); setLinkColor (d->LinkColor); - setFocusPolicy( TQWidget::StrongFocus ); //better accessibility + setFocusPolicy( TQ_StrongFocus ); //better accessibility setMouseTracking (true); } @@ -98,7 +98,7 @@ KURLLabel::KURLLabel (TQWidget* parent, const char* name) setFont (font()); setUseCursor (true); setLinkColor (d->LinkColor); - setFocusPolicy( TQWidget::StrongFocus ); //better accessibility + setFocusPolicy( TQ_StrongFocus ); //better accessibility setMouseTracking (true); } @@ -122,17 +122,17 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e) switch (e->button()) { - case LeftButton: + case Qt::LeftButton: emit leftClickedURL (); emit leftClickedURL (d->URL); break; - case MidButton: + case Qt::MidButton: emit middleClickedURL (); emit middleClickedURL (d->URL); break; - case RightButton: + case Qt::RightButton: emit rightClickedURL (); emit rightClickedURL (d->URL); break; @@ -308,7 +308,7 @@ void KURLLabel::enterEvent (TQEvent* e) TQLabel::enterEvent (e); TQRect r( activeRect() ); - if (!r.contains( static_cast<TQMouseEvent*>(e)->pos() )) + if (!r.contains( TQT_TQMOUSEEVENT(e)->pos() )) return; if (!d->AltPixmap.isNull() && pixmap()) @@ -353,10 +353,10 @@ bool KURLLabel::event (TQEvent *e) { if (e && e->type() == TQEvent::ParentPaletteChange) { - // use parentWidget() unless you are a toplevel widget, then try qAapp - TQPalette p = parentWidget() ? parentWidget()->palette() : qApp->palette(); + // use tqparentWidget() unless you are a toplevel widget, then try qAapp + TQPalette p = tqparentWidget() ? tqparentWidget()->palette() : tqApp->palette(); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); - p.setColor(TQColorGroup::Foreground, palette().active().foreground()); + p.setColor(TQColorGroup::Foreground, tqpalette().active().foreground()); setPalette(p); d->LinkColor = KGlobalSettings::linkColor(); setLinkColor(d->LinkColor); @@ -367,12 +367,12 @@ bool KURLLabel::event (TQEvent *e) if (result && hasFocus()) { TQPainter p(this); TQRect r( activeRect() ); - style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, tqcolorGroup() ); } return result; } else if (e->type() == TQEvent::KeyPress) { - TQKeyEvent* ke = static_cast<TQKeyEvent*>(e); + TQKeyEvent* ke = TQT_TQKEYEVENT(e); if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) { setLinkColor (d->HighlightedLinkColor); d->Timer->start (300); @@ -384,12 +384,12 @@ bool KURLLabel::event (TQEvent *e) } else if (e->type() == TQEvent::MouseButtonPress) { TQRect r( activeRect() ); - d->MousePressed = r.contains(static_cast<TQMouseEvent*>(e)->pos()); + d->MousePressed = r.contains(TQT_TQMOUSEEVENT(e)->pos()); } else if (e->type() == TQEvent::MouseMove) { if (d->Cursor) { TQRect r( activeRect() ); - bool inside = r.contains(static_cast<TQMouseEvent*>(e)->pos()); + bool inside = r.contains(TQT_TQMOUSEEVENT(e)->pos()); if (d->WasInsideRect != inside) { if (inside) TQLabel::setCursor(*d->Cursor); @@ -407,7 +407,7 @@ TQRect KURLLabel::activeRect() const TQRect r( contentsRect() ); if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed))) return r; //fixed size is sometimes used with pixmap - int hAlign = TQApplication::horizontalAlignment( alignment() ); + int hAlign = TQApplication::horizontalAlignment( tqalignment() ); int indentX = (hAlign && indent()>0) ? indent() : 0; TQFontMetrics fm(font()); r.setWidth( QMIN(fm.width(text()), r.width())); @@ -428,17 +428,17 @@ void KURLLabel::setMargin( int margin ) d->MarginAltered = true; } -void KURLLabel::setFocusPolicy( FocusPolicy policy ) +void KURLLabel::setFocusPolicy( TQ_FocusPolicy policy ) { TQLabel::setFocusPolicy(policy); if (!d->MarginAltered) { - TQLabel::setMargin(policy == NoFocus ? 0 : 3); //better default : better look when focused + TQLabel::setMargin(policy == TQ_NoFocus ? 0 : 3); //better default : better look when focused } } -void KURLLabel::setSizePolicy ( TQSizePolicy policy ) +void KURLLabel::tqsetSizePolicy ( TQSizePolicy policy ) { - TQLabel::setSizePolicy(policy); + TQLabel::tqsetSizePolicy(policy); if (!d->MarginAltered && policy.horData()==TQSizePolicy::Fixed && policy.verData()==TQSizePolicy::Fixed) { TQLabel::setMargin(0); //better default : better look when fixed size } diff --git a/kdeui/kurllabel.h b/kdeui/kurllabel.h index b39d65d92..30ef78a39 100644 --- a/kdeui/kurllabel.h +++ b/kdeui/kurllabel.h @@ -68,7 +68,7 @@ class TQPixmap; * @version $Id$ * */ -class KDEUI_EXPORT KURLLabel : public QLabel +class KDEUI_EXPORT KURLLabel : public TQLabel { Q_OBJECT Q_PROPERTY (TQString url READ url WRITE setURL) @@ -161,12 +161,12 @@ public: /** * Reimplemented for internal reasons, the API is not affected. */ - virtual void setFocusPolicy ( FocusPolicy policy ); + virtual void setFocusPolicy ( TQ_FocusPolicy policy ); /** * Reimplemented for internal reasons, the API is not affected. */ - virtual void setSizePolicy ( TQSizePolicy ); + virtual void tqsetSizePolicy ( TQSizePolicy ); public slots: /** diff --git a/kdeui/kwhatsthismanager.cpp b/kdeui/kwhatsthismanager.cpp index a2f3cf0f6..0ec05e5c4 100644 --- a/kdeui/kwhatsthismanager.cpp +++ b/kdeui/kwhatsthismanager.cpp @@ -26,7 +26,7 @@ KWhatsThisManager *KWhatsThisManager::s_instance = 0; -class KWhatsThisUndefined : public QWhatsThis +class KWhatsThisUndefined : public TQWhatsThis { public: KWhatsThisUndefined (TQWidget *); @@ -52,8 +52,8 @@ TQString KWhatsThisUndefined::text (const TQPoint &) " describe the widget, you are welcome to <a href=\"submit" "-whatsthis\">send us your own \"What's This?\" help</a> for it."); TQString parent; - if (m_widget -> parentWidget ()) - parent = TQWhatsThis::textFor (m_widget -> parentWidget ()); + if (m_widget -> tqparentWidget ()) + parent = TQWhatsThis::textFor (m_widget -> tqparentWidget ()); if (parent != txt) if (! parent . isEmpty ()) return parent; @@ -68,11 +68,11 @@ bool KWhatsThisUndefined::clicked (const TQString& href) body . append ("Widget text: '" + (m_widget -> property ("text") . toString ()) + "'\n"); TQString dsc = TQString ("current --> ") + m_widget -> name (); dsc . append (TQString (" (") + m_widget -> className () + ")\n"); - for (w = m_widget; w && w != m_widget -> topLevelWidget (); w = w -> parentWidget ()) { + for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> tqparentWidget ()) { dsc . append (w -> name ()); dsc . append (TQString (" (") + w -> className () + ")\n"); } - w = m_widget -> topLevelWidget (); + w = m_widget -> tqtopLevelWidget (); if (w) { dsc . append ("toplevel --> "); dsc . append (w -> name ()); @@ -80,7 +80,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href) } body . append (dsc); TQString subj ("What's This submission: "); - subj . append (qApp -> argv () [0]); + subj . append (tqApp -> argv () [0]); body . append ("\nPlease type in your what's this help between these lines: " "\n--%-----------------------------------------------------------------------\n" "\n--%-----------------------------------------------------------------------"); @@ -99,7 +99,7 @@ void KWhatsThisManager::init () KWhatsThisManager::KWhatsThisManager () { // go away... - // qApp -> installEventFilter (this); + // tqApp -> installEventFilter (this); } bool KWhatsThisManager::eventFilter (TQObject * /*o*/, TQEvent *e) diff --git a/kdeui/kwhatsthismanager_p.h b/kdeui/kwhatsthismanager_p.h index f797dc4d3..919ffd197 100644 --- a/kdeui/kwhatsthismanager_p.h +++ b/kdeui/kwhatsthismanager_p.h @@ -43,7 +43,7 @@ class TQTextEdit; * @see QWhatsThis * @author Peter Rockai (mornfall) <mornfall@danill.sk> **/ -class KDEUI_EXPORT KWhatsThisManager : public QObject +class KDEUI_EXPORT KWhatsThisManager : public TQObject { Q_OBJECT public: diff --git a/kdeui/kwindowinfo.h b/kdeui/kwindowinfo.h index efd797c91..167d3e0a9 100644 --- a/kdeui/kwindowinfo.h +++ b/kdeui/kwindowinfo.h @@ -38,7 +38,7 @@ * @author Richard Moore, rich@kde.org * @since 3.1 */ -class KDEUI_EXPORT KWindowInfo : public QObject +class KDEUI_EXPORT KWindowInfo : public TQObject { Q_OBJECT diff --git a/kdeui/kwindowlistmenu.cpp b/kdeui/kwindowlistmenu.cpp index de9cd0c08..10538a67c 100644 --- a/kdeui/kwindowlistmenu.cpp +++ b/kdeui/kwindowlistmenu.cpp @@ -85,7 +85,7 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection: KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) : KPopupMenu(parent, name) { - kwin_module = new KWinModule(this); + kwin_module = new KWinModule(TQT_TQOBJECT(this)); connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); } @@ -186,7 +186,7 @@ void KWindowListMenu::init() } // Avoid creating unwanted accelerators. - itemText.replace('&', TQString::fromLatin1("&&")); + itemText.replace('&', TQString::tqfromLatin1("&&")); insertItem( pm, itemText, i); map.insert(i, info->win()); if (info->win() == active_window) @@ -242,12 +242,12 @@ void KWindowListMenu::selectActiveWindow() void KWindowListMenu::slotUnclutterWindows() { - kapp->dcopClient()->send(kwinName(), "KWinInterface", "unclutterDesktop()", ""); + kapp->dcopClient()->send(kwinName(), "KWinInterface", "unclutterDesktop()", TQString("")); } void KWindowListMenu::slotCascadeWindows() { - kapp->dcopClient()->send(kwinName(), "KWinInterface", "cascadeDesktop()", ""); + kapp->dcopClient()->send(kwinName(), "KWinInterface", "cascadeDesktop()", TQString("")); } void KWindowListMenu::virtual_hook( int id, void* data ) diff --git a/kdeui/kwindowlistmenu.h b/kdeui/kwindowlistmenu.h index 4b69799d2..3e05cf63f 100644 --- a/kdeui/kwindowlistmenu.h +++ b/kdeui/kwindowlistmenu.h @@ -28,6 +28,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpopupmenu.h> #include <tqmap.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 // not yet available for non-X11 class KWinModule; diff --git a/kdeui/kwizard.h b/kdeui/kwizard.h index 81a2c2d65..977ea5d86 100644 --- a/kdeui/kwizard.h +++ b/kdeui/kwizard.h @@ -43,7 +43,7 @@ * @author Harri Porten <porten@kde.org> * @version 0.3 */ -class KDEUI_EXPORT KWizard : public QWizard +class KDEUI_EXPORT KWizard : public TQWizard { Q_OBJECT public: diff --git a/kdeui/kwordwrap.cpp b/kdeui/kwordwrap.cpp index 9c6427eb5..0bdcf52dd 100644 --- a/kdeui/kwordwrap.cpp +++ b/kdeui/kwordwrap.cpp @@ -35,7 +35,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla { KWordWrap* kw = new KWordWrap( r ); // The wordwrap algorithm - // The variable names and the global shape of the algorithm are inspired + // The variable names and the global tqshape of the algorithm are inspired // from QTextFormatterBreakWords::format(). //kdDebug() << "KWordWrap::formatText " << str << " r=" << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << endl; int height = fm.height(); @@ -198,7 +198,7 @@ void KWordWrap::drawFadeoutText(TQPainter *p, int x, int y, int maxW, p->drawText( x, y, t.left( tl - 3 ) ); x += fm.width( t.left( tl - 3 ) ); } - int n = QMIN( tl, 3); + int n = TQMIN( tl, 3); for (int i = 0; i < n; i++) { p->setPen( mixColors( 0.70 - i * 0.25, textColor, bgColor ) ); TQString s( t.at( tl - n + i ) ); diff --git a/kdeui/kwordwrap.h b/kdeui/kwordwrap.h index 22fcf940a..5971525da 100644 --- a/kdeui/kwordwrap.h +++ b/kdeui/kwordwrap.h @@ -91,17 +91,17 @@ public: /** * Draw the text that has been previously wrapped, at position x,y. - * Flags are for alignment, e.g. Qt::AlignHCenter. Default is + * Flags are for tqalignment, e.g. Qt::AlignHCenter. Default is * Qt::AlignAuto. * @param painter the TQPainter to use. * @param x the horizontal position of the text * @param y the vertical position of the text - * @param flags the ORed text alignment flags from the Qt namespace, + * @param flags the ORed text tqalignment flags from the Qt namespace, * ORed with FadeOut if you want the text to fade out if it * does not fit (the @p painter's background must be set * accordingly) */ - void drawText( TQPainter *painter, int x, int y, int flags = Qt::AlignAuto ) const; + void drawText( TQPainter *painter, int x, int y, int flags = TQt::AlignAuto ) const; /** * Destructor. diff --git a/kdeui/kxmlguibuilder.cpp b/kdeui/kxmlguibuilder.cpp index 305ce135c..e6412fa6d 100644 --- a/kdeui/kxmlguibuilder.cpp +++ b/kdeui/kxmlguibuilder.cpp @@ -70,24 +70,24 @@ KXMLGUIBuilder::KXMLGUIBuilder( TQWidget *widget ) d = new KXMLGUIBuilderPrivate; d->m_widget = widget; - d->tagMainWindow = TQString::fromLatin1( "mainwindow" ); - d->tagMenuBar = TQString::fromLatin1( "menubar" ); - d->tagMenu = TQString::fromLatin1( "menu" ); - d->tagToolBar = TQString::fromLatin1( "toolbar" ); - d->tagStatusBar = TQString::fromLatin1( "statusbar" ); + d->tagMainWindow = TQString::tqfromLatin1( "mainwindow" ); + d->tagMenuBar = TQString::tqfromLatin1( "menubar" ); + d->tagMenu = TQString::tqfromLatin1( "menu" ); + d->tagToolBar = TQString::tqfromLatin1( "toolbar" ); + d->tagStatusBar = TQString::tqfromLatin1( "statusbar" ); - d->tagSeparator = TQString::fromLatin1( "separator" ); - d->tagTearOffHandle = TQString::fromLatin1( "tearoffhandle" ); - d->tagMenuTitle = TQString::fromLatin1( "title" ); + d->tagSeparator = TQString::tqfromLatin1( "separator" ); + d->tagTearOffHandle = TQString::tqfromLatin1( "tearoffhandle" ); + d->tagMenuTitle = TQString::tqfromLatin1( "title" ); - d->attrName = TQString::fromLatin1( "name" ); - d->attrLineSeparator = TQString::fromLatin1( "lineseparator" ); + d->attrName = TQString::tqfromLatin1( "name" ); + d->attrLineSeparator = TQString::tqfromLatin1( "lineseparator" ); - d->attrText1 = TQString::fromLatin1( "text" ); - d->attrText2 = TQString::fromLatin1( "Text" ); - d->attrContext = TQString::fromLatin1( "context" ); + d->attrText1 = TQString::tqfromLatin1( "text" ); + d->attrText2 = TQString::tqfromLatin1( "Text" ); + d->attrContext = TQString::tqfromLatin1( "context" ); - d->attrIcon = TQString::fromLatin1( "icon" ); + d->attrIcon = TQString::tqfromLatin1( "icon" ); d->m_instance = 0; d->m_client = 0; @@ -117,7 +117,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ if ( element.tagName().lower() == d->tagMainWindow ) { KMainWindow *mainwindow = 0; - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) mainwindow = static_cast<KMainWindow *>(d->m_widget); return mainwindow; @@ -127,7 +127,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ { KMenuBar *bar; - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) bar = static_cast<KMainWindow *>(d->m_widget)->menuBar(); else bar = new KMenuBar( d->m_widget ); @@ -145,8 +145,8 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ // And we don't want to set the parent for a standalone popupmenu, // otherwise its shortcuts appear. TQWidget* p = parent; - while ( p && !::qt_cast<KMainWindow *>( p ) ) - p = p->parentWidget(); + while ( p && !::tqqt_cast<KMainWindow *>( p ) ) + p = p->tqparentWidget(); TQCString name = element.attribute( d->attrName ).utf8(); @@ -181,14 +181,14 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ pix = SmallIconSet( icon, 16, instance ); } - if ( parent && ::qt_cast<KMenuBar *>( parent ) ) + if ( parent && ::tqqt_cast<KMenuBar *>( parent ) ) { if ( !icon.isEmpty() ) id = static_cast<KMenuBar *>(parent)->insertItem( pix, i18nText, popup, -1, index ); else id = static_cast<KMenuBar *>(parent)->insertItem( i18nText, popup, -1, index ); } - else if ( parent && ::qt_cast<TQPopupMenu *>( parent ) ) + else if ( parent && ::tqqt_cast<TQPopupMenu *>( parent ) ) { if ( !icon.isEmpty() ) id = static_cast<TQPopupMenu *>(parent)->insertItem( pix, i18nText, popup, -1, index ); @@ -205,13 +205,13 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ TQCString name = element.attribute( d->attrName ).utf8(); - KToolBar *bar = static_cast<KToolBar*>(d->m_widget->child( name, "KToolBar" )); + KToolBar *bar = static_cast<KToolBar*>(TQT_TQWIDGET(d->m_widget->child( name, "KToolBar" ))); if( !bar ) { bar = new KToolBar( d->m_widget, name, honor, false ); } - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) { if ( d->m_client && !d->m_client->xmlFile().isEmpty() ) bar->setXMLGUIClient( d->m_client ); @@ -224,7 +224,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ if ( element.tagName().lower() == d->tagStatusBar ) { - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) { KMainWindow *mainWin = static_cast<KMainWindow *>(d->m_widget); mainWin->statusBar()->show(); @@ -241,26 +241,26 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD { // Warning parent can be 0L - if ( ::qt_cast<TQPopupMenu *>( container ) ) + if ( ::tqqt_cast<TQPopupMenu *>( container ) ) { if ( parent ) { - if ( ::qt_cast<KMenuBar *>( parent ) ) + if ( ::tqqt_cast<KMenuBar *>( parent ) ) static_cast<KMenuBar *>(parent)->removeItem( id ); - else if ( ::qt_cast<TQPopupMenu *>( parent ) ) + else if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) static_cast<TQPopupMenu *>(parent)->removeItem( id ); } delete container; } - else if ( ::qt_cast<KToolBar *>( container ) ) + else if ( ::tqqt_cast<KToolBar *>( container ) ) { KToolBar *tb = static_cast<KToolBar *>( container ); tb->saveState( element ); delete tb; } - else if ( ::qt_cast<KMenuBar *>( container ) ) + else if ( ::tqqt_cast<KMenuBar *>( container ) ) { KMenuBar *mb = static_cast<KMenuBar *>( container ); mb->hide(); @@ -269,9 +269,9 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD // sure that TQMainWindow::d->mb does not point to a deleted // menubar object. } - else if ( ::qt_cast<KStatusBar *>( container ) ) + else if ( ::tqqt_cast<KStatusBar *>( container ) ) { - if ( ::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( ::tqqt_cast<KMainWindow *>( d->m_widget ) ) container->hide(); else delete static_cast<KStatusBar *>(container); @@ -291,7 +291,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo { if ( element.tagName().lower() == d->tagSeparator ) { - if ( ::qt_cast<TQPopupMenu *>( parent ) ) + if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) { // Don't insert multiple separators in a row TQPopupMenu *menu = static_cast<TQPopupMenu *>(parent); @@ -317,9 +317,9 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo else return menu->insertSeparator( index ); } - else if ( ::qt_cast<TQMenuBar *>( parent ) ) + else if ( ::tqqt_cast<TQMenuBar *>( parent ) ) return static_cast<TQMenuBar *>(parent)->insertSeparator( index ); - else if ( ::qt_cast<KToolBar *>( parent ) ) + else if ( ::tqqt_cast<KToolBar *>( parent ) ) { KToolBar *bar = static_cast<KToolBar *>( parent ); @@ -332,7 +332,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo TQDomAttr attr = attributes.item( i ).toAttr(); if ( attr.name().lower() == d->attrLineSeparator && - attr.value().lower() == TQString::fromLatin1("false") ) + attr.value().lower() == TQString::tqfromLatin1("false") ) { isLineSep = false; break; @@ -351,12 +351,12 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo } else if ( element.tagName().lower() == d->tagTearOffHandle ) { - if ( ::qt_cast<TQPopupMenu *>( parent ) && KGlobalSettings::insertTearOffHandle()) + if ( ::tqqt_cast<TQPopupMenu *>( parent ) && KGlobalSettings::insertTearOffHandle()) return static_cast<TQPopupMenu *>(parent)->insertTearOffHandle( -1, index ); } else if ( element.tagName().lower() == d->tagMenuTitle ) { - if ( ::qt_cast<KPopupMenu *>( parent ) ) + if ( ::tqqt_cast<KPopupMenu *>( parent ) ) { TQString i18nText; TQCString text = element.text().utf8(); @@ -389,11 +389,11 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo void KXMLGUIBuilder::removeCustomElement( TQWidget *parent, int id ) { - if ( ::qt_cast<TQPopupMenu *>( parent ) ) + if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) static_cast<TQPopupMenu *>(parent)->removeItem( id ); - else if ( ::qt_cast<TQMenuBar *>( parent ) ) + else if ( ::tqqt_cast<TQMenuBar *>( parent ) ) static_cast<TQMenuBar *>(parent)->removeItem( id ); - else if ( ::qt_cast<KToolBar *>( parent ) ) + else if ( ::tqqt_cast<KToolBar *>( parent ) ) static_cast<KToolBar *>(parent)->removeItemDelayed( id ); } @@ -421,7 +421,7 @@ void KXMLGUIBuilder::setBuilderInstance( KInstance *instance ) void KXMLGUIBuilder::finalizeGUI( KXMLGUIClient * ) { - if ( !d->m_widget || !::qt_cast<KMainWindow *>( d->m_widget ) ) + if ( !d->m_widget || !::tqqt_cast<KMainWindow *>( d->m_widget ) ) return; #if 0 KToolBar *toolbar = 0; diff --git a/kdeui/kxmlguiclient.cpp b/kdeui/kxmlguiclient.cpp index f857f3109..cfe7e6a8f 100644 --- a/kdeui/kxmlguiclient.cpp +++ b/kdeui/kxmlguiclient.cpp @@ -143,7 +143,7 @@ TQString KXMLGUIClient::localXMLFile() const if ( !TQDir::isRelativePath(d->m_xmlFile) ) return TQString::null; // can't save anything here - return locateLocal( "data", TQString::fromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile ); + return locateLocal( "data", TQString::tqfromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile ); } @@ -178,7 +178,7 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo { TQString doc; - TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + _file; + TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + _file; TQStringList allFiles = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", _file ); @@ -269,7 +269,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, // tag, in any event and just replace the old with the new if ( additive.attribute(attrNoMerge) == attrOne ) // ### use toInt() instead? (Simon) { - base.parentNode().replaceChild(additive, base); + base.tqparentNode().tqreplaceChild(additive, base); return true; } @@ -291,7 +291,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, if ( tag == tagAction ) { TQCString name = e.attribute( attrName ).utf8(); // WABA - if ( !actionCollection->action( name ) || + if ( !actionCollection->action( name.data() ) || (kapp && !kapp->authorizeKAction(name))) { // remove this child as we aren't using it @@ -452,7 +452,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, // if base contains an implemented action, then we must not get // deleted (note that the actionCollection contains both, // "global" and "local" actions - if ( actionCollection->action( e.attribute( attrName ).utf8() ) ) + if ( actionCollection->action( e.attribute( attrName ).utf8().data() ) ) { deleteMe = false; break; @@ -699,7 +699,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri else { TQString f = (*local).file; - TQString backup = f + TQString::fromLatin1( ".backup" ); + TQString backup = f + TQString::tqfromLatin1( ".backup" ); TQDir dir; dir.rename( f, backup ); } @@ -734,7 +734,7 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) case ST_AFTER_OPEN: { //Jump to gui.. - int guipos = xml.find("gui", pos, false /*case-insensitive*/); + int guipos = xml.tqfind("gui", pos, false /*case-insensitive*/); if (guipos == -1) return TQString::null; //Reject @@ -747,7 +747,7 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) break; case ST_EXPECT_VERSION: { - int verpos = xml.find("version=\"", pos, false /*case-insensitive*/); + int verpos = xml.tqfind("version=\"", pos, false /*case-insensitive*/); if (verpos == -1) return TQString::null; //Reject @@ -760,9 +760,9 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) unsigned int endpos; for (endpos = pos; endpos < xml.length(); endpos++) { - if (xml[endpos].unicode() >= '0' && xml[endpos].unicode() <= '9') + if (xml[endpos].tqunicode() >= '0' && xml[endpos].tqunicode() <= '9') continue; //Number.. - if (xml[endpos].unicode() == '"') //End of parameter + if (xml[endpos].tqunicode() == '"') //End of parameter break; else //This shouldn't be here.. { @@ -810,7 +810,7 @@ KXMLGUIClient::ActionPropertiesMap KXMLGUIClient::extractActionProperties( const if ( actionName.isEmpty() ) continue; - TQMap<TQString, TQMap<TQString, TQString> >::Iterator propIt = properties.find( actionName ); + TQMap<TQString, TQMap<TQString, TQString> >::Iterator propIt = properties.tqfind( actionName ); if ( propIt == properties.end() ) propIt = properties.insert( actionName, TQMap<TQString, TQString>() ); @@ -874,7 +874,7 @@ void KXMLGUIClient::addStateActionEnabled(const TQString& state, stateChange.actionsToEnable.append( action ); //kdDebug() << "KXMLGUIClient::addStateActionEnabled( " << state << ", " << action << ")" << endl; - m_actionsStateMap.replace( state, stateChange ); + m_actionsStateMap.tqreplace( state, stateChange ); } @@ -886,7 +886,7 @@ void KXMLGUIClient::addStateActionDisabled(const TQString& state, stateChange.actionsToDisable.append( action ); //kdDebug() << "KXMLGUIClient::addStateActionDisabled( " << state << ", " << action << ")" << endl; - m_actionsStateMap.replace( state, stateChange ); + m_actionsStateMap.tqreplace( state, stateChange ); } diff --git a/kdeui/kxmlguifactory.cpp b/kdeui/kxmlguifactory.cpp index c166df861..5778e74d0 100644 --- a/kdeui/kxmlguifactory.cpp +++ b/kdeui/kxmlguifactory.cpp @@ -110,7 +110,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu xml_file = filename; else { - xml_file = locate("data", TQString::fromLatin1(instance->instanceName() + '/' ) + filename); + xml_file = locate("data", TQString::tqfromLatin1(instance->instanceName() + '/' ) + filename); if ( !TQFile::exists( xml_file ) ) xml_file = locate( "data", filename ); } @@ -120,7 +120,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu { kdError(240) << "No such XML file " << filename << endl; if ( never_null ) - return TQString::fromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" ); + return TQString::tqfromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" ); else return TQString::null; } @@ -146,7 +146,7 @@ bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc, TQString xml_file(filename); if (TQDir::isRelativePath(xml_file)) - xml_file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + xml_file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + filename); TQFile file( xml_file ); @@ -240,7 +240,7 @@ void KXMLGUIFactory::addClient( KXMLGUIClient *client ) d->guiClient = client; // add this client to our client list - if ( !d->m_clients.containsRef( client ) ) + if ( !d->m_clients.tqcontainsRef( client ) ) d->m_clients.append( client ); else kdDebug(1002) << "XMLGUI client already added " << client << endl; @@ -566,7 +566,7 @@ int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSe TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc ) { - const TQString tagActionProp = TQString::fromLatin1("ActionProperties"); + const TQString tagActionProp = TQString::tqfromLatin1("ActionProperties"); // first, lets see if we have existing properties TQDomElement elem; TQDomNode it = doc.documentElement().firstChild(); diff --git a/kdeui/kxmlguifactory.h b/kdeui/kxmlguifactory.h index fa534e093..59b75c14b 100644 --- a/kdeui/kxmlguifactory.h +++ b/kdeui/kxmlguifactory.h @@ -59,7 +59,7 @@ class BuildHelper; * according to the XML and the merging rules of previously inserted clients. Container widgets * are built via a KXMLGUIBuilder , which has to be provided with the KXMLGUIFactory constructor. */ -class KDEUI_EXPORT KXMLGUIFactory : public QObject +class KDEUI_EXPORT KXMLGUIFactory : public TQObject { friend class KXMLGUI::BuildHelper; Q_OBJECT diff --git a/kdeui/kxmlguifactory_p.cpp b/kdeui/kxmlguifactory_p.cpp index 4bd5ad68e..f7955f471 100644 --- a/kdeui/kxmlguifactory_p.cpp +++ b/kdeui/kxmlguifactory_p.cpp @@ -136,7 +136,7 @@ ContainerNode *ContainerNode::findContainer( const TQString &name, const TQStrin { for (; nIt.current(); ++nIt ) if ( nIt.current()->name == name && - !excludeList->containsRef( nIt.current()->container ) ) + !excludeList->tqcontainsRef( nIt.current()->container ) ) { res = nIt.current(); break; @@ -149,7 +149,7 @@ ContainerNode *ContainerNode::findContainer( const TQString &name, const TQStrin for (; nIt.current(); ++nIt ) { if ( nIt.current()->tagName == tagName && - !excludeList->containsRef( nIt.current()->container ) + !excludeList->tqcontainsRef( nIt.current()->container ) /* * It is a bad idea to also compare the client, because * we don't want to do so in situations like these: @@ -226,7 +226,7 @@ void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::I TQString k( mergingIdx.mergingName ); - if ( k.find( tagActionList ) == -1 ) + if ( k.tqfind( tagActionList ) == -1 ) return; k = k.mid( tagActionList.length() ); @@ -268,7 +268,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: TQString k = mergingIdx.mergingName; - if ( k.find( tagActionList ) == -1 ) + if ( k.tqfind( tagActionList ) == -1 ) return; k = k.mid( tagActionList.length() ); @@ -283,7 +283,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: TQString::null, mergingIndices.end() ); - ActionListMap::Iterator lIt( client->actionLists.find( k ) ); + ActionListMap::Iterator lIt( client->actionLists.tqfind( k ) ); if ( lIt == client->actionLists.end() ) return; @@ -568,9 +568,9 @@ void BuildHelper::processElement( const TQDomElement &e ) bool isActionTag = ( tag == tagAction ); - if ( isActionTag || customTags.findIndex( tag ) != -1 ) + if ( isActionTag || customTags.tqfindIndex( tag ) != -1 ) processActionOrCustomElement( e, isActionTag ); - else if ( containerTags.findIndex( tag ) != -1 ) + else if ( containerTags.tqfindIndex( tag ) != -1 ) processContainerElement( e, tag, currName ); else if ( tag == tagMerge || tag == tagDefineGroup || tag == tagActionList ) processMergeElement( tag, currName, e ); diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index 7ec1db3a2..fa21446ed 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -150,10 +150,10 @@ namespace { // L0200: This application wide event filter handles focus // issues in the embedded client. - class QXEmbedAppFilter : public QObject + class QXEmbedAppFilter : public TQObject { public: - QXEmbedAppFilter() { qApp->installEventFilter( this ); } + QXEmbedAppFilter() { tqApp->installEventFilter( this ); } ~QXEmbedAppFilter() { } bool eventFilter( TQObject *, TQEvent * ); }; @@ -174,7 +174,7 @@ static XKeyEvent last_key_event; // the toplevel window is embedded using the XEMBED protocol (L0680). // Handle `parentWinId' then records the id of the embedding window. -class QPublicWidget : public QWidget +class QPublicWidget : public TQWidget { public: QTLWExtra* topData() { return TQWidget::topData(); } @@ -311,8 +311,8 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // active and has just been given the Qt focus (L0614) or // because the widget already had the Qt focus and just became // active (L0615). - if ( qApp->focusWidget() == o && - ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->embedded ) { + if ( TQT_BASE_OBJECT(tqApp->tqfocusWidget()) == TQT_BASE_OBJECT(o) && + ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) { TQFocusEvent* fe = (TQFocusEvent*) e; if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse || fe->reason() == TQFocusEvent::Shortcut*/ ) { @@ -320,8 +320,12 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // Variable `obeyFocus' suggests that this is the result of mouse // activity in the client. The XEMBED_REQUEST_FOCUS message causes // the embedding widget to take the Qt focus (L2085). - WId window = ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->parentWinId; - focusMap->remove( qApp->focusWidget()->topLevelWidget() ); +#ifdef USE_QT4 + WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->effectiveWinId(); +#else // USE_QT4 + WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->parentWinId; +#endif // USE_QT4 + focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() ); sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS ); } else if ( fe->reason() == TQFocusEvent::ActiveWindow ) { // L0615: Both the embedder and the embedded client became active. @@ -329,20 +333,20 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // So we clear the Qt focus for now. If indeed the QXEmbed widget // has the focus, it will receive a FocusIn message (L1530) and // tell us to restore the focus (L0680, L0683). - focusMap->remove( qApp->focusWidget()->topLevelWidget() ); - focusMap->insert( qApp->focusWidget()->topLevelWidget(), - new TQGuardedPtr<TQWidget>(qApp->focusWidget()->topLevelWidget()->focusWidget() ) ); - // L0616: qApp->focusWidget() might belong to a modal dialog and not be - // equal to qApp->focusWidget()->topLevelWidget()->focusWidget() ! - qApp->focusWidget()->clearFocus(); + focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() ); + focusMap->insert( tqApp->tqfocusWidget()->tqtopLevelWidget(), + new TQGuardedPtr<TQWidget>(tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ) ); + // L0616: tqApp->tqfocusWidget() might belong to a modal dialog and not be + // equal to tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ! + tqApp->tqfocusWidget()->clearFocus(); // L0617: ??? [why not {obeyFocus=false; return true;} here?] } obeyFocus = false; } break; case TQEvent::KeyPress: - if (qApp->focusWidget() == o && - ((QPublicWidget*)qApp->focusWidget()->topLevelWidget())->topData()->embedded ) { + if (TQT_BASE_OBJECT(tqApp->tqfocusWidget()) == TQT_BASE_OBJECT(o) && + ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) { // L0620: The following code replaces the Qt code that // handles focus focus changes with the tab key. See the // XEMBED specification for details. The keypress event @@ -356,35 +360,47 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // (L0653, L0654) which then performs tab navigation // (L2081). TQKeyEvent *k = (TQKeyEvent *)e; - TQWidget *w = qApp->focusWidget(); + TQWidget *w = tqApp->tqfocusWidget(); // L0621: The following tests are copied from TQWidget::event(). bool res = false; bool tabForward = true; if ( !(k->state() & ControlButton || k->state() & AltButton) ) { if ( k->key() == Key_Backtab || (k->key() == Key_Tab && (k->state() & ShiftButton)) ) { +#ifdef USE_QT4 + res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false ); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Backtab ); res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false ); TQFocusEvent::resetReason(); +#endif // USE_QT4 } else if ( k->key() == Key_Tab ) { +#ifdef USE_QT4 + res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true ); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Tab ); res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true ); TQFocusEvent::resetReason(); +#endif // USE_QT4 } } if (res) { // L0625: We changed the focus because of tab/backtab key // Now check whether we have been looping around. TQFocusData *fd = ((QPublicWidget*)w)->focusData(); - WId window = ((QPublicWidget*)w->topLevelWidget())->topData()->parentWinId; +#ifdef USE_QT4 + WId window = ((QPublicWidget*)w->tqtopLevelWidget())->effectiveWinId(); +#else // USE_QT4 + WId window = ((QPublicWidget*)w->tqtopLevelWidget())->topData()->parentWinId; +#endif // USE_QT4 TQWidget *cw = 0; TQWidget *fw = fd->home(); if (tabForward && window) { - while (cw != w && cw != fw && cw != w->topLevelWidget()) + while (cw != w && cw != fw && cw != w->tqtopLevelWidget()) cw = fd->prev(); if (cw != w) sendXEmbedMessage( window, XEMBED_FOCUS_NEXT ); } else if (window) { - while (cw != w && cw != fw && cw != w->topLevelWidget()) + while (cw != w && cw != fw && cw != w->tqtopLevelWidget()) cw = fd->next(); if (cw != w) sendXEmbedMessage( window, XEMBED_FOCUS_PREV ); @@ -422,16 +438,21 @@ static int qxembed_x11_event_filter( XEvent* e) // L0671: Keep Qt message time up to date if ( msgtime > qt_x_time ) qt_x_time = msgtime; - TQWidget* w = TQWidget::find( e->xclient.window ); + TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); if ( !w ) break; switch ( message) { case XEMBED_EMBEDDED_NOTIFY: { // L0675: We just have been embedded into a XEMBED aware widget. - QTLWExtra *extra = ((QPublicWidget*)w->topLevelWidget())->topData(); + QTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData(); extra->embedded = 1; +#ifdef USE_QT4 + // [FIXME] + printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r"); +#else // USE_QT4 extra->parentWinId = e->xclient.data.l[3]; - w->topLevelWidget()->show(); +#endif // USE_QT4 + w->tqtopLevelWidget()->show(); break; } case XEMBED_WINDOW_ACTIVATE: { @@ -444,10 +465,10 @@ static int qxembed_x11_event_filter( XEvent* e) memset(&ev, 0, sizeof(ev)); ev.xfocus.display = qt_xdisplay(); ev.xfocus.type = XFocusIn; - ev.xfocus.window = w->topLevelWidget()->winId(); + ev.xfocus.window = w->tqtopLevelWidget()->winId(); ev.xfocus.mode = NotifyNormal; ev.xfocus.detail = NotifyAncestor; - qApp->x11ProcessEvent( &ev ); + tqApp->x11ProcessEvent( &ev ); } break; case XEMBED_WINDOW_DEACTIVATE: { @@ -458,10 +479,10 @@ static int qxembed_x11_event_filter( XEvent* e) memset(&ev, 0, sizeof(ev)); ev.xfocus.display = qt_xdisplay(); ev.xfocus.type = XFocusOut; - ev.xfocus.window = w->topLevelWidget()->winId(); + ev.xfocus.window = w->tqtopLevelWidget()->winId(); ev.xfocus.mode = NotifyNormal; ev.xfocus.detail = NotifyAncestor; - qApp->x11ProcessEvent( &ev ); + tqApp->x11ProcessEvent( &ev ); } break; case XEMBED_FOCUS_IN: @@ -469,11 +490,11 @@ static int qxembed_x11_event_filter( XEvent* e) { // L0681: Search saved focus widget. TQWidget* focusCurrent = 0; - TQGuardedPtr<TQWidget>* fw = focusMap->find( w->topLevelWidget() ); + TQGuardedPtr<TQWidget>* fw = focusMap->tqfind( w->tqtopLevelWidget() ); if ( fw ) { focusCurrent = *fw; // L0682: Remove it from the map - focusMap->remove( w->topLevelWidget() ); + focusMap->remove( w->tqtopLevelWidget() ); } switch ( detail ) { case XEMBED_FOCUS_CURRENT: @@ -483,25 +504,35 @@ static int qxembed_x11_event_filter( XEvent* e) if( QXEmbed* emb = dynamic_cast< QXEmbed* >( focusCurrent )) emb->updateEmbeddedFocus( true ); } - else if ( !w->topLevelWidget()->focusWidget() ) - w->topLevelWidget()->setFocus(); + else if ( !w->tqtopLevelWidget()->tqfocusWidget() ) + w->tqtopLevelWidget()->setFocus(); break; case XEMBED_FOCUS_FIRST: { // L0684: Search first widget in tab chain +#ifdef USE_QT4 + w->tqtopLevelWidget()->setFocus(); + ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Tab ); - w->topLevelWidget()->setFocus(); - ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true); + w->tqtopLevelWidget()->setFocus(); + ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true); TQFocusEvent::resetReason(); +#endif // USE_QT4 } break; case XEMBED_FOCUS_LAST: { // L0686: Search last widget in tab chain +#ifdef USE_QT4 + w->tqtopLevelWidget()->setFocus(); + ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Backtab ); - w->topLevelWidget()->setFocus(); - ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false); + w->tqtopLevelWidget()->setFocus(); + ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false); TQFocusEvent::resetReason(); +#endif // USE_QT4 } break; default: @@ -513,12 +544,12 @@ static int qxembed_x11_event_filter( XEvent* e) // L0688: Embedding application takes the focus away // We first record what the focus widget was // and clear the Qt focus. - if ( w->topLevelWidget()->focusWidget() ) { - if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget())) + if ( w->tqtopLevelWidget()->tqfocusWidget() ) { + if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->tqtopLevelWidget()->tqfocusWidget())) emb->updateEmbeddedFocus( false ); - focusMap->insert( w->topLevelWidget(), - new TQGuardedPtr<TQWidget>(w->topLevelWidget()->focusWidget() ) ); - w->topLevelWidget()->focusWidget()->clearFocus(); + focusMap->insert( w->tqtopLevelWidget(), + new TQGuardedPtr<TQWidget>(w->tqtopLevelWidget()->tqfocusWidget() ) ); + w->tqtopLevelWidget()->tqfocusWidget()->clearFocus(); } break; default: @@ -526,7 +557,7 @@ static int qxembed_x11_event_filter( XEvent* e) } } else if ( e->xclient.format == 32 && e->xclient.message_type ) { if ( e->xclient.message_type == qt_wm_protocols ) { - TQWidget* w = TQWidget::find( e->xclient.window ); + TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window )); if ( !w ) break; // L0690: This is for the embedding side! @@ -621,7 +652,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // whole embedding application. They compete between themselves and // against Qt (L0690, L0914, L1040, L1310, L1510, L1580). // This would be much simpler if implemented within Qt. - d->focusProxy = new TQWidget( topLevelWidget(), "xembed_focus" ); + d->focusProxy = new TQWidget( tqtopLevelWidget(), "xembed_focus" ); d->focusProxy->setGeometry( -1, -1, 1, 1 ); d->focusProxy->show(); // make sure it's shown - for XSetInputFocus @@ -631,7 +662,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // See L0660, L0671, L0685. initialize(); window = 0; - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); setKeyCompression( false ); // L0910: Trick Qt to create extraData(); @@ -656,13 +687,13 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // L0913: all application events pass through eventFilter(). // This is mostly used to force the X11 focus on the // proxy focus window. See L1300. - topLevelWidget()->installEventFilter( this ); - qApp->installEventFilter( this ); + tqtopLevelWidget()->installEventFilter( this ); + tqApp->installEventFilter( this ); // L0914: Start moving the X11 focus on the focus proxy window. // See L1581 to know why we do not use isActiveWindow(). - if ( qApp->activeWindow() == topLevelWidget() ) - if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) + if ( tqApp->activeWindow() == tqtopLevelWidget() ) + if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), RevertToParent, qt_x_time ); // L0915: ??? [drag&drop?] @@ -716,7 +747,7 @@ QXEmbed::~QXEmbed() int revert; XGetInputFocus( qt_xdisplay(), &focus, &revert ); if( focus == d->focusProxy->winId()) - XSetInputFocus( qt_xdisplay(), topLevelWidget()->winId(), RevertToParent, qt_x_time ); + XSetInputFocus( qt_xdisplay(), tqtopLevelWidget()->winId(), RevertToParent, qt_x_time ); // L01045: Delete our private data. delete d; } @@ -780,10 +811,10 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) switch ( e->type() ) { case TQEvent::WindowActivate: - if ( o == topLevelWidget() ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqtopLevelWidget()) ) { // L1310: Qt thinks the application window has just been activated. // Make sure the X11 focus is on the focus proxy window. See L0686. - if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) + if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) if (! hasFocus() ) XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(), RevertToParent, qt_x_time ); @@ -796,7 +827,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::WindowDeactivate: - if ( o == topLevelWidget() ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqtopLevelWidget()) ) { if (d->xplain) // L1321: Activation has changed. Grab state might change. See L2800. checkGrab(); @@ -808,9 +839,9 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) case TQEvent::Move: { TQWidget* pos = this; - while( pos != o && pos != topLevelWidget()) - pos = pos->parentWidget(); - if( pos == o ) { + while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(tqtopLevelWidget())) + pos = pos->tqparentWidget(); + if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) { // L1390: Send fake configure notify events whenever the // global position of the client changes. See L2900. TQPoint globalPos = mapToGlobal(TQPoint(0,0)); @@ -864,8 +895,8 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){ return; // L1510: This is a good time to set the X11 focus on the focus proxy window. // Except if the the embedding application itself is embedded into another. - if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) - if ( qApp->activeWindow() == topLevelWidget() ) + if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) + if ( tqApp->activeWindow() == tqtopLevelWidget() ) // L1511: Alter X focus only when window is active. // This is dual safety here because FocusIn implies this. // But see L1581 for an example where this really matters. @@ -913,8 +944,8 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){ // is properly set to the X11 focus widget. We do this because // the client application might have moved the X11 focus after // receiving the fake focus messages. - if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) - if ( qApp->activeWindow() == topLevelWidget() ) + if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded ) + if ( tqApp->activeWindow() == tqtopLevelWidget() ) // L1581: Alter X focus only when window is active. // The test above is not the same as isActiveWindow(). // Function isActiveWindow() also returns true when a modal @@ -950,7 +981,7 @@ static bool wstate_withdrawn( WId winid ) // L1610: Non managed windows have no WM_STATE property. // Returning true ensures that the loop L1711 stops. if ( r == Success && data && format == 32 ) { - Q_UINT32 *wstate = (Q_UINT32*)data; + TQ_UINT32 *wstate = (TQ_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); XFree( (char *)data ); } @@ -1004,7 +1035,7 @@ void QXEmbed::embed(WId w) // time to create the embedded application main window. Window parent = 0; get_parent(w, &parent); - kdDebug() << TQString("> before reparent: parent=0x%1").arg(parent,0,16) << endl; + kdDebug() << TQString(TQString("> before reparent: parent=0x%1").arg(parent,0,16)) << endl; for (int i = 0; i < 50; i++) { // this is done once more when finishing embedding, but it's done also here // just in case we crash before reaching that place @@ -1012,15 +1043,15 @@ void QXEmbed::embed(WId w) XAddToSaveSet( qt_xdisplay(), w ); XReparentWindow(qt_xdisplay(), w, winId(), 0, 0); if (get_parent(w, &parent) && parent == winId()) { - kdDebug() << TQString("> Loop %1: ").arg(i) - << TQString("> reparent of 0x%1").arg(w,0,16) - << TQString(" into 0x%1").arg(winId(),0,16) + kdDebug() << TQString(TQString("> Loop %1: ").arg(i)) + << TQString(TQString("> reparent of 0x%1").arg(w,0,16)) + << TQString(TQString(" into 0x%1").arg(winId(),0,16)) << TQString(" successful") << endl; break; } - kdDebug() << TQString("> Loop %1: ").arg(i) - << TQString("> reparent of 0x%1").arg(w,0,16) - << TQString(" into 0x%1").arg(winId(),0,16) + kdDebug() << TQString(TQString("> Loop %1: ").arg(i)) + << TQString(TQString("> reparent of 0x%1").arg(w,0,16)) + << TQString(TQString(" into 0x%1").arg(winId(),0,16)) << TQString(" failed") << endl; USLEEP(1000); } @@ -1138,9 +1169,13 @@ bool QXEmbed::x11Event( XEvent* e) if (d->xplain && d->xgrab) { // L2060: The passive grab has intercepted a mouse click // in the embedded client window. Take the focus. +#ifdef USE_QT4 + setFocus(); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Mouse ); setFocus(); TQFocusEvent::resetReason(); +#endif // USE_QT4 // L2064: Resume X11 event processing. XAllowEvents(qt_xdisplay(), ReplayPointer, CurrentTime); // L2065: Qt should not know about this. @@ -1176,15 +1211,23 @@ bool QXEmbed::x11Event( XEvent* e) break; // L2085: The client asks for the focus. case XEMBED_REQUEST_FOCUS: - if( ((QPublicWidget*)topLevelWidget())->topData()->embedded ) { - focusMap->remove( topLevelWidget() ); - focusMap->insert( topLevelWidget(), new TQGuardedPtr<TQWidget>( this )); - WId window = ((QPublicWidget*)topLevelWidget())->topData()->parentWinId; + if( ((QPublicWidget*)tqtopLevelWidget())->topData()->embedded ) { + focusMap->remove( tqtopLevelWidget() ); + focusMap->insert( tqtopLevelWidget(), new TQGuardedPtr<TQWidget>( this )); +#ifdef USE_QT4 + WId window = ((QPublicWidget*)tqtopLevelWidget())->effectiveWinId(); +#else // USE_QT4 + WId window = ((QPublicWidget*)tqtopLevelWidget())->topData()->parentWinId; +#endif // USE_QT4 sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS ); } else { +#ifdef USE_QT4 + setFocus(); +#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Mouse ); setFocus(); TQFocusEvent::resetReason(); +#endif // USE_QT4 } break; default: @@ -1276,7 +1319,12 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) XReparentWindow(qt_xdisplay(), client->winId(), window, 0, 0); // L2451: These two lines are redundant. See L0680. ((QXEmbed*)client)->topData()->embedded = true; +#ifdef USE_QT4 + // [FIXME] + printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r"); +#else // USE_QT4 ((QXEmbed*)client)->topData()->parentWinId = window; +#endif // USE_QT4 // L2452: This seems redundant because L2020 maps the window. // But calling show() might also set Qt internal flags. client->show(); @@ -1285,7 +1333,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) // L2500: Specifies that this widget can use additional space, -// and that it can survive on less than sizeHint(). +// and that it can survive on less than tqsizeHint(). TQSizePolicy QXEmbed::sizePolicy() const { return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); @@ -1293,13 +1341,13 @@ TQSizePolicy QXEmbed::sizePolicy() const // L2520: Returns a size sufficient for the embedded window -TQSize QXEmbed::sizeHint() const +TQSize QXEmbed::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } // L2550: Returns the minimum size specified by the embedded window. -TQSize QXEmbed::minimumSizeHint() const +TQSize QXEmbed::tqminimumSizeHint() const { int minw = 0; int minh = 0; diff --git a/kdeui/qxembed.h b/kdeui/qxembed.h index 3b345554f..c9dcac05d 100644 --- a/kdeui/qxembed.h +++ b/kdeui/qxembed.h @@ -25,6 +25,10 @@ #include <tqwidget.h> #include <kdelibs_export.h> +#ifdef Q_MOC_RUN +#define Q_WS_X11 +#endif // Q_MOC_RUN + #ifdef Q_WS_X11 class QXEmbedData; @@ -55,9 +59,10 @@ class QXEmbedData; * * @short The QXEmbed widget is a graphical socket that can embed an external X-Window. */ -class KDEUI_EXPORT QXEmbed : public QWidget +class KDEUI_EXPORT QXEmbed : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -183,8 +188,8 @@ public: bool autoDelete() const; /* Reimp */ - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; TQSizePolicy sizePolicy() const; bool eventFilter( TQObject *, TQEvent * ); bool customWhatsThis() const; diff --git a/kdeui/tests/itemcontainertest.h b/kdeui/tests/itemcontainertest.h index 9af239c60..4334bd805 100644 --- a/kdeui/tests/itemcontainertest.h +++ b/kdeui/tests/itemcontainertest.h @@ -9,7 +9,7 @@ class KListBox; class TQButtonGroup; class TQLabel; -class TopLevel : public QWidget +class TopLevel : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/kalphaicontest.h b/kdeui/tests/kalphaicontest.h index 6143b569d..201f96cd6 100644 --- a/kdeui/tests/kalphaicontest.h +++ b/kdeui/tests/kalphaicontest.h @@ -5,7 +5,7 @@ #include <kimageeffect.h> #include <kalphapainter.h> -class KAlphaTest : public QWidget +class KAlphaTest : public TQWidget { public: KAlphaTest(); diff --git a/kdeui/tests/kblendtest.cpp b/kdeui/tests/kblendtest.cpp index e2d36a575..59a57dc6a 100644 --- a/kdeui/tests/kblendtest.cpp +++ b/kdeui/tests/kblendtest.cpp @@ -11,7 +11,7 @@ KBlendWidget::KBlendWidget(TQWidget *parent, const char *name) :TQWidget(parent, name) { - bgnd = qRgb(255, 255, 255); + bgnd = tqRgb(255, 255, 255); image = TQImage("testimage.png"); diff --git a/kdeui/tests/kblendtest.h b/kdeui/tests/kblendtest.h index b0f4485dd..f35afbb5f 100644 --- a/kdeui/tests/kblendtest.h +++ b/kdeui/tests/kblendtest.h @@ -10,7 +10,7 @@ #include <tqwidget.h> #include <tqimage.h> -class KBlendWidget : public QWidget +class KBlendWidget : public TQWidget { public: KBlendWidget(TQWidget *parent=0, const char *name=0); diff --git a/kdeui/tests/kbuttonboxtest.cpp b/kdeui/tests/kbuttonboxtest.cpp index 1773c47f9..86850f0ce 100644 --- a/kdeui/tests/kbuttonboxtest.cpp +++ b/kdeui/tests/kbuttonboxtest.cpp @@ -37,8 +37,8 @@ int main(int argc, char **argv) { "the window!\n" "Press OK or Cancel when done" , w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); TQPushButton *b = bbox->addButton("OK"); @@ -65,8 +65,8 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are right aligned\n"\ "Try resizing the window!", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -91,8 +91,8 @@ int main(int argc, char **argv) { TQLabel *l = new TQLabel("Another common dialog\n\n"\ "OK and Cancel are middle aligned\n"\ "Try resizing the window!", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -120,8 +120,8 @@ int main(int argc, char **argv) { "the maximum width for all buttons\n" "since it will look ugly -- " "anyway, it works", w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -152,8 +152,8 @@ int main(int argc, char **argv) { "prevent this strange effect as seen\n" "the former example!" ,w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w); bbox->addStretch(1); @@ -182,8 +182,8 @@ int main(int argc, char **argv) { "to make vertically aligned buttons\n" "too?" ,w); - l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); - l->setMinimumSize(l->sizeHint()); + l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); + l->setMinimumSize(l->tqsizeHint()); tl->addWidget(l,1); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); TQPushButton *b = bbox->addButton("OK"); diff --git a/kdeui/tests/kcharselecttest.cpp b/kdeui/tests/kcharselecttest.cpp index facd17bca..5880c436a 100644 --- a/kdeui/tests/kcharselecttest.cpp +++ b/kdeui/tests/kcharselecttest.cpp @@ -7,7 +7,7 @@ int main (int argc,char **argv) KApplication app( argc, argv, "kcharselecttest" ); KCharSelect selector( 0, "char selector" ); - selector.resize( selector.sizeHint() ); + selector.resize( selector.tqsizeHint() ); selector.show(); selector.setCaption( "KCharSelect Test" ); diff --git a/kdeui/tests/kcolortest.cpp b/kdeui/tests/kcolortest.cpp index d4a5c2625..46f5b42bc 100644 --- a/kdeui/tests/kcolortest.cpp +++ b/kdeui/tests/kcolortest.cpp @@ -51,9 +51,9 @@ void KColorWidget::doIntensityLoop() for (int i=0;i<size; i++, qptr++) { qrgb=*(QRgb *)qptr; - *qptr=qRgb((int)(qRed(qrgb)*1./max), - (int)(qGreen(qrgb)*1./max), - (int)(qBlue(qrgb)*1./max)); + *qptr=tqRgb((int)(tqRed(qrgb)*1./max), + (int)(tqGreen(qrgb)*1./max), + (int)(tqBlue(qrgb)*1./max)); } } pixmap.convertFromImage(image); diff --git a/kdeui/tests/kcolortest.h b/kdeui/tests/kcolortest.h index ac8716d59..529a1ad74 100644 --- a/kdeui/tests/kcolortest.h +++ b/kdeui/tests/kcolortest.h @@ -5,7 +5,7 @@ #include <tqimage.h> #include <kpixmap.h> -class KColorWidget : public QWidget +class KColorWidget : public TQWidget { public: KColorWidget(TQWidget *parent=0, const char *name=0); diff --git a/kdeui/tests/kcomboboxtest.cpp b/kdeui/tests/kcomboboxtest.cpp index 44b849b44..e8fd35f7e 100644 --- a/kdeui/tests/kcomboboxtest.cpp +++ b/kdeui/tests/kcomboboxtest.cpp @@ -36,7 +36,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) TQHBox* hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); TQLabel* lbl = new TQLabel("&QCombobox:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" ); lbl->setBuddy (m_qc); @@ -48,7 +48,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&Read-Only Combo:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); @@ -61,7 +61,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&Editable Combo:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_rw = new KComboBox( true, hbox, "ReadWriteCombo" ); lbl->setBuddy (m_rw); @@ -78,7 +78,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel("&History Combo:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_hc = new KHistoryCombo( true, hbox, "HistoryCombo" ); lbl->setBuddy (m_hc); @@ -94,7 +94,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) hbox = new TQHBox(this); hbox->setSpacing (KDialog::spacingHint()); lbl = new TQLabel( "&Konq's Combo:", hbox); - lbl->setSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); + lbl->tqsetSizePolicy (TQSizePolicy::Maximum, TQSizePolicy::Preferred); m_konqc = new KComboBox( true, hbox, "KonqyCombo" ); lbl->setBuddy (m_konqc); diff --git a/kdeui/tests/kcomboboxtest.h b/kdeui/tests/kcomboboxtest.h index ac6d48338..6566c9097 100644 --- a/kdeui/tests/kcomboboxtest.h +++ b/kdeui/tests/kcomboboxtest.h @@ -9,7 +9,7 @@ class TQPushButton; class KComboBox; -class KComboBoxTest : public QWidget +class KComboBoxTest : public TQWidget { Q_OBJECT diff --git a/kdeui/tests/kcompletiontest.cpp b/kdeui/tests/kcompletiontest.cpp index bdd47ab48..fd44307d3 100644 --- a/kdeui/tests/kcompletiontest.cpp +++ b/kdeui/tests/kcompletiontest.cpp @@ -42,7 +42,7 @@ Form1::Form1( TQWidget* parent, const char* name ) GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); - GroupBox1Layout->setAlignment( Qt::AlignTop ); + GroupBox1Layout->tqsetAlignment( Qt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/kdeui/tests/kcompletiontest.h b/kdeui/tests/kcompletiontest.h index 55b01a82d..9443401eb 100644 --- a/kdeui/tests/kcompletiontest.h +++ b/kdeui/tests/kcompletiontest.h @@ -25,7 +25,7 @@ class KHistoryCombo; class KLineEdit; -class Form1 : public QWidget +class Form1 : public TQWidget { Q_OBJECT diff --git a/kdeui/tests/kdesattest.cpp b/kdeui/tests/kdesattest.cpp index 28f7d4cf2..e75b320a7 100644 --- a/kdeui/tests/kdesattest.cpp +++ b/kdeui/tests/kdesattest.cpp @@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name) void KDesatWidget::change(double) { desat_value = slide->value(); - repaint(false); + tqrepaint(false); } void KDesatWidget::paintEvent(TQPaintEvent */*ev*/) diff --git a/kdeui/tests/kdesattest.h b/kdeui/tests/kdesattest.h index 67329d578..8e04c08c6 100644 --- a/kdeui/tests/kdesattest.h +++ b/kdeui/tests/kdesattest.h @@ -11,7 +11,7 @@ #include <tqimage.h> #include <knuminput.h> -class KDesatWidget : public QWidget +class KDesatWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/kdialogbasetest.cpp b/kdeui/tests/kdialogbasetest.cpp index 5e62115fa..ec77e7453 100644 --- a/kdeui/tests/kdialogbasetest.cpp +++ b/kdeui/tests/kdialogbasetest.cpp @@ -64,7 +64,7 @@ int main(int argc, char** argv) widget may change before the dialog is shown. Additionally, setting a help chapter may cause a need for adjustment since it modifies the height of the upper frame. */ - dialog.resize(dialog.minimumSize()); + dialog.resize(dialog.tqminimumSize()); /* The dialog object is used just as any other TQDialog: */ if(dialog.exec()) { diff --git a/kdeui/tests/kdockwidgetdemo.cpp b/kdeui/tests/kdockwidgetdemo.cpp index 15b83d14e..2f2c59d94 100644 --- a/kdeui/tests/kdockwidgetdemo.cpp +++ b/kdeui/tests/kdockwidgetdemo.cpp @@ -82,7 +82,7 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const :TQDialog(0L,name,true) { KConfig* config = kapp->config(); - config->setGroup( TQString::fromLatin1("SFileDialogData:") + name ); + config->setGroup( TQString::tqfromLatin1("SFileDialogData:") + name ); if ( initially.isNull() ){ initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() ); } @@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); - viewport()->repaint( true ); + viewport()->tqrepaint( true ); } void PixmapView::drawContents( TQPainter *p, int, int, int, int ) @@ -777,13 +777,13 @@ int main(int argc, char* argv[]) { #endif #if 0 - qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::fromLatin1("All (*)"), - TQString::fromLatin1("DockWidget Demo"), "dialog1" ) ); + qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::tqfromLatin1("All (*)"), + TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ) ); #endif #if 1 - TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::fromLatin1("All (*)"), - TQString::fromLatin1("DockWidget Demo"), "dialog1" ); + TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::tqfromLatin1("All (*)"), + TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ); TQStringList::Iterator it = s.begin(); for ( ; it != s.end(); ++it ){ qDebug( "%s", (*it).local8Bit().data() ); diff --git a/kdeui/tests/kdockwidgetdemo.h b/kdeui/tests/kdockwidgetdemo.h index ff9b1451b..b6f029cd5 100644 --- a/kdeui/tests/kdockwidgetdemo.h +++ b/kdeui/tests/kdockwidgetdemo.h @@ -28,7 +28,7 @@ class CustomFileDialog; class Preview; class DirectoryView; -class SFileDialog : public QDialog +class SFileDialog : public TQDialog {Q_OBJECT public: @@ -67,7 +67,7 @@ private: TQToolButton *b_preview; }; /******************************************************************************************************/ -class Directory : public QListViewItem +class Directory : public TQListViewItem { public: Directory( TQListView * parent, const TQString& filename ); @@ -86,7 +86,7 @@ private: bool readable; }; -class DirectoryView : public QListView +class DirectoryView : public TQListView {Q_OBJECT public: DirectoryView( TQWidget *parent = 0, const char *name = 0 ); @@ -107,7 +107,7 @@ private: TQString fullPath(TQListViewItem* item); }; /******************************************************************************************************/ -class PixmapView : public QScrollView +class PixmapView : public TQScrollView {Q_OBJECT public: PixmapView( TQWidget *parent ); @@ -118,7 +118,7 @@ private: TQPixmap pixmap; }; -class Preview : public QWidgetStack +class Preview : public TQWidgetStack {Q_OBJECT public: Preview( TQWidget *parent ); @@ -132,7 +132,7 @@ private: PixmapView *pixmap; }; -class CustomFileDialog : public QFileDialog +class CustomFileDialog : public TQFileDialog {Q_OBJECT public: CustomFileDialog( TQWidget* parent ); diff --git a/kdeui/tests/kdockwidgettest.cpp b/kdeui/tests/kdockwidgettest.cpp index 08a7e42b3..b2f7b8bd9 100644 --- a/kdeui/tests/kdockwidgettest.cpp +++ b/kdeui/tests/kdockwidgettest.cpp @@ -101,7 +101,7 @@ DockApplication::DockApplication( const char* name ) l->setBackgroundColor(white); l->setMinimumSize(100,100); dock5->setWidget(l); - if (l->qt_cast("KDockContainer")) qDebug("KDockContainer created for dock 5"); + if (l->tqqt_cast("KDockContainer")) qDebug("KDockContainer created for dock 5"); /*****************************************************/ /*****************************************************/ @@ -112,7 +112,7 @@ DockApplication::DockApplication( const char* name ) l->setBackgroundColor(white); l->setMinimumSize(100,100); dock6->setWidget(l); - if (l->qt_cast("KDockContainer")) qDebug("KDockContainer created for dock 6"); + if (l->tqqt_cast("KDockContainer")) qDebug("KDockContainer created for dock 6"); /*****************************************************/ diff --git a/kdeui/tests/kdualcolortest.cpp b/kdeui/tests/kdualcolortest.cpp index 2060a9842..507030132 100644 --- a/kdeui/tests/kdualcolortest.cpp +++ b/kdeui/tests/kdualcolortest.cpp @@ -10,8 +10,8 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) { lbl = new TQLabel("Testing, testing, 1, 2, 3...", this); KDualColorButton *colorBtn = - new KDualColorButton(lbl->colorGroup().text(), - lbl->colorGroup().background(), this); + new KDualColorButton(lbl->tqcolorGroup().text(), + lbl->tqcolorGroup().background(), this); connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)), TQT_SLOT(slotFgChanged(const TQColor &))); connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)), @@ -23,7 +23,7 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) layout->addWidget(colorBtn, 0); layout->addWidget(lbl, 1); layout->activate(); - resize(sizeHint()); + resize(tqsizeHint()); } void KDualColorWidget::slotFgChanged(const TQColor &c) diff --git a/kdeui/tests/kdualcolortest.h b/kdeui/tests/kdualcolortest.h index bcd9b271e..2c38b7af0 100644 --- a/kdeui/tests/kdualcolortest.h +++ b/kdeui/tests/kdualcolortest.h @@ -4,7 +4,7 @@ #include <tqlabel.h> #include <kdualcolorbutton.h> -class KDualColorWidget : public QWidget +class KDualColorWidget : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/keditlistboxtest.cpp b/kdeui/tests/keditlistboxtest.cpp index 90dbb74d0..fdc90a742 100644 --- a/kdeui/tests/keditlistboxtest.cpp +++ b/kdeui/tests/keditlistboxtest.cpp @@ -7,14 +7,14 @@ int main( int argc, char **argv ) KApplication app( argc, argv, "keditlistboxtest" ); KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) ); - KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"), + KEditListBox *box = new KEditListBox( TQString::tqfromLatin1("KEditListBox"), editor ); - box->insertItem( TQString::fromLatin1("Test") ); - box->insertItem( TQString::fromLatin1("for") ); - box->insertItem( TQString::fromLatin1("this") ); - box->insertItem( TQString::fromLatin1("KEditListBox") ); - box->insertItem( TQString::fromLatin1("Widget") ); + box->insertItem( TQString::tqfromLatin1("Test") ); + box->insertItem( TQString::tqfromLatin1("for") ); + box->insertItem( TQString::tqfromLatin1("this") ); + box->insertItem( TQString::tqfromLatin1("KEditListBox") ); + box->insertItem( TQString::tqfromLatin1("Widget") ); box->show(); return app.exec(); diff --git a/kdeui/tests/kgradienttest.h b/kdeui/tests/kgradienttest.h index a793bfa5c..ba99c8313 100644 --- a/kdeui/tests/kgradienttest.h +++ b/kdeui/tests/kgradienttest.h @@ -10,7 +10,7 @@ #include <tqwidget.h> #include <kpixmap.h> -class KGradientWidget : public QWidget +class KGradientWidget : public TQWidget { public: KGradientWidget(TQWidget *parent=0, const char *name=0) diff --git a/kdeui/tests/khashtest.h b/kdeui/tests/khashtest.h index 3d4e8a3fa..05de5c435 100644 --- a/kdeui/tests/khashtest.h +++ b/kdeui/tests/khashtest.h @@ -10,7 +10,7 @@ #include <tqwidget.h> #include <kpixmap.h> -class KHashWidget : public QWidget +class KHashWidget : public TQWidget { Q_OBJECT diff --git a/kdeui/tests/kledtest.cpp b/kdeui/tests/kledtest.cpp index d68f1e366..f8d031530 100644 --- a/kdeui/tests/kledtest.cpp +++ b/kdeui/tests/kledtest.cpp @@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent) } else { y=Grid; index=0; - for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) { + for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) { x=Grid; for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) { for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1)) { leds[index]=new KLed(Qt::yellow, state, (KLed::Look)(look+1), - (KLed::Shape)(shape+1), this); + (KLed::Shape)(tqshape+1), this); leds[index]->setGeometry(x, y, LedWidth, LedHeight); ++index; x+=Grid+LedWidth; @@ -108,7 +108,7 @@ KLedTest::nextLook() { ledlook = static_cast<KLed::Look>(tmp); l->setLook(ledlook); //qDebug("painting look %i", ledlook); - //l->repaint(); + //l->tqrepaint(); } diff --git a/kdeui/tests/kledtest.h b/kdeui/tests/kledtest.h index 33c70fe83..5d660f5a3 100644 --- a/kdeui/tests/kledtest.h +++ b/kdeui/tests/kledtest.h @@ -6,7 +6,7 @@ #include <stdlib.h> #include <kled.h> -class KLedTest : public QWidget +class KLedTest : public TQWidget { Q_OBJECT protected: @@ -15,7 +15,7 @@ protected: const int LedWidth; const int LedHeight; const int Grid; - KLed::Shape shape; + KLed::Shape tqshape; KLed::Look look; KLed::State state; int x, y, index; diff --git a/kdeui/tests/klineedittest.h b/kdeui/tests/klineedittest.h index fc2b74a30..6fee4dbc4 100644 --- a/kdeui/tests/klineedittest.h +++ b/kdeui/tests/klineedittest.h @@ -9,7 +9,7 @@ class TQPushButton; class KLineEdit; -class KLineEditTest : public QWidget +class KLineEditTest : public TQWidget { Q_OBJECT diff --git a/kdeui/tests/kmessageboxtest.cpp b/kdeui/tests/kmessageboxtest.cpp index 1b926739f..e63d24fca 100644 --- a/kdeui/tests/kmessageboxtest.cpp +++ b/kdeui/tests/kmessageboxtest.cpp @@ -25,18 +25,18 @@ ExampleWidget::ExampleWidget( TQWidget *parent, const char *name ) // and sub-layouts. TQSize sh; setText("<p>Hello.</p>"); - sh = sizeHint(); + sh = tqsizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); setText("Hello."); - sh = sizeHint(); + sh = tqsizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); setText("<p>Hello<br>World</p>"); - sh = sizeHint(); + sh = tqsizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); // setText("Hello\nWorld"); - sh = sizeHint(); + sh = tqsizeHint(); qWarning("SizeHint = %d x %d", sh.width(), sh.height()); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -79,11 +79,11 @@ case 1: i = KMessageBox::warningContinueCancel(w, "You are about to <Print>.\n" "Are you sure?", - "Print", TQString::fromLatin1("&Print"), "dontask", false); + "Print", TQString::tqfromLatin1("&Print"), "dontask", false); i = KMessageBox::warningContinueCancel(0, "You are about to <Print>.\n" "Are you sure?", - "Print", TQString::fromLatin1("&Print"), "dontask", KMessageBox::AllowLink); + "Print", TQString::tqfromLatin1("&Print"), "dontask", KMessageBox::AllowLink); i = KMessageBox::questionYesNo(0, "<p>Do you have a printer? thisisaverylongdkldhklghklghklashgkllasghkdlsghkldfghklsabla bla bbla bla. It also has <a href=http://www.kde.org>this URL</a>.</p>", TQString("Bla"), TQString("Yes"), TQString("No"), "bla", KMessageBox::AllowLink); break; @@ -96,7 +96,7 @@ case 2: case 3: i = KMessageBox::questionYesNo(0, "Does your printer support color or only black and white?", - "Printer setup", TQString::fromLatin1("&Color"), TQString::fromLatin1("&Black & White")); + "Printer setup", TQString::tqfromLatin1("&Color"), TQString::tqfromLatin1("&Black & White")); break; case 4: @@ -123,13 +123,13 @@ case 6: i = KMessageBox::warningContinueCancel(0, "You are about to print.\n" "Are you sure?", - "Print", TQString::fromLatin1("&Print")); + "Print", TQString::tqfromLatin1("&Print")); break; case 7: i = KMessageBox::warningContinueCancel(0, "You are about to <Print>.\n" "Are you sure?", - "Print", TQString::fromLatin1("&Print"), "dontask", false); + "Print", TQString::tqfromLatin1("&Print"), "dontask", false); break; case 8: @@ -142,14 +142,14 @@ case 9: i = KMessageBox::warningYesNoCancel(0, "Your document contains unsaved changes.\n" "Do you want to save your changes?\n", - TQString::fromLatin1("Close")); + TQString::tqfromLatin1("Close")); break; case 10: i = KMessageBox::warningYesNoCancel(0, "Your document contains unsaved changes.\n" "Do you want to save or discard your changes?\n", - "Close", TQString::fromLatin1("&Save"), TQString::fromLatin1("&Discard") ); + "Close", TQString::tqfromLatin1("&Save"), TQString::tqfromLatin1("&Discard") ); break; case 11: diff --git a/kdeui/tests/knuminputtest.h b/kdeui/tests/knuminputtest.h index f32e1c4b4..32a9e9098 100644 --- a/kdeui/tests/knuminputtest.h +++ b/kdeui/tests/knuminputtest.h @@ -6,7 +6,7 @@ class KIntNumInput; class KDoubleNumInput; -class TopLevel : public QWidget +class TopLevel : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/kpanelmenutest.cpp b/kdeui/tests/kpanelmenutest.cpp index 6f2d8f2be..e081e467f 100644 --- a/kdeui/tests/kpanelmenutest.cpp +++ b/kdeui/tests/kpanelmenutest.cpp @@ -20,7 +20,7 @@ TestWidget::TestWidget(TQWidget *parent, const char *name) init(); setText("We added \"Client Test\" to kicker. Click the K Menu to check."); - resize(sizeHint()); + resize(tqsizeHint()); } void TestWidget::init() diff --git a/kdeui/tests/kpanelmenutest.h b/kdeui/tests/kpanelmenutest.h index ec76a4498..361ae545a 100644 --- a/kdeui/tests/kpanelmenutest.h +++ b/kdeui/tests/kpanelmenutest.h @@ -4,7 +4,7 @@ #include <kpanelappmenu.h> #include <tqlabel.h> -class TestWidget : public QLabel +class TestWidget : public TQLabel { Q_OBJECT public: diff --git a/kdeui/tests/kpopuptest.cpp b/kdeui/tests/kpopuptest.cpp index 96f4b3d32..3db71106b 100644 --- a/kdeui/tests/kpopuptest.cpp +++ b/kdeui/tests/kpopuptest.cpp @@ -24,7 +24,7 @@ public: menu->insertItem("Item1"); menu->insertItem("Item2"); menu->insertSeparator(); - menu->insertItem("Quit", qApp, TQT_SLOT(quit())); + menu->insertItem("Quit", tqApp, TQT_SLOT(quit())); } }; diff --git a/kdeui/tests/krulertest.cpp b/kdeui/tests/krulertest.cpp index ad2f5630a..8d64a53f4 100644 --- a/kdeui/tests/krulertest.cpp +++ b/kdeui/tests/krulertest.cpp @@ -140,7 +140,7 @@ KRulerTest::KRulerTest( const char *name ) beginMark = new KIntNumInput(0, lineEdit); beginMark->setRange(-1000, 1000, 1, false); beginMark->move(5, 15); - beginMark->setFixedSize(beginMark->sizeHint()); + beginMark->setFixedSize(beginMark->tqsizeHint()); connect(beginMark, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotNewOffset(int)) ); connect(beginMark, TQT_SIGNAL(valueChanged(int)), @@ -148,7 +148,7 @@ KRulerTest::KRulerTest( const char *name ) endMark = new KIntNumInput(0, lineEdit); endMark->setRange(-1000, 1000, 1, false); endMark->move(5, 35); - endMark->setFixedSize(endMark->sizeHint()); + endMark->setFixedSize(endMark->tqsizeHint()); connect(endMark, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotEndOffset(int)) ); connect(endMark, TQT_SIGNAL(valueChanged(int)), @@ -156,7 +156,7 @@ KRulerTest::KRulerTest( const char *name ) lengthInput = new KIntNumInput(0, lineEdit); lengthInput->setRange(-1000, 1000, 1, false); lengthInput->move(5, 55); - lengthInput->setFixedSize(lengthInput->sizeHint()); + lengthInput->setFixedSize(lengthInput->tqsizeHint()); connect(lengthInput, TQT_SIGNAL(valueChanged(int)), hruler, TQT_SLOT(slotEndOffset(int)) ); connect(lengthInput, TQT_SIGNAL(valueChanged(int)), @@ -169,21 +169,21 @@ KRulerTest::KRulerTest( const char *name ) transX = new KDoubleNumInput(0.0, vertrot); transX->setRange(-1000, 1000, 1, false); transX->move(5, 15); - transX->setFixedSize(transX->sizeHint()); + transX->setFixedSize(transX->tqsizeHint()); //transX->setLabel("transx", AlignLeft); connect(transX, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetXTrans(double)) ); transY = new KDoubleNumInput(-12.0, vertrot); transY->setRange(-1000, 1000, 1, false); transY->move(5, 35); - transY->setFixedSize(transY->sizeHint()); + transY->setFixedSize(transY->tqsizeHint()); //transY->setLabel("transy", AlignLeft); connect(transY, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetYTrans(double)) ); rotV = new KDoubleNumInput(90.0, vertrot); rotV->setRange(-1000, 1000, 1, false); rotV->move(5, 55); - rotV->setFixedSize(rotV->sizeHint()); + rotV->setFixedSize(rotV->tqsizeHint()); //rotV->setLabel("rot", AlignLeft); connect(rotV, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotSetRotate(double)) ); diff --git a/kdeui/tests/krulertest.h b/kdeui/tests/krulertest.h index fe552467c..d180e93a0 100644 --- a/kdeui/tests/krulertest.h +++ b/kdeui/tests/krulertest.h @@ -19,7 +19,7 @@ class TQCheckBox; class TQGroupBox; -class MouseWidget : public QFrame +class MouseWidget : public TQFrame { Q_OBJECT public: diff --git a/kdeui/tests/ktabctltest.h b/kdeui/tests/ktabctltest.h index 8b4632411..6dd3b932a 100644 --- a/kdeui/tests/ktabctltest.h +++ b/kdeui/tests/ktabctltest.h @@ -10,7 +10,7 @@ class KTabCtl; class TQPushButton; class TQMultiLineEdit; -class TopLevel : public QWidget +class TopLevel : public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/ktabwidgettest.cpp b/kdeui/tests/ktabwidgettest.cpp index 32ed5c89f..5f9fb3dcc 100644 --- a/kdeui/tests/ktabwidgettest.cpp +++ b/kdeui/tests/ktabwidgettest.cpp @@ -73,9 +73,9 @@ Test::Test( TQWidget* parent, const char *name ) gridlayout->addWidget( mTabsBottom, 3, 0 ); connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) ); - TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid ); - gridlayout->addWidget( tabshape, 3, 1 ); - connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); + TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid ); + gridlayout->addWidget( tabtqshape, 3, 1 ); + connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid ); gridlayout->addWidget( tabClose, 4, 0 ); diff --git a/kdeui/tests/ktabwidgettest.h b/kdeui/tests/ktabwidgettest.h index 2bd056cf8..7c178bd32 100644 --- a/kdeui/tests/ktabwidgettest.h +++ b/kdeui/tests/ktabwidgettest.h @@ -13,7 +13,7 @@ #include <tqcheckbox.h> #include <tqtoolbutton.h> -class Test : public QVBox +class Test : public TQVBox { Q_OBJECT public: diff --git a/kdeui/tests/kunbalancedgrdtest.cpp b/kdeui/tests/kunbalancedgrdtest.cpp index 7f5b2cc78..9f616496d 100644 --- a/kdeui/tests/kunbalancedgrdtest.cpp +++ b/kdeui/tests/kunbalancedgrdtest.cpp @@ -159,7 +159,7 @@ void myTopWidget::rebalance() if ((otime - itime )> 500) { - grds->repaint(false); + grds->tqrepaint(false); itime = time.elapsed(); } } diff --git a/kdeui/tests/kunbalancedgrdtest.h b/kdeui/tests/kunbalancedgrdtest.h index bc282b1ce..8b7893772 100644 --- a/kdeui/tests/kunbalancedgrdtest.h +++ b/kdeui/tests/kunbalancedgrdtest.h @@ -13,7 +13,7 @@ #include <tqlabel.h> #include <tqdatetime.h> -class KGradientWidget : public QWidget +class KGradientWidget : public TQWidget { public: KGradientWidget(TQWidget *parent=0, const char *name=0); @@ -28,7 +28,7 @@ private: }; -class myTopWidget: public QWidget +class myTopWidget: public TQWidget { Q_OBJECT public: diff --git a/kdeui/tests/kwizardtest.cpp b/kdeui/tests/kwizardtest.cpp index 91974263e..dd9e9eeaf 100644 --- a/kdeui/tests/kwizardtest.cpp +++ b/kdeui/tests/kwizardtest.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) TQString msg = TQString("This is page %1 out of 10").arg(i); TQLabel *label = new TQLabel(msg, p); TQHBoxLayout *layout = new TQHBoxLayout(p, 5); - label->setAlignment(Qt::AlignCenter); + label->tqsetAlignment(Qt::AlignCenter); label->setFixedSize(300, 200); layout->addWidget(label); TQString title = TQString("%1. page").arg(i); diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp index c2339e5a1..60ffd95c0 100644 --- a/kdewidgets/makekdewidgets.cpp +++ b/kdewidgets/makekdewidgets.cpp @@ -47,7 +47,7 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n" " TQPixmap pix(m_widgets[key].iconSet);\n" "#else\n" " TQPixmap pix(locate( \"data\", \n" - " TQString::fromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n" + " TQString::tqfromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n" "#endif\n" " return TQIconSet(pix);\n" " }\n" @@ -81,17 +81,17 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n" "%PluginName::%PluginName()\n" "{\n" " WidgetInfo widget;\n"; -static const char widgetDef[] = " widget.group = TQString::fromLatin1(\"%Group\");\n" +static const char widgetDef[] = " widget.group = TQString::tqfromLatin1(\"%Group\");\n" "#ifdef EMBED_IMAGES\n" " widget.iconSet = TQPixmap(%Pixmap);\n" "#else\n" - " widget.iconSet = TQString::fromLatin1(\"%IconSet\");\n" + " widget.iconSet = TQString::tqfromLatin1(\"%IconSet\");\n" "#endif\n" - " widget.includeFile = TQString::fromLatin1(\"%IncludeFile\");\n" - " widget.toolTip = TQString::fromLatin1(\"%ToolTip\");\n" - " widget.whatsThis = TQString::fromLatin1(\"%WhatsThis\");\n" + " widget.includeFile = TQString::tqfromLatin1(\"%IncludeFile\");\n" + " widget.toolTip = TQString::tqfromLatin1(\"%ToolTip\");\n" + " widget.whatsThis = TQString::tqfromLatin1(\"%WhatsThis\");\n" " widget.isContainer = %IsContainer;\n" - " m_widgets.insert(TQString::fromLatin1(\"%Class\"), widget);\n"; + " m_widgets.insert(TQString::tqfromLatin1(\"%Class\"), widget);\n"; static const char endCtor[] = " %Init\n" "}\n" "%PluginName::~%PluginName()\n" @@ -100,7 +100,7 @@ static const char endCtor[] = " %Init\n" "}\n" "TQWidget *%PluginName::create(const TQString &key, TQWidget *parent, const char *name)\n" "{\n"; -static const char widgetCreate[] = " if (key == TQString::fromLatin1(\"%Class\"))\n" +static const char widgetCreate[] = " if (key == TQString::tqfromLatin1(\"%Class\"))\n" " return new %ImplClass%ConstructorArgs;\n"; static const char endCreate[] = " return 0;\n" "}\n" @@ -172,7 +172,7 @@ void buildFile( TQTextStream &ts, const TQString& group, const TQString& fileNam for ( uint idx = 0; idx < includes.count(); ++idx ) ts << "#include <" << includes[ idx ] << ">" << endl; TQStringList classes = input.groupList(); - classes.remove( classes.find( "Global" ) ); + classes.remove( classes.tqfind( "Global" ) ); // Autogenerate widget includes here for ( uint idx = 0; idx < classes.count(); ++idx ) ts << buildWidgetInclude( classes[ idx ], input ) << endl; diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index 292c4de13..f1f1c634b 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -75,7 +75,7 @@ TQString HelpProtocol::langLookup(const TQString& fname) if ( ( *it ).right( 5 ) == ".html" ) { - TQString file = (*it).left((*it).findRev('/')) + "/index.docbook"; + TQString file = (*it).left((*it).tqfindRev('/')) + "/index.docbook"; kdDebug( 7119 ) << "Looking for help in: " << file << endl; info.setFile(file); if (info.exists() && info.isFile() && info.isReadable()) @@ -112,7 +112,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname, } else { - unicodeError( i18n("There is no documentation available for %1." ).arg(path) ); + tqunicodeError( i18n("There is no documentation available for %1." ).arg(path) ); finished(); return TQString::null; } @@ -123,7 +123,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname, } -void HelpProtocol::unicodeError( const TQString &t ) +void HelpProtocol::tqunicodeError( const TQString &t ) { data(fromUnicode( TQString( "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\"></head>\n" @@ -189,7 +189,7 @@ void HelpProtocol::get( const KURL& url ) return; } } else { - TQString docbook_file = file.left(file.findRev('/')) + "/index.docbook"; + TQString docbook_file = file.left(file.tqfindRev('/')) + "/index.docbook"; if (!KStandardDirs::exists(file)) { file = docbook_file; } else { @@ -215,11 +215,11 @@ void HelpProtocol::get( const KURL& url ) kdDebug( 7119 ) << "parsed " << mParsed.length() << endl; if (mParsed.isEmpty()) { - unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); + tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); } else { - int pos1 = mParsed.find( "charset=" ); + int pos1 = mParsed.tqfind( "charset=" ); if ( pos1 > 0 ) { - int pos2 = mParsed.find( '"', pos1 ); + int pos2 = mParsed.tqfind( '"', pos1 ); if ( pos2 > 0 ) { mParsed.replace( pos1, pos2 - pos1, "charset=UTF-8" ); } @@ -248,7 +248,7 @@ void HelpProtocol::get( const KURL& url ) kdDebug( 7119 ) << "parsed " << mParsed.length() << endl; if (mParsed.isEmpty()) { - unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); + tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) ); } else { TQString query = url.query(), anchor; @@ -274,7 +274,7 @@ void HelpProtocol::get( const KURL& url ) { int index = 0; while ( true ) { - index = mParsed.find( TQRegExp( "<a name=" ), index); + index = mParsed.tqfind( TQRegExp( "<a name=" ), index); if ( index == -1 ) { kdDebug( 7119 ) << "no anchor\n"; break; // use whatever is the target, most likely index.html @@ -283,12 +283,12 @@ void HelpProtocol::get( const KURL& url ) if ( mParsed.mid( index, 11 + anchor.length() ).lower() == TQString( "<a name=\"%1\">" ).arg( anchor ) ) { - index = mParsed.findRev( "<FILENAME filename=", index ) + + index = mParsed.tqfindRev( "<FILENAME filename=", index ) + strlen( "<FILENAME filename=\"" ); TQString filename=mParsed.mid( index, 2000 ); - filename = filename.left( filename.find( '\"' ) ); + filename = filename.left( filename.tqfind( '\"' ) ); TQString path = target.path(); - path = path.left( path.findRev( '/' ) + 1) + filename; + path = path.left( path.tqfindRev( '/' ) + 1) + filename; kdDebug( 7119 ) << "anchor found in " << path <<endl; target.setPath( path ); break; @@ -307,16 +307,16 @@ void HelpProtocol::emitFile( const KURL& url ) { infoMessage(i18n("Looking up section")); - TQString filename = url.path().mid(url.path().findRev('/') + 1); + TQString filename = url.path().mid(url.path().tqfindRev('/') + 1); - int index = mParsed.find(TQString("<FILENAME filename=\"%1\"").arg(filename)); + int index = mParsed.tqfind(TQString("<FILENAME filename=\"%1\"").arg(filename)); if (index == -1) { if ( filename == "index.html" ) { data( fromUnicode( mParsed ) ); return; } - unicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) ); + tqunicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) ); return; } diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h index 13c198af1..c442e7c61 100644 --- a/kdoctools/kio_help.h +++ b/kdoctools/kio_help.h @@ -37,7 +37,7 @@ private: TQString lookupFile(const TQString &fname, const TQString &query, bool &redirect); - void unicodeError( const TQString &t ); + void tqunicodeError( const TQString &t ); TQString mParsed; bool mGhelp; diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index dd2e194e6..f3a5fc983 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -204,7 +204,7 @@ int main(int argc, char **argv) { TQValueVector<const char *> params; if (args->isSet( "output" ) ) { params.append( qstrdup( "outputFile" ) ); - params.append( qstrdup( TQFile::decodeName( args->getOption( "output" ) ).latin1() ) ); + params.append( qstrdup( TQString(TQFile::decodeName( args->getOption( "output" ) )).latin1() ) ); } { const QCStringList paramList = args->getOptionList( "param" ); @@ -212,7 +212,7 @@ int main(int argc, char **argv) { QCStringList::ConstIterator end = paramList.end(); for ( ; it != end; ++it ) { const TQCString tuple = *it; - const int ch = tuple.find( '=' ); + const int ch = tuple.tqfind( '=' ); if ( ch == -1 ) { kdError() << "Key-Value tuple '" << tuple << "' lacks a '='!" << endl; return( 2 ); @@ -277,12 +277,12 @@ int main(int argc, char **argv) { TQString cache = args->getOption( "cache" ); if ( !cache.isEmpty() ) { if ( !saveToCache( output, cache ) ) { - kdError() << i18n( "Could not write to cache file %1." ).arg( cache ) << endl; + kdError() << TQString(i18n( "Could not write to cache file %1." ).arg( cache )) << endl; } goto end; } - if (output.find( "<FILENAME " ) == -1 || args->isSet( "stdout" ) || args->isSet("output") ) + if (output.tqfind( "<FILENAME " ) == -1 || args->isSet( "stdout" ) || args->isSet("output") ) { TQFile file; if (args->isSet( "stdout" ) ) { @@ -302,13 +302,13 @@ int main(int argc, char **argv) { } else { int index = 0; while (true) { - index = output.find("<FILENAME ", index); + index = output.tqfind("<FILENAME ", index); if (index == -1) break; int filename_index = index + strlen("<FILENAME filename=\""); TQString filename = output.mid(filename_index, - output.find("\"", filename_index) - + output.tqfind("\"", filename_index) - filename_index); TQString filedata = splitOut(output, index); diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 216773e7d..9cbf4cb4d 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -140,8 +140,8 @@ TQString splitOut(const TQString &parsed, int index) TQString filedata; while (true) { - int endindex = parsed.find("</FILENAME>", index); - int startindex = parsed.find("<FILENAME ", index) + 1; + int endindex = parsed.tqfind("</FILENAME>", index); + int startindex = parsed.tqfind("<FILENAME ", index) + 1; // kdDebug() << "FILENAME " << startindex << " " << endindex << " " << inside << " " << parsed.mid(startindex + 18, 15)<< " " << parsed.length() << endl; @@ -166,10 +166,10 @@ TQString splitOut(const TQString &parsed, int index) } - index = filedata.find("<FILENAME "); + index = filedata.tqfind("<FILENAME "); if (index > 0) { - int endindex = filedata.findRev("</FILENAME>"); + int endindex = filedata.tqfindRev("</FILENAME>"); while (filedata.at(endindex) != '>') endindex++; endindex++; filedata = filedata.left(index) + filedata.mid(endindex); @@ -205,7 +205,7 @@ static TQIODevice *getBZip2device(const TQString &fileName ) if ( base ) { - base->setDevice(f, true); + base->setDevice(TQT_TQIODEVICE(f), true); return new KFilterDev(base, true); } return 0; @@ -336,7 +336,7 @@ TQCString fromUnicode( const TQString &data ) buffer_len += test.length(); } else { TQString res; - res.sprintf( "&#%d;", part.at( i ).unicode() ); + res.sprintf( "&#%d;", TQChar(part.at( i )).tqunicode() ); test = locale->fromUnicode( res ); if (buffer_len + test.length() + 1 > sizeof(buffer)) break; diff --git a/khtml/DESIGN.html b/khtml/DESIGN.html index 00af13045..ea7f73439 100644 --- a/khtml/DESIGN.html +++ b/khtml/DESIGN.html @@ -291,7 +291,7 @@ that defines the DTD to use for HTML (used mainly in the parser). <dd>Java related stuff. <dt><a href="misc/">misc:</a> <dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the -decoder class that converts the incoming stream to unicode. +decoder class that converts the incoming stream to tqunicode. <dt><a href="rendering">rendering:</a> <dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains the definition of the objects used in the rendering tree, the layouting code, and the RenderStyle objects. diff --git a/khtml/css/css_base.cpp b/khtml/css/css_base.cpp index 5af37b9b9..699ff6554 100644 --- a/khtml/css/css_base.cpp +++ b/khtml/css/css_base.cpp @@ -319,7 +319,7 @@ DOMString CSSSelector::selectorText() const // the original namespace prefix used. Ugh. -dwh DOMString str; const CSSSelector* cs = this; - Q_UINT16 tag = localNamePart(cs->tag); + TQ_UINT16 tag = localNamePart(cs->tag); if (tag == anyLocalName && cs->match == CSSSelector::None) str = "*"; else if (tag != anyLocalName) diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp index daf607a9e..eef98f41e 100644 --- a/khtml/css/css_renderstyledeclarationimpl.cpp +++ b/khtml/css/css_renderstyledeclarationimpl.cpp @@ -930,7 +930,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) case CSS_PROP_TOP: return getPositionOffsetValue(renderer, CSS_PROP_TOP); case CSS_PROP_UNICODE_BIDI: - switch (style->unicodeBidi()) { + switch (style->tqunicodeBidi()) { case UBNormal: return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL); case Embed: diff --git a/khtml/css/css_stylesheetimpl.cpp b/khtml/css/css_stylesheetimpl.cpp index bf85c0d59..8189a6846 100644 --- a/khtml/css/css_stylesheetimpl.cpp +++ b/khtml/css/css_stylesheetimpl.cpp @@ -235,7 +235,7 @@ void CSSStyleSheetImpl::addNamespace(CSSParser* p, const DOM::DOMString& prefix, } } -void CSSStyleSheetImpl::determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix) +void CSSStyleSheetImpl::determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix) { // If the stylesheet has no namespaces we can just return. There won't be any need to ever check // namespace values in selectors. @@ -253,7 +253,7 @@ void CSSStyleSheetImpl::determineNamespace(Q_UINT32& id, const DOM::DOMString& p Q_ASSERT(m_doc != 0); // Look up the id for this namespace URI. - Q_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode); + TQ_UINT16 nsid = m_doc->getId(NodeImpl::NamespaceId, 0, 0, ns->uri().implementation(), false, false, &exceptioncode); id = makeId(nsid, localNamePart(id)); } } diff --git a/khtml/css/css_stylesheetimpl.h b/khtml/css/css_stylesheetimpl.h index e7a551947..656b59ca9 100644 --- a/khtml/css/css_stylesheetimpl.h +++ b/khtml/css/css_stylesheetimpl.h @@ -101,8 +101,8 @@ public: void deleteRule ( unsigned long index, int &exceptioncode ); void addNamespace(CSSParser* p, const DOM::DOMString& prefix, const DOM::DOMString& uri); - void determineNamespace(Q_UINT32& id, const DOM::DOMString& prefix); - Q_UINT32 defaultNamespace() { return m_defaultNamespace; }; + void determineNamespace(TQ_UINT32& id, const DOM::DOMString& prefix); + TQ_UINT32 defaultNamespace() { return m_defaultNamespace; }; void setCharset(const DOMString &charset) { m_charset = charset; } const DOMString& charset() const { return m_charset; } @@ -123,7 +123,7 @@ public: protected: DocumentImpl *m_doc; bool m_implicit; - Q_UINT32 m_defaultNamespace; + TQ_UINT32 m_defaultNamespace; CSSNamespace* m_namespaces; DOMString m_charset; }; diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp index 52e962725..0fa8bc837 100644 --- a/khtml/css/css_valueimpl.cpp +++ b/khtml/css/css_valueimpl.cpp @@ -757,14 +757,14 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const break; } case CSSPrimitiveValue::CSS_RGBCOLOR: - if (qAlpha(m_value.rgbcolor) != 0xFF) { + if (tqAlpha(m_value.rgbcolor) != 0xFF) { if (m_value.rgbcolor == khtml::transparentColor) text = "transparent"; else - text = "rgba(" + TQString::number(qRed (m_value.rgbcolor)) + "," - + TQString::number(qBlue (m_value.rgbcolor)) + "," - + TQString::number(qGreen(m_value.rgbcolor)) + "," - + TQString::number(qAlpha(m_value.rgbcolor)/255.0) + ")"; + text = "rgba(" + TQString::number(tqRed (m_value.rgbcolor)) + "," + + TQString::number(tqBlue (m_value.rgbcolor)) + "," + + TQString::number(tqGreen(m_value.rgbcolor)) + "," + + TQString::number(tqAlpha(m_value.rgbcolor)/255.0) + ")"; } else { text = TQColor(m_value.rgbcolor).name(); } @@ -896,21 +896,21 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string) parsedFontName = parsedFontName.lower(); // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl; - int pos = available.find( ',' + parsedFontName + ',', 0, false ); + int pos = available.tqfind( ',' + parsedFontName + ',', 0, false ); if ( pos == -1 ) { // many pages add extra MSs to make sure it's windows only ;( if ( parsedFontName.startsWith( "ms " ) ) parsedFontName = parsedFontName.mid( 3 ); if ( parsedFontName.endsWith( " ms" ) ) parsedFontName.truncate( parsedFontName.length() - 3 ); - pos = available.find( ",ms " + parsedFontName + ',', 0, false ); + pos = available.tqfind( ",ms " + parsedFontName + ',', 0, false ); if ( pos == -1 ) - pos = available.find( ',' + parsedFontName + " ms,", 0, false ); + pos = available.tqfind( ',' + parsedFontName + " ms,", 0, false ); } if ( pos != -1 ) { ++pos; - int p = available.find(',', pos); + int p = available.tqfind(',', pos); assert( p != -1 ); // available is supposed to start and end with , parsedFontName = available.mid( pos, p - pos); // kdDebug(0) << "going for '" << parsedFontName << "'" << endl; diff --git a/khtml/css/csshelper.cpp b/khtml/css/csshelper.cpp index 73eff588c..f1d681bd6 100644 --- a/khtml/css/csshelper.cpp +++ b/khtml/css/csshelper.cpp @@ -78,7 +78,7 @@ DOMString khtml::parseURL(const DOMString &url) int nl = 0; for(int k = o; k < o+l; k++) - if(i->s[k].unicode() > '\r') + if(i->s[k].tqunicode() > '\r') j->s[nl++] = i->s[k]; j->l = nl; diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp index d167af025..474067cf0 100644 --- a/khtml/css/cssparser.cpp +++ b/khtml/css/cssparser.cpp @@ -166,7 +166,7 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string ) int length = string.length() + 3; data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); - memcpy( data, string.unicode(), string.length()*sizeof( unsigned short) ); + memcpy( data, string.tqunicode(), string.length()*sizeof( unsigned short) ); #ifdef CSS_DEBUG kdDebug( 6080 ) << ">>>>>>> start parsing style sheet" << endl; @@ -190,7 +190,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_rule); i++ ) data[i] = khtml_rule[i]; - memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_rule ), string.tqunicode(), string.length()*sizeof( unsigned short) ); // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); data[length-4] = '}'; @@ -218,7 +218,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id, data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_value); i++ ) data[i] = khtml_value[i]; - memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_value ), string.tqunicode(), string.length()*sizeof( unsigned short) ); data[length-4] = '}'; // qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() ); @@ -260,7 +260,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con data = (unsigned short *)malloc( length *sizeof( unsigned short ) ); for ( unsigned int i = 0; i < strlen(khtml_decls); i++ ) data[i] = khtml_decls[i]; - memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) ); + memcpy( data + strlen( khtml_decls ), string.tqunicode(), string.length()*sizeof( unsigned short) ); data[length-4] = '}'; nonCSSHint = _nonCSSHint; @@ -522,7 +522,7 @@ bool CSSParser::parseValue( int propId, bool important ) valid_primitive = true; break; - case CSS_PROP_CLIP: // <shape> | auto | inherit + case CSS_PROP_CLIP: // <tqshape> | auto | inherit if ( id == CSS_VAL_AUTO ) valid_primitive = true; else if ( value->unit == Value::Function ) @@ -2125,7 +2125,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) ); colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) ); colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) ); - c = qRgb(colorValues[0], colorValues[1], colorValues[2]); + c = tqRgb(colorValues[0], colorValues[1], colorValues[2]); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 7 /* rgba + three commas */ && @@ -2136,7 +2136,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) colorValues[0] = kMax( 0, kMin( 255, colorValues[0] ) ); colorValues[1] = kMax( 0, kMin( 255, colorValues[1] ) ); colorValues[2] = kMax( 0, kMin( 255, colorValues[2] ) ); - c = qRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); + c = tqRgba(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 5 /* hsl + two commas */ && @@ -2144,7 +2144,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) double colorValues[3]; if (!parseHSLParameters(value, colorValues, false)) return 0; - c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0); + c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], 1.0); } else if (value->unit == Value::Function && value->function->args != 0 && value->function->args->size() == 7 /* hsla + three commas */ && @@ -2152,7 +2152,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) double colorValues[4]; if (!parseHSLParameters(value, colorValues, true)) return 0; - c = khtml::qRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); + c = khtml::tqRgbaFromHsla(colorValues[0], colorValues[1], colorValues[2], colorValues[3]); } else return 0; diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c index c86f2d326..894ab787f 100644 --- a/khtml/css/cssproperties.c +++ b/khtml/css/cssproperties.c @@ -281,7 +281,7 @@ findProp (register const char *str, register unsigned int len) #line 102 "cssproperties.gperf" {"text-align", CSS_PROP_TEXT_ALIGN}, #line 109 "cssproperties.gperf" - {"unicode-bidi", CSS_PROP_UNICODE_BIDI}, + {"tqunicode-bidi", CSS_PROP_UNICODE_BIDI}, #line 82 "cssproperties.gperf" {"outline-color", CSS_PROP_OUTLINE_COLOR}, #line 60 "cssproperties.gperf" @@ -632,7 +632,7 @@ static const char * const propertyList[] = { "text-shadow", "text-transform", "top", -"unicode-bidi", +"tqunicode-bidi", "vertical-align", "visibility", "white-space", diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index 15432dcd6..abe6a89ef 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do if ( readbytes >= 0 ) file[readbytes] = '\0'; - TQString style = TQString::fromLatin1( file.data() ); + TQString style = TQString::tqfromLatin1( file.data() ); if(s) style += s->settingsToCSS(); DOMString str(style); @@ -352,7 +352,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do if ( readbytes >= 0 ) file[readbytes] = '\0'; - TQString style = TQString::fromLatin1( file.data() ); + TQString style = TQString::tqfromLatin1( file.data() ); DOMString str(style); s_quirksSheet = new DOM::CSSStyleSheetImpl(doc); @@ -496,12 +496,12 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e) unsigned int numPseudoProps = 0; // try to sort out most style rules as early as possible. - Q_UINT16 cssTagId = localNamePart(element->id()); + TQ_UINT16 cssTagId = localNamePart(element->id()); int smatch = 0; int schecked = 0; for ( unsigned int i = 0; i < selectors_size; i++ ) { - Q_UINT16 tag = localNamePart(selectors[i]->tag); + TQ_UINT16 tag = localNamePart(selectors[i]->tag); if ( cssTagId == tag || tag == anyLocalName ) { ++schecked; @@ -741,8 +741,8 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e // Cull out any useless layers and also repeat patterns into additional layers. style->adjustBackgroundLayers(); - // Only use slow repaints if we actually have a background image. - // FIXME: We only need to invalidate the fixed regions when scrolling. It's total overkill to + // Only use slow tqrepaints if we actually have a background image. + // FIXME: We only need to tqinvalidate the fixed regions when scrolling. It's total overkill to // prevent the entire view from blitting on a scroll. if (style->hasFixedBackgroundImage() && view) view->useSlowRepaints(); @@ -828,7 +828,7 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e, static void cleanpath(TQString &path) { int pos; - while ( (pos = path.find( "/../" )) != -1 ) { + while ( (pos = path.tqfind( "/../" )) != -1 ) { int prev = 0; if ( pos > 0 ) prev = path.findRev( "/", pos -1 ); @@ -846,9 +846,9 @@ static void cleanpath(TQString &path) // We don't want to waste a function call on the search for the anchor // in the vast majority of cases where there is no "//" in the path. int refPos = -2; - while ( (pos = path.find( "//", pos )) != -1) { + while ( (pos = path.tqfind( "//", pos )) != -1) { if (refPos == -2) - refPos = path.find("#", 0); + refPos = path.tqfind("#", 0); if (refPos > 0 && pos >= refPos) break; @@ -857,7 +857,7 @@ static void cleanpath(TQString &path) else pos += 2; } - while ( (pos = path.find( "/./" )) != -1) + while ( (pos = path.tqfind( "/./" )) != -1) path.remove( pos, 2 ); //kdDebug() << "checkPseudoState " << path << endl; } @@ -871,7 +871,7 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded if( attr.isNull() ) { return PseudoNone; } - TQConstString cu(attr.unicode(), attr.length()); + TQConstString cu(attr.tqunicode(), attr.length()); TQString u = cu.string(); if ( !u.contains("://") ) { if ( u[0] == '/' ) @@ -904,7 +904,7 @@ static bool matchNth(int count, const TQString& nth) b = 0; } else { - int n = nth.find('n'); + int n = nth.tqfind('n'); if (n != -1) { if (nth[0] == '-') if (n==1) @@ -917,11 +917,11 @@ static bool matchNth(int count, const TQString& nth) else a = nth.left(n).toInt(); - int p = nth.find('+'); + int p = nth.tqfind('+'); if (p != -1) b = nth.mid(p+1).toInt(); else { - p = nth.find('-'); + p = nth.tqfind('-'); b = -nth.mid(p+1).toInt(); } } @@ -1107,10 +1107,10 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm if (sel->tag != anyQName) { int eltID = e->id(); - Q_UINT16 localName = localNamePart(eltID); - Q_UINT16 ns = namespacePart(eltID); - Q_UINT16 selLocalName = localNamePart(sel->tag); - Q_UINT16 selNS = namespacePart(sel->tag); + TQ_UINT16 localName = localNamePart(eltID); + TQ_UINT16 ns = namespacePart(eltID); + TQ_UINT16 selLocalName = localNamePart(sel->tag); + TQ_UINT16 selNS = namespacePart(sel->tag); if (localName <= ID_LAST_TAG && ns == defaultNamespace) { assert(e->isHTMLElement()); @@ -1158,22 +1158,22 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm // Be smart compare on length first if (sel_len > val_len) return false; // Selector string may not contain spaces - if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.find(' ') != -1) return false; + if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.tqfind(' ') != -1) return false; if (sel_len == val_len) return (caseSensitive && !strcmp(sel->value, value)) || (!caseSensitive && !strcasecmp(sel->value, value)); // else the value is longer and can be a list if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false; - TQChar* sel_uc = sel->value.unicode(); - TQChar* val_uc = value->unicode(); + TQChar* sel_uc = sel->value.tqunicode(); + TQChar* val_uc = value->tqunicode(); TQConstString sel_str(sel_uc, sel_len); TQConstString val_str(val_uc, val_len); int pos = 0; for ( ;; ) { - pos = val_str.string().find(sel_str.string(), pos, caseSensitive); + pos = val_str.string().tqfind(sel_str.string(), pos, caseSensitive); if ( pos == -1 ) return false; if ( pos == 0 || val_uc[pos-1].isSpace() ) { int endpos = pos + sel_len; @@ -1187,34 +1187,34 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm case CSSSelector::Contain: { //kdDebug( 6080 ) << "checking for contains match" << endl; - TQConstString val_str(value->unicode(), value->length()); - TQConstString sel_str(sel->value.unicode(), sel->value.length()); + TQConstString val_str(value->tqunicode(), value->length()); + TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); return val_str.string().contains(sel_str.string(), caseSensitive); } case CSSSelector::Begin: { //kdDebug( 6080 ) << "checking for beginswith match" << endl; - TQConstString val_str(value->unicode(), value->length()); - TQConstString sel_str(sel->value.unicode(), sel->value.length()); + TQConstString val_str(value->tqunicode(), value->length()); + TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); return val_str.string().startsWith(sel_str.string(), caseSensitive); } case CSSSelector::End: { //kdDebug( 6080 ) << "checking for endswith match" << endl; - TQConstString val_str(value->unicode(), value->length()); - TQConstString sel_str(sel->value.unicode(), sel->value.length()); + TQConstString val_str(value->tqunicode(), value->length()); + TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); return val_str.string().endsWith(sel_str.string(), caseSensitive); } case CSSSelector::Hyphen: { //kdDebug( 6080 ) << "checking for hyphen match" << endl; - TQConstString val_str(value->unicode(), value->length()); - TQConstString sel_str(sel->value.unicode(), sel->value.length()); + TQConstString val_str(value->tqunicode(), value->length()); + TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); const TQString& str = val_str.string(); const TQString& selStr = sel_str.string(); if(str.length() < selStr.length()) return false; // Check if str begins with selStr: - if(str.find(selStr, 0, caseSensitive) != 0) return false; + if(str.tqfind(selStr, 0, caseSensitive) != 0) return false; // It does. Check for exact match or following '-': if(str.length() != selStr.length() && str[selStr.length()] != '-') return false; @@ -2079,13 +2079,13 @@ static TQColor colorForCSSValue( int css_value ) KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support bckgrConfig.setGroup("Desktop0"); // Desktop background. - return bckgrConfig.readColorEntry("Color1", &qApp->palette().disabled().background()); + return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background()); } return TQColor(); } #endif - const TQPalette &pal = qApp->palette(); + const TQPalette &pal = tqApp->palette(); TQColor c = pal.color( uicol->group, uicol->role ); #ifndef APPLE_CHANGES if ( uicol->configEntry ) { @@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) } case CSS_PROP_UNICODE_BIDI: { - HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi) + HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi) if(!primitiveValue) break; switch (primitiveValue->getIdent()) { case CSS_VAL_NORMAL: @@ -2772,7 +2772,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) col = colorForCSSValue( ident ); } else if ( primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_RGBCOLOR ) { #ifndef APPLE_CHANGES - if(qAlpha(primitiveValue->getRGBColorValue())) + if(tqAlpha(primitiveValue->getRGBColorValue())) #endif col.setRgb(primitiveValue->getRGBColorValue()); } else { diff --git a/khtml/css/cssstyleselector.h b/khtml/css/cssstyleselector.h index 23d854bc0..1b076337e 100644 --- a/khtml/css/cssstyleselector.h +++ b/khtml/css/cssstyleselector.h @@ -290,7 +290,7 @@ public: unsigned int selector; unsigned int position; - Q_UINT32 priority; + TQ_UINT32 priority; }; /* diff --git a/khtml/css/html4.css b/khtml/css/html4.css index c3fd1a347..575945464 100644 --- a/khtml/css/html4.css +++ b/khtml/css/html4.css @@ -486,27 +486,27 @@ a:visited:active { color: red; outline: 1px dotted invert; } bdo[dir="ltr"] { direction: ltr; - unicode-bidi: bidi-override; + tqunicode-bidi: bidi-override; } bdo[dir="rtl"] { direction: rtl; - unicode-bidi: bidi-override; + tqunicode-bidi: bidi-override; } /* ### this selector seems to be still broken ... - *[dir="ltr"] { direction: ltr; unicode-bidi: embed } - *[dir="rtl"] { direction: rtl; unicode-bidi: embed } + *[dir="ltr"] { direction: ltr; tqunicode-bidi: embed } + *[dir="rtl"] { direction: rtl; tqunicode-bidi: embed } */ /* elements that are block-level in html4 */ -/* ### don't support unicode-bidi at the moment +/* ### don't support tqunicode-bidi at the moment address, blockquote, body, dd, div, dl, dt, fieldset, form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe, noscript, noframes, object, ol, p, ul, applet, center, dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot, col, colgroup, td, th, caption - { unicode-bidi: embed } + { tqunicode-bidi: embed } */ /* end bidi settings */ diff --git a/khtml/dom/css_extensions.cpp b/khtml/dom/css_extensions.cpp index 23f7739dc..01a47d5f1 100644 --- a/khtml/dom/css_extensions.cpp +++ b/khtml/dom/css_extensions.cpp @@ -1881,15 +1881,15 @@ void CSS2Properties::setTop( const DOMString &value ) if(impl) ((ElementImpl *)impl)->setAttribute("top", value); } -DOMString CSS2Properties::unicodeBidi() const +DOMString CSS2Properties::tqunicodeBidi() const { if(!impl) return 0; - return ((ElementImpl *)impl)->getAttribute("unicodeBidi"); + return ((ElementImpl *)impl)->getAttribute("tqunicodeBidi"); } void CSS2Properties::setUnicodeBidi( const DOMString &value ) { - if(impl) ((ElementImpl *)impl)->setAttribute("unicodeBidi", value); + if(impl) ((ElementImpl *)impl)->setAttribute("tqunicodeBidi", value); } DOMString CSS2Properties::verticalAlign() const diff --git a/khtml/dom/css_extensions.h b/khtml/dom/css_extensions.h index a6cdb2149..bda2cfbbc 100644 --- a/khtml/dom/css_extensions.h +++ b/khtml/dom/css_extensions.h @@ -2515,14 +2515,14 @@ public: /** * See the <a - * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-unicode-bidi"> - * unicode-bidi property definition </a> in CSS2. + * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-tqunicode-bidi"> + * tqunicode-bidi property definition </a> in CSS2. * */ - DOM::DOMString unicodeBidi() const; + DOM::DOMString tqunicodeBidi() const; /** - * see unicodeBidi + * see tqunicodeBidi */ void setUnicodeBidi( const DOM::DOMString & ); diff --git a/khtml/dom/css_value.cpp b/khtml/dom/css_value.cpp index de450e861..20faff88a 100644 --- a/khtml/dom/css_value.cpp +++ b/khtml/dom/css_value.cpp @@ -126,7 +126,7 @@ void CSSStyleDeclaration::setProperty( const DOMString &propName, const DOMStrin if (!id) return; bool important = false; TQString str = priority.string(); - if (str.find("important", 0, false) != -1) + if (str.tqfind("important", 0, false) != -1) important = true; static_cast<CSSStyleDeclarationImpl *>(impl)->setProperty( id, value, important ); @@ -500,17 +500,17 @@ RGBColor::~RGBColor() CSSPrimitiveValue RGBColor::red() const { - return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qRed(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqRed(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } CSSPrimitiveValue RGBColor::green() const { - return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qGreen(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqGreen(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } CSSPrimitiveValue RGBColor::blue() const { - return new CSSPrimitiveValueImpl(float(qAlpha(m_color) ? qBlue(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); + return new CSSPrimitiveValueImpl(float(tqAlpha(m_color) ? tqBlue(m_color) : 0), CSSPrimitiveValue::CSS_DIMENSION); } diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h index 5d4a043c7..7523a2797 100644 --- a/khtml/dom/css_value.h +++ b/khtml/dom/css_value.h @@ -633,7 +633,7 @@ class RectImpl; /** * The \c Rect interface is used to represent any <a - * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-shape"> + * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-tqshape"> * rect </a> value. This interface reflects the values in the * underlying style property. Hence, modifications made through this * interface modify the style property. diff --git a/khtml/dom/dom_doc.cpp b/khtml/dom/dom_doc.cpp index 0ff123444..088a7a94a 100644 --- a/khtml/dom/dom_doc.cpp +++ b/khtml/dom/dom_doc.cpp @@ -112,8 +112,8 @@ HTMLDocument DOMImplementation::createHTMLDocument( const DOMString& title ) r->open(); - r->write(TQString::fromLatin1("<HTML><HEAD><TITLE>") + title.string() + - TQString::fromLatin1("</TITLE></HEAD>")); + r->write(TQString::tqfromLatin1("<HTML><HEAD><TITLE>") + title.string() + + TQString::tqfromLatin1("</TITLE></HEAD>")); return r; } diff --git a/khtml/dom/dom_node.h b/khtml/dom/dom_node.h index 37889eec2..4ddd4ffb1 100644 --- a/khtml/dom/dom_node.h +++ b/khtml/dom/dom_node.h @@ -875,7 +875,7 @@ public: * not part of the DOM. * @returns the element id, in case this is an element, 0 otherwise */ - Q_UINT32 elementId() const; + TQ_UINT32 elementId() const; /** * tests if this Node is 0. Useful especially, if casting to a derived diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp index 14bdc2613..f8487cf5a 100644 --- a/khtml/dom/dom_string.cpp +++ b/khtml/dom/dom_string.cpp @@ -39,7 +39,7 @@ DOMString::DOMString(const TQString &str) return; } - impl = new DOMStringImpl( str.unicode(), str.length() ); + impl = new DOMStringImpl( str.tqunicode(), str.length() ); impl->ref(); } @@ -193,10 +193,10 @@ bool DOMString::percentage(int &_percentage) const return true; } -TQChar *DOMString::unicode() const +TQChar *DOMString::tqunicode() const { if(!impl) return 0; - return impl->unicode(); + return impl->tqunicode(); } TQString DOMString::string() const @@ -225,8 +225,8 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) { if ( as.length() != bs.length() ) return true; - const TQChar *a = as.unicode(); - const TQChar *b = bs.unicode(); + const TQChar *a = as.tqunicode(); + const TQChar *b = bs.tqunicode(); if ( a == b ) return false; if ( !( a && b ) ) return true; int l = as.length(); @@ -239,7 +239,7 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) bool DOM::strcasecmp( const DOMString &as, const char* bs ) { - const TQChar *a = as.unicode(); + const TQChar *a = as.tqunicode(); int l = as.length(); if ( !bs ) return ( l != 0 ); while ( l-- ) { @@ -265,7 +265,7 @@ bool DOM::operator==( const DOMString &a, const DOMString &b ) if( l != b.length() ) return false; - if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar))) + if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar))) return true; return false; } @@ -276,7 +276,7 @@ bool DOM::operator==( const DOMString &a, const TQString &b ) if( l != b.length() ) return false; - if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar))) + if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar))) return true; return false; } @@ -291,7 +291,7 @@ bool DOM::operator==( const DOMString &a, const char *b ) const TQChar *aptr = aimpl->s; while ( alen-- ) { unsigned char c = *b++; - if ( !c || ( *aptr++ ).unicode() != c ) + if ( !c || ( *aptr++ ).tqunicode() != c ) return false; } } diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h index 3fe725f68..69f2f7b13 100644 --- a/khtml/dom/dom_string.h +++ b/khtml/dom/dom_string.h @@ -97,7 +97,7 @@ public: */ DOMString upper() const; - TQChar *unicode() const; + TQChar *tqunicode() const; TQString string() const; int toInt() const; diff --git a/khtml/dom/html_block.h b/khtml/dom/html_block.h index 43be3660d..e57c311cd 100644 --- a/khtml/dom/html_block.h +++ b/khtml/dom/html_block.h @@ -105,7 +105,7 @@ public: ~HTMLDivElement(); /** - * Horizontal text alignment. See the <a + * Horizontal text tqalignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -231,7 +231,7 @@ public: ~HTMLHeadingElement(); /** - * Horizontal text alignment. See the <a + * Horizontal text tqalignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -272,7 +272,7 @@ public: ~HTMLParagraphElement(); /** - * Horizontal text alignment. See the <a + * Horizontal text tqalignment. See the <a * href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. diff --git a/khtml/dom/html_element.cpp b/khtml/dom/html_element.cpp index 0a2c15e53..0063985ea 100644 --- a/khtml/dom/html_element.cpp +++ b/khtml/dom/html_element.cpp @@ -177,7 +177,7 @@ HTMLCollection HTMLElement::all() const void HTMLElement::assignOther( const Node &other, int elementId ) { - if (other.elementId() != static_cast<Q_UINT32>(elementId)) { + if (other.elementId() != static_cast<TQ_UINT32>(elementId)) { if ( impl ) impl->deref(); impl = 0; } else { diff --git a/khtml/dom/html_form.h b/khtml/dom/html_form.h index 0623e421b..ef318ba06 100644 --- a/khtml/dom/html_form.h +++ b/khtml/dom/html_form.h @@ -798,7 +798,7 @@ public: void setAccessKey( const DOMString & ); /** - * Text alignment relative to \c FIELDSET . See the <a + * Text tqalignment relative to \c FIELDSET . See the <a * href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-align-LEGEND"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. diff --git a/khtml/dom/html_image.cpp b/khtml/dom/html_image.cpp index f7c9dac26..a5cdb3b71 100644 --- a/khtml/dom/html_image.cpp +++ b/khtml/dom/html_image.cpp @@ -122,7 +122,7 @@ void HTMLAreaElement::setNoHref( bool _noHref ) } } -DOMString HTMLAreaElement::shape() const +DOMString HTMLAreaElement::tqshape() const { if(!impl) return DOMString(); return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE); diff --git a/khtml/dom/html_image.h b/khtml/dom/html_image.h index 9f30aaa14..9b1334c83 100644 --- a/khtml/dom/html_image.h +++ b/khtml/dom/html_image.h @@ -90,7 +90,7 @@ public: /** * Comma-separated list of lengths, defining an active region - * geometry. See also \c shape for the shape of the + * geometry. See also \c tqshape for the tqshape of the * region. See the <a * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords"> * coords attribute definition </a> in HTML 4.0. @@ -131,16 +131,16 @@ public: void setNoHref( bool ); /** - * The shape of the active area. The coordinates are given by + * The tqshape of the active area. The coordinates are given by * \c coords . See the <a - * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> - * shape attribute definition </a> in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape"> + * tqshape attribute definition </a> in HTML 4.0. * */ - DOMString shape() const; + DOMString tqshape() const; /** - * see shape + * see tqshape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp index 568761685..9f40da2fb 100644 --- a/khtml/dom/html_inline.cpp +++ b/khtml/dom/html_inline.cpp @@ -148,7 +148,7 @@ void HTMLAnchorElement::setRev( const DOMString &value ) if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_REV, value); } -DOMString HTMLAnchorElement::shape() const +DOMString HTMLAnchorElement::tqshape() const { if(!impl) return DOMString(); return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE); diff --git a/khtml/dom/html_inline.h b/khtml/dom/html_inline.h index 6c1b2d2a2..d5c11d515 100644 --- a/khtml/dom/html_inline.h +++ b/khtml/dom/html_inline.h @@ -89,7 +89,7 @@ public: /** * Comma-separated list of lengths, defining an active region - * geometry. See also \c shape for the shape of the + * geometry. See also \c tqshape for the tqshape of the * region. See the <a * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords"> * coords attribute definition </a> in HTML 4.0. @@ -168,16 +168,16 @@ public: void setRev( const DOMString & ); /** - * The shape of the active area. The coordinates are given by + * The tqshape of the active area. The coordinates are given by * \c coords . See the <a - * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> - * shape attribute definition </a> in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape"> + * tqshape attribute definition </a> in HTML 4.0. * */ - DOMString shape() const; + DOMString tqshape() const; /** - * see shape + * see tqshape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_table.h b/khtml/dom/html_table.h index c3a364d47..69d163723 100644 --- a/khtml/dom/html_table.h +++ b/khtml/dom/html_table.h @@ -63,7 +63,7 @@ public: ~HTMLTableCaptionElement(); /** - * Caption alignment with respect to the table. See the <a + * Caption tqalignment with respect to the table. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-CAPTION"> * align attribute definition </a> in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -134,7 +134,7 @@ public: void setAbbr( const DOMString & ); /** - * Horizontal alignment of data in cell. See the <a + * Horizontal tqalignment of data in cell. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. * @@ -187,7 +187,7 @@ public: void setCh( const DOMString & ); /** - * Offset of alignment character. See the <a + * Offset of tqalignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -281,7 +281,7 @@ public: void setScope( const DOMString & ); /** - * Vertical alignment of data in cell. See the <a + * Vertical tqalignment of data in cell. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -338,7 +338,7 @@ public: ~HTMLTableColElement(); /** - * Horizontal alignment of cell data in column. See the <a + * Horizontal tqalignment of cell data in column. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. * @@ -364,7 +364,7 @@ public: void setCh( const DOMString & ); /** - * Offset of alignment character. See the <a + * Offset of tqalignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -391,7 +391,7 @@ public: void setSpan( long ); /** - * Vertical alignment of cell data in column. See the <a + * Vertical tqalignment of cell data in column. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -790,7 +790,7 @@ public: void setCells( const HTMLCollection & ); /** - * Horizontal alignment of data within cells of this row. See the + * Horizontal tqalignment of data within cells of this row. See the * <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD"> * align attribute definition </a> in HTML 4.0. @@ -831,7 +831,7 @@ public: void setCh( const DOMString & ); /** - * Offset of alignment character. See the <a + * Offset of tqalignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -844,7 +844,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical alignment of data within cells of this row. See the <a + * Vertical tqalignment of data within cells of this row. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign"> * valign attribute definition </a> in HTML 4.0. * @@ -913,7 +913,7 @@ public: ~HTMLTableSectionElement(); /** - * Horizontal alignment of data in cells. See the \c align + * Horizontal tqalignment of data in cells. See the \c align * attribute for HTMLTheadElement for details. * */ @@ -938,7 +938,7 @@ public: void setCh( const DOMString & ); /** - * Offset of alignment character. See the <a + * Offset of tqalignment character. See the <a * href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff"> * charoff attribute definition </a> in HTML 4.0. * @@ -951,7 +951,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical alignment of data in cells. See the \c valign + * Vertical tqalignment of data in cells. See the \c valign * attribute for HTMLTheadElement for details. * */ diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp index f9dd291d7..b67e206f0 100644 --- a/khtml/ecma/kjs_binding.cpp +++ b/khtml/ecma/kjs_binding.cpp @@ -261,7 +261,7 @@ UString::UString(const TQString &d) { unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.unicode(), len * sizeof(UChar)); + memcpy(dat, d.tqunicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } @@ -277,7 +277,7 @@ UString::UString(const DOM::DOMString &d) unsigned int len = d.length(); UChar *dat = new UChar[len]; - memcpy(dat, d.unicode(), len * sizeof(UChar)); + memcpy(dat, d.tqunicode(), len * sizeof(UChar)); rep = UString::Rep::create(dat, len); } diff --git a/khtml/ecma/kjs_css.cpp b/khtml/ecma/kjs_css.cpp index b42f9dd02..ea651336e 100644 --- a/khtml/ecma/kjs_css.cpp +++ b/khtml/ecma/kjs_css.cpp @@ -185,7 +185,7 @@ void DOMCSSStyleDeclaration::tryPut(ExecState *exec, const Identifier &propertyN if (propvalue.isEmpty()) styleDecl.removeProperty(prop); else { - int important = propvalue.find("!important", 0, false); + int important = propvalue.tqfind("!important", 0, false); if (important == -1) styleDecl.setProperty(prop, DOM::DOMString(propvalue), ""); else diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index eeb126ebb..8e5cf5dae 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -107,7 +107,7 @@ void SourceDisplay::setSource(SourceFile *sourceFile) } TQString code = sourceFile->getCode(); - const TQChar *chars = code.unicode(); + const TQChar *chars = code.tqunicode(); uint len = code.length(); TQChar newLine('\n'); TQChar cr('\r'); @@ -249,7 +249,7 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0; TQString SourceFile::getCode() { if (interpreter) { - KHTMLPart *part = ::qt_cast<KHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); + KHTMLPart *part = ::tqqt_cast<KHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); if (part && url == part->url().url() && KHTMLPageCache::self()->isValid(part->cacheId())) { Decoder *decoder = part->createDecoder(); TQByteArray data; @@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch return true; KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part(); - KHTMLPart *khtmlpart = ::qt_cast<KHTMLPart*>(part); + KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart*>(part); if (khtmlpart && !khtmlpart->settings()->isJavaScriptErrorReportingEnabled()) return true; @@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch if (dontShowAgain) { KConfig *config = kapp->config(); - KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings")); + KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings")); config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0)); config->sync(); TQByteArray data; @@ -1020,7 +1020,7 @@ void KJSDebugWin::enterSession(ExecState *exec) updateContextList(); - qApp->enter_loop(); // won't return until leaveSession() is called + tqApp->enter_loop(); // won't return until leaveSession() is called } void KJSDebugWin::leaveSession() @@ -1043,7 +1043,7 @@ void KJSDebugWin::leaveSession() enableOtherWindows(); } - qApp->exit_loop(); + tqApp->exit_loop(); } void KJSDebugWin::updateContextList() diff --git a/khtml/ecma/kjs_dom.cpp b/khtml/ecma/kjs_dom.cpp index 08afc6aab..1231c5710 100644 --- a/khtml/ecma/kjs_dom.cpp +++ b/khtml/ecma/kjs_dom.cpp @@ -1088,7 +1088,7 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List Window* active = Window::retrieveActive(exec); // Complete the URL using the "active part" (running interpreter). We do this for the security // check and to make sure we load exactly the same url as we have verified to be safe - KHTMLPart *khtmlpart = ::qt_cast<KHTMLPart *>(active->part()); + KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart *>(active->part()); if (khtmlpart) { // Security: only allow documents to be loaded from the same host TQString dstUrl = khtmlpart->htmlDocument().completeURL(s).string(); @@ -1274,7 +1274,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c case DOMDOMImplementation::CreateDocument: { // DOM2 // Initially set the URL to document of the creator... this is so that it resides in the same // host/domain for security checks. The URL will be updated if Document.load() is called. - KHTMLPart *part = ::qt_cast<KHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part()); + KHTMLPart *part = ::tqqt_cast<KHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part()); if (part) { Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2])); KURL url = static_cast<DocumentImpl*>(part->document().handle())->URL(); diff --git a/khtml/ecma/kjs_events.cpp b/khtml/ecma/kjs_events.cpp index 1144e723b..38664c1b2 100644 --- a/khtml/ecma/kjs_events.cpp +++ b/khtml/ecma/kjs_events.cpp @@ -63,7 +63,7 @@ void JSEventListener::handleEvent(DOM::Event &evt) if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession()) return; #endif - KHTMLPart *part = ::qt_cast<KHTMLPart *>(static_cast<Window*>(win.imp())->part()); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(static_cast<Window*>(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); @@ -163,7 +163,7 @@ Object JSLazyEventListener::listenerObj() const void JSLazyEventListener::parseCode() const { if (!parsed) { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(static_cast<Window*>(win.imp())->part()); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(static_cast<Window*>(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp index 57762ffd3..3fdc35bb2 100644 --- a/khtml/ecma/kjs_html.cpp +++ b/khtml/ecma/kjs_html.cpp @@ -896,7 +896,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const rel KJS::HTMLElement::AnchorRel DontDelete rev KJS::HTMLElement::AnchorRev DontDelete search KJS::HTMLElement::AnchorSearch DontDelete - shape KJS::HTMLElement::AnchorShape DontDelete + tqshape KJS::HTMLElement::AnchorShape DontDelete tabIndex KJS::HTMLElement::AnchorTabIndex DontDelete target KJS::HTMLElement::AnchorTarget DontDelete text KJS::HTMLElement::AnchorText DontDelete|ReadOnly @@ -981,7 +981,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const protocol KJS::HTMLElement::AreaProtocol DontDelete|ReadOnly search KJS::HTMLElement::AreaSearch DontDelete|ReadOnly noHref KJS::HTMLElement::AreaNoHref DontDelete - shape KJS::HTMLElement::AreaShape DontDelete + tqshape KJS::HTMLElement::AreaShape DontDelete tabIndex KJS::HTMLElement::AreaTabIndex DontDelete target KJS::HTMLElement::AreaTarget DontDelete @end @@ -1599,7 +1599,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const case AnchorName: return String(anchor.name()); case AnchorRel: return String(anchor.rel()); case AnchorRev: return String(anchor.rev()); - case AnchorShape: return String(anchor.shape()); + case AnchorShape: return String(anchor.tqshape()); case AnchorTabIndex: return Number(anchor.tabIndex()); case AnchorTarget: return String(anchor.target()); // Not specified in http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/a.asp @@ -1735,7 +1735,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const } } case AreaNoHref: return Boolean(area.noHref()); - case AreaShape: return String(area.shape()); + case AreaShape: return String(area.tqshape()); case AreaTabIndex: return Number(area.tabIndex()); case AreaTarget: return String(area.target()); } diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp index a5c793357..b8712e01b 100644 --- a/khtml/ecma/kjs_navigator.cpp +++ b/khtml/ecma/kjs_navigator.cpp @@ -188,14 +188,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String("Mozilla"); case AppName: // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape - if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::fromLatin1("compatible")) == -1) + if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1) { //kdDebug() << "appName -> Mozilla" << endl; return String("Netscape"); } - if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::fromLatin1("MSIE")) >= 0) + if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) { //kdDebug() << "appName -> IE" << endl; return String("Microsoft Internet Explorer"); @@ -204,17 +204,17 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String("Konqueror"); case AppVersion: // We assume the string is something like Mozilla/version (properties) - return String(userAgent.mid(userAgent.find('/') + 1)); + return String(userAgent.mid(userAgent.tqfind('/') + 1)); case Product: // We are pretending to be Mozilla or Safari - if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::fromLatin1("compatible")) == -1) + if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1) { return String("Gecko"); } // When spoofing as IE, we use Undefined(). - if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::fromLatin1("MSIE")) >= 0) + if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) { return Undefined(); } @@ -222,9 +222,9 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String("Konqueror/khtml"); case ProductSub: { - int ix = userAgent.find("Gecko"); - if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.unicode()[ix+5] == TQChar('/') && - userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6) + int ix = userAgent.tqfind("Gecko"); + if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') && + userAgent.tqfind(TQRegExp("\\d{8}"), ix+6) == ix+6) { // We have Gecko/<productSub> in the UA string return String(userAgent.mid(ix+6, 8)); @@ -245,19 +245,19 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const return String(userAgent); case Platform: // yet another evil hack, but necessary to spoof some sites... - if ( (userAgent.find(TQString::fromLatin1("Win"),0,false)>=0) ) - return String(TQString::fromLatin1("Win32")); - else if ( (userAgent.find(TQString::fromLatin1("Macintosh"),0,false)>=0) || - (userAgent.find(TQString::fromLatin1("Mac_PowerPC"),0,false)>=0) ) - return String(TQString::fromLatin1("MacPPC")); + if ( (userAgent.tqfind(TQString::tqfromLatin1("Win"),0,false)>=0) ) + return String(TQString::tqfromLatin1("Win32")); + else if ( (userAgent.tqfind(TQString::tqfromLatin1("Macintosh"),0,false)>=0) || + (userAgent.tqfind(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) ) + return String(TQString::tqfromLatin1("MacPPC")); else { struct utsname name; int ret = uname(&name); if ( ret >= 0 ) - return String(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)); + return String(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)); else // can't happen - return String(TQString::fromLatin1("Unix X11")); + return String(TQString::tqfromLatin1("Unix X11")); } case CpuClass: { diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp index ca26c5a0b..55e9aeff6 100644 --- a/khtml/ecma/kjs_proxy.cpp +++ b/khtml/ecma/kjs_proxy.cpp @@ -343,8 +343,8 @@ void KJSProxyImpl::applyUserAgent() assert( m_script ); TQString host = m_frame->m_part->url().isLocalFile() ? "localhost" : m_frame->m_part->url().host(); TQString userAgent = KProtocolManager::userAgentForHost(host); - if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 || - userAgent.find(TQString::fromLatin1("MSIE")) >= 0) + if (userAgent.tqfind(TQString::tqfromLatin1("Microsoft")) >= 0 || + userAgent.tqfind(TQString::tqfromLatin1("MSIE")) >= 0) { m_script->setCompatMode(Interpreter::IECompat); #ifdef KJS_VERBOSE @@ -353,9 +353,9 @@ void KJSProxyImpl::applyUserAgent() } else // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape - if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && - userAgent.find(TQString::fromLatin1("compatible")) == -1 && - userAgent.find(TQString::fromLatin1("KHTML")) == -1) + if (userAgent.tqfind(TQString::tqfromLatin1("Mozilla")) >= 0 && + userAgent.tqfind(TQString::tqfromLatin1("compatible")) == -1 && + userAgent.tqfind(TQString::tqfromLatin1("KHTML")) == -1) { m_script->setCompatMode(Interpreter::NetscapeCompat); #ifdef KJS_VERBOSE diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index 90123aec6..5fe2ef33e 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -421,7 +421,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p) Object obj = Object::dynamicCast( retrieve( p ) ); #ifndef NDEBUG // obj should never be null, except when javascript has been disabled in that part. - KHTMLPart *part = ::qt_cast<KHTMLPart *>(p); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(p); if ( part && part->jScriptEnabled() ) { assert( obj.isValid() ); @@ -448,10 +448,10 @@ Window *Window::retrieveActive(ExecState *exec) Value Window::retrieve(KParts::ReadOnlyPart *p) { assert(p); - KHTMLPart * part = ::qt_cast<KHTMLPart *>(p); + KHTMLPart * part = ::tqqt_cast<KHTMLPart *>(p); KJSProxy *proxy = 0L; if (!part) { - part = ::qt_cast<KHTMLPart *>(p->parent()); + part = ::tqqt_cast<KHTMLPart *>(p->parent()); if (part) proxy = part->framejScript(p); } else @@ -478,7 +478,7 @@ Location *Window::location() const ObjectImp* Window::frames( ExecState* exec ) const { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (part) return m_frames ? m_frames : (const_cast<Window*>(this)->m_frames = new FrameArray(exec, part)); @@ -516,7 +516,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const if (Lookup::findEntry(&WindowTable, p)) return true; - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (!part) return false; @@ -585,7 +585,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const } const HashEntry* entry = Lookup::findEntry(&WindowTable, p); - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); // properties that work on all windows if (entry) { @@ -864,7 +864,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const #if defined Q_WS_X11 && ! defined K_WS_QTONLY if (!part->widget()) return Number(0); - KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId()); + KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId()); return Number(entry->value == OuterHeight ? inf.geometry().height() : inf.geometry().width()); #else @@ -1085,7 +1085,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v default: break; } - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (part) { switch( entry->value ) { case Status: { @@ -1222,7 +1222,7 @@ bool Window::toBoolean(ExecState *) const DOM::AbstractView Window::toAbstractView() const { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (!part) return DOM::AbstractView(); return part->document().defaultView(); @@ -1240,7 +1240,7 @@ void Window::closeNow() if (m_frame.isNull() || m_frame->m_part.isNull()) { kdDebug(6070) << k_funcinfo << "part is deleted already" << endl; } else { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (!part) { kdDebug(6070) << "closeNow on non KHTML part" << endl; } else { @@ -1288,7 +1288,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem. return true; - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (!part) return true; // not a KHTMLPart @@ -1301,7 +1301,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const return false; } - KHTMLPart *activeKHTMLPart = ::qt_cast<KHTMLPart *>(activePart); + KHTMLPart *activeKHTMLPart = ::tqqt_cast<KHTMLPart *>(activePart); if (!activeKHTMLPart) return true; // not a KHTMLPart @@ -1327,7 +1327,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const void Window::setListener(ExecState *exec, int eventId, Value func) { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (!part || !isSafeScript(exec)) return; DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); @@ -1339,7 +1339,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func) Value Window::getListener(ExecState *exec, int eventId) const { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (!part || !isSafeScript(exec)) return Undefined(); DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); @@ -1357,7 +1357,7 @@ Value Window::getListener(ExecState *exec, int eventId) const JSEventListener *Window::getJSEventListener(const Value& val, bool html) { // This function is so hot that it's worth coding it directly with imps. - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (!part || val.type() != ObjectType) return 0; @@ -1433,8 +1433,8 @@ void Window::setCurrentEvent( DOM::Event *evt ) void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) { Window* active = Window::retrieveActive(exec); - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); - KHTMLPart *active_part = ::qt_cast<KHTMLPart *>(active->part()); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *active_part = ::tqqt_cast<KHTMLPart *>(active->part()); // Complete the URL using the "active part" (running interpreter) if (active_part && part) { if (url[0] == TQChar('#')) { @@ -1446,7 +1446,7 @@ void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) // check if we're allowed to inject javascript // SYNC check with khtml_part.cpp::slotRedirect! if ( isSafeScript(exec) || - dstUrl.find(TQString::fromLatin1("javascript:"), 0, false) != 0 ) + dstUrl.tqfind(TQString::tqfromLatin1("javascript:"), 0, false) != 0 ) part->scheduleRedirection(-1, dstUrl, lockHistory); @@ -1470,7 +1470,7 @@ void Window::delayedGoHistory( int steps ) void Window::goHistory( int steps ) { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if(!part) // TODO history readonlypart return; @@ -1488,7 +1488,7 @@ void Window::goHistory( int steps ) void KJS::Window::resizeTo(TQWidget* tl, int width, int height) { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if(!part) // TODO resizeTo readonlypart return; @@ -1531,7 +1531,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height) Value Window::openWindow(ExecState *exec, const List& args) { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); if (!part) return Undefined(); KHTMLView *widget = part->view(); @@ -1544,7 +1544,7 @@ Value Window::openWindow(ExecState *exec, const List& args) KURL url; if (!str.isEmpty()) { - KHTMLPart* p = ::qt_cast<KHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part); + KHTMLPart* p = ::tqqt_cast<KHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part); if ( p ) url = p->htmlDocument().completeURL(str).string(); if ( !p || @@ -1602,7 +1602,7 @@ Value Window::openWindow(ExecState *exec, const List& args) Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features) { - KHTMLPart *p = ::qt_cast<KHTMLPart *>(m_frame->m_part); + KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); KHTMLView *widget = p->view(); KParts::WindowArgs winargs; @@ -1618,11 +1618,11 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString while (it != flist.end()) { TQString s = *it++; TQString key, val; - int pos = s.find('='); + int pos = s.tqfind('='); if (pos >= 0) { key = s.left(pos).stripWhiteSpace().lower(); val = s.mid(pos + 1).stripWhiteSpace().lower(); - TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget()); + TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget()); if (key == "left" || key == "screenx") { winargs.x = (int)val.toFloat() + screen.x(); @@ -1633,13 +1633,13 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString if (winargs.y < screen.y() || winargs.y > screen.bottom()) winargs.y = screen.y(); // only safe choice until size is determined } else if (key == "height") { - winargs.height = (int)val.toFloat() + 2*qApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.height = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; if (winargs.height > screen.height()) // should actually check workspace winargs.height = screen.height(); if (winargs.height < 100) winargs.height = 100; } else if (key == "width") { - winargs.width = (int)val.toFloat() + 2*qApp->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; + winargs.width = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; if (winargs.width > screen.width()) // should actually check workspace winargs.width = screen.width(); if (winargs.width < 100) @@ -1703,7 +1703,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString // request window (new or existing if framename is set) KParts::ReadOnlyPart *newPart = 0L; emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart); - if (newPart && ::qt_cast<KHTMLPart*>(newPart)) { + if (newPart && ::tqqt_cast<KHTMLPart*>(newPart)) { KHTMLPart *khtmlpart = static_cast<KHTMLPart*>(newPart); //qDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window); khtmlpart->setOpener(p); @@ -1735,7 +1735,7 @@ void Window::forgetSuppressedWindows() void Window::showSuppressedWindows() { - KHTMLPart *part = ::qt_cast<KHTMLPart *>( m_frame->m_part ); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>( m_frame->m_part ); KJS::Interpreter *interpreter = part->jScript()->interpreter(); ExecState *exec = interpreter->globalExec(); @@ -1760,7 +1760,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) Window *window = static_cast<Window *>(thisObj.imp()); TQString str, str2; - KHTMLPart *part = ::qt_cast<KHTMLPart *>(window->m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(window->m_frame->m_part); if (!part) return Undefined(); @@ -1897,8 +1897,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) KHTMLSettings::KJSWindowFocusPolicy policy = part->settings()->windowFocusPolicy(part->url().host()); if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) { - widget->topLevelWidget()->raise(); - KWin::deIconifyWindow( widget->topLevelWidget()->winId() ); + widget->tqtopLevelWidget()->raise(); + KWin::deIconifyWindow( widget->tqtopLevelWidget()->winId() ); widget->setActiveWindow(); emit part->browserExtension()->requestFocus(part); } @@ -1950,7 +1950,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) { KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { - TQWidget * tl = widget->topLevelWidget(); + TQWidget * tl = widget->tqtopLevelWidget(); TQRect sg = KGlobalSettings::desktopGeometry(tl); TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) ); @@ -1970,7 +1970,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) { KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { - TQWidget * tl = widget->topLevelWidget(); + TQWidget * tl = widget->tqtopLevelWidget(); TQRect sg = KGlobalSettings::desktopGeometry(tl); TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() ); @@ -1989,7 +1989,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) if(policy == KHTMLSettings::KJSWindowResizeAllow && args.size() == 2 && widget) { - TQWidget * tl = widget->topLevelWidget(); + TQWidget * tl = widget->tqtopLevelWidget(); TQRect geom = tl->frameGeometry(); window->resizeTo( tl, geom.width() + args[0].toInt32(exec), @@ -2003,7 +2003,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) if(policy == KHTMLSettings::KJSWindowResizeAllow && args.size() == 2 && widget) { - TQWidget * tl = widget->topLevelWidget(); + TQWidget * tl = widget->tqtopLevelWidget(); window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) ); } return Undefined(); @@ -2114,7 +2114,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte bool ScheduledAction::execute(Window *window) { - KHTMLPart *part = ::qt_cast<KHTMLPart *>(window->m_frame->m_part); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(window->m_frame->m_part); if (!part || !part->jScriptEnabled()) return false; ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter()); @@ -2353,10 +2353,10 @@ DateTimeMS DateTimeMS::now() { DateTimeMS t; TQTime before = TQTime::currentTime(); - t.mDate = TQDate::currentDate(); + t.mDate = TQDate::tqcurrentDate(); t.mTime = TQTime::currentTime(); if (t.mTime < before) - t.mDate = TQDate::currentDate(); // prevent race condition in hacky way :) + t.mDate = TQDate::tqcurrentDate(); // prevent race condition in hacky way :) return t; } @@ -2545,7 +2545,7 @@ Value Location::get(ExecState *exec, const Identifier &p) const return String(""); return String( url.path().isEmpty() ? TQString("/") : url.path() ); case Port: - return String( url.port() ? TQString::number((int)url.port()) : TQString::fromLatin1("") ); + return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") ); case Protocol: return String( url.protocol()+":" ); case Search: @@ -2590,7 +2590,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att TQString str = v.toString(exec).qstring(); switch (entry->value) { case Href: { - KHTMLPart* p =::qt_cast<KHTMLPart*>(Window::retrieveActive(exec)->part()); + KHTMLPart* p =::tqqt_cast<KHTMLPart*>(Window::retrieveActive(exec)->part()); if ( p ) url = p->htmlDocument().completeURL( str ).string(); else @@ -2603,8 +2603,8 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att url.setRef(str); break; case Host: { - TQString host = str.left(str.find(":")); - TQString port = str.mid(str.find(":")+1); + TQString host = str.left(str.tqfind(":")); + TQString port = str.mid(str.tqfind(":")+1); url.setHost(host); url.setPort(port.toUInt()); break; @@ -2681,7 +2681,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) id == Location::Replace); break; case Location::Reload: { - KHTMLPart *khtmlpart = ::qt_cast<KHTMLPart *>(part); + KHTMLPart *khtmlpart = ::tqqt_cast<KHTMLPart *>(part); if (khtmlpart) khtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/); else diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp index b20515de7..a2095769f 100644 --- a/khtml/ecma/xmlhttprequest.cpp +++ b/khtml/ecma/xmlhttprequest.cpp @@ -395,7 +395,7 @@ void XMLHttpRequest::send(const TQString& _body) // through setRequestHeader. NOTE: the user can still disable // this feature at the protocol level (kio_http). // ### does find() ever succeed? the headers are stored in lower case! - if (requestHeaders.find("Referer") == requestHeaders.end()) { + if (requestHeaders.tqfind("Referer") == requestHeaders.end()) { KURL documentURL(doc->URL()); documentURL.setPass(TQString::null); documentURL.setUser(TQString::null); @@ -487,7 +487,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val // Reject all banned headers. See BANNED_HTTP_HEADERS above. // kdDebug() << "Banned HTTP Headers: " << BANNED_HTTP_HEADERS << endl; TQStringList bannedHeaders = TQStringList::split(',', - TQString::fromLatin1(BANNED_HTTP_HEADERS)); + TQString::tqfromLatin1(BANNED_HTTP_HEADERS)); if (bannedHeaders.contains(name)) return; // Denied @@ -501,7 +501,7 @@ Value XMLHttpRequest::getAllResponseHeaders() const return Undefined(); } - int endOfLine = responseHeaders.find("\n"); + int endOfLine = responseHeaders.tqfind("\n"); if (endOfLine == -1) { return Undefined(); @@ -535,7 +535,7 @@ Value XMLHttpRequest::getResponseHeader(const TQString& name) const return Undefined(); } - int endOfLine = responseHeaders.find("\n", headerLinePos + matchLength); + int endOfLine = responseHeaders.tqfind("\n", headerLinePos + matchLength); return String(responseHeaders.mid(headerLinePos + matchLength, endOfLine - (headerLinePos + matchLength)).stripWhiteSpace()); } @@ -546,10 +546,10 @@ static Value httpStatus(const TQString& response, bool textStatus = false) return Undefined(); } - int endOfLine = response.find("\n"); + int endOfLine = response.tqfind("\n"); TQString firstLine = (endOfLine == -1) ? response : response.left(endOfLine); - int codeStart = firstLine.find(" "); - int codeEnd = firstLine.find(" ", codeStart + 1); + int codeStart = firstLine.tqfind(" "); + int codeEnd = firstLine.tqfind(" ", codeStart + 1); if (codeStart == -1 || codeEnd == -1) { return Undefined(); @@ -643,9 +643,9 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data) // NOTE: Replace a 304 response with a 200! Both IE and Mozilla do this. // Problem first reported through bug# 110272. - int codeStart = responseHeaders.find("304"); + int codeStart = responseHeaders.tqfind("304"); if ( codeStart != -1) { - int codeEnd = responseHeaders.find("\n", codeStart+3); + int codeEnd = responseHeaders.tqfind("\n", codeStart+3); if (codeEnd != -1) responseHeaders.replace(codeStart, (codeEnd-codeStart), "200 OK"); } @@ -659,11 +659,11 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data) #endif if ( decoder == NULL ) { - int pos = responseHeaders.find("content-type:", 0, false); + int pos = responseHeaders.tqfind("content-type:", 0, false); if ( pos > -1 ) { pos += 13; - int index = responseHeaders.find('\n', pos); + int index = responseHeaders.tqfind('\n', pos); TQString type = responseHeaders.mid(pos, (index-pos)); index = type.find (';'); if (index > -1) @@ -725,7 +725,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L } TQString method = args[0].toString(exec).qstring(); - KHTMLPart *part = ::qt_cast<KHTMLPart *>(Window::retrieveActive(exec)->part()); + KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(Window::retrieveActive(exec)->part()); if (!part) return Undefined(); KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string()); diff --git a/khtml/html/html_baseimpl.cpp b/khtml/html/html_baseimpl.cpp index 9ebe26242..0ed4e4888 100644 --- a/khtml/html/html_baseimpl.cpp +++ b/khtml/html/html_baseimpl.cpp @@ -414,7 +414,7 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const RenderPart* render = static_cast<RenderPart*>( m_render ); - if(render->widget() && ::qt_cast<KHTMLView*>( render->widget()) ) + if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) ) return static_cast<KHTMLView*>( render->widget() )->part()->xmlDocImpl(); return 0; @@ -426,7 +426,7 @@ KHTMLPart* HTMLFrameElementImpl::contentPart() const RenderPart* render = static_cast<RenderPart*>( m_render ); - if(render->widget() && ::qt_cast<KHTMLView*>( render->widget()) ) + if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) ) return static_cast<KHTMLView*>( render->widget() )->part(); return 0; diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index e2ee3ba57..a38f6c2fb 100644 --- a/khtml/html/html_documentimpl.cpp +++ b/khtml/html/html_documentimpl.cpp @@ -110,8 +110,8 @@ DOMString HTMLDocumentImpl::cookie() const long windowId = 0; KHTMLView *v = view (); - if ( v && v->topLevelWidget() ) - windowId = v->topLevelWidget()->winId(); + if ( v && v->tqtopLevelWidget() ) + windowId = v->tqtopLevelWidget()->winId(); TQCString replyType; TQByteArray params, reply; @@ -142,8 +142,8 @@ void HTMLDocumentImpl::setCookie( const DOMString & value ) long windowId = 0; KHTMLView *v = view (); - if ( v && v->topLevelWidget() ) - windowId = v->topLevelWidget()->winId(); + if ( v && v->tqtopLevelWidget() ) + windowId = v->tqtopLevelWidget()->winId(); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); @@ -226,18 +226,18 @@ void HTMLDocumentImpl::slotHistoryChanged() return; recalcStyle( Force ); - m_render->repaint(); + m_render->tqrepaint(); } HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url) { TQString url = _url.string(); TQString s; - int pos = url.find('#'); + int pos = url.tqfind('#'); //kdDebug(0) << "map pos of #:" << pos << endl; - s = TQString(_url.unicode() + pos + 1, _url.length() - pos - 1); + s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1); - TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.find(s); + TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.tqfind(s); if (it != mapMap.end()) return *it; @@ -297,7 +297,7 @@ static int parseDocTypePart(const TQString& buffer, int index) else if (ch == '-') { int tmpIndex=index; if (buffer[index+1] == '-' && - ((tmpIndex=buffer.find("--", index+2)) != -1)) + ((tmpIndex=buffer.tqfind("--", index+2)) != -1)) index = tmpIndex+2; else return index; @@ -330,7 +330,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // Skip through any comments and processing instructions. int index = 0; do { - index = buffer.find('<', index); + index = buffer.tqfind('<', index); if (index == -1) break; TQChar nextChar = buffer[index+1]; if (nextChar == '!') { @@ -340,10 +340,10 @@ static bool parseDocTypeDeclaration(const TQString& buffer, break; } index = parseDocTypePart(buffer,index); - index = buffer.find('>', index); + index = buffer.tqfind('>', index); } else if (nextChar == '?') - index = buffer.find('>', index); + index = buffer.tqfind('>', index); else break; } while (index != -1); @@ -371,7 +371,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // |start| is the first character (after the quote) and |end| // is the final quote, so there are |end|-|start| characters. int publicIDStart = index+1; - int publicIDEnd = buffer.find(theChar, publicIDStart); + int publicIDEnd = buffer.tqfind(theChar, publicIDStart); if (publicIDEnd == -1) return false; index = parseDocTypePart(buffer, publicIDEnd+1); @@ -385,7 +385,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, // We have a system identifier. *resultFlags |= PARSEMODE_HAVE_SYSTEM_ID; int systemIDStart = index+1; - int systemIDEnd = buffer.find(next, systemIDStart); + int systemIDEnd = buffer.tqfind(next, systemIDStart); if (systemIDEnd == -1) return false; systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart); @@ -410,7 +410,7 @@ static bool parseDocTypeDeclaration(const TQString& buffer, if (next != '\"' && next != '\'') return false; int systemIDStart = index+1; - int systemIDEnd = buffer.find(next, systemIDStart); + int systemIDEnd = buffer.tqfind(next, systemIDStart); if (systemIDEnd == -1) return false; systemID = buffer.mid(systemIDStart, systemIDEnd - systemIDStart); diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp index e6269d8b5..a5931cd41 100644 --- a/khtml/html/html_elementimpl.cpp +++ b/khtml/html/html_elementimpl.cpp @@ -176,7 +176,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr) case ATTR_CLASS: if (attr->val()) { DOMString v = attr->value(); - const TQChar* s = v.unicode(); + const TQChar* s = v.tqunicode(); int l = v.length(); while( l && !s->isSpace() ) l--,s++; @@ -354,11 +354,11 @@ static inline bool isHexDigit( const TQChar &c ) { static inline int toHex( const TQChar &c ) { return ( (c >= '0' && c <= '9') - ? (c.unicode() - '0') + ? (c.tqunicode() - '0') : ( ( c >= 'a' && c <= 'f' ) - ? (c.unicode() - 'a' + 10) + ? (c.tqunicode() - 'a' + 10) : ( ( c >= 'A' && c <= 'F' ) - ? (c.unicode() - 'A' + 10) + ? (c.tqunicode() - 'A' + 10) : -1 ) ) ); } @@ -457,7 +457,7 @@ DOMString HTMLElementImpl::innerHTML() const TQString result; //Use TQString to accumulate since DOMString is poor for appends for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) { DOMString kid = child->toString(); - result += TQConstString(kid.unicode(), kid.length()).string(); + result += TQConstString(kid.tqunicode(), kid.length()).string(); } return result; } @@ -620,32 +620,32 @@ void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode ) appendChild( t, exceptioncode ); } -void HTMLElementImpl::addHTMLAlignment( DOMString alignment ) +void HTMLElementImpl::addHTMLAlignment( DOMString tqalignment ) { - //qDebug("alignment is %s", alignment.string().latin1() ); - // vertical alignment with respect to the current baseline of the text + //qDebug("tqalignment is %s", tqalignment.string().latin1() ); + // vertical tqalignment with respect to the current baseline of the text // right or left means floating images int propfloat = -1; int propvalign = -1; - if ( strcasecmp( alignment, "absmiddle" ) == 0 ) { + if ( strcasecmp( tqalignment, "absmiddle" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( alignment, "absbottom" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "absbottom" ) == 0 ) { propvalign = CSS_VAL_BOTTOM; - } else if ( strcasecmp( alignment, "left" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "left" ) == 0 ) { propfloat = CSS_VAL_LEFT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( alignment, "right" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "right" ) == 0 ) { propfloat = CSS_VAL_RIGHT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( alignment, "top" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "top" ) == 0 ) { propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( alignment, "middle" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "middle" ) == 0 ) { propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE; - } else if ( strcasecmp( alignment, "center" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "center" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( alignment, "bottom" ) == 0 ) { + } else if ( strcasecmp( tqalignment, "bottom" ) == 0 ) { propvalign = CSS_VAL_BASELINE; - } else if ( strcasecmp ( alignment, "texttop") == 0 ) { + } else if ( strcasecmp ( tqalignment, "texttop") == 0 ) { propvalign = CSS_VAL_TEXT_TOP; } diff --git a/khtml/html/html_elementimpl.h b/khtml/html/html_elementimpl.h index f71ae9b23..83836f15d 100644 --- a/khtml/html/html_elementimpl.h +++ b/khtml/html/html_elementimpl.h @@ -68,7 +68,7 @@ public: protected: // for IMG, OBJECT and APPLET - void addHTMLAlignment( DOMString alignment ); + void addHTMLAlignment( DOMString tqalignment ); }; class HTMLGenericElementImpl : public HTMLElementImpl diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index a72df3743..530eb5fb7 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -193,7 +193,7 @@ inline static TQString escapeUnencodeable(const TQTextCodec* codec, const TQStri enc_string.append(c); else { TQString ampersandEscape; - ampersandEscape.sprintf("&#%u;", c.unicode()); + ampersandEscape.sprintf("&#%u;", c.tqunicode()); enc_string.append(ampersandEscape); } } @@ -391,12 +391,12 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) void HTMLFormElementImpl::setEnctype( const DOMString& type ) { - if(type.string().find("multipart", 0, false) != -1 || type.string().find("form-data", 0, false) != -1) + if(type.string().tqfind("multipart", 0, false) != -1 || type.string().tqfind("form-data", 0, false) != -1) { m_enctype = "multipart/form-data"; m_multipart = true; m_post = true; - } else if (type.string().find("text", 0, false) != -1 || type.string().find("plain", 0, false) != -1) + } else if (type.string().tqfind("text", 0, false) != -1 || type.string().tqfind("plain", 0, false) != -1) { m_enctype = "text/plain"; m_multipart = false; @@ -1316,10 +1316,10 @@ TQString HTMLInputElementImpl::state( ) { switch (m_type) { case PASSWORD: - return TQString::fromLatin1("."); // empty string, avoid restoring + return TQString::tqfromLatin1("."); // empty string, avoid restoring case CHECKBOX: case RADIO: - return TQString::fromLatin1(checked() ? "on" : "off"); + return TQString::tqfromLatin1(checked() ? "on" : "off"); case TEXT: if (autoComplete() && value() != getAttribute(ATTR_VALUE) && getDocument()->view()) getDocument()->view()->addFormCompletionItem(name().string(), value().string()); @@ -1334,7 +1334,7 @@ void HTMLInputElementImpl::restoreState(const TQString &state) switch (m_type) { case CHECKBOX: case RADIO: - setChecked((state == TQString::fromLatin1("on"))); + setChecked((state == TQString::tqfromLatin1("on"))); break; case FILE: m_value = DOMString(state.left(state.length()-1)); @@ -1560,12 +1560,12 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis if(m_clicked) { m_clicked = false; - TQString astr(nme.isEmpty() ? TQString::fromLatin1("x") : nme + ".x"); + TQString astr(nme.isEmpty() ? TQString::tqfromLatin1("x") : nme + ".x"); encoding += fixUpfromUnicode(codec, astr); astr.setNum(KMAX( clickX(), 0 )); encoding += fixUpfromUnicode(codec, astr); - astr = nme.isEmpty() ? TQString::fromLatin1("y") : nme + ".y"; + astr = nme.isEmpty() ? TQString::tqfromLatin1("y") : nme + ".y"; encoding += fixUpfromUnicode(codec, astr); astr.setNum(KMAX( clickY(), 0 ) ); encoding += fixUpfromUnicode(codec, astr); @@ -1612,7 +1612,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis KIO::UDSEntry filestat; // can't submit file in www-url-form encoded - TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget(); + TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->tqtopLevelWidget(); if (multipart) { TQCString filearray( "" ); if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) { @@ -2756,7 +2756,7 @@ static TQString expandLF(const TQString& s) for(unsigned pos = 0; pos < len; pos++) { TQChar c = s.at(pos); - switch(c.unicode()) + switch(c.tqunicode()) { case '\n': r[pos2++] = '\r'; diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp index be13e93c2..9ced3bf1b 100644 --- a/khtml/html/html_imageimpl.cpp +++ b/khtml/html/html_imageimpl.cpp @@ -418,8 +418,8 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr) case ATTR_NAME: { DOMString s = attr->value(); - if(*s.unicode() == '#') - name = TQString(s.unicode()+1, s.length()-1).lower(); + if(*s.tqunicode() == '#') + name = TQString(s.tqunicode()+1, s.length()-1).lower(); else name = s.string().lower(); // ### make this work for XML documents, e.g. in case of <html:map...> @@ -441,7 +441,7 @@ HTMLAreaElementImpl::HTMLAreaElementImpl(DocumentImpl *doc) m_coords=0; m_coordsLen = 0; nohref = false; - shape = Unknown; + tqshape = Unknown; lasth = lastw = -1; } @@ -461,13 +461,13 @@ void HTMLAreaElementImpl::parseAttribute(AttributeImpl *attr) { case ATTR_SHAPE: if ( strcasecmp( attr->value(), "default" ) == 0 ) - shape = Default; + tqshape = Default; else if ( strcasecmp( attr->value(), "circle" ) == 0 ) - shape = Circle; + tqshape = Circle; else if ( strcasecmp( attr->value(), "poly" ) == 0 || strcasecmp( attr->value(), "polygon" ) == 0 ) - shape = Poly; + tqshape = Poly; else if ( strcasecmp( attr->value(), "rect" ) == 0 ) - shape = Rect; + tqshape = Rect; break; case ATTR_COORDS: delete [] m_coords; @@ -530,7 +530,7 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const // what the HTML author tried to tell us. // a Poly needs at least 3 points (6 coords), so this is correct - if ((shape==Poly || shape==Unknown) && m_coordsLen > 5) { + if ((tqshape==Poly || tqshape==Unknown) && m_coordsLen > 5) { // make sure its even int len = m_coordsLen >> 1; TQPointArray points(len); @@ -539,19 +539,19 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const m_coords[(i<<1)+1].minWidth(height_)); region = TQRegion(points); } - else if (shape==Circle && m_coordsLen>=3 || shape==Unknown && m_coordsLen == 3) { + else if (tqshape==Circle && m_coordsLen>=3 || tqshape==Unknown && m_coordsLen == 3) { int r = kMin(m_coords[2].minWidth(width_), m_coords[2].minWidth(height_)); region = TQRegion(m_coords[0].minWidth(width_)-r, m_coords[1].minWidth(height_)-r, 2*r, 2*r,TQRegion::Ellipse); } - else if (shape==Rect && m_coordsLen>=4 || shape==Unknown && m_coordsLen == 4) { + else if (tqshape==Rect && m_coordsLen>=4 || tqshape==Unknown && m_coordsLen == 4) { int x0 = m_coords[0].minWidth(width_); int y0 = m_coords[1].minWidth(height_); int x1 = m_coords[2].minWidth(width_); int y1 = m_coords[3].minWidth(height_); region = TQRegion(x0,y0,x1-x0,y1-y0); } - else if (shape==Default) + else if (tqshape==Default) region = TQRegion(0,0,width_,height_); // else // return null region diff --git a/khtml/html/html_imageimpl.h b/khtml/html/html_imageimpl.h index 6f26cd2df..1a389e895 100644 --- a/khtml/html/html_imageimpl.h +++ b/khtml/html/html_imageimpl.h @@ -102,7 +102,7 @@ public: virtual void parseAttribute(AttributeImpl *attr); - bool isDefault() const { return shape==Default; } + bool isDefault() const { return tqshape==Default; } bool mapMouseEvent(int x_, int y_, int width_, int height_, khtml::RenderObject::NodeInfo& info); @@ -117,7 +117,7 @@ protected: khtml::Length* m_coords; int m_coordsLen; int lastw, lasth; - Shape shape : 3; + Shape tqshape : 3; bool nohref : 1; }; diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp index 58804bff5..1528fa942 100644 --- a/khtml/html/html_miscimpl.cpp +++ b/khtml/html/html_miscimpl.cpp @@ -290,7 +290,7 @@ TQValueList<NodeImpl*> HTMLCollectionImpl::namedItems( const DOMString &name ) c //remember stuff about elements we were asked for. m_cache->updateNodeListInfo(m_refNode->getDocument()); CollectionCache* cache = static_cast<CollectionCache*>(m_cache); - if (TQValueList<NodeImpl*>* info = cache->nameCache.find(key)) { + if (TQValueList<NodeImpl*>* info = cache->nameCache.tqfind(key)) { return *info; } else { diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp index 106a862e9..5ed1e11f3 100644 --- a/khtml/html/html_objectimpl.cpp +++ b/khtml/html/html_objectimpl.cpp @@ -57,7 +57,7 @@ HTMLObjectBaseElementImpl::HTMLObjectBaseElementImpl(DocumentImpl *doc) void HTMLObjectBaseElementImpl::setServiceType(const TQString & val) { serviceType = val.lower(); - int pos = serviceType.find( ";" ); + int pos = serviceType.tqfind( ";" ); if ( pos!=-1 ) serviceType.truncate( pos ); } @@ -160,9 +160,9 @@ void HTMLObjectBaseElementImpl::attach() { if (serviceType.isEmpty() && url.startsWith("data:")) { // Extract the MIME type from the data URL. - int index = url.find(';'); + int index = url.tqfind(';'); if (index == -1) - index = url.find(','); + index = url.tqfind(','); if (index != -1) { int len = index - 5; if (len > 0) @@ -422,7 +422,7 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const if ( !m_render ) return 0; if ( !m_render->isWidget() ) return 0; TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget(); - if( widget && ::qt_cast<KHTMLView*>( widget ) ) + if( widget && ::tqqt_cast<KHTMLView*>( widget ) ) return static_cast<KHTMLView*>( widget )->part()->xmlDocImpl(); return 0; } diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp index 5da6edd14..d1d009d39 100644 --- a/khtml/html/htmltokenizer.cpp +++ b/khtml/html/htmltokenizer.cpp @@ -89,7 +89,7 @@ static const char titleEnd [] = "</title"; #define fixUpChar(x) #else #define fixUpChar(x) \ - switch ((x).unicode()) \ + switch ((x).tqunicode()) \ { \ case 0x80: (x) = 0x20ac; break; \ case 0x82: (x) = 0x201a; break; \ @@ -347,7 +347,7 @@ void HTMLTokenizer::parseSpecial(TokenizerString &src) // possible end of tagname, lets check. if ( !scriptCodeResync && !escaped && !src.escaped() && ( ch == '>' || ch == '/' || ch <= ' ' ) && ch && scriptCodeSize >= searchStopperLen && - !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().find( searchStopper, 0, false )) { + !TQConstString( scriptCode+scriptCodeSize-searchStopperLen, searchStopperLen ).string().tqfind( searchStopper, 0, false )) { scriptCodeResync = scriptCodeSize-searchStopperLen+1; tquote = NoQuote; continue; @@ -471,7 +471,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) if (strict) { - if (src->unicode() == '-') { + if (src->tqunicode() == '-') { delimiterCount++; if (delimiterCount == 2) { delimiterCount = 0; @@ -482,7 +482,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src) delimiterCount = 0; } - if ((!strict || canClose) && src->unicode() == '>') + if ((!strict || canClose) && src->tqunicode() == '>') { bool handleBrokenComments = brokenComments && !( script || style ); bool scriptEnd=false; @@ -521,7 +521,7 @@ void HTMLTokenizer::parseServer(TokenizerString &src) checkScriptBuffer(src.length()); while ( !src.isEmpty() ) { scriptCode[ scriptCodeSize++ ] = *src; - if (src->unicode() == '>' && + if (src->tqunicode() == '>' && scriptCodeSize > 1 && scriptCode[scriptCodeSize-2] == '%') { ++src; server = false; @@ -607,7 +607,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) while( !src.isEmpty() ) { - ushort cc = src->unicode(); + ushort cc = src->tqunicode(); switch(Entity) { case NoEntity: return; @@ -639,7 +639,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) case Hexadecimal: { - int uc = EntityChar.unicode(); + int uc = EntityChar.tqunicode(); int ll = kMin<uint>(src.length(), 8); while(ll--) { TQChar csrc(src->lower()); @@ -658,7 +658,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) } case Decimal: { - int uc = EntityChar.unicode(); + int uc = EntityChar.tqunicode(); int ll = kMin(src.length(), 9-cBufferPos); while(ll--) { cc = src->cell(); @@ -718,7 +718,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start) } case SearchSemicolon: #ifdef TOKEN_DEBUG - kdDebug( 6036 ) << "ENTITY " << EntityChar.unicode() << endl; + kdDebug( 6036 ) << "ENTITY " << EntityChar.tqunicode() << endl; #endif fixUpChar(EntityChar); @@ -919,7 +919,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) a = khtml::getAttrID(cBuffer, cBufferPos-1); } if (!a) - attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data()); + attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data()); } dest = buffer; @@ -941,7 +941,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) } if ( cBufferPos == CBUFLEN ) { cBuffer[cBufferPos] = '\0'; - attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data()); + attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data()); dest = buffer; *dest++ = 0; tag = SearchEqual; @@ -956,7 +956,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) ushort curchar; bool atespace = false; while(!src.isEmpty()) { - curchar = src->unicode(); + curchar = src->tqunicode(); if(curchar > ' ') { if(curchar == '=') { #ifdef TOKEN_DEBUG @@ -988,7 +988,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) { ushort curchar; while(!src.isEmpty()) { - curchar = src->unicode(); + curchar = src->tqunicode(); if(curchar > ' ') { if(( curchar == '\'' || curchar == '\"' )) { tquote = curchar == '\"' ? DoubleQuote : SingleQuote; @@ -1012,7 +1012,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) while(!src.isEmpty()) { checkBuffer(); - curchar = src->unicode(); + curchar = src->tqunicode(); if(curchar <= '\'' && !src.escaped()) { // ### attributes like '&{blaa....};' are supposed to be treated as jscript. if ( curchar == '&' ) @@ -1050,7 +1050,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src) ushort curchar; while(!src.isEmpty()) { checkBuffer(); - curchar = src->unicode(); + curchar = src->tqunicode(); if(curchar <= '>' && !src.escaped()) { // parse Entities if ( curchar == '&' ) @@ -1351,7 +1351,7 @@ void HTMLTokenizer::write( const TokenizerString &str, bool appendData ) // do we need to enlarge the buffer? checkBuffer(); - ushort cc = src->unicode(); + ushort cc = src->tqunicode(); if (skipLF && (cc != '\n')) skipLF = false; @@ -1618,7 +1618,7 @@ void HTMLTokenizer::finish() food += TQString(scriptCode, scriptCodeSize); } else { - pos = TQConstString(scriptCode, scriptCodeSize).string().find('>'); + pos = TQConstString(scriptCode, scriptCodeSize).string().tqfind('>'); food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy } KHTML_DELETE_QCHAR_VEC(scriptCode); diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h index 8e36353b0..2197a5083 100644 --- a/khtml/html/htmltokenizer.h +++ b/khtml/html/htmltokenizer.h @@ -76,8 +76,8 @@ namespace khtml { { DOMStringImpl *value = 0; NodeImpl::Id tid = 0; - if(buffer->unicode()) { - tid = buffer->unicode(); + if(buffer->tqunicode()) { + tid = buffer->tqunicode(); value = v.implementation(); } else if ( !attrName.isEmpty() && attrName != "/" ) { diff --git a/khtml/htmlpageinfo.ui b/khtml/htmlpageinfo.ui index 37adef500..9f2e4030c 100644 --- a/khtml/htmlpageinfo.ui +++ b/khtml/htmlpageinfo.ui @@ -40,7 +40,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/khtml/java/kjavaapplet.h b/khtml/java/kjavaapplet.h index 6fe0f7709..8e02c5ba4 100644 --- a/khtml/java/kjavaapplet.h +++ b/khtml/java/kjavaapplet.h @@ -47,7 +47,7 @@ class KJavaAppletContext; class KJavaAppletPrivate; -class KJavaApplet : public QObject +class KJavaApplet : public TQObject { Q_OBJECT diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp index 76914a5dc..776eb8a64 100644 --- a/khtml/java/kjavaappletcontext.cpp +++ b/khtml/java/kjavaappletcontext.cpp @@ -138,7 +138,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg kdDebug(6100) << "KJavaAppletContext::received, cmd = >>" << cmd << "<<" << endl; kdDebug(6100) << "arg count = " << arg.count() << endl; - if ( cmd == TQString::fromLatin1("showstatus") + if ( cmd == TQString::tqfromLatin1("showstatus") && !arg.empty() ) { TQString tmp = arg.first(); @@ -146,19 +146,19 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg kdDebug(6100) << "status message = " << tmp << endl; emit showStatus( tmp ); } - else if ( cmd == TQString::fromLatin1( "showurlinframe" ) + else if ( cmd == TQString::tqfromLatin1( "showurlinframe" ) && arg.count() > 1 ) { kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl; emit showDocument( arg[0], arg[1] ); } - else if ( cmd == TQString::fromLatin1( "showdocument" ) + else if ( cmd == TQString::tqfromLatin1( "showdocument" ) && !arg.empty() ) { kdDebug(6100) << "url = " << arg.first() << endl; emit showDocument( arg.first(), "_top" ); } - else if ( cmd == TQString::fromLatin1( "resizeapplet" ) + else if ( cmd == TQString::tqfromLatin1( "resizeapplet" ) && arg.count() > 2 ) { //arg[1] should be appletID @@ -180,10 +180,10 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg tmp->resizeAppletWidget( width, height ); } } - else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) { + else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) { kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd << " " << arg[0] << endl; } - else if ( cmd == TQString::fromLatin1( "JS_Event" ) + else if ( cmd == TQString::tqfromLatin1( "JS_Event" ) && arg.count() > 2 ) { bool ok; @@ -198,7 +198,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg else kdError(DEBUGAREA) << "parse JS event " << arg[0] << " " << arg[1] << endl; } - else if ( cmd == TQString::fromLatin1( "AppletStateNotification" ) ) + else if ( cmd == TQString::tqfromLatin1( "AppletStateNotification" ) ) { bool ok; const int appletID = arg.first().toInt(&ok); @@ -222,7 +222,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg } else kdError(DEBUGAREA) << "AppletStateNotification: Applet ID is not numerical" << endl; } - else if ( cmd == TQString::fromLatin1( "AppletFailed" ) ) { + else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) { bool ok; const int appletID = arg.first().toInt(&ok); if (ok) diff --git a/khtml/java/kjavaappletcontext.h b/khtml/java/kjavaappletcontext.h index ca851a42e..119699f23 100644 --- a/khtml/java/kjavaappletcontext.h +++ b/khtml/java/kjavaappletcontext.h @@ -42,7 +42,7 @@ class KJavaAppletServer; class KJavaApplet; class KJavaAppletContextPrivate; -class KJavaAppletContext : public QObject +class KJavaAppletContext : public TQObject { Q_OBJECT diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp index 59d0517a2..199256b59 100644 --- a/khtml/java/kjavaappletserver.cpp +++ b/khtml/java/kjavaappletserver.cpp @@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray& void KJavaAppletServer::removeDataJob( int loaderID ) { - const KIOJobMap::iterator it = d->kiojobs.find( loaderID ); + const KIOJobMap::iterator it = d->kiojobs.tqfind( loaderID ); if (it != d->kiojobs.end()) { it.data()->deleteLater(); d->kiojobs.erase( it ); @@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) if (cmd_code == KJAS_PUT_DATA) { // rest of the data is for kio put if (ok) { - KIOJobMap::iterator it = d->kiojobs.find( ID_num ); + KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num ); if (ok && it != d->kiojobs.end()) { TQByteArray qba; qba.setRawData(qb.data() + index, qb.size() - index - 1); @@ -517,7 +517,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) //now parse out the arguments while( index < qb_size ) { - int sep_pos = qb.find( 0, index ); + int sep_pos = qb.tqfind( 0, index ); if (sep_pos < 0) { kdError(6100) << "Missing separation byte" << endl; sep_pos = qb_size; @@ -531,19 +531,19 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) switch( cmd_code ) { case KJAS_SHOW_DOCUMENT: - cmd = TQString::fromLatin1( "showdocument" ); + cmd = TQString::tqfromLatin1( "showdocument" ); break; case KJAS_SHOW_URLINFRAME: - cmd = TQString::fromLatin1( "showurlinframe" ); + cmd = TQString::tqfromLatin1( "showurlinframe" ); break; case KJAS_SHOW_STATUS: - cmd = TQString::fromLatin1( "showstatus" ); + cmd = TQString::tqfromLatin1( "showstatus" ); break; case KJAS_RESIZE_APPLET: - cmd = TQString::fromLatin1( "resizeapplet" ); + cmd = TQString::tqfromLatin1( "resizeapplet" ); break; case KJAS_GET_URLDATA: @@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) case KJAS_DATA_COMMAND: if (ok && !args.empty()) { const int cmd = args.first().toInt( &ok ); - KIOJobMap::iterator it = d->kiojobs.find( ID_num ); + KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num ); if (ok && it != d->kiojobs.end()) it.data()->jobCommand( cmd ); kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl; @@ -573,7 +573,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl; return; case KJAS_JAVASCRIPT_EVENT: - cmd = TQString::fromLatin1( "JS_Event" ); + cmd = TQString::tqfromLatin1( "JS_Event" ); kdDebug(6100) << "Javascript request: "<< contextID << " code: " << args[0] << endl; break; @@ -581,7 +581,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) case KJAS_PUT_MEMBER: case KJAS_CALL_MEMBER: { const int ticket = args[0].toInt(); - JSStack::iterator it = d->jsstack.find(ticket); + JSStack::iterator it = d->jsstack.tqfind(ticket); if (it != d->jsstack.end()) { kdDebug(6100) << "slotJavaRequest: " << ticket << endl; args.pop_front(); @@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) return; } case KJAS_AUDIOCLIP_PLAY: - cmd = TQString::fromLatin1( "audioclip_play" ); + cmd = TQString::tqfromLatin1( "audioclip_play" ); kdDebug(6100) << "Audio Play: url=" << args[0] << endl; break; case KJAS_AUDIOCLIP_LOOP: - cmd = TQString::fromLatin1( "audioclip_loop" ); + cmd = TQString::tqfromLatin1( "audioclip_loop" ); kdDebug(6100) << "Audio Loop: url=" << args[0] << endl; break; case KJAS_AUDIOCLIP_STOP: - cmd = TQString::fromLatin1( "audioclip_stop" ); + cmd = TQString::tqfromLatin1( "audioclip_stop" ); kdDebug(6100) << "Audio Stop: url=" << args[0] << endl; break; case KJAS_APPLET_STATE: kdDebug(6100) << "Applet State Notification for Applet " << args[0] << ". New state=" << args[1] << endl; - cmd = TQString::fromLatin1( "AppletStateNotification" ); + cmd = TQString::tqfromLatin1( "AppletStateNotification" ); break; case KJAS_APPLET_FAILED: kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl; - cmd = TQString::fromLatin1( "AppletFailed" ); + cmd = TQString::tqfromLatin1( "AppletFailed" ); break; case KJAS_SECURITY_CONFIRM: { if (KSSL::doesSSLWork() && !d->kssl) @@ -670,7 +670,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) TQString subject = cert->getSubject() + TQChar('\n'); TQRegExp reg(TQString("/[A-Z]+=")); int pos = 0; - while ((pos = subject.find(reg, pos)) > -1) + while ((pos = subject.tqfind(reg, pos)) > -1) subject.replace(pos, 1, TQString("\n ")); text += subject.mid(1); } @@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) KSSLCertChain chain; chain.setChain( certs ); if ( chain.isValid() ) - answer = PermissionDialog( qApp->activeWindow() ).exec( text, args[0] ); + answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] ); } } sl.push_front( TQString(answer) ); @@ -779,7 +779,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent ) TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) { TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog"); - dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); + dialog->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); dialog->setModal( true ); dialog->setCaption( i18n("Security Alert") ); @@ -807,7 +807,7 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) TQPushButton* const grant = new TQPushButton( i18n("&Grant All"), dialog, "grant" ); buttonLayout->addWidget( grant ); dialogLayout->addLayout( buttonLayout ); - dialog->resize( dialog->minimumSizeHint() ); + dialog->resize( dialog->tqminimumSizeHint() ); //clearWState( WState_Polished ); connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); @@ -827,7 +827,7 @@ PermissionDialog::~PermissionDialog() void PermissionDialog::clicked() { m_button = sender()->name(); - static_cast<const TQWidget*>(sender())->parentWidget()->close(); + static_cast<const TQWidget*>(sender())->tqparentWidget()->close(); } #include "kjavaappletserver.moc" diff --git a/khtml/java/kjavaappletserver.h b/khtml/java/kjavaappletserver.h index 08d0f2983..63463b040 100644 --- a/khtml/java/kjavaappletserver.h +++ b/khtml/java/kjavaappletserver.h @@ -39,7 +39,7 @@ class KJavaAppletContext; class KJavaAppletServerPrivate; class JSStackFrame; -class KJavaAppletServer : public QObject +class KJavaAppletServer : public TQObject { Q_OBJECT @@ -161,7 +161,7 @@ private: }; -class PermissionDialog : public QObject +class PermissionDialog : public TQObject { Q_OBJECT public: diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index d4c8e266f..7e9264786 100644 --- a/khtml/java/kjavaappletviewer.cpp +++ b/khtml/java/kjavaappletviewer.cpp @@ -230,7 +230,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, TQStringList::const_iterator it = args.begin(); const TQStringList::const_iterator itEnd = args.end(); for ( ; it != itEnd; ++it) { - const int equalPos = (*it).find("="); + const int equalPos = (*it).tqfind("="); if (equalPos > 0) { const TQString name = (*it).left (equalPos).upper (); TQString value = (*it).right ((*it).length () - equalPos - 1); @@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, baseurl = KURL (KURL (value), TQString (".")).url (); } else if (name == "__KHTML__CODEBASE") khtml_codebase = value; - else if (name_lower == TQString::fromLatin1("codebase") || - name_lower == TQString::fromLatin1("java_codebase")) { + else if (name_lower == TQString::tqfromLatin1("codebase") || + name_lower == TQString::tqfromLatin1("java_codebase")) { if (!value.isEmpty ()) codebase = value; } else if (name == "__KHTML__CLASSID") - //else if (name.lower()==TQString::fromLatin1("classid")) + //else if (name.lower()==TQString::tqfromLatin1("classid")) classid = value; - else if (name_lower == TQString::fromLatin1("code") || - name_lower == TQString::fromLatin1("java_code")) + else if (name_lower == TQString::tqfromLatin1("code") || + name_lower == TQString::tqfromLatin1("java_code")) classname = value; - else if (name_lower == TQString::fromLatin1("src")) + else if (name_lower == TQString::tqfromLatin1("src")) src_param = value; - else if (name_lower == TQString::fromLatin1("archive") || - name_lower == TQString::fromLatin1("java_archive") || + else if (name_lower == TQString::tqfromLatin1("archive") || + name_lower == TQString::tqfromLatin1("java_archive") || name_lower.startsWith ("cache_archive")) applet->setArchives (value); - else if (name_lower == TQString::fromLatin1("name")) + else if (name_lower == TQString::tqfromLatin1("name")) applet->setAppletName (value); - else if (name_lower == TQString::fromLatin1("width")) + else if (name_lower == TQString::tqfromLatin1("width")) width = value.toInt(); - else if (name_lower == TQString::fromLatin1("height")) + else if (name_lower == TQString::tqfromLatin1("height")) height = value.toInt(); if (!name.startsWith ("__KHTML__")) { applet->setParameter (name, value); @@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, info.verifyPath = true; TQDataStream stream(params, IO_WriteOnly); - stream << info << m_view->topLevelWidget()->winId(); + stream << info << m_view->tqtopLevelWidget()->winId(); if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) { kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl; @@ -342,7 +342,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, /* install event filter for close events */ if (wparent) - wparent->topLevelWidget ()->installEventFilter (this); + wparent->tqtopLevelWidget ()->installEventFilter (this); setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); @@ -391,7 +391,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) { } else applet->setAppletClass (url.url ()); AppletParameterDialog (w).exec (); - applet->setSize (w->sizeHint()); + applet->setSize (w->tqsizeHint()); } if (!m_statusbar_icon) { KStatusBar *sb = m_statusbar->statusBar(); @@ -500,7 +500,7 @@ void KJavaAppletViewerBrowserExtension::restoreState (TQDataStream & stream) { applet->setParameter (key, val); kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl; } - applet->setSize (w->sizeHint ()); + applet->setSize (w->tqsizeHint ()); if (w->isVisible()) w->showApplet (); } diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp index 1299ce7e8..2e9597b2d 100644 --- a/khtml/java/kjavaappletwidget.cpp +++ b/khtml/java/kjavaappletwidget.cpp @@ -50,7 +50,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name ) d->tmplabel = new TQLabel( this ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); - d->tmplabel->setAlignment( Qt::AlignCenter | Qt::WordBreak ); + d->tmplabel->tqsetAlignment( Qt::AlignCenter | Qt::WordBreak ); d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); d->tmplabel->show(); @@ -98,10 +98,10 @@ void KJavaAppletWidget::setWindow( WId w ) } } -TQSize KJavaAppletWidget::sizeHint() const +TQSize KJavaAppletWidget::tqsizeHint() const { - kdDebug(6100) << "KJavaAppletWidget::sizeHint()" << endl; - TQSize rval = QXEmbed::sizeHint(); + kdDebug(6100) << "KJavaAppletWidget::tqsizeHint()" << endl; + TQSize rval = QXEmbed::tqsizeHint(); if( rval.width() == 0 || rval.height() == 0 ) { @@ -132,7 +132,7 @@ void KJavaAppletWidget::showEvent (TQShowEvent * e) { if (!applet()->isCreated() && !applet()->appletClass().isEmpty()) { // delayed showApplet if (applet()->size().width() <= 0) - applet()->setSize (sizeHint()); + applet()->setSize (tqsizeHint()); showApplet(); } } diff --git a/khtml/java/kjavaappletwidget.h b/khtml/java/kjavaappletwidget.h index 18f5be341..0b8ce90e9 100644 --- a/khtml/java/kjavaappletwidget.h +++ b/khtml/java/kjavaappletwidget.h @@ -75,7 +75,7 @@ class KJavaAppletWidgetPrivate; -class KJavaAppletWidget : public QXEmbed +class KJavaAppletWidget : public TQXEmbed { Q_OBJECT public: @@ -96,7 +96,7 @@ public: */ void showApplet(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void resize( int, int ); protected slots: diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h index d3cf0de41..f9514304c 100644 --- a/khtml/java/kjavadownloader.h +++ b/khtml/java/kjavadownloader.h @@ -40,7 +40,7 @@ namespace KIO { class KJavaDownloaderPrivate; class KJavaUploaderPrivate; -class KJavaKIOJob : public QObject +class KJavaKIOJob : public TQObject { Q_OBJECT public: diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp index 1c9f1b346..48eb7b764 100644 --- a/khtml/java/kjavaprocess.cpp +++ b/khtml/java/kjavaprocess.cpp @@ -300,7 +300,7 @@ bool KJavaProcess::invokeJVM() TQString argStr; TQTextOStream stream( &argStr ); const TQValueList<TQCString> args = javaProcess->args(); - qCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) ); + tqCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) ); kdDebug(6100) << argStr << endl; KProcess::Communication flags = (KProcess::Communication) diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp index 9b819ee6c..756b16653 100644 --- a/khtml/khtml_caret.cpp +++ b/khtml/khtml_caret.cpp @@ -775,7 +775,7 @@ void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontM caret_boxes.append(caretBox); // afaik an inner flow box can only have the width 0, therefore we don't - // have to care for rtl or alignment + // have to care for rtl or tqalignment // ### can empty inline elements have a width? css 2 spec isn't verbose about it caretBox->_y += flowBox->baseline() - fm.ascent(); @@ -1749,7 +1749,7 @@ void EditableCharacterIterator::initFirstChar() if (_offset == box->maxOffset()) peekNext(); else if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode(); + _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode(); else _char = -1; } @@ -1849,7 +1849,7 @@ kdDebug(6200) << "_offset " << _offset << endl; readchar: // get character if (b && !box->isOutside() && b->isInlineTextBox() && _offset < b->maxOffset()) - _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode(); + _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode(); else _char = -1; }/*end if*/ @@ -1887,7 +1887,7 @@ kdDebug(6200) << "_offset == minofs: " << _offset << " == " << minofs << endl; // _peekNext = b; // get character if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode(); + _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode(); else _char = -1; @@ -1990,9 +1990,9 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl; #endif // get character if (_peekNext && _offset >= box->maxOffset() && _peekNext->isInlineTextBox()) - _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].unicode(); + _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].tqunicode(); else if (b && _offset < b->maxOffset() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode(); + _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode(); else _char = -1; }/*end if*/ diff --git a/khtml/khtml_caret_p.h b/khtml/khtml_caret_p.h index 9524f2df7..a5c4bf60d 100644 --- a/khtml/khtml_caret_p.h +++ b/khtml/khtml_caret_p.h @@ -1034,7 +1034,7 @@ public: */ int chr() const { return _char; } - /** returns the current character as a unicode symbol, substituting + /** returns the current character as a tqunicode symbol, substituting * a blank for a non-text node. */ TQChar operator *() const { return TQChar(_char >= 0 ? _char : ' '); } @@ -1089,7 +1089,7 @@ protected: CaretBox *box = *copy; InlineBox *b = box->inlineBox(); if (b && !box->isOutside() && b->isInlineTextBox()) - _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].unicode(); + _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].tqunicode(); else _char = -1; } diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp index 7cadfb944..4f2ceca79 100644 --- a/khtml/khtml_ext.cpp +++ b/khtml/khtml_ext.cpp @@ -315,7 +315,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) if ( !m_extensionProxy ) return; - int slot = m_extensionProxy->metaObject()->findSlot( method ); + int slot = m_extensionProxy->tqmetaObject()->findSlot( method ); if ( slot == -1 ) return; @@ -344,9 +344,9 @@ void KHTMLPartBrowserExtension::updateEditActions() bool hasSelection = false; if( m_editableFormWidget) { - if ( ::qt_cast<TQLineEdit*>(m_editableFormWidget)) + if ( ::tqqt_cast<TQLineEdit*>(m_editableFormWidget)) hasSelection = static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->hasSelectedText(); - else if(::qt_cast<TQTextEdit*>(m_editableFormWidget)) + else if(::tqqt_cast<TQTextEdit*>(m_editableFormWidget)) hasSelection = static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->hasSelectedText(); } @@ -809,7 +809,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption, const TQString &filter, long cacheId, const TQString & suggestedFilename ) { - TQString name = TQString::fromLatin1( "index.html" ); + TQString name = TQString::tqfromLatin1( "index.html" ); if ( !suggestedFilename.isEmpty() ) name = suggestedFilename; else if ( !url.fileName().isEmpty() ) diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp index 7eedc6311..dc7614dce 100644 --- a/khtml/khtml_factory.cpp +++ b/khtml/khtml_factory.cpp @@ -103,13 +103,13 @@ KHTMLFactory::~KHTMLFactory() deref(); } -KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) +KParts::Part *KHTMLFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLPart( parentWidget, widgetName, parent, name, prof ); + return new KHTMLPart( tqparentWidget, widgetName, parent, name, prof ); } void KHTMLFactory::ref() diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h index e9d5c62a8..e5319bf83 100644 --- a/khtml/khtml_factory.h +++ b/khtml/khtml_factory.h @@ -45,7 +45,7 @@ public: KHTMLFactory( bool clone = false ); virtual ~KHTMLFactory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); static void registerPart( KHTMLPart *part ); static void deregisterPart( KHTMLPart *part ); diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp index 935f31cc0..33462110a 100644 --- a/khtml/khtml_pagecache.cpp +++ b/khtml/khtml_pagecache.cpp @@ -157,7 +157,7 @@ KHTMLPageCache::createCacheEntry() void KHTMLPageCache::addData(long id, const TQByteArray &data) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); if (entry) entry->addData(data); } @@ -165,7 +165,7 @@ KHTMLPageCache::addData(long id, const TQByteArray &data) void KHTMLPageCache::endData(long id) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); if (entry) entry->endData(); } @@ -184,13 +184,13 @@ KHTMLPageCache::cancelEntry(long id) bool KHTMLPageCache::isValid(long id) { - return (d->dict.find(id) != 0); + return (d->dict.tqfind(id) != 0); } bool KHTMLPageCache::isComplete(long id) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); if (entry) return entry->isComplete(); return false; @@ -199,7 +199,7 @@ KHTMLPageCache::isComplete(long id) void KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); if (!entry || !entry->isComplete()) return; // Make this entry the most recent entry. @@ -271,7 +271,7 @@ KHTMLPageCache::sendData() void KHTMLPageCache::saveData(long id, TQDataStream *str) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + KHTMLPageCacheEntry *entry = d->dict.tqfind(id); assert(entry); int fd = entry->m_file->handle(); diff --git a/khtml/khtml_pagecache.h b/khtml/khtml_pagecache.h index 9b41950a7..ac9ea5b4b 100644 --- a/khtml/khtml_pagecache.h +++ b/khtml/khtml_pagecache.h @@ -38,7 +38,7 @@ class KHTMLPageCachePrivate; * * It operates completely independent from the kio_http cache. */ -class KHTMLPageCache : public QObject +class KHTMLPageCache : public TQObject { Q_OBJECT public: @@ -113,7 +113,7 @@ private: KHTMLPageCachePrivate *d; }; -class KHTMLPageCacheDelivery : public QObject +class KHTMLPageCacheDelivery : public TQObject { friend class KHTMLPageCache; Q_OBJECT diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 338b9605d..e59b7fe3f 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -178,7 +178,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e script += ")"; kdDebug(6050) << "khtml::ChildFrame::liveConnectEvent " << script << endl; - KHTMLPart * part = ::qt_cast<KHTMLPart *>(m_part->parent()); + KHTMLPart * part = ::tqqt_cast<KHTMLPart *>(m_part->parent()); if (!part) return; if (!m_jscript) @@ -203,7 +203,7 @@ KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name ) return it; } -KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) +KHTMLPart::KHTMLPart( TQWidget *tqparentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ) { d = 0; @@ -211,7 +211,7 @@ KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject * setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); // TODO KDE4 - don't load plugins yet //setInstance( KHTMLFactory::instance(), false ); - init( new KHTMLView( this, parentWidget, widgetname ), prof ); + init( new KHTMLView( this, tqparentWidget, widgetname ), prof ); } KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof ) @@ -608,7 +608,7 @@ bool KHTMLPart::openURL( const KURL &url ) if (!d->m_statusBarUALabel) { d->m_statusBarUALabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarUALabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarUALabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarUALabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarUALabel, 0, false); d->m_statusBarUALabel->setPixmap(SmallIcon("agent", instance())); @@ -717,7 +717,7 @@ bool KHTMLPart::openURL( const KURL &url ) } if (widget()) - d->m_job->setWindow(widget()->topLevelWidget()); + d->m_job->setWindow(widget()->tqtopLevelWidget()); d->m_job->addMetaData(args.metaData()); connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ), @@ -1075,7 +1075,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() { if (!d->m_statusBarJSErrorLabel) { d->m_statusBarJSErrorLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarJSErrorLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarJSErrorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarJSErrorLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarJSErrorLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false); TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors.")); @@ -1525,7 +1525,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec ) if ( sec != NotCrypted && !d->m_statusBarIconLabel && !parentPart() ) { d->m_statusBarIconLabel = new KURLLabel( d->m_statusBarExtension->statusBar() ); d->m_statusBarIconLabel->setFixedHeight( instance()->iconLoader()->currentSize(KIcon::Small) ); - d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + d->m_statusBarIconLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarIconLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false ); connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) ); @@ -1722,14 +1722,14 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU d->m_bJScriptForce = false; d->m_bJScriptOverride = true; begin(); - TQString errText = TQString::fromLatin1( "<HTML dir=%1><HEAD><TITLE>" ) + TQString errText = TQString::tqfromLatin1( "<HTML dir=%1><HEAD><TITLE>" ) .arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() ); - errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" ); + errText += TQString::tqfromLatin1( "</TITLE></HEAD><BODY><P>" ); errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() ); - errText += TQString::fromLatin1( "</P>" ); + errText += TQString::tqfromLatin1( "</P>" ); errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) ); - errText += TQString::fromLatin1( "</BODY></HTML>" ); + errText += TQString::tqfromLatin1( "</BODY></HTML>" ); write(errText); end(); @@ -1757,56 +1757,56 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU TQString url, protocol, datetime; url = reqUrl.prettyURL(); protocol = reqUrl.protocol(); - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); - TQString doc = TQString::fromLatin1( "<html><head><title>" ); + TQString doc = TQString::tqfromLatin1( "<html><head><title>" ); doc += i18n( "Error: " ); doc += errorName; - doc += TQString::fromLatin1( " - %1</title></head><body><h1>" ).arg( url ); + doc += TQString::tqfromLatin1( " - %1</title></head><body><h1>" ).arg( url ); doc += i18n( "The requested operation could not be completed" ); - doc += TQString::fromLatin1( "</h1><h2>" ); + doc += TQString::tqfromLatin1( "</h1><h2>" ); doc += errorName; - doc += TQString::fromLatin1( "</h2>" ); + doc += TQString::tqfromLatin1( "</h2>" ); if ( !techName.isNull() ) { - doc += TQString::fromLatin1( "<h2>" ); + doc += TQString::tqfromLatin1( "<h2>" ); doc += i18n( "Technical Reason: " ); doc += techName; - doc += TQString::fromLatin1( "</h2>" ); + doc += TQString::tqfromLatin1( "</h2>" ); } - doc += TQString::fromLatin1( "<h3>" ); + doc += TQString::tqfromLatin1( "<h3>" ); doc += i18n( "Details of the Request:" ); - doc += TQString::fromLatin1( "</h3><ul><li>" ); + doc += TQString::tqfromLatin1( "</h3><ul><li>" ); doc += i18n( "URL: %1" ).arg( url ); - doc += TQString::fromLatin1( "</li><li>" ); + doc += TQString::tqfromLatin1( "</li><li>" ); if ( !protocol.isNull() ) { // uncomment for 3.1... i18n change // doc += i18n( "Protocol: %1" ).arg( protocol ).arg( protocol ); - doc += TQString::fromLatin1( "</li><li>" ); + doc += TQString::tqfromLatin1( "</li><li>" ); } doc += i18n( "Date and Time: %1" ).arg( datetime ); - doc += TQString::fromLatin1( "</li><li>" ); + doc += TQString::tqfromLatin1( "</li><li>" ); doc += i18n( "Additional Information: %1" ).arg( text ); - doc += TQString::fromLatin1( "</li></ul><h3>" ); + doc += TQString::tqfromLatin1( "</li></ul><h3>" ); doc += i18n( "Description:" ); - doc += TQString::fromLatin1( "</h3><p>" ); + doc += TQString::tqfromLatin1( "</h3><p>" ); doc += description; - doc += TQString::fromLatin1( "</p>" ); + doc += TQString::tqfromLatin1( "</p>" ); if ( causes.count() ) { - doc += TQString::fromLatin1( "<h3>" ); + doc += TQString::tqfromLatin1( "<h3>" ); doc += i18n( "Possible Causes:" ); - doc += TQString::fromLatin1( "</h3><ul><li>" ); + doc += TQString::tqfromLatin1( "</h3><ul><li>" ); doc += causes.join( "</li><li>" ); - doc += TQString::fromLatin1( "</li></ul>" ); + doc += TQString::tqfromLatin1( "</li></ul>" ); } if ( solutions.count() ) { - doc += TQString::fromLatin1( "<h3>" ); + doc += TQString::tqfromLatin1( "<h3>" ); doc += i18n( "Possible Solutions:" ); - doc += TQString::fromLatin1( "</h3><ul><li>" ); + doc += TQString::tqfromLatin1( "</h3><ul><li>" ); doc += solutions.join( "</li><li>" ); - doc += TQString::fromLatin1( "</li></ul>" ); + doc += TQString::tqfromLatin1( "</li></ul>" ); } - doc += TQString::fromLatin1( "</body></html>" ); + doc += TQString::tqfromLatin1( "</body></html>" ); write( doc ); end(); @@ -1841,7 +1841,7 @@ void KHTMLPart::slotFinished( KIO::Job * job ) return; } - KIO::TransferJob *tjob = ::qt_cast<KIO::TransferJob*>(job); + KIO::TransferJob *tjob = ::tqqt_cast<KIO::TransferJob*>(job); if (tjob && tjob->isErrorPage()) { khtml::RenderPart *renderPart = d->m_frame ? static_cast<khtml::RenderPart *>(d->m_frame->m_frame) : 0; if (renderPart) { @@ -2286,7 +2286,7 @@ void KHTMLPart::checkCompleted() } // the view will emit completed on our behalf, - // either now or at next repaint if one is pending + // either now or at next tqrepaint if one is pending //kdDebug(6050) << this << " asks the view to emit completed. pendingAction=" << pendingAction << endl; d->m_view->complete( pendingAction ); @@ -2402,7 +2402,7 @@ void KHTMLPart::slotRedirect() d->m_redirectURL = TQString::null; // SYNC check with ecma/kjs_window.cpp::goURL ! - if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( u.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( u.right( u.length() - 11 ) ); kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl; @@ -2838,7 +2838,7 @@ bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensit matchLen = matcher.matchedLength(); } else { - d->m_findPos = s.string().find(str, d->m_findPos+1, caseSensitive); + d->m_findPos = s.string().tqfind(str, d->m_findPos+1, caseSensitive); matchLen = str.length(); } @@ -3111,9 +3111,9 @@ bool KHTMLPart::findTextNext( bool reverse ) if( d->m_lastFindState.last_dir != -1 && bool( d->m_lastFindState.last_dir ) != bool( options & KFindDialog::FindBackwards )) { - qSwap( d->m_findNodeEnd, d->m_findNodeStart ); - qSwap( d->m_findPosEnd, d->m_findPosStart ); - qSwap( d->m_findNode, d->m_findNodePrevious ); + tqSwap( d->m_findNodeEnd, d->m_findNodeStart ); + tqSwap( d->m_findPosEnd, d->m_findPosStart ); + tqSwap( d->m_findNode, d->m_findNodePrevious ); // d->m_findNode now point at the end of the last searched line - advance one node khtml::RenderObject* obj = d->m_findNode ? d->m_findNode->renderer() : 0; khtml::RenderObject* end = d->m_findNodeEnd ? d->m_findNodeEnd->renderer() : 0; @@ -3212,7 +3212,7 @@ bool KHTMLPart::findTextNext( bool reverse ) s.truncate( d->m_findPosEnd ); if ( !s.isEmpty() ) { - newLine = s.find( '\n' ) != -1; // did we just get a newline? + newLine = s.tqfind( '\n' ) != -1; // did we just get a newline? if( !( options & KFindDialog::FindBackwards )) { //kdDebug(6050) << "StringPortion: " << index << "-" << index+s.length()-1 << " -> " << lastNode << endl; @@ -3731,8 +3731,8 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi return; } - if (url.find( TQString::fromLatin1( "javascript:" ),0, false ) == 0 ) { - TQString jscode = KURL::decode_string( url.mid( url.find( "javascript:", 0, false ) ) ); + if (url.tqfind( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) { + TQString jscode = KURL::decode_string( url.mid( url.tqfind( "javascript:", 0, false ) ) ); jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long if (url.startsWith("javascript:window.open")) jscode += i18n(" (In new window)"); @@ -3838,18 +3838,18 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi extra = i18n(" (In other frame)"); } - if (u.protocol() == TQString::fromLatin1("mailto")) { - TQString mailtoMsg /* = TQString::fromLatin1("<img src=%1>").arg(locate("icon", TQString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/; + if (u.protocol() == TQString::tqfromLatin1("mailto")) { + TQString mailtoMsg /* = TQString::tqfromLatin1("<img src=%1>").arg(locate("icon", TQString::tqfromLatin1("locolor/16x16/actions/mail_send.png")))*/; mailtoMsg += i18n("Email to: ") + KURL::decode_string(u.path()); TQStringList queries = TQStringList::split('&', u.query().mid(1)); TQStringList::Iterator it = queries.begin(); const TQStringList::Iterator itEnd = queries.end(); for (; it != itEnd; ++it) - if ((*it).startsWith(TQString::fromLatin1("subject="))) + if ((*it).startsWith(TQString::tqfromLatin1("subject="))) mailtoMsg += i18n(" - Subject: ") + KURL::decode_string((*it).mid(8)); - else if ((*it).startsWith(TQString::fromLatin1("cc="))) + else if ((*it).startsWith(TQString::tqfromLatin1("cc="))) mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3)); - else if ((*it).startsWith(TQString::fromLatin1("bcc="))) + else if ((*it).startsWith(TQString::tqfromLatin1("bcc="))) mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4)); mailtoMsg = TQStyleSheet::escape(mailtoMsg); mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString::null); @@ -3858,9 +3858,9 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi } // Is this check necessary at all? (Frerich) #if 0 - else if (u.protocol() == TQString::fromLatin1("http")) { + else if (u.protocol() == TQString::tqfromLatin1("http")) { DOM::Node hrefNode = nodeUnderMouse().parentNode(); - while (hrefNode.nodeName().string() != TQString::fromLatin1("A") && !hrefNode.isNull()) + while (hrefNode.nodeName().string() != TQString::tqfromLatin1("A") && !hrefNode.isNull()) hrefNode = hrefNode.parentNode(); if (!hrefNode.isNull()) { @@ -3868,12 +3868,12 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi if (!hreflangNode.isNull()) { TQString countryCode = hreflangNode.nodeValue().string().lower(); // Map the language code to an appropriate country code. - if (countryCode == TQString::fromLatin1("en")) - countryCode = TQString::fromLatin1("gb"); - TQString flagImg = TQString::fromLatin1("<img src=%1>").arg( - locate("locale", TQString::fromLatin1("l10n/") + if (countryCode == TQString::tqfromLatin1("en")) + countryCode = TQString::tqfromLatin1("gb"); + TQString flagImg = TQString::tqfromLatin1("<img src=%1>").arg( + locate("locale", TQString::tqfromLatin1("l10n/") + countryCode - + TQString::fromLatin1("/flag.png"))); + + TQString::tqfromLatin1("/flag.png"))); emit setStatusBarText(flagImg + u.prettyURL() + extra); } } @@ -3906,7 +3906,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c if ( !target.isEmpty() ) hasTarget = true; - if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { crossFrameExecuteScript( target, KURL::decode_string( url.mid( 11 ) ) ); return false; @@ -4027,7 +4027,7 @@ void KHTMLPart::slotViewDocumentSource() } } - (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); + (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile ); } void KHTMLPart::slotViewPageInfo() @@ -4108,7 +4108,7 @@ void KHTMLPart::slotViewFrameSource() } } - (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); + (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile ); } KURL KHTMLPart::backgroundURL() const @@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions() { TQObject *ext = KParts::BrowserExtension::childObject( frame ); if ( ext ) - enablePrintFrame = ext->metaObject()->slotNames().contains( "print()" ); + enablePrintFrame = ext->tqmetaObject()->slotNames().contains( "print()" ); } d->m_paPrintFrame->setEnabled( enablePrintFrame ); @@ -4305,7 +4305,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con const TQStringList ¶ms, bool isIFrame ) { //kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl; - FrameIt it = d->m_frames.find( frameName ); + FrameIt it = d->m_frames.tqfind( frameName ); if ( it == d->m_frames.end() ) { khtml::ChildFrame * child = new khtml::ChildFrame; @@ -4319,7 +4319,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con (*it)->m_params = params; // Support for <frame src="javascript:string"> - if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) + if ( url.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) { KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part)); @@ -4341,7 +4341,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con TQString KHTMLPart::requestFrameName() { - return TQString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++); + return TQString::tqfromLatin1("<!--frame %1-->").arg(d->m_frameNameId++); } bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType, @@ -4408,7 +4408,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const // We want a KHTMLPart if the HTML says <frame src=""> or <frame src="about:blank"> if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty()) - args.serviceType = TQString::fromLatin1( "text/html" ); + args.serviceType = TQString::tqfromLatin1( "text/html" ); if ( args.serviceType.isEmpty() ) { kdDebug(6050) << "Running new KHTMLRun for " << this << " and child=" << child << endl; @@ -4486,7 +4486,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url //CRITICAL STUFF if ( child->m_part ) { - if (!::qt_cast<KHTMLPart*>(child->m_part) && child->m_jscript) + if (!::tqqt_cast<KHTMLPart*>(child->m_part) && child->m_jscript) child->m_jscript->clear(); partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part ); delete (KParts::ReadOnlyPart *)child->m_part; @@ -4507,7 +4507,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url child->m_part = part; - if (::qt_cast<KHTMLPart*>(part)) { + if (::tqqt_cast<KHTMLPart*>(part)) { static_cast<KHTMLPart*>(part)->d->m_frame = child; } else if (child->m_frame) { child->m_liveconnect = KParts::LiveConnectExtension::childObject(part); @@ -4643,19 +4643,19 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url } } -KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName, +KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms ) { TQString constr; if ( !serviceName.isEmpty() ) - constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) ); + constr.append( TQString::tqfromLatin1( "Name == '%1'" ).arg( serviceName ) ); KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString::null ); if ( offers.isEmpty() ) { - int pos = mimetype.find( "-plugin" ); + int pos = mimetype.tqfind( "-plugin" ); if (pos < 0) return 0L; TQString stripped_mime = mimetype.left( pos ); @@ -4679,9 +4679,9 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char className = "Browser/View"; if ( factory->inherits( "KParts::Factory" ) ) - res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); + res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params )); else - res = static_cast<KParts::ReadOnlyPart *>(factory->create( parentWidget, widgetName, className )); + res = static_cast<KParts::ReadOnlyPart *>(factory->create( tqparentWidget, widgetName, className )); if ( res ) { serviceTypes = service->serviceTypes(); @@ -4701,7 +4701,7 @@ KParts::PartManager *KHTMLPart::partManager() { if ( !d->m_manager && d->m_view ) { - d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "khtml part manager" ); + d->m_manager = new KParts::PartManager( d->m_view->tqtopLevelWidget(), this, "khtml part manager" ); d->m_manager->setAllowNestedParts( true ); connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); @@ -4777,7 +4777,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt "WarnOnUnencryptedForm"); // Move this setting into KSSL instead KConfig *config = kapp->config(); - TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages"); + TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages"); KConfigGroupSaver saver( config, grpNotifMsgs ); if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) { @@ -4811,7 +4811,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt TQString urlstring = u.url(); - if ( urlstring.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlstring.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { urlstring = KURL::decode_string(urlstring); crossFrameExecuteScript( _target, urlstring.right( urlstring.length() - 11) ); return; @@ -4873,18 +4873,18 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt TQString bodyEnc; if (contentType.lower() == "multipart/form-data") { // FIXME: is this correct? I suspect not - bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(), + bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(), formData.size())); } else if (contentType.lower() == "text/plain") { // Convention seems to be to decode, and s/&/\n/ - TQString tmpbody = TQString::fromLatin1(formData.data(), + TQString tmpbody = TQString::tqfromLatin1(formData.data(), formData.size()); tmpbody.replace(TQRegExp("[&]"), "\n"); tmpbody.replace(TQRegExp("[+]"), " "); tmpbody = KURL::decode_string(tmpbody); // Decode the rest of it bodyEnc = KURL::encode_string(tmpbody); // Recode for the URL } else { - bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(), + bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(), formData.size())); } @@ -4895,7 +4895,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt if ( strcmp( action, "get" ) == 0 ) { if (u.protocol() != "mailto") - u.setQuery( TQString::fromLatin1( formData.data(), formData.size() ) ); + u.setQuery( TQString::tqfromLatin1( formData.data(), formData.size() ) ); args.setDoPost( false ); } else { @@ -4975,7 +4975,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl ) KHTMLPopupGUIClient* client = new KHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL ); TQGuardedPtr<TQObject> guard( client ); - TQString mimetype = TQString::fromLatin1( "text/html" ); + TQString mimetype = TQString::tqfromLatin1( "text/html" ); args.metaData()["referrer"] = referrer; if (!linkUrl.isEmpty()) // over a link @@ -5095,7 +5095,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg // TODO: handle child target correctly! currently the script are always executed fur the parent TQString urlStr = url.url(); - if ( urlStr.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { + if ( urlStr.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( urlStr.right( urlStr.length() - 11 ) ); executeScript( DOM::Node(), script ); return; @@ -5103,17 +5103,17 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg TQString frameName = args.frameName.lower(); if ( !frameName.isEmpty() ) { - if ( frameName == TQString::fromLatin1( "_top" ) ) + if ( frameName == TQString::tqfromLatin1( "_top" ) ) { emit d->m_extension->openURLRequest( url, args ); return; } - else if ( frameName == TQString::fromLatin1( "_blank" ) ) + else if ( frameName == TQString::tqfromLatin1( "_blank" ) ) { emit d->m_extension->createNewWindow( url, args ); return; } - else if ( frameName == TQString::fromLatin1( "_parent" ) ) + else if ( frameName == TQString::tqfromLatin1( "_parent" ) ) { KParts::URLArgs newArgs( args ); newArgs.frameName = TQString::null; @@ -5121,7 +5121,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg emit d->m_extension->openURLRequest( url, newArgs ); return; } - else if ( frameName != TQString::fromLatin1( "_self" ) ) + else if ( frameName != TQString::tqfromLatin1( "_self" ) ) { khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args ); @@ -5224,7 +5224,7 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f if (!childFrame && !parentPart() && (TQString::fromLocal8Bit(name()) == f)) return this; - FrameIt it = d->m_frames.find( f ); + FrameIt it = d->m_frames.tqfind( f ); const FrameIt end = d->m_frames.end(); if ( it != end ) { @@ -5287,7 +5287,7 @@ KParts::ReadOnlyPart *KHTMLPart::currentFrame() const bool KHTMLPart::frameExists( const TQString &frameName ) { - ConstFrameIt it = d->m_frames.find( frameName ); + ConstFrameIt it = d->m_frames.tqfind( frameName ); if ( it == d->m_frames.end() ) return false; @@ -5299,7 +5299,7 @@ bool KHTMLPart::frameExists( const TQString &frameName ) KJSProxy *KHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) { - KHTMLPart* const kp = ::qt_cast<KHTMLPart*>(framePart); + KHTMLPart* const kp = ::tqqt_cast<KHTMLPart*>(framePart); if (kp) return kp->jScript(); @@ -5317,7 +5317,7 @@ KJSProxy *KHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) KHTMLPart *KHTMLPart::parentPart() { - return ::qt_cast<KHTMLPart *>( parent() ); + return ::tqqt_cast<KHTMLPart *>( parent() ); } khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, @@ -5360,8 +5360,8 @@ void KHTMLPart::saveState( TQDataStream &stream ) kdDebug( 6050 ) << indent << "saveState this=" << this << " '" << name() << "' saving URL " << m_url.url() << endl; #endif - stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY() - << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight(); + stream << m_url << (TQ_INT32)d->m_view->contentsX() << (TQ_INT32)d->m_view->contentsY() + << (TQ_INT32) d->m_view->contentsWidth() << (TQ_INT32) d->m_view->contentsHeight() << (TQ_INT32) d->m_view->marginWidth() << (TQ_INT32) d->m_view->marginHeight(); // save link cursor position int focusNodeNumber; @@ -5431,7 +5431,7 @@ void KHTMLPart::saveState( TQDataStream &stream ) } // Save frame data - stream << (Q_UINT32) frameNameLst.count(); + stream << (TQ_UINT32) frameNameLst.count(); stream << frameNameLst << frameServiceTypeLst << frameServiceNameLst << frameURLLst << frameStateBufferLst; #ifndef NDEBUG s_saveStateIndentLevel = indentLevel; @@ -5441,8 +5441,8 @@ void KHTMLPart::saveState( TQDataStream &stream ) void KHTMLPart::restoreState( TQDataStream &stream ) { KURL u; - Q_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight; - Q_UINT32 frameCount; + TQ_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight; + TQ_UINT32 frameCount; TQStringList frameNames, frameServiceTypes, docState, frameServiceNames; KURL::List frameURLs; TQValueList<TQByteArray> frameStateBuffers; @@ -5912,7 +5912,7 @@ TQPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ) { kdDebug( 6050 ) << this << "KHTMLPart::openURLInFrame " << url << endl; - FrameIt it = d->m_frames.find( urlArgs.frameName ); + FrameIt it = d->m_frames.tqfind( urlArgs.frameName ); if ( it == d->m_frames.end() ) return false; @@ -6658,7 +6658,7 @@ void KHTMLPart::slotPrintFrame() if ( !ext ) return; - TQMetaObject *mo = ext->metaObject(); + TQMetaObject *mo = ext->tqmetaObject(); int idx = mo->findSlot( "print()", true ); if ( idx >= 0 ) { @@ -6877,7 +6877,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken); - frame->repaint(); + frame->tqrepaint(); } } @@ -6905,7 +6905,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain); - frame->repaint(); + frame->tqrepaint(); } kdDebug(6050) << "new active frame " << d->m_activeFrame << endl; } @@ -7157,7 +7157,7 @@ void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) } if (!d->m_wq) { - KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); d->m_wq = new KHTMLWalletQueue(this); d->m_wq->wallet = wallet; connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); @@ -7199,7 +7199,7 @@ void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString> } if (!d->m_wq) { - KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); d->m_wq = new KHTMLWalletQueue(this); d->m_wq->wallet = wallet; connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); @@ -7249,7 +7249,7 @@ void KHTMLPart::walletOpened(KWallet::Wallet *wallet) { if (!d->m_statusBarWalletLabel) { d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - d->m_statusBarWalletLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + d->m_statusBarWalletLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarWalletLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false); d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance())); @@ -7386,7 +7386,7 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart if ( enable && !d->m_statusBarPopupLabel ) { d->m_statusBarPopupLabel = new KURLLabel( d->m_statusBarExtension->statusBar() ); d->m_statusBarPopupLabel->setFixedHeight( instance()->iconLoader()->currentSize( KIcon::Small) ); - d->m_statusBarPopupLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + d->m_statusBarPopupLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarPopupLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarPopupLabel, 0, false ); d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) ); diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h index af8a1695d..95cd952b1 100644 --- a/khtml/khtml_part.h +++ b/khtml/khtml_part.h @@ -243,10 +243,10 @@ public: * rendered in. You can specify two different parent objects for a * KHTMLPart, one parent for the KHTMLPart document and on parent * for the KHTMLView. If the second @p parent argument is 0L, then - * @p parentWidget is used as parent for both objects, the part and + * @p tqparentWidget is used as parent for both objects, the part and * the view. */ - KHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0, + KHTMLPart( TQWidget *tqparentWidget = 0, const char *widgetname = 0, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); KHTMLPart( KHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); @@ -1168,7 +1168,7 @@ protected: * to be a object of your derived type, in which case you should return a new instance for * the mimetype 'text/html' . */ - virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName, + virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms); diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp index 90770d38f..c07b44b79 100644 --- a/khtml/khtml_run.cpp +++ b/khtml/khtml_run.cpp @@ -30,7 +30,7 @@ KHTMLRun::KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args, bool hideErrorDialog ) - : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0, + : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->tqtopLevelWidget() : 0, false, false, hideErrorDialog ), m_child( child ) { diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 8e1c0f934..bcefa88c6 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -121,7 +121,7 @@ static KPerDomainSettings &setup_per_domain_policy( kdWarning() << "setup_per_domain_policy: domain is empty" << endl; } const TQString ldomain = domain.lower(); - PolicyMap::iterator it = d->domainPolicy.find(ldomain); + PolicyMap::iterator it = d->domainPolicy.tqfind(ldomain); if (it == d->domainPolicy.end()) { // simply copy global domain settings (they should have been initialized // by this time) @@ -138,9 +138,9 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str if (!_str) ret = KJavaScriptDunno; - if (_str.lower() == TQString::fromLatin1("accept")) + if (_str.lower() == TQString::tqfromLatin1("accept")) ret = KJavaScriptAccept; - else if (_str.lower() == TQString::fromLatin1("reject")) + else if (_str.lower() == TQString::tqfromLatin1("reject")) ret = KJavaScriptReject; return ret; @@ -161,7 +161,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice) { TQString tmp(configStr); - int splitIndex = tmp.find(':'); + int splitIndex = tmp.tqfind(':'); if ( splitIndex == -1) { domain = configStr.lower(); @@ -172,7 +172,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai { domain = tmp.left(splitIndex).lower(); TQString adviceString = tmp.mid( splitIndex+1, tmp.length() ); - int splitIndex2 = adviceString.find( ':' ); + int splitIndex2 = adviceString.tqfind( ':' ); if( splitIndex2 == -1 ) { // Java advice only javaAdvice = strToAdvice( adviceString ); @@ -189,63 +189,63 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai void KHTMLSettings::readDomainSettings(KConfig *config, bool reset, bool global, KPerDomainSettings &pd_settings) { TQString jsPrefix = global ? TQString::null - : TQString::fromLatin1("javascript."); + : TQString::tqfromLatin1("javascript."); TQString javaPrefix = global ? TQString::null - : TQString::fromLatin1("java."); + : TQString::tqfromLatin1("java."); TQString pluginsPrefix = global ? TQString::null - : TQString::fromLatin1("plugins."); + : TQString::tqfromLatin1("plugins."); // The setting for Java - TQString key = javaPrefix + TQString::fromLatin1("EnableJava"); + TQString key = javaPrefix + TQString::tqfromLatin1("EnableJava"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnableJava = config->readBoolEntry( key, false ); else if ( !global ) pd_settings.m_bEnableJava = d->global.m_bEnableJava; // The setting for Plugins - key = pluginsPrefix + TQString::fromLatin1("EnablePlugins"); + key = pluginsPrefix + TQString::tqfromLatin1("EnablePlugins"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnablePlugins = config->readBoolEntry( key, true ); else if ( !global ) pd_settings.m_bEnablePlugins = d->global.m_bEnablePlugins; // The setting for JavaScript - key = jsPrefix + TQString::fromLatin1("EnableJavaScript"); + key = jsPrefix + TQString::tqfromLatin1("EnableJavaScript"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_bEnableJavaScript = config->readBoolEntry( key, true ); else if ( !global ) pd_settings.m_bEnableJavaScript = d->global.m_bEnableJavaScript; // window property policies - key = jsPrefix + TQString::fromLatin1("WindowOpenPolicy"); + key = jsPrefix + TQString::tqfromLatin1("WindowOpenPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowOpenPolicy = (KJSWindowOpenPolicy) config->readUnsignedNumEntry( key, KJSWindowOpenSmart ); else if ( !global ) pd_settings.m_windowOpenPolicy = d->global.m_windowOpenPolicy; - key = jsPrefix + TQString::fromLatin1("WindowMovePolicy"); + key = jsPrefix + TQString::tqfromLatin1("WindowMovePolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowMovePolicy = (KJSWindowMovePolicy) config->readUnsignedNumEntry( key, KJSWindowMoveAllow ); else if ( !global ) pd_settings.m_windowMovePolicy = d->global.m_windowMovePolicy; - key = jsPrefix + TQString::fromLatin1("WindowResizePolicy"); + key = jsPrefix + TQString::tqfromLatin1("WindowResizePolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowResizePolicy = (KJSWindowResizePolicy) config->readUnsignedNumEntry( key, KJSWindowResizeAllow ); else if ( !global ) pd_settings.m_windowResizePolicy = d->global.m_windowResizePolicy; - key = jsPrefix + TQString::fromLatin1("WindowStatusPolicy"); + key = jsPrefix + TQString::tqfromLatin1("WindowStatusPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowStatusPolicy = (KJSWindowStatusPolicy) config->readUnsignedNumEntry( key, KJSWindowStatusAllow ); else if ( !global ) pd_settings.m_windowStatusPolicy = d->global.m_windowStatusPolicy; - key = jsPrefix + TQString::fromLatin1("WindowFocusPolicy"); + key = jsPrefix + TQString::tqfromLatin1("WindowFocusPolicy"); if ( (global && reset) || config->hasKey( key ) ) pd_settings.m_windowFocusPolicy = (KJSWindowFocusPolicy) config->readUnsignedNumEntry( key, KJSWindowFocusAllow ); @@ -508,7 +508,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) const TQStringList::ConstIterator itEnd = dl.end(); for (; it != itEnd; ++it) { const TQString domain = (*it).lower(); - TQMap<TQString,int>::Iterator pos = domainList.find(domain); + TQMap<TQString,int>::Iterator pos = domainList.tqfind(domain); if (pos == notfound) domainList.insert(domain,0); }/*next it*/ } @@ -611,7 +611,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) { TQCString javaPolicy = adviceToStr( it.data() ); TQCString javaScriptPolicy = adviceToStr( KJavaScriptDunno ); - domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); + domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); } config->writeEntry( "JavaDomainSettings", domainConfig ); } @@ -624,7 +624,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) { TQCString javaPolicy = adviceToStr( KJavaScriptDunno ); TQCString javaScriptPolicy = adviceToStr( it.data() ); - domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); + domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy)); } config->writeEntry( "ECMADomainSettings", domainConfig ); } @@ -656,7 +656,7 @@ static const KPerDomainSettings &lookup_hostname_policy( const PolicyMap::const_iterator notfound = d->domainPolicy.end(); // First check whether there is a perfect match. - PolicyMap::const_iterator it = d->domainPolicy.find(hostname); + PolicyMap::const_iterator it = d->domainPolicy.tqfind(hostname); if( it != notfound ) { #ifdef DEBUG_SETTINGS kdDebug() << "perfect match" << endl; @@ -670,9 +670,9 @@ static const KPerDomainSettings &lookup_hostname_policy( // there's no dots left. TQString host_part = hostname; int dot_idx = -1; - while( (dot_idx = host_part.find(TQChar('.'))) >= 0 ) { + while( (dot_idx = host_part.tqfind(TQChar('.'))) >= 0 ) { host_part.remove(0,dot_idx); - it = d->domainPolicy.find(host_part); + it = d->domainPolicy.tqfind(host_part); Q_ASSERT(notfound == d->domainPolicy.end()); if( it != notfound ) { #ifdef DEBUG_SETTINGS diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp index 03279e968..195602849 100644 --- a/khtml/khtmlimage.cpp +++ b/khtml/khtmlimage.cpp @@ -48,24 +48,24 @@ KHTMLImageFactory::~KHTMLImageFactory() delete s_instance; } -KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, +KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) prof = KHTMLPart::BrowserViewGUI; - return new KHTMLImage( parentWidget, widgetName, parent, name, prof ); + return new KHTMLImage( tqparentWidget, widgetName, parent, name, prof ); } -KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, +KHTMLImage::KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { - KHTMLPart* parentPart = ::qt_cast<KHTMLPart *>( parent ); + KHTMLPart* parentPart = ::tqqt_cast<KHTMLPart *>( parent ); setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart ); - TQVBox *box = new TQVBox( parentWidget, widgetName ); + TQVBox *box = new TQVBox( tqparentWidget, widgetName ); m_khtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_khtml->setAutoloadImages( true ); @@ -103,7 +103,7 @@ KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, // forward important signals from the khtml part // forward opening requests to parent frame (if existing) - KHTMLPart *p = ::qt_cast<KHTMLPart *>(parent); + KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(parent); KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext; connect(m_khtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); @@ -304,7 +304,7 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) { case TQEvent::Drop: { // find out if this part is embedded in a frame, and send the // event to its outside widget - KHTMLPart *p = ::qt_cast<KHTMLPart *>(parent()); + KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(parent()); if (p) return TQApplication::sendEvent(p->widget(), e); // otherwise simply forward all dnd events to the part widget, diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h index dda918177..735df4491 100644 --- a/khtml/khtmlimage.h +++ b/khtml/khtmlimage.h @@ -44,7 +44,7 @@ public: KHTMLImageFactory(); virtual ~KHTMLImageFactory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); @@ -61,7 +61,7 @@ class KHTMLImage : public KParts::ReadOnlyPart, public khtml::CachedObjectClient { Q_OBJECT public: - KHTMLImage( TQWidget *parentWidget, const char *widgetName, + KHTMLImage( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ); virtual ~KHTMLImage(); diff --git a/khtml/khtmlpart_p.h b/khtml/khtmlpart_p.h index 0047dde54..cebee9455 100644 --- a/khtml/khtmlpart_p.h +++ b/khtml/khtmlpart_p.h @@ -72,7 +72,7 @@ namespace KParts namespace khtml { - class KDE_EXPORT ChildFrame : public QObject + class KDE_EXPORT ChildFrame : public TQObject { Q_OBJECT public: @@ -127,7 +127,7 @@ typedef KHTMLFrameList::Iterator FrameIt; static int khtml_part_dcop_counter = 0; -class KHTMLWalletQueue : public QObject +class KHTMLWalletQueue : public TQObject { Q_OBJECT public: diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 850d8e9cd..58306a4a5 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -220,7 +220,7 @@ public: #ifdef DEBUG_PIXEL timer.start(); pixelbooth = 0; - repaintbooth = 0; + tqrepaintbooth = 0; #endif scrollBarMoved = false; contentsMoving = false; @@ -238,7 +238,7 @@ public: delete postponed_autorepeat; postponed_autorepeat = NULL; layoutTimerId = 0; - repaintTimerId = 0; + tqrepaintTimerId = 0; scrollTimerId = 0; scrollSuspended = false; scrollSuspendPreActivate = false; @@ -324,7 +324,7 @@ public: #ifdef DEBUG_PIXEL TQTime timer; unsigned int pixelbooth; - unsigned int repaintbooth; + unsigned int tqrepaintbooth; #endif TQPainter *tp; @@ -359,7 +359,7 @@ public: int layoutTimerId; TQKeyEvent* postponed_autorepeat; - int repaintTimerId; + int tqrepaintTimerId; int scrollTimerId; int scrollTiming; int scrollBy; @@ -650,14 +650,14 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) #ifdef DEBUG_PIXEL if ( d->timer.elapsed() > 5000 ) { - qDebug( "drawed %d pixels in %d repaints the last %d milliseconds", - d->pixelbooth, d->repaintbooth, d->timer.elapsed() ); + qDebug( "drawed %d pixels in %d tqrepaints the last %d milliseconds", + d->pixelbooth, d->tqrepaintbooth, d->timer.elapsed() ); d->timer.restart(); d->pixelbooth = 0; - d->repaintbooth = 0; + d->tqrepaintbooth = 0; } d->pixelbooth += ew*eh; - d->repaintbooth++; + d->tqrepaintbooth++; #endif //kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl; @@ -867,7 +867,7 @@ void KHTMLView::layout() } #if 0 ElementImpl *listitem = m_part->xmlDocImpl()->getElementById("__test_element__"); - if (listitem) kdDebug(6000) << "after layout, before repaint" << endl; + if (listitem) kdDebug(6000) << "after layout, before tqrepaint" << endl; if (listitem) dumpLineBoxes(static_cast<RenderFlow *>(listitem->renderer())); #endif #ifndef KHTML_NO_CARET @@ -972,7 +972,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) if ( !d->m_mouseScrollIndicator ) { TQPixmap pixmap, icon; pixmap.resize( 48, 48 ); - pixmap.fill( TQColor( qRgba( 127, 127, 127, 127 ) ) ); + pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) ); TQPainter p( &pixmap ); icon = KGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small ); @@ -1112,8 +1112,8 @@ static inline void forwardPeripheralEvent(khtml::RenderWidget* r, TQMouseEvent* TQPoint p(x-absx, y-absy); TQMouseEvent fw(me->type(), p, me->button(), me->state()); TQWidget* w = r->widget(); - TQScrollView* sc = ::qt_cast<TQScrollView*>(w); - if (sc && !::qt_cast<TQListBox*>(w)) + TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w); + if (sc && !::tqqt_cast<TQListBox*>(w)) static_cast<khtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(&fw); else if(w) static_cast<khtml::RenderWidget::EventPropagator*>(w)->sendEvent(&fw); @@ -1179,7 +1179,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if (d->clickCount > 0 && TQPoint(d->clickX-xm,d->clickY-ym).manhattanLength() > TQApplication::startDragDistance()) { - d->clickCount = 0; // moving the mouse outside the threshold invalidates the click + d->clickCount = 0; // moving the mouse outside the threshold tqinvalidates the click } // execute the scheduled script. This is to make sure the mouseover events come after the mouseout events @@ -1202,7 +1202,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) c = KCursor::ibeamCursor(); if ( mev.url.length() && m_part->settings()->changeCursor() ) { c = m_part->urlCursor(); - if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0) + if (mev.url.string().startsWith("mailto:") && mev.url.string().tqfind('@')>0) mailtoCursor = true; else newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() ); @@ -1217,7 +1217,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) break; case CURSOR_POINTER: c = m_part->urlCursor(); - if (mev.url.string().startsWith("mailto:") && mev.url.string().find('@')>0) + if (mev.url.string().startsWith("mailto:") && mev.url.string().tqfind('@')>0) mailtoCursor = true; else newWindowCursor = targetOpensNewWindow( m_part, mev.target.string() ); @@ -1903,19 +1903,19 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) if (c->isWidgetType()) { TQWidget *w = static_cast<TQWidget *>(c); // don't install the event filter on toplevels - if (w->parentWidget(true) == view) { + if (w->tqparentWidget(true) == view) { if (!strcmp(w->name(), "__khtml")) { w->installEventFilter(this); w->unsetCursor(); - if (!::qt_cast<TQFrame*>(w)) + if (!::tqqt_cast<TQFrame*>(w)) w->setBackgroundMode( TQWidget::NoBackground ); static_cast<HackWidget *>(w)->setNoErase(); if (w->children()) { TQObjectListIterator it(*w->children()); for (; it.current(); ++it) { - TQWidget *widget = ::qt_cast<TQWidget *>(it.current()); + TQWidget *widget = ::tqqt_cast<TQWidget *>(it.current()); if (widget && !widget->isTopLevel()) { - if (!::qt_cast<TQFrame*>(w)) + if (!::tqqt_cast<TQFrame*>(w)) widget->setBackgroundMode( TQWidget::NoBackground ); static_cast<HackWidget *>(widget)->setNoErase(); widget->installEventFilter(this); @@ -1931,7 +1931,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) TQWidget *c = v; while (v && v != view) { c = v; - v = v->parentWidget(true); + v = v->tqparentWidget(true); } if (v && !strcmp(c->name(), "__khtml")) { @@ -1941,23 +1941,23 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Paint: if (!allowWidgetPaintEvents) { // eat the event. Like this we can control exactly when the widget - // get's repainted. + // get's tqrepainted. block = true; int x = 0, y = 0; TQWidget *v = w; while (v && v != view) { x += v->x(); y += v->y(); - v = v->parentWidget(); + v = v->tqparentWidget(); } viewportToContents( x, y, x, y ); TQPaintEvent *pe = static_cast<TQPaintEvent *>(e); - bool asap = !d->contentsMoving && ::qt_cast<TQScrollView *>(c); + bool asap = !d->contentsMoving && ::tqqt_cast<TQScrollView *>(c); - // TQScrollView needs fast repaints + // TQScrollView needs fast tqrepaints if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() && !static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer())->needsLayout() ) { - repaintContents(x + pe->rect().x(), y + pe->rect().y(), + tqrepaintContents(x + pe->rect().x(), y + pe->rect().y(), pe->rect().width(), pe->rect().height(), true); } else { scheduleRepaint(x + pe->rect().x(), y + pe->rect().y(), @@ -1969,7 +1969,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: { - if ( (w->parentWidget() == view || ::qt_cast<TQScrollView*>(c)) && !::qt_cast<TQScrollBar *>(w)) { + if ( (w->tqparentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); TQPoint pt = w->mapTo( view, me->pos()); TQMouseEvent me2(me->type(), pt, me->button(), me->state()); @@ -1988,7 +1988,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) } case TQEvent::KeyPress: case TQEvent::KeyRelease: - if (w->parentWidget() == view && !::qt_cast<TQScrollBar *>(w)) { + if (w->tqparentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) { TQKeyEvent *ke = static_cast<TQKeyEvent *>(e); if (e->type() == TQEvent::KeyPress) keyPressEvent(ke); @@ -2272,19 +2272,19 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal TQString accesskey; if( s.length() == 1 ) { TQChar a = s.string()[ 0 ].upper(); - if( qFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains + if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains accesskey = a; } if( accesskey.isNull() && fallbacks.contains( en )) { TQChar a = fallbacks[ en ].upper(); - if( qFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains + if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains accesskey = TQString( "<qt><i>" ) + a + "</i></qt>"; } if( !accesskey.isNull()) { TQRect rec=en->getRect(); TQLabel *lab=new TQLabel(accesskey,viewport(),0,Qt::WDestructiveClose); connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint())); + connect( this, TQT_SIGNAL(tqrepaintAccessKeys()), lab, TQT_SLOT(tqrepaint())); lab->setPalette(TQToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(TQFrame::Box | TQFrame::Plain); @@ -2835,7 +2835,7 @@ void KHTMLView::print(bool quick) int headerHeight = 0; TQFont headerFont("Sans Serif", 8); - TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true); + TQString headerLeft = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true); TQString headerMid = docname; TQString headerRight; @@ -2933,7 +2933,7 @@ void KHTMLView::print(bool quick) root->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight)); // m_part->xmlDocImpl()->renderer()->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight)); -// root->repaint(); +// root->tqrepaint(); // p->flush(); kdDebug(6000) << "printed: page " << page <<" bottom At = " << bottom << endl; @@ -3121,7 +3121,7 @@ bool KHTMLView::nonPasswordStorableSite(const TQString& host) const TQStringList sites = d->formCompletions->readListEntry("Sites"); d->formCompletions->setGroup(TQString::null);//reset - return (sites.find(host) != sites.end()); + return (sites.tqfind(host) != sites.end()); } // returns true if event should be swallowed @@ -3497,8 +3497,8 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) khtml::RenderCanvas* root = static_cast<khtml::RenderCanvas *>(document->renderer()); if ( root && root->needsLayout() ) { - killTimer(d->repaintTimerId); - d->repaintTimerId = 0; + killTimer(d->tqrepaintTimerId); + d->tqrepaintTimerId = 0; scheduleRelayout(); return; } @@ -3506,9 +3506,9 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) setStaticBackground(d->useSlowRepaints); -// kdDebug() << "scheduled repaint "<< d->repaintTimerId << endl; - killTimer(d->repaintTimerId); - d->repaintTimerId = 0; +// kdDebug() << "scheduled tqrepaint "<< d->tqrepaintTimerId << endl; + killTimer(d->tqrepaintTimerId); + d->tqrepaintTimerId = 0; TQRect updateRegion; TQMemArray<TQRect> rects = d->updateRegion.rects(); @@ -3522,7 +3522,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) TQRect newRegion = updateRegion.unite(rects[i]); if (2*newRegion.height() > 3*updateRegion.height() ) { - repaintContents( updateRegion ); + tqrepaintContents( updateRegion ); updateRegion = rects[i]; } else @@ -3530,11 +3530,11 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) } if ( !updateRegion.isNull() ) - repaintContents( updateRegion ); + tqrepaintContents( updateRegion ); // As widgets can only be accurately positioned during painting, every layout might // dissociate a widget from its RenderWidget. E.g: if a RenderWidget was visible before layout, but the layout - // pushed it out of the viewport, it will not be repainted, and consequently it's assocoated widget won't be repositioned! + // pushed it out of the viewport, it will not be tqrepainted, and consequently it's assocoated widget won't be repositioned! // Thus we need to check each supposedly 'visible' widget at the end of each layout, and remove it in case it's no more in sight. if (d->dirtyLayout && !d->visibleWidgets.isEmpty()) { @@ -3556,7 +3556,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) addChild(w, 0, -500000); } - emit repaintAccessKeys(); + emit tqrepaintAccessKeys(); if (d->emitCompletedAfterRepaint) { bool full = d->emitCompletedAfterRepaint == KHTMLViewPrivate::CSFull; d->emitCompletedAfterRepaint = KHTMLViewPrivate::CSNone; @@ -3587,11 +3587,11 @@ void KHTMLView::unscheduleRelayout() void KHTMLView::unscheduleRepaint() { - if (!d->repaintTimerId) + if (!d->tqrepaintTimerId) return; - killTimer(d->repaintTimerId); - d->repaintTimerId = 0; + killTimer(d->tqrepaintTimerId); + d->tqrepaintTimerId = 0; } void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) @@ -3618,8 +3618,8 @@ void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) if (asap && !parsing) unscheduleRepaint(); - if ( !d->repaintTimerId ) - d->repaintTimerId = startTimer( time ); + if ( !d->tqrepaintTimerId ) + d->tqrepaintTimerId = startTimer( time ); // kdDebug() << "starting timer " << time << endl; } @@ -3641,13 +3641,13 @@ void KHTMLView::complete( bool pendingAction ) KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; } - // is there a repaint pending? - if (d->repaintTimerId) + // is there a tqrepaint pending? + if (d->tqrepaintTimerId) { -// kdDebug() << "requesting repaint now" << endl; +// kdDebug() << "requesting tqrepaint now" << endl; // do it now - killTimer(d->repaintTimerId); - d->repaintTimerId = startTimer( 20 ); + killTimer(d->tqrepaintTimerId); + d->tqrepaintTimerId = startTimer( 20 ); d->emitCompletedAfterRepaint = pendingAction ? KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; } @@ -3698,7 +3698,7 @@ void KHTMLView::initCaret(bool keepSelection) }/*end if*/ // kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle() // << " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl; - // ### does not repaint the selection on keepSelection!=false + // ### does not tqrepaint the selection on keepSelection!=false moveCaretTo(m_part->d->caretNode().handle(), m_part->d->caretOffset(), !keepSelection); // kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle() // << " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl; @@ -3841,7 +3841,7 @@ void KHTMLView::showCaret(bool forceRepaint) d->m_caretViewContext->width, d->m_caretViewContext->height); } else { - repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, + tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, d->m_caretViewContext->height); }/*end if*/ @@ -3873,9 +3873,9 @@ void KHTMLView::hideCaret() if (d->m_caretViewContext->visible) { // kdDebug(6200) << "redraw caret hidden" << endl; d->m_caretViewContext->visible = false; - // force repaint, otherwise the event won't be handled + // force tqrepaint, otherwise the event won't be handled // before the focus leaves the window - repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, + tqrepaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, d->m_caretViewContext->height); d->m_caretViewContext->visible = true; @@ -4426,7 +4426,7 @@ void KHTMLView::placeCaretOnChar(CaretBox *hintBox) d->m_caretViewContext->origX = d->m_caretViewContext->x; d->scrollBarMoved = false; #if DEBUG_CARETMODE > 3 - //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().unicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl; + //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().tqunicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl; #endif ensureNodeHasFocus(m_part->d->caretNode().handle()); caretOn(); diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h index a79eff17f..b9bf47222 100644 --- a/khtml/khtmlview.h +++ b/khtml/khtmlview.h @@ -75,7 +75,7 @@ class KHTMLViewPrivate; * * Suitable for use as an application's main view. **/ -class KHTML_EXPORT KHTMLView : public QScrollView +class KHTML_EXPORT KHTMLView : public TQScrollView { Q_OBJECT @@ -179,7 +179,7 @@ signals: void cleared(); void zoomView( int ); void hideAccessKeys(); - void repaintAccessKeys(); + void tqrepaintAccessKeys(); void findAheadActive( bool ); //#define NO_SMOOTH_SCROLL_HACK #ifndef NO_SMOOTH_SCROLL_HACK @@ -231,7 +231,7 @@ protected slots: #ifndef NO_SMOOTH_SCROLL_HACK void scrollTick(); #else - void scrollTick() {}; // moc cannot handle #if + void scrollTick() {}; // tqmoc cannot handle #if #endif private slots: @@ -384,8 +384,8 @@ private: * * These operations are executed unconditionally, regardless of the * focus, and the caret display policy. - * @param forceRepaint @p true to force an immediate repaint, otherwise - * do a scheduled repaint + * @param forceRepaint @p true to force an immediate tqrepaint, otherwise + * do a scheduled tqrepaint */ void showCaret(bool forceRepaint = false); /** makes the caret invisible, but does not influence the frequency timer. diff --git a/khtml/kjserrordlg.ui b/khtml/kjserrordlg.ui index 3e2eea389..7a86c2569 100644 --- a/khtml/kjserrordlg.ui +++ b/khtml/kjserrordlg.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>311</width> <height>21</height> diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index 17ea9d485..ef76339ab 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -93,7 +93,7 @@ Data for the second and last object. */ -KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, +KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ) : KParts::ReadOnlyPart( parent, name ) { @@ -101,7 +101,7 @@ KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, setInstance( KMultiPartFactory::instance() ); - TQVBox *box = new TQVBox( parentWidget, widgetName ); + TQVBox *box = new TQVBox( tqparentWidget, widgetName ); setWidget( box ); m_extension = new KParts::BrowserExtension( this ); @@ -234,7 +234,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) } else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) ) { - TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower(); + TQString encoding = TQString::tqfromLatin1(line.data()+17).stripWhiteSpace().lower(); if (encoding == "gzip" || encoding == "x-gzip") { m_gzip = true; } else { @@ -245,8 +245,8 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) else if ( !qstrnicmp( line.data(), "Content-Type:", 13 ) ) { Q_ASSERT( m_nextMimeType.isNull() ); - m_nextMimeType = TQString::fromLatin1( line.data() + 14 ).stripWhiteSpace(); - int semicolon = m_nextMimeType.find( ';' ); + m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace(); + int semicolon = m_nextMimeType.tqfind( ';' ); if ( semicolon != -1 ) m_nextMimeType = m_nextMimeType.left( semicolon ); kdDebug() << "m_nextMimeType=" << m_nextMimeType << endl; @@ -266,14 +266,14 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) else if ( !line.isEmpty() ) // this happens with e.g. Set-Cookie: kdDebug() << "Ignoring header " << line << endl; } else { - if ( !qstrncmp( line, m_boundary, m_boundaryLength ) ) + if ( !tqstrncmp( line, m_boundary, m_boundaryLength ) ) { #ifdef DEBUG_PARSING kdDebug() << "boundary found!" << endl; kdDebug() << "after it is " << line.data() + m_boundaryLength << endl; #endif // Was it the very last boundary ? - if ( !qstrncmp( line.data() + m_boundaryLength, "--", 2 ) ) + if ( !tqstrncmp( line.data() + m_boundaryLength, "--", 2 ) ) { #ifdef DEBUG_PARSING kdDebug() << "Completed!" << endl; diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h index f3bf95219..a17269d74 100644 --- a/khtml/kmultipart/kmultipart.h +++ b/khtml/kmultipart/kmultipart.h @@ -40,7 +40,7 @@ class KMultiPart : public KParts::ReadOnlyPart { Q_OBJECT public: - KMultiPart( TQWidget *parentWidget, const char *widgetName, + KMultiPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ); virtual ~KMultiPart(); diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp index 5efcaf98d..58d531384 100644 --- a/khtml/misc/arena.cpp +++ b/khtml/misc/arena.cpp @@ -143,7 +143,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb) assert((nb & pool->mask) == 0); #endif - nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */ + nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */ /* attempt to allocate from arenas at pool->current */ { @@ -197,7 +197,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb) } else #endif sz = pool->arenasize > nb ? pool->arenasize : nb; - sz += sizeof *a + pool->mask; /* header and alignment slop */ + sz += sizeof *a + pool->mask; /* header and tqalignment slop */ pool->cumul += sz; #ifdef DEBUG_ARENA_MALLOC i++; diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp index f227f4014..bd831c125 100644 --- a/khtml/misc/decoder.cpp +++ b/khtml/misc/decoder.cpp @@ -170,7 +170,7 @@ static int findXMLEncoding(const TQCString &str, int &encodingLength) { int len = str.length(); - int pos = str.find("encoding"); + int pos = str.tqfind("encoding"); if (pos == -1) return -1; pos += 8; @@ -365,10 +365,10 @@ TQString Decoder::decode(const char *data, int len) TQCString str( ptr, (end-ptr)+1); str = str.lower(); int pos = 0; - //if( (pos = str.find("http-equiv", pos)) == -1) break; - //if( (pos = str.find("content-type", pos)) == -1) break; + //if( (pos = str.tqfind("http-equiv", pos)) == -1) break; + //if( (pos = str.tqfind("content-type", pos)) == -1) break; while( pos < ( int ) str.length() ) { - if( (pos = str.find("charset", pos)) == -1) break; + if( (pos = str.tqfind("charset", pos)) == -1) break; pos += 7; // skip whitespace.. while( pos < (int)str.length() && str[pos] <= ' ' ) pos++; diff --git a/khtml/misc/helper.cpp b/khtml/misc/helper.cpp index f56a4ba92..8c0b79ab5 100644 --- a/khtml/misc/helper.cpp +++ b/khtml/misc/helper.cpp @@ -66,12 +66,12 @@ double calcHue(double temp1, double temp2, double hueVal) // explanation available at http://en.wikipedia.org/wiki/HSL_color_space // all values are in the range of 0 to 1.0 -QRgb khtml::qRgbaFromHsla(double h, double s, double l, double a) +QRgb khtml::tqRgbaFromHsla(double h, double s, double l, double a) { double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s; double temp1 = 2.0 * l - temp2; - return qRgba(calcHue(temp1, temp2, h + 1.0 / 3.0) * 255, calcHue(temp1, temp2, h) * 255, calcHue(temp1, temp2, h - 1.0 / 3.0) * 255, a * 255); + return tqRgba(calcHue(temp1, temp2, h + 1.0 / 3.0) * 255, calcHue(temp1, temp2, h) * 255, calcHue(temp1, temp2, h - 1.0 / 3.0) * 255, a * 255); } /** finds out the background color of an element diff --git a/khtml/misc/helper.h b/khtml/misc/helper.h index 85442fae8..167a2a68e 100644 --- a/khtml/misc/helper.h +++ b/khtml/misc/helper.h @@ -40,7 +40,7 @@ namespace khtml bool hasSufficientContrast(const TQColor &c1, const TQColor &c2); TQColor retrieveBackgroundColor(const RenderObject *obj); - QRgb qRgbaFromHsla(double h, double s, double l, double a); + QRgb tqRgbaFromHsla(double h, double s, double l, double a); //enumerator for findSelectionNode enum FindSelectionResult { SelectionPointBefore, diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c index 779792e71..6f420e3b3 100644 --- a/khtml/misc/htmlattrs.c +++ b/khtml/misc/htmlattrs.c @@ -188,7 +188,7 @@ struct spool_attr_t char spool_attr_str42[sizeof("rules")]; char spool_attr_str43[sizeof("compact")]; char spool_attr_str44[sizeof("rev")]; - char spool_attr_str45[sizeof("shape")]; + char spool_attr_str45[sizeof("tqshape")]; char spool_attr_str46[sizeof("charset")]; char spool_attr_str47[sizeof("charoff")]; char spool_attr_str48[sizeof("lang")]; @@ -343,7 +343,7 @@ static const struct spool_attr_t spool_attr_contents = "rules", "compact", "rev", - "shape", + "tqshape", "charset", "charoff", "lang", diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h index e4fb531a1..b0c8dc613 100644 --- a/khtml/misc/khtmllayout.h +++ b/khtml/misc/khtmllayout.h @@ -33,7 +33,7 @@ namespace khtml const int UNDEFINED = -1; - // alignment + // tqalignment enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline }; enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 }; @@ -103,7 +103,7 @@ namespace khtml unsigned type : 3; bool quirk : 1; } l; - Q_UINT32 _length; + TQ_UINT32 _length; }; }; diff --git a/khtml/misc/knsplugininstaller.h b/khtml/misc/knsplugininstaller.h index 0d9535ba9..0910a685b 100644 --- a/khtml/misc/knsplugininstaller.h +++ b/khtml/misc/knsplugininstaller.h @@ -87,7 +87,7 @@ private: * This class contain all the the methods used to perform a plugin installation * */ -class KNSPluginInstallEngine : public QObject +class KNSPluginInstallEngine : public TQObject { Q_OBJECT public: diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index d6e463b02..3d9d7b531 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -144,7 +144,7 @@ void CachedObject::deref(CachedObjectClient *c) assert( c ); assert( m_clients.count() ); assert( !canDelete() ); - assert( m_clients.find( c ) ); + assert( m_clients.tqfind( c ) ); Cache::flush(); @@ -213,7 +213,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI : CachedObject(url, CSSStyleSheet, _cachePolicy, 0) { // Set the type we want (probably css or xml) - TQString ah = TQString::fromLatin1( accept ); + TQString ah = TQString::tqfromLatin1( accept ); if ( !ah.isEmpty() ) ah += ","; ah += "*/*;q=0.1"; @@ -327,7 +327,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro // It's javascript we want. // But some websites think their scripts are <some wrong mimetype here> // and refuse to serve them if we only accept application/x-javascript. - setAccept( TQString::fromLatin1("*/*") ); + setAccept( TQString::tqfromLatin1("*/*") ); // load the file Cache::loader()->load(dl, this, false); m_loading = true; @@ -476,7 +476,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl pixPart = 0; bg = 0; scaled = 0; - bgColor = qRgba( 0, 0, 0, 0xFF ); + bgColor = tqRgba( 0, 0, 0, 0xFF ); typeChecked = false; isFullyTransparent = false; monochrome = false; @@ -526,7 +526,7 @@ void CachedImage::deref( CachedObjectClient *c ) const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int xHeight) { - static QRgb bgTransparent = qRgba( 0, 0, 0, 0xFF ); + static QRgb bgTransparent = tqRgba( 0, 0, 0, 0xFF ); TQSize s(pixmap_size()); int w = xWidth; @@ -709,8 +709,8 @@ void CachedImage::movieStatus(int status) const TQImage& im = m->frameImage(); monochrome = ( ( im.depth() <= 8 ) && ( im.numColors() - int( im.hasAlphaBuffer() ) <= 2 ) ); for (int i = 0; monochrome && i < im.numColors(); ++i) - if (im.colorTable()[i] != qRgb(0xff, 0xff, 0xff) && - im.colorTable()[i] != qRgb(0x00, 0x00, 0x00)) + if (im.colorTable()[i] != tqRgb(0xff, 0xff, 0xff) && + im.colorTable()[i] != tqRgb(0x00, 0x00, 0x00)) monochrome = false; if( (im.width() < 5 || im.height() < 5) && im.hasAlphaBuffer()) // only evaluate for small images { @@ -816,7 +816,7 @@ void CachedImage::clear() delete p; p = 0; delete bg; bg = 0; delete scaled; scaled = 0; - bgColor = qRgba( 0, 0, 0, 0xff ); + bgColor = tqRgba( 0, 0, 0, 0xff ); bgSize = TQSize(-1,-1); delete pixPart; pixPart = 0; @@ -981,7 +981,7 @@ void DocLoader::setExpireDate(time_t _expireDate, bool relative) void DocLoader::insertCachedObject( CachedObject* o ) const { - if ( m_docObjects.find(o) ) + if ( m_docObjects.tqfind(o) ) return; m_docObjects.insert( o, o ); if ( m_docObjects.count() > 3 * m_docObjects.size() ) @@ -1167,7 +1167,7 @@ void Loader::servePendingRequests() { job->addMetaData( "cross-domain", part->toplevelURL().url() ); if (part->widget()) - job->setWindow (part->widget()->topLevelWidget()); + job->setWindow (part->widget()->tqtopLevelWidget()); } } diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h index 4314e950e..e950f1767 100644 --- a/khtml/misc/loader.h +++ b/khtml/misc/loader.h @@ -405,7 +405,7 @@ namespace khtml /** * @internal */ - class Loader : public QObject + class Loader : public TQObject { Q_OBJECT diff --git a/khtml/misc/loader_jpeg.cpp b/khtml/misc/loader_jpeg.cpp index 57174fe1b..8c6404924 100644 --- a/khtml/misc/loader_jpeg.cpp +++ b/khtml/misc/loader_jpeg.cpp @@ -358,7 +358,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar* } else if ( cinfo.output_components == 1 ) { image.create( cinfo.output_width, cinfo.output_height, 8, 256 ); for (int i=0; i<256; i++) - image.setColor(i, qRgb(i,i,i)); + image.setColor(i, tqRgb(i,i,i)); } #ifdef JPEG_DEBUG @@ -431,7 +431,7 @@ again: for (uint i=cinfo.output_width; i--; ) { in-=3; - out[i] = qRgb(in[0], in[1], in[2]); + out[i] = tqRgb(in[0], in[1], in[2]); } } } diff --git a/khtml/misc/loader_jpeg.h b/khtml/misc/loader_jpeg.h index c97b2bcbf..87b18a8b5 100644 --- a/khtml/misc/loader_jpeg.h +++ b/khtml/misc/loader_jpeg.h @@ -35,7 +35,7 @@ namespace khtml * * An incremental loader factory for JPEG's. */ - class KJPEGFormatType : public QImageFormatType + class KJPEGFormatType : public TQImageFormatType { public: TQImageFormat* decoderFor(const uchar* buffer, int length); diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h index 125e8e07d..fbd883457 100644 --- a/khtml/misc/multimap.h +++ b/khtml/misc/multimap.h @@ -42,7 +42,7 @@ public: typedef MultiMapPtrList<T> List; void append(void* key, T* element) { - List *list = dict.find(key); + List *list = dict.tqfind(key); if (!list){ list = new List(8); dict.insert(key, list); @@ -50,7 +50,7 @@ public: list->append(element); } void remove(void* key, T* element) { - List *list = dict.find(key); + List *list = dict.tqfind(key); if (list) { list->remove(element); if (list->isEmpty()) dict.remove(key); @@ -60,7 +60,7 @@ public: dict.remove(key); } List* find(void* key) { - return dict.find(key); + return dict.tqfind(key); } private: TQPtrDict<List> dict; @@ -70,7 +70,7 @@ private: static inline unsigned int stupidHash(void* ptr) { unsigned long val = (unsigned long)ptr; - // remove alignment and multiply by a prime unlikely to be a factor of size + // remove tqalignment and multiply by a prime unlikely to be a factor of size val = (val >> 4) * 1237; return val; } diff --git a/khtml/misc/stringit.h b/khtml/misc/stringit.h index 789f22af8..d56a78397 100644 --- a/khtml/misc/stringit.h +++ b/khtml/misc/stringit.h @@ -46,7 +46,7 @@ public: DOMStringIt(TQChar *str, uint len) { s = str, l = len; lines = 0; } DOMStringIt(const TQString &str) - { s = str.unicode(); l = str.length(); lines = 0; } + { s = str.tqunicode(); l = str.length(); lines = 0; } DOMStringIt *operator++() { @@ -85,13 +85,13 @@ class TokenizerSubstring friend class TokenizerString; public: TokenizerSubstring() : m_length(0), m_current(0) {} - TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.unicode()) {} + TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.tqunicode()) {} TokenizerSubstring(const TQChar *str, int length) : m_length(length), m_current(length == 0 ? 0 : str) {} void clear() { m_length = 0; m_current = 0; } void appendTo(TQString &str) const { - if (m_string.unicode() == m_current) { + if (m_string.tqunicode() == m_current) { if (str.isEmpty()) str = m_string; else diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp index bd010047a..80aede1ef 100644 --- a/khtml/rendering/bidi.cpp +++ b/khtml/rendering/bidi.cpp @@ -242,7 +242,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned()) { next = current->firstChild(); if ( next && adjustEmbedding ) { - EUnicodeBidi ub = next->style()->unicodeBidi(); + EUnicodeBidi ub = next->style()->tqunicodeBidi(); if ( ub != UBNormal && !emptyRun ) { EDirection dir = next->style()->direction(); TQChar::Direction d = ( ub == Embed ? ( dir == RTL ? TQChar::DirRLE : TQChar::DirLRE ) @@ -261,7 +261,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B while (current && current != par) { next = current->nextSibling(); if (next) break; - if ( adjustEmbedding && current->style()->unicodeBidi() != UBNormal && !emptyRun ) { + if ( adjustEmbedding && current->style()->tqunicodeBidi() != UBNormal && !emptyRun ) { embed( TQChar::DirPDF, bidi ); } current = current->parent(); @@ -454,7 +454,7 @@ static void checkMidpoints(BidiIterator& lBreak, BidiState &bidi) // Don't shave a character off the endpoint if it was from a soft hyphen. RenderText* textObj = static_cast<RenderText*>(endpoint.obj); if (endpoint.pos+1 < textObj->length() && - textObj->text()[endpoint.pos+1].unicode() == SOFT_HYPHEN) + textObj->text()[endpoint.pos+1].tqunicode() == SOFT_HYPHEN) return; } endpoint.pos--; @@ -1241,7 +1241,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator } // this causes the operator ++ to open and close embedding levels as needed - // for the CSS unicode-bidi property + // for the CSS tqunicode-bidi property adjustEmbedding = true; bidi.current.increment( bidi ); adjustEmbedding = false; @@ -1329,7 +1329,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLin m_overflowHeight = 0; - invalidateVerticalPositions(); + tqinvalidateVerticalPositions(); #ifdef DEBUG_LAYOUT TQTime qt; qt.start(); @@ -1360,7 +1360,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int breakBeforeLin RenderObject *o = first( this, bidi, false ); while ( o ) { if (o->markedForRepaint()) { - o->repaintDuringLayout(); + o->tqrepaintDuringLayout(); o->setMarkedForRepaint(false); } if (o->isReplaced() || o->isFloating() || o->isPositioned()) { @@ -1611,11 +1611,11 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi // be skipped. while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() && #ifndef QT_NO_UNICODETABLES - ( (start.current().unicode() == (ushort)0x0020) || // ASCII space - (start.current().unicode() == (ushort)0x0009) || // ASCII tab - (start.current().unicode() == (ushort)0x000A) || // ASCII line feed - (start.current().unicode() == (ushort)0x000C) || // ASCII form feed - (start.current().unicode() == (ushort)0x200B) || // Zero-width space + ( (start.current().tqunicode() == (ushort)0x0020) || // ASCII space + (start.current().tqunicode() == (ushort)0x0009) || // ASCII tab + (start.current().tqunicode() == (ushort)0x000A) || // ASCII line feed + (start.current().tqunicode() == (ushort)0x000C) || // ASCII form feed + (start.current().tqunicode() == (ushort)0x200B) || // Zero-width space start.obj->isFloatingOrPositioned() ) #else ( start.current() == ' ' || start.current() == '\n' || start.obj->isFloatingOrPositioned() ) @@ -1824,7 +1824,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi isLineEmpty = false; // Check for soft hyphens. Go ahead and ignore them. - if (c.unicode() == SOFT_HYPHEN && pos > 0) { + if (c.tqunicode() == SOFT_HYPHEN && pos > 0) { nextIsSoftBreakable = true; if (!ignoringSpaces) { // Ignore soft hyphens @@ -1911,7 +1911,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi lBreak.endOfInline = false; } goto end; - } else if ( (pos > 1 && str[pos-1].unicode() == SOFT_HYPHEN) ) + } else if ( (pos > 1 && str[pos-1].tqunicode() == SOFT_HYPHEN) ) // Subtract the width of the soft hyphen out since we fit on a line. tmpW -= t->width(pos-1, 1, f); } @@ -2189,7 +2189,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi // For soft hyphens on line breaks, we have to chop out the midpoints that made us // ignore the hyphen so that it will render at the end of the line. TQChar c = static_cast<RenderText*>(lBreak.obj)->text()[lBreak.pos-1]; - if (c.unicode() == SOFT_HYPHEN) + if (c.tqunicode() == SOFT_HYPHEN) chopMidpointsAt(lBreak.obj, lBreak.pos-2); } diff --git a/khtml/rendering/break_lines.h b/khtml/rendering/break_lines.h index 5176e5fb0..ed6df2aab 100644 --- a/khtml/rendering/break_lines.h +++ b/khtml/rendering/break_lines.h @@ -6,7 +6,7 @@ namespace khtml { /* - array of unicode codes where breaking shouldn't occur. + array of tqunicode codes where breaking shouldn't occur. (in sorted order because of using with binary search) these are currently for Japanese, though simply adding Korean, Chinese ones should work as well @@ -122,7 +122,7 @@ namespace khtml { inline bool isBreakable( const TQChar *str, const int pos, int len ) { const TQChar *c = str+pos; - unsigned short ch = c->unicode(); + unsigned short ch = c->tqunicode(); if ( ch > 0xff ) { // not latin1, need to do more sophisticated checks for asian fonts unsigned char row = c->row(); @@ -147,8 +147,8 @@ namespace khtml { return false; // do binary search in dontbreak[] - return break_bsearch(dontbreakbefore, c->unicode()) && - break_bsearch(dontbreakafter, (str+(pos-1))->unicode()); + return break_bsearch(dontbreakbefore, c->tqunicode()) && + break_bsearch(dontbreakafter, (str+(pos-1))->tqunicode()); } else // no asian font return c->isSpace(); } else { diff --git a/khtml/rendering/enumerate.cpp b/khtml/rendering/enumerate.cpp index 9cfe149ad..57445c12b 100644 --- a/khtml/rendering/enumerate.cpp +++ b/khtml/rendering/enumerate.cpp @@ -138,7 +138,7 @@ TQString toHebrew( int number ) { TQString letter; if (number < 1) return TQString::number(number); if (number>999) { - letter = toHebrew(number/1000) + TQString::fromLatin1("'"); + letter = toHebrew(number/1000) + TQString::tqfromLatin1("'"); number = number%1000; } diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp index a33f0e082..64ede83e3 100644 --- a/khtml/rendering/font.cpp +++ b/khtml/rendering/font.cpp @@ -293,7 +293,7 @@ int Font::width( TQChar *chs, int, int pos, int len, int start, int end, int toA const TQString qstr = cstr.string(); if ( scFont ) { const TQString upper = qstr.upper(); - const TQChar *uc = qstr.unicode(); + const TQChar *uc = qstr.tqunicode(); const TQFontMetrics sc_fm( *scFont ); for ( int i = 0; i < len; ++i ) { if ( (uc+i)->category() == TQChar::Letter_Lowercase ) diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp index fce22f7c8..3bf373f73 100644 --- a/khtml/rendering/render_applet.cpp +++ b/khtml/rendering/render_applet.cpp @@ -70,7 +70,7 @@ short RenderApplet::intrinsicWidth() const int rval = 300; if( m_widget ) - rval = ((KJavaAppletWidget*)(m_widget))->sizeHint().width(); + rval = ((KJavaAppletWidget*)(m_widget))->tqsizeHint().width(); return rval > 10 ? rval : 50; } @@ -80,7 +80,7 @@ int RenderApplet::intrinsicHeight() const int rval = 150; if( m_widget ) - rval = m_widget->sizeHint().height(); + rval = m_widget->tqsizeHint().height(); return rval > 10 ? rval : 50; } @@ -123,22 +123,22 @@ void RenderApplet::processArguments(const TQMap<TQString, TQString> &args) KJavaApplet* applet = w ? w->applet() : 0; if ( applet ) { - applet->setBaseURL( args[TQString::fromLatin1("baseURL") ] ); - applet->setAppletClass( args[TQString::fromLatin1("code") ] ); + applet->setBaseURL( args[TQString::tqfromLatin1("baseURL") ] ); + applet->setAppletClass( args[TQString::tqfromLatin1("code") ] ); - TQString str = args[TQString::fromLatin1("codeBase") ]; + TQString str = args[TQString::tqfromLatin1("codeBase") ]; if( !str.isEmpty() ) applet->setCodeBase( str ); - str = args[TQString::fromLatin1("name") ]; + str = args[TQString::tqfromLatin1("name") ]; if( !str.isNull() ) applet->setAppletName( str ); else - applet->setAppletName( args[TQString::fromLatin1("code") ] ); + applet->setAppletName( args[TQString::tqfromLatin1("code") ] ); - str = args[TQString::fromLatin1("archive") ]; + str = args[TQString::tqfromLatin1("archive") ]; if( !str.isEmpty() ) - applet->setArchives( args[TQString::fromLatin1("archive") ] ); + applet->setArchives( args[TQString::tqfromLatin1("archive") ] ); } } diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp index 99fbf4f4d..023b98e36 100644 --- a/khtml/rendering/render_arena.cpp +++ b/khtml/rendering/render_arena.cpp @@ -88,7 +88,7 @@ void* RenderArena::allocate(size_t size) #else void* result = 0; - // Ensure we have correct alignment for pointers. Important for Tru64 + // Ensure we have correct tqalignment for pointers. Important for Tru64 size = KHTML_ROUNDUP(size, sizeof(void*)); // Check recyclers first @@ -130,7 +130,7 @@ void RenderArena::free(size_t size, void* ptr) VALGRIND_MEMPOOL_FREE(findContainingArena(&m_pool, ptr)->base, ptr); #endif - // Ensure we have correct alignment for pointers. Important for Tru64 + // Ensure we have correct tqalignment for pointers. Important for Tru64 size = KHTML_ROUNDUP(size, sizeof(void*)); // See if it's a size that we recycle diff --git a/khtml/rendering/render_block.cpp b/khtml/rendering/render_block.cpp index ccbb6fad0..764eecb55 100644 --- a/khtml/rendering/render_block.cpp +++ b/khtml/rendering/render_block.cpp @@ -635,7 +635,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren) } if (markedForRepaint()) { - repaintDuringLayout(); + tqrepaintDuringLayout(); setMarkedForRepaint(false); } @@ -881,7 +881,7 @@ static inline bool isAnonymousWhitespace( RenderObject* o ) { return false; RenderObject *fc = o->firstChild(); return fc && fc == o->lastChild() && fc->isText() && static_cast<RenderText *>(fc)->stringLength() == 1 && - static_cast<RenderText *>(fc)->text()[0].unicode() == ' '; + static_cast<RenderText *>(fc)->text()[0].tqunicode() == ' '; } RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo& compactInfo, const MarginInfo& marginInfo, bool& handled) @@ -1581,7 +1581,7 @@ void RenderBlock::layoutPositionedObjects(bool relayoutChildren) for ( ; (r = it.current()); ++it ) { //kdDebug(6040) << " have a positioned object" << endl; if (r->markedForRepaint()) { - r->repaintDuringLayout(); + r->tqrepaintDuringLayout(); r->setMarkedForRepaint(false); } if ( relayoutChildren || r->style()->position() == FIXED || diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp index 930ec358c..2ed114a53 100644 --- a/khtml/rendering/render_body.cpp +++ b/khtml/rendering/render_body.cpp @@ -81,11 +81,11 @@ void RenderBody::paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty) } -void RenderBody::repaint(Priority p) +void RenderBody::tqrepaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->repaint(p); + cb->tqrepaint(p); } void RenderBody::layout() diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h index 7951f73e1..17c237e91 100644 --- a/khtml/rendering/render_body.h +++ b/khtml/rendering/render_body.h @@ -40,7 +40,7 @@ public: virtual bool isBody() const { return true; } virtual const char *renderName() const { return "RenderBody"; } - virtual void repaint(Priority p=NormalPriority); + virtual void tqrepaint(Priority p=NormalPriority); virtual void layout(); virtual void setStyle(RenderStyle* style); diff --git a/khtml/rendering/render_box.cpp b/khtml/rendering/render_box.cpp index e6742d54e..602b07d0a 100644 --- a/khtml/rendering/render_box.cpp +++ b/khtml/rendering/render_box.cpp @@ -490,7 +490,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba TQColor bgColor = c; // Paint the color first underneath all images. - if (!bgLayer->next() && bgColor.isValid() && qAlpha(bgColor.rgb()) > 0) + if (!bgLayer->next() && bgColor.isValid() && tqAlpha(bgColor.rgb()) > 0) p->fillRect(_tx, clipy, w, cliph, bgColor); // no progressive loading of the background image @@ -622,7 +622,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba sy+=b.y()-cy; cx=b.x();cy=b.y();cw=b.width();ch=b.height(); } - // restrict painting to repaint-clip + // restrict painting to tqrepaint-clip if (cy < clipy) { ch -= (clipy - cy); sy += (clipy - cy); @@ -795,7 +795,7 @@ void RenderBox::position(InlineBox* box, int /*from*/, int /*len*/, bool /*rever setPos( box->xPos(), box->yPos() ); } -void RenderBox::repaint(Priority prior) +void RenderBox::tqrepaint(Priority prior) { int ow = style() ? style()->outlineSize() : 0; if( isInline() && !isReplaced() ) @@ -806,17 +806,17 @@ void RenderBox::repaint(Priority prior) p = p->parent(); int xoff = p->hasOverflowClip() ? 0 : p->overflowLeft(); int yoff = p->hasOverflowClip() ? 0 : p->overflowTop(); - p->repaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior); + p->tqrepaintRectangle( -ow + xoff, -ow + yoff, p->effectiveWidth()+ow*2, p->effectiveHeight()+ow*2, prior); } else { int xoff = hasOverflowClip() ? 0 : overflowLeft(); int yoff = hasOverflowClip() ? 0 : overflowTop(); - repaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); + tqrepaintRectangle( -ow + xoff, -ow + yoff, effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); } } -void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderBox::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) { x += m_x; y += m_y; @@ -830,7 +830,7 @@ void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) if (style()->position() == FIXED) f=true; - // kdDebug( 6040 ) << "RenderBox(" <<this << ", " << renderName() << ")::repaintRectangle (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl; + // kdDebug( 6040 ) << "RenderBox(" <<this << ", " << renderName() << ")::tqrepaintRectangle (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl; RenderObject *o = container(); if( o ) { if (o->layer()) { @@ -839,7 +839,7 @@ void RenderBox::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) if (style()->position() == ABSOLUTE) o->layer()->checkInlineRelOffset(this,x,y); } - o->repaintRectangle(x, y, w, h, p, f); + o->tqrepaintRectangle(x, y, w, h, p, f); } } diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h index c0c618d5c..8158d6037 100644 --- a/khtml/rendering/render_box.h +++ b/khtml/rendering/render_box.h @@ -87,9 +87,9 @@ public: virtual int rightmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; virtual int leftmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; - virtual void repaint(Priority p=NormalPriority); + virtual void tqrepaint(Priority p=NormalPriority); - virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual short containingBlockWidth() const; void relativePositionOffset(int &tx, int &ty) const; diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp index e8540eba6..2065d8b1a 100644 --- a/khtml/rendering/render_canvas.cpp +++ b/khtml/rendering/render_canvas.cpp @@ -217,11 +217,11 @@ void RenderCanvas::updateDocumentSize() // if we are about to show a scrollbar, and the document is sized to the viewport w or h, // then reserve the scrollbar space so that it doesn't trigger the _other_ scrollbar - if (!vss && m_width - m_view->verticalScrollBar()->sizeHint().width() == s.width() && + if (!vss && m_width - m_view->verticalScrollBar()->tqsizeHint().width() == s.width() && m_cachedDocWidth <= m_width) hDocW = kMin( m_cachedDocWidth, s.width() ); - if (!hss && m_height - m_view->horizontalScrollBar()->sizeHint().height() == s.height() && + if (!hss && m_height - m_view->horizontalScrollBar()->tqsizeHint().height() == s.height() && m_cachedDocHeight <= m_height) hDocH = kMin( m_cachedDocHeight, s.height() ); @@ -269,7 +269,7 @@ bool RenderCanvas::needsFullRepaint() const return m_needsFullRepaint || m_pagedMode; } -void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap) +void RenderCanvas::tqrepaintViewRectangle(int x, int y, int w, int h, bool asap) { KHTMLAssert( view() ); view()->scheduleRepaint( x, y, w, h, asap ); @@ -332,7 +332,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /* paintInfo.p->fillRect(paintInfo.r, view()->palette().active().color(TQColorGroup::Base)); } -void RenderCanvas::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) { if (m_staticMode) return; // kdDebug( 6040 ) << "updating views contents (" << x << "/" << y << ") (" << w << "/" << h << ")" << endl; @@ -353,7 +353,7 @@ void RenderCanvas::repaintRectangle(int x, int y, int w, int h, Priority p, bool if (p == RealtimePriority) // ### KWQ's updateContents has an additional parameter "now". // It's not clear what the difference between updateContents(...,true) - // and repaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS) + // and tqrepaintContents(...) is. As Qt doesn't have this, I'm leaving it out. (LS) m_view->updateContents(ur/*, true*/); else if (p == HighPriority) m_view->scheduleRepaint(x, y, w, h, true /*asap*/); @@ -372,13 +372,13 @@ void RenderCanvas::scheduleDeferredRepaints() if (!needsFullRepaint()) { TQValueList<RenderObject*>::const_iterator it; for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it ) - (*it)->repaint(); + (*it)->tqrepaint(); } - //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full repaint: " << needsFullRepaint() << endl; + //kdDebug(6040) << "scheduled deferred tqrepaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl; m_dirtyChildren.clear(); } -void RenderCanvas::repaint(Priority p) +void RenderCanvas::tqrepaint(Priority p) { if (m_view && !m_staticMode) { if (p == RealtimePriority) { @@ -388,7 +388,7 @@ void RenderCanvas::repaint(Priority p) m_view->scheduleRelayout(); return; } - // ### same as in repaintRectangle + // ### same as in tqrepaintRectangle m_view->updateContents(m_view->contentsX(), m_view->contentsY(), m_view->visibleWidth(), m_view->visibleHeight()/*, true*/); } @@ -567,7 +567,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep TQRect updateRect; - // Don't use repaint() because it will cause all rects to + // Don't use tqrepaint() because it will cause all rects to // be united (see khtmlview::scheduleRepaint()). Instead // just draw damage rects for objects that have a change // in selection state. @@ -651,9 +651,9 @@ void RenderCanvas::clearSelection(bool doRepaint) { if (o->selectionState()!=SelectionNone) if (doRepaint) - o->repaint(); + o->tqrepaint(); o->setSelectionState(SelectionNone); - o->repaint(); + o->tqrepaint(); RenderObject* no; if ( !(no = o->firstChild()) ) if ( !(no = o->nextSibling()) ) @@ -669,7 +669,7 @@ void RenderCanvas::clearSelection(bool doRepaint) if (m_selectionEnd) { m_selectionEnd->setSelectionState(SelectionNone); if (doRepaint) - m_selectionEnd->repaint(); + m_selectionEnd->tqrepaint(); } // set selection start & end to 0 diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h index 17f279d7b..82b59705b 100644 --- a/khtml/rendering/render_canvas.h +++ b/khtml/rendering/render_canvas.h @@ -61,9 +61,9 @@ public: KHTMLView *view() const { return m_view; } - virtual void repaint(Priority p=NormalPriority); - virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); - void repaintViewRectangle(int x, int y, int w, int h, bool asap=false); + virtual void tqrepaint(Priority p=NormalPriority); + virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + void tqrepaintViewRectangle(int x, int y, int w, int h, bool asap=false); bool needsFullRepaint() const; void deferredRepaint( RenderObject* o ); void scheduleDeferredRepaints(); @@ -137,7 +137,7 @@ protected: void updateDocumentSize(); // internal setters for cached values of document width/height - // Setting to -1/-1 invalidates the cache. + // Setting to -1/-1 tqinvalidates the cache. void setCachedDocWidth(int w ) { m_cachedDocWidth = w; } void setCachedDocHeight(int h) { m_cachedDocHeight = h; } diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp index 69f987477..45cfc5729 100644 --- a/khtml/rendering/render_container.cpp +++ b/khtml/rendering/render_container.cpp @@ -170,11 +170,11 @@ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild) KHTMLAssert(oldChild->parent() == this); // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or - // that a positioned child got yanked). We also repaint, so that the area exposed when the child - // disappears gets repainted properly. + // that a positioned child got yanked). We also tqrepaint, so that the area exposed when the child + // disappears gets tqrepainted properly. if ( document()->renderer() ) { oldChild->setNeedsLayoutAndMinMaxRecalc(); - oldChild->repaint(); + oldChild->tqrepaint(); // Keep our layer hierarchy updated. oldChild->removeLayers(enclosingLayer()); diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp index ae579bd46..2d56e8f40 100644 --- a/khtml/rendering/render_flow.cpp +++ b/khtml/rendering/render_flow.cpp @@ -267,7 +267,7 @@ bool RenderFlow::hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTest } -void RenderFlow::repaint(Priority prior) +void RenderFlow::tqrepaint(Priority prior) { if (isInlineFlow()) { // Find our leftmost position. @@ -280,7 +280,7 @@ void RenderFlow::repaint(Priority prior) if (curr == firstLineBox() || curr->xPos() < left) left = curr->xPos(); - // Now invalidate a rectangle. + // Now tqinvalidate a rectangle. int ow = style() ? style()->outlineSize() : 0; // We need to add in the relative position offsets of any inlines (including us) up to our @@ -295,18 +295,18 @@ void RenderFlow::repaint(Priority prior) } RootInlineBox *lastRoot = lastLineBox() && !needsLayout() ? lastLineBox()->root() : 0; - containingBlock()->repaintRectangle(-ow+left, -ow+top, + containingBlock()->tqrepaintRectangle(-ow+left, -ow+top, width()+ow*2, (lastRoot ? lastRoot->bottomOverflow() - top : height())+ow*2, prior); } else { if (firstLineBox() && firstLineBox()->topOverflow() < 0) { int ow = style() ? style()->outlineSize() : 0; - repaintRectangle(-ow, -ow+firstLineBox()->topOverflow(), + tqrepaintRectangle(-ow, -ow+firstLineBox()->topOverflow(), effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); } else - return RenderBox::repaint(prior); + return RenderBox::tqrepaint(prior); } } diff --git a/khtml/rendering/render_flow.h b/khtml/rendering/render_flow.h index 1e23822bb..3267a92f1 100644 --- a/khtml/rendering/render_flow.h +++ b/khtml/rendering/render_flow.h @@ -69,7 +69,7 @@ public: void paintLines(PaintInfo& i, int _tx, int _ty); bool hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTestAction hitTestAction); - virtual void repaint(Priority p=NormalPriority); + virtual void tqrepaint(Priority p=NormalPriority); virtual int highestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; virtual int lowestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const; diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp index 58a9a8d33..f06dd4a62 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -99,7 +99,7 @@ void RenderFormElement::layout() setNeedsLayout(false); } -Qt::AlignmentFlags RenderFormElement::textAlignment() const +TQ_Alignment RenderFormElement::textAlignment() const { switch (style()->textAlign()) { case LEFT: @@ -155,8 +155,8 @@ void RenderCheckBox::calcMinMaxWidth() KHTMLAssert( !minMaxKnown() ); TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget ); - TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ), - cb->style().pixelMetric( TQStyle::PM_IndicatorHeight ) ); + TQSize s( cb->style().tqpixelMetric( TQStyle::PM_IndicatorWidth ), + cb->style().tqpixelMetric( TQStyle::PM_IndicatorHeight ) ); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); @@ -207,8 +207,8 @@ void RenderRadioButton::calcMinMaxWidth() KHTMLAssert( !minMaxKnown() ); TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget ); - TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), - rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); + TQSize s( rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), + rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); @@ -260,17 +260,17 @@ void RenderSubmitButton::calcMinMaxWidth() bool empty = raw.isEmpty(); if ( empty ) - raw = TQString::fromLatin1("X"); + raw = TQString::tqfromLatin1("X"); TQFontMetrics fm = pb->fontMetrics(); TQSize ts = fm.size( ShowPrefix, raw); TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts ) .expandedTo(TQApplication::globalStrut())); - int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) + - pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; + int margin = pb->style().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) + + pb->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; int w = ts.width() + margin; int h = s.height(); if (pb->isDefault() || pb->autoDefault()) { - int dbw = pb->style().pixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; + int dbw = pb->style().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; w += dbw; } @@ -491,7 +491,7 @@ void RenderLineEdit::setStyle(RenderStyle* _style) { RenderFormElement::setStyle( _style ); - widget()->setAlignment(textAlignment()); + widget()->tqsetAlignment(textAlignment()); } void RenderLineEdit::highLightWord( unsigned int length, unsigned int pos ) @@ -809,7 +809,7 @@ void RenderFileButton::calcMinMaxWidth() edit, TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) .expandedTo(TQApplication::globalStrut()); - TQSize bs = static_cast<KURLRequester*>( m_widget )->minimumSizeHint() - edit->minimumSizeHint(); + TQSize bs = static_cast<KURLRequester*>( m_widget )->tqminimumSizeHint() - edit->tqminimumSizeHint(); setIntrinsicWidth( s.width() + bs.width() ); setIntrinsicHeight( kMax(s.height(), bs.height()) ); @@ -1018,7 +1018,7 @@ void RenderSelect::updateFromElement() DOMString label = optElem->getAttribute(ATTR_LABEL); if (!label.isEmpty()) text = label.string(); - text = TQString::fromLatin1(" ")+text; + text = TQString::tqfromLatin1(" ")+text; } if(m_useListBox) { @@ -1107,14 +1107,14 @@ void RenderSelect::layout( ) if(size < 1) size = kMin(static_cast<KListBox*>(m_widget)->count(), 10u); - width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width(); + width += 2*w->frameWidth() + w->verticalScrollBar()->tqsizeHint().width(); height = size*height + 2*w->frameWidth(); setIntrinsicWidth( width ); setIntrinsicHeight( height ); } else { - TQSize s(m_widget->sizeHint()); + TQSize s(m_widget->tqsizeHint()); setIntrinsicWidth( s.width() ); setIntrinsicHeight( s.height() ); } @@ -1450,7 +1450,7 @@ void TextAreaWidget::slotReplaceNext() if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) { viewport()->setUpdatesEnabled(true); - repaintChanged(); + tqrepaintChanged(); } if (res == KFind::NoMatch) { // at end @@ -1651,10 +1651,10 @@ void RenderTextArea::calcMinMaxWidth() const TQFontMetrics &m = style()->fontMetrics(); w->setTabStopWidth(8 * m.width(" ")); TQSize size( kMax(element()->cols(), 1L)*m.width('x') + w->frameWidth() + - w->verticalScrollBar()->sizeHint().width(), + w->verticalScrollBar()->tqsizeHint().width(), kMax(element()->rows(), 1L)*m.lineSpacing() + w->frameWidth()*4 + (w->wordWrap() == TQTextEdit::NoWrap ? - w->horizontalScrollBar()->sizeHint().height() : 0) + w->horizontalScrollBar()->tqsizeHint().height() : 0) ); setIntrinsicWidth( size.width() ); @@ -1670,7 +1670,7 @@ void RenderTextArea::setStyle(RenderStyle* _style) RenderFormElement::setStyle(_style); widget()->blockSignals(true); - widget()->setAlignment(textAlignment()); + widget()->tqsetAlignment(textAlignment()); widget()->blockSignals(false); scrollbarsStyled = false; @@ -1738,13 +1738,13 @@ TQString RenderTextArea::text() paragraphText = paragraphText.left(pl); //Snip invented space. for (int l = 0; l < pl; ++l) { if (lindex != w->lineOfChar(p, l)) { - paragraphText.insert(l+ll++, TQString::fromLatin1("\n")); + paragraphText.insert(l+ll++, TQString::tqfromLatin1("\n")); lindex = w->lineOfChar(p, l); } } txt += paragraphText; if (p < w->paragraphs() - 1) - txt += TQString::fromLatin1("\n"); + txt += TQString::tqfromLatin1("\n"); } } else diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index 3d06b7e6d..b157df16d 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -728,16 +728,16 @@ void RenderPartObject::updateWidget() HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>( child ); TQString aStr = p->name(); - aStr += TQString::fromLatin1("=\""); + aStr += TQString::tqfromLatin1("=\""); aStr += p->value(); - aStr += TQString::fromLatin1("\""); + aStr += TQString::tqfromLatin1("\""); TQString name_lower = p->name().lower(); - if (name_lower == TQString::fromLatin1("type") && objbase->id() != ID_APPLET) { + if (name_lower == TQString::tqfromLatin1("type") && objbase->id() != ID_APPLET) { objbase->setServiceType(p->value()); } else if (url.isEmpty() && - (name_lower == TQString::fromLatin1("src") || - name_lower == TQString::fromLatin1("movie") || - name_lower == TQString::fromLatin1("code"))) { + (name_lower == TQString::tqfromLatin1("src") || + name_lower == TQString::tqfromLatin1("movie") || + name_lower == TQString::tqfromLatin1("code"))) { url = p->value(); } params.append(aStr); @@ -754,8 +754,8 @@ void RenderPartObject::updateWidget() } } } - params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); - params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); + params.append( TQString::tqfromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); + params.append( TQString::tqfromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); HTMLEmbedElementImpl *embed = 0; TQString classId; @@ -775,18 +775,18 @@ void RenderPartObject::updateWidget() } classId = objbase->classId; - params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); - params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); + params.append( TQString::tqfromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); + params.append( TQString::tqfromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); if (!objbase->getAttribute(ATTR_WIDTH).isEmpty()) - params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); + params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) { - params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) ); + params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) ); objbase->setAttribute(ATTR_WIDTH, embed->getAttribute(ATTR_WIDTH)); } if (!objbase->getAttribute(ATTR_HEIGHT).isEmpty()) - params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) ); + params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) ); else if (embed && !embed->getAttribute(ATTR_HEIGHT).isEmpty()) { - params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) ); + params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) ); objbase->setAttribute(ATTR_HEIGHT, embed->getAttribute(ATTR_HEIGHT)); } @@ -808,7 +808,7 @@ void RenderPartObject::updateWidget() serviceType = "application/x-activex-handler"; #endif - if(classId.find(TQString::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) { + if(classId.tqfind(TQString::tqfromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) { // It is ActiveX, but the nsplugin system handling // should also work, that's why we don't override the // serviceType with application/x-activex-handler @@ -817,17 +817,17 @@ void RenderPartObject::updateWidget() // with nspluginviewer (Niko) serviceType = "application/x-shockwave-flash"; } - else if(classId.find(TQString::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) + else if(classId.tqfind(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0) serviceType = "audio/x-pn-realaudio-plugin"; - else if(classId.find(TQString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || - objbase->classId.find(TQString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0) + else if(classId.tqfind(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 || + objbase->classId.tqfind(TQString::tqfromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0) serviceType = "application/x-java-applet"; // http://www.apple.com/quicktime/tools_tips/tutorials/activex.html - else if(classId.find(TQString::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0) + else if(classId.tqfind(TQString::tqfromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0) serviceType = "video/quicktime"; // http://msdn.microsoft.com/library/en-us/dnwmt/html/adding_windows_media_to_web_pages__etse.asp?frame=true - else if(objbase->classId.find(TQString::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || - classId.find(TQString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) + else if(objbase->classId.tqfind(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 || + classId.tqfind(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0) serviceType = "video/x-msvideo"; else diff --git a/khtml/rendering/render_frames.h b/khtml/rendering/render_frames.h index 3dd7ed0d9..c6e93cbe0 100644 --- a/khtml/rendering/render_frames.h +++ b/khtml/rendering/render_frames.h @@ -61,7 +61,7 @@ public: bool canResize( int _x, int _y); void setResizing(bool e); - Qt::CursorShape cursorShape() const { return m_cursor; } + Qt::tqCursorShape cursorShape() const { return m_cursor; } bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside); @@ -73,7 +73,7 @@ public: #endif private: - Qt::CursorShape m_cursor; + Qt::tqCursorShape m_cursor; int m_oldpos; int m_gridLen[2]; int* m_gridDelta[2]; diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp index 17c65fc9c..ba80a5aa1 100644 --- a/khtml/rendering/render_generated.cpp +++ b/khtml/rendering/render_generated.cpp @@ -53,7 +53,7 @@ void RenderCounterBase::calcMinMaxWidth() generateContent(); if (str) str->deref(); - str = new DOM::DOMStringImpl(m_item.unicode(), m_item.length()); + str = new DOM::DOMStringImpl(m_item.tqunicode(), m_item.length()); str->ref(); RenderText::calcMinMaxWidth(); diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp index 120e75361..2db7e56bb 100644 --- a/khtml/rendering/render_image.cpp +++ b/khtml/rendering/render_image.cpp @@ -196,10 +196,10 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o) resizeCache = TQPixmap(); // for resized animations if(completeRepaint) - repaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight()); + tqrepaintRectangle(borderLeft()+paddingLeft(), borderTop()+paddingTop(), contentWidth(), contentHeight()); else { - repaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(), + tqrepaintRectangle(r.x() + borderLeft() + paddingLeft(), r.y() + borderTop() + paddingTop(), r.width(), r.height()); } } @@ -416,7 +416,7 @@ void RenderImage::notifyFinished(CachedObject *finishedObj) if ( ( m_cachedImage == finishedObj || m_oldImage == finishedObj ) && m_oldImage ) { m_oldImage->deref( this ); m_oldImage = 0; - repaint(); + tqrepaint(); } RenderReplaced::notifyFinished(finishedObj); diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp index 2b7e93f1f..d1cdfa63e 100644 --- a/khtml/rendering/render_layer.cpp +++ b/khtml/rendering/render_layer.cpp @@ -195,17 +195,17 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer) return r; } -void RenderLayer::repaint( Priority p, bool markForRepaint ) +void RenderLayer::tqrepaint( Priority p, bool markForRepaint ) { if (markForRepaint && m_markedForRepaint) return; for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) - child->repaint( p, markForRepaint ); + child->tqrepaint( p, markForRepaint ); TQRect layerBounds, damageRect, fgrect; calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect); m_visibleRect = damageRect.intersect( layerBounds ); if (m_visibleRect.isValid()) - renderer()->canvas()->repaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) ); + renderer()->canvas()->tqrepaintViewRectangle( m_visibleRect.x(), m_visibleRect.y(), m_visibleRect.width(), m_visibleRect.height(), (p > NormalPriority) ); if (markForRepaint) m_markedForRepaint = true; } @@ -213,7 +213,7 @@ void RenderLayer::repaint( Priority p, bool markForRepaint ) void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint) { if (doFullRepaint) { - m_object->repaint(); + m_object->tqrepaint(); checkForRepaint = doFullRepaint = false; } @@ -233,14 +233,14 @@ void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepain #ifdef APPLE_CHANGES // FIXME: Child object could override visibility. if (checkForRepaint && (m_object->style()->visibility() == VISIBLE)) - m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect); + m_object->tqrepaintAfterLayoutIfNeeded(m_tqrepaintRect, m_fullRepaintRect); #else if (checkForRepaint && m_markedForRepaint) { TQRect layerBounds, damageRect, fgrect; calculateRects(rootLayer, renderer()->viewRect(), layerBounds, damageRect, fgrect); TQRect vr = damageRect.intersect( layerBounds ); if (vr != m_visibleRect && vr.isValid()) { - renderer()->canvas()->repaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() ); + renderer()->canvas()->tqrepaintViewRectangle( vr.x(), vr.y(), vr.width(), vr.height() ); m_visibleRect = vr; } } @@ -537,7 +537,7 @@ void RenderLayer::checkInlineRelOffset(const RenderObject* o, int& x, int& y) y += sy; } -void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repaint) +void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrepaint) { if (renderer()->style()->overflowX() != OMARQUEE || !renderer()->hasOverflowClip()) { if (x < 0) x = 0; @@ -569,9 +569,9 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repai // Fire the scroll DOM event. m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); - // Just schedule a full repaint of our object. - if (repaint) - m_object->repaint(RealtimePriority); + // Just schedule a full tqrepaint of our object. + if (tqrepaint) + m_object->tqrepaint(RealtimePriority); if (updateScrollbars) { if (m_hBar) @@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth() #ifdef APPLE_CHANGES return m_vBar->width(); #else - return m_vBar->style().pixelMetric(TQStyle::PM_ScrollBarExtent); + return m_vBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); #endif } @@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight() #ifdef APPLE_CHANGES return m_hBar->height(); #else - return m_hBar->style().pixelMetric(TQStyle::PM_ScrollBarExtent); + return m_hBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); #endif } @@ -691,7 +691,7 @@ void RenderLayer::positionScrollbars(const TQRect& absBounds) TQScrollBar *b = m_hBar; if (!m_hBar) b = m_vBar; - int sw = b->style().pixelMetric(TQStyle::PM_ScrollBarExtent); + int sw = b->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); if (m_vBar) { TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1); diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h index b65047391..1176a63a3 100644 --- a/khtml/rendering/render_layer.h +++ b/khtml/rendering/render_layer.h @@ -63,7 +63,7 @@ namespace khtml { class RenderObject; class RenderScrollMediator; -class RenderScrollMediator: public QObject +class RenderScrollMediator: public TQObject { Q_OBJECT public: @@ -78,7 +78,7 @@ private: }; // This class handles the auto-scrolling of layers with overflow: marquee. -class Marquee: public QObject +class Marquee: public TQObject { Q_OBJECT @@ -190,7 +190,7 @@ public: void checkInlineRelOffset(const RenderObject* o, int& x, int& y); short scrollXOffset() { return m_scrollX; } int scrollYOffset() { return m_scrollY; } - void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true); + void scrollToOffset(int x, int y, bool updateScrollbars = true, bool tqrepaint = true); void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); } void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); } void showScrollbar(Qt::Orientation, bool); @@ -202,7 +202,7 @@ public: void paintScrollbars(RenderObject::PaintInfo& pI); void checkScrollbarsAfterLayout(); void slotValueChanged(int); - void repaint(Priority p=NormalPriority, bool markForRepaint = false); + void tqrepaint(Priority p=NormalPriority, bool markForRepaint = false); void updateScrollPositionFromScrollbars(); void updateLayerPosition(); diff --git a/khtml/rendering/render_list.cpp b/khtml/rendering/render_list.cpp index b08ec6eb9..45767a8bb 100644 --- a/khtml/rendering/render_list.cpp +++ b/khtml/rendering/render_list.cpp @@ -344,21 +344,21 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) if( style()->direction() == LTR) { p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, - TQString::fromLatin1(". ")); + TQString::tqfromLatin1(". ")); } else { - const TQString& punct(TQString::fromLatin1(" .")); + const TQString& punct(TQString::tqfromLatin1(" .")); p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct); p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); } } else { if (style()->direction() == LTR) { - const TQString& punct(TQString::fromLatin1(". ")); + const TQString& punct(TQString::tqfromLatin1(". ")); p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|Qt::DontClip, punct); p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|Qt::DontClip, m_item); } else { - const TQString& punct(TQString::fromLatin1(" .")); + const TQString& punct(TQString::tqfromLatin1(" .")); p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct); p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); } @@ -387,7 +387,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag if(m_width != m_listImage->pixmap_size().width() || m_height != m_listImage->pixmap_size().height()) setNeedsLayoutAndMinMaxRecalc(); else - repaintRectangle(0, 0, m_width, m_height); + tqrepaintRectangle(0, 0, m_width, m_height); } void RenderListMarker::calcMinMaxWidth() @@ -543,7 +543,7 @@ void RenderListMarker::calcMinMaxWidth() default: KHTMLAssert(false); } - m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". ")); + m_markerWidth = fm.width(m_item) + fm.width(TQString::tqfromLatin1(". ")); } end: diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp index c5ee68720..2efeae238 100644 --- a/khtml/rendering/render_object.cpp +++ b/khtml/rendering/render_object.cpp @@ -71,8 +71,8 @@ using namespace khtml; #define COLOR_DARK_BS_FACTOR 30 #define COLOR_DARK_TS_FACTOR 50 -#define LIGHT_GRAY qRgb(192, 192, 192) -#define DARK_GRAY qRgb(96, 96, 96) +#define LIGHT_GRAY tqRgb(192, 192, 192) +#define DARK_GRAY tqRgb(96, 96, 96) #ifndef NDEBUG static void *baseOfRenderObjectBeingDeleted; @@ -535,9 +535,9 @@ bool RenderObject::hasStaticY() const void RenderObject::setPixmap(const TQPixmap&, const TQRect& /*r*/, CachedImage* image) { - //repaint bg when it finished loading + //tqrepaint bg when it finished loading if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) { - isBody() ? canvas()->repaint() : repaint(); + isBody() ? canvas()->tqrepaint() : tqrepaint(); } } @@ -1103,9 +1103,9 @@ void RenderObject::paint( PaintInfo&, int /*tx*/, int /*ty*/) { } -void RenderObject::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderObject::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) { - if(parent()) parent()->repaintRectangle(x, y, w, h, p, f); + if(parent()) parent()->tqrepaintRectangle(x, y, w, h, p, f); } #ifdef ENABLE_DUMP @@ -1164,15 +1164,15 @@ TQString RenderObject::information() const << " mB: " << marginBottom() << " qB: " << isBottomMarginQuirk() << "}" << (isTableCell() ? - ( TQString::fromLatin1(" [r=") + + ( TQString::tqfromLatin1(" [r=") + TQString::number( static_cast<const RenderTableCell *>(this)->row() ) + - TQString::fromLatin1(" c=") + + TQString::tqfromLatin1(" c=") + TQString::number( static_cast<const RenderTableCell *>(this)->col() ) + - TQString::fromLatin1(" rs=") + + TQString::tqfromLatin1(" rs=") + TQString::number( static_cast<const RenderTableCell *>(this)->rowSpan() ) + - TQString::fromLatin1(" cs=") + + TQString::tqfromLatin1(" cs=") + TQString::number( static_cast<const RenderTableCell *>(this)->colSpan() ) + - TQString::fromLatin1("]") ) : TQString::null ); + TQString::tqfromLatin1("]") ) : TQString::null ); if ( layer() ) ts << " layer=" << layer(); if ( continuation() ) @@ -1283,11 +1283,11 @@ void RenderObject::setStyle(RenderStyle *style) m_style->outlineWidth() > style->outlineWidth() || (!m_style->hidesOverflow() && style->hidesOverflow()) || ( m_style->hasClip() && !(m_style->clip() == style->clip()) ) ) ) { - // schedule a repaint with the old style + // schedule a tqrepaint with the old style if (layer() && !isInlineFlow()) - layer()->repaint(pri); + layer()->tqrepaint(pri); else - repaint(pri); + tqrepaint(pri); } if ( ( isFloating() && m_style->floating() != style->floating() ) || @@ -1345,7 +1345,7 @@ void RenderObject::setStyle(RenderStyle *style) } setNeedsLayoutAndMinMaxRecalc(); } else if (!isText() && d >= RenderStyle::Visible) { - // a repaint is enough + // a tqrepaint is enough if (layer()) { if (canvas() && canvas()->needsWidgetMasks()) { // update our widget masks @@ -1357,9 +1357,9 @@ void RenderObject::setStyle(RenderStyle *style) } } if (layer() && !isInlineFlow()) - layer()->repaint(pri); + layer()->tqrepaint(pri); else - repaint(pri); + tqrepaint(pri); } } } @@ -1423,14 +1423,14 @@ void RenderObject::dirtyFormattingContext( bool checkContainer ) m_parent->dirtyFormattingContext(false); } -void RenderObject::repaintDuringLayout() +void RenderObject::tqrepaintDuringLayout() { if (canvas()->needsFullRepaint() || isText()) return; if (layer() && !isInlineFlow()) { - layer()->repaint( NormalPriority, true ); + layer()->tqrepaint( NormalPriority, true ); } else { - repaint(); + tqrepaint(); canvas()->deferredRepaint( this ); } } @@ -1850,7 +1850,7 @@ short RenderObject::getVerticalPosition( bool firstLine, RenderObject* ref ) con bool checkParent = ref->isInline() && !ref->isReplacedBlock() && !( ref->style()->verticalAlign() == TOP || ref->style()->verticalAlign() == BOTTOM ); vpos = checkParent ? ref->verticalPositionHint( firstLine ) : 0; - // don't allow elements nested inside text-top to have a different valignment. + // don't allow elements nested inside text-top to have a different vtqalignment. if ( va == BASELINE ) return vpos; else if ( va == LENGTH ) @@ -1923,12 +1923,12 @@ short RenderObject::baselinePosition( bool firstLine ) const return fm.ascent() + ( lineHeight( firstLine) - fm.height() ) / 2; } -void RenderObject::invalidateVerticalPositions() +void RenderObject::tqinvalidateVerticalPositions() { m_verticalPosition = PositionUndefined; RenderObject *child = firstChild(); while( child ) { - child->invalidateVerticalPositions(); + child->tqinvalidateVerticalPositions(); child = child->nextSibling(); } } diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h index f7f772387..2e67807c3 100644 --- a/khtml/rendering/render_object.h +++ b/khtml/rendering/render_object.h @@ -327,7 +327,7 @@ public: void setOverhangingContents(bool p=true); void markContainingBlocksForLayout(); void dirtyFormattingContext( bool checkContainer ); - void repaintDuringLayout(); + void tqrepaintDuringLayout(); void setNeedsLayout(bool b, bool markParents = true); void setChildNeedsLayout(bool b, bool markParents = true); void setMinMaxKnown(bool b=true) { @@ -441,7 +441,7 @@ public: void layoutIfNeeded() { if (needsLayout()) layout(); } // used for element state updates that can not be fixed with a - // repaint and do not need a relayout + // tqrepaint and do not need a relayout virtual void updateFromElement() {} // Called immediately after render-object is inserted @@ -681,9 +681,9 @@ public: // Used by collapsed border tables. virtual void collectBorders(TQValueList<CollapsedBorderValue>& borderStyles); - // force a complete repaint - virtual void repaint(Priority p = NormalPriority) { if(m_parent) m_parent->repaint(p); } - virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + // force a complete tqrepaint + virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); } + virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual unsigned int length() const { return 1; } @@ -747,8 +747,8 @@ public: virtual int leftmostPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; } virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; } - // recursively invalidate current layout - // unused: void invalidateLayout(); + // recursively tqinvalidate current layout + // unused: void tqinvalidateLayout(); virtual void calcVerticalMargins() {} void removeFromObjectLists(); @@ -790,7 +790,7 @@ protected: virtual TQRect viewRect() const; void remove(); - void invalidateVerticalPositions(); + void tqinvalidateVerticalPositions(); bool attemptDirectLayerTranslation(); void updateWidgetMasks(); diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 157d1b76d..300328688 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -183,10 +183,10 @@ bool RenderWidget::event( TQEvent *e ) return true; QWidgetResizeEvent *re = static_cast<QWidgetResizeEvent *>(e); m_widget->resize( re->w, re->h ); - repaint(); + tqrepaint(); } // eat all events - except if this is a frame (in which case KHTMLView handles it all) - if ( ::qt_cast<KHTMLView *>( m_widget ) ) + if ( ::tqqt_cast<KHTMLView *>( m_widget ) ) return TQObject::event( e ); return true; } @@ -212,7 +212,7 @@ void RenderWidget::setQWidget(TQWidget *widget) connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); m_widget->installEventFilter(this); - if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__khtml")) && !::qt_cast<TQFrame*>(m_widget)) + if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__khtml")) && !::tqqt_cast<TQFrame*>(m_widget)) m_widget->setBackgroundMode( TQWidget::NoBackground ); if (m_widget->focusPolicy() > TQWidget::StrongFocus) @@ -330,7 +330,7 @@ void RenderWidget::updateFromElement() else m_widget->unsetPalette(); // Border: - TQFrame* frame = ::qt_cast<TQFrame*>(m_widget); + TQFrame* frame = ::tqqt_cast<TQFrame*>(m_widget); if (frame) { if (shouldPaintBackgroundOrBorder()) { @@ -531,7 +531,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, // build region TQObjectListIterator it = *widget->children(); for (; it.current(); ++it) { - TQWidget* const w = ::qt_cast<TQWidget *>(it.current()); + TQWidget* const w = ::tqqt_cast<TQWidget *>(it.current()); if ( w && !w->isTopLevel() && !w->isHidden()) { TQRect r2 = w->geometry(); blit -= r2; @@ -557,7 +557,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, if ( external ) { // even hackier! TQPainter pt( pm ); - const TQColor c = widget->colorGroup().base(); + const TQColor c = widget->tqcolorGroup().base(); for (int i = 0; i < cnt; ++i) pt.fillRect( br[i], c ); } else { @@ -612,7 +612,7 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty) bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) { // no special event processing if this is a frame (in which case KHTMLView handles it all) - if ( ::qt_cast<KHTMLView *>( m_widget ) ) + if ( ::tqqt_cast<KHTMLView *>( m_widget ) ) return false; if ( !element() ) return true; @@ -667,11 +667,11 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) break; case TQEvent::Wheel: - if (widget()->parentWidget() == view()->viewport()) { + if (widget()->tqparentWidget() == view()->viewport()) { // don't allow the widget to react to wheel event unless its // currently focused. this avoids accidentally changing a select box // or something while wheeling a webpage. - if (qApp->focusWidget() != widget() && + if (tqApp->tqfocusWidget() != widget() && widget()->focusPolicy() <= TQWidget::StrongFocus) { static_cast<TQWheelEvent*>(e)->ignore(); TQApplication::sendEvent(view(), e); @@ -808,8 +808,8 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) // << " pos=" << p << " type=" << type // << " button=" << button << " state=" << state << endl; TQMouseEvent e(type, p, button, state); - TQScrollView * sc = ::qt_cast<TQScrollView*>(m_widget); - if (sc && !::qt_cast<TQListBox*>(m_widget)) + TQScrollView * sc = ::tqqt_cast<TQScrollView*>(m_widget); + if (sc && !::tqqt_cast<TQListBox*>(m_widget)) static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(&e); else static_cast<EventPropagator *>(m_widget)->sendEvent(&e); diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp index a71dd4116..81d0b62ed 100644 --- a/khtml/rendering/render_style.cpp +++ b/khtml/rendering/render_style.cpp @@ -726,7 +726,7 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const CbLayout: The containing block of the object needs a relayout. Layout: the RenderObject needs a relayout after the style change Visible: The change is visible, but no relayout is needed - NonVisible: The object does need neither repaint nor relayout after + NonVisible: The object does need neither tqrepaint nor relayout after the change. ### TODO: @@ -744,7 +744,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const // EUserInput _user_input : 2; as long as :enabled is not impl'd // ### this needs work to know more exactly if we need a relayout -// or just a repaint +// or just a tqrepaint // non-inherited attributes // DataRef<StyleBoxData> box; @@ -786,7 +786,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const !(noninherited_flags.f._position == other->noninherited_flags.f._position) || !(noninherited_flags.f._floating == other->noninherited_flags.f._floating) || !(noninherited_flags.f._flowAroundFloats == other->noninherited_flags.f._flowAroundFloats) || - !(noninherited_flags.f._unicodeBidi == other->noninherited_flags.f._unicodeBidi) ) + !(noninherited_flags.f._tqunicodeBidi == other->noninherited_flags.f._tqunicodeBidi) ) return CbLayout; } diff --git a/khtml/rendering/render_style.h b/khtml/rendering/render_style.h index 29b369ca1..59e38277d 100644 --- a/khtml/rendering/render_style.h +++ b/khtml/rendering/render_style.h @@ -220,7 +220,7 @@ public: } bool isTransparent() const { - return color.isValid() && qAlpha(color.rgb()) == 0; + return color.isValid() && tqAlpha(color.rgb()) == 0; } bool operator==(const BorderValue& o) const @@ -888,7 +888,7 @@ protected: unsigned int unused : 27; } f; - Q_UINT64 _iflags; + TQ_UINT64 _iflags; }; } inherited_flags; @@ -919,14 +919,14 @@ protected: PseudoId _styleType : 4; bool _hasClip : 1; unsigned _pseudoBits : 8; - EUnicodeBidi _unicodeBidi : 2; + EUnicodeBidi _tqunicodeBidi : 2; // non CSS2 non-inherited bool _textOverflow : 1; // Whether or not lines that spill out should be truncated with "..." unsigned int unused : 11; } f; - Q_UINT64 _niflags; + TQ_UINT64 _niflags; }; } noninherited_flags; @@ -991,7 +991,7 @@ protected: noninherited_flags.f._styleType = NOPSEUDO; noninherited_flags.f._hasClip = false; noninherited_flags.f._pseudoBits = 0; - noninherited_flags.f._unicodeBidi = initialUnicodeBidi(); + noninherited_flags.f._tqunicodeBidi = initialUnicodeBidi(); noninherited_flags.f._textOverflow = initialTextOverflow(); noninherited_flags.f.unused = 0; } @@ -1029,7 +1029,7 @@ public: bool hasOffset() const { return surround->offset.nonZero(); } bool hasBackground() const { - if (backgroundColor().isValid() && qAlpha(backgroundColor().rgb()) > 0) + if (backgroundColor().isValid() && tqAlpha(backgroundColor().rgb()) > 0) return true; else return background->m_background.hasImage(); @@ -1108,7 +1108,7 @@ public: LengthBox clip() const { return visual->clip; } bool hasClip() const { return noninherited_flags.f._hasClip; } - EUnicodeBidi unicodeBidi() const { return noninherited_flags.f._unicodeBidi; } + EUnicodeBidi tqunicodeBidi() const { return noninherited_flags.f._tqunicodeBidi; } EClear clear() const { return noninherited_flags.f._clear; } ETableLayout tableLayout() const { return noninherited_flags.f._table_layout; } @@ -1272,7 +1272,7 @@ public: void setClip( Length top, Length right, Length bottom, Length left ); void setHasClip( bool b ) { noninherited_flags.f._hasClip = b; } - void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._unicodeBidi = b; } + void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._tqunicodeBidi = b; } void setClear(EClear v) { noninherited_flags.f._clear = v; } void setTableLayout(ETableLayout v) { noninherited_flags.f._table_layout = v; } diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp index 2cf1bf1f9..f1ce83155 100644 --- a/khtml/rendering/render_table.cpp +++ b/khtml/rendering/render_table.cpp @@ -277,7 +277,7 @@ void RenderTable::layout() } if (markedForRepaint()) { - repaintDuringLayout(); + tqrepaintDuringLayout(); setMarkedForRepaint(false); } @@ -1306,7 +1306,7 @@ int RenderTableSection::layoutRows( int toAdd ) m_width = table()->contentWidth(); if (markedForRepaint()) { - repaintDuringLayout(); + tqrepaintDuringLayout(); setMarkedForRepaint(false); } @@ -2319,9 +2319,9 @@ bool RenderTableCell::requiresLayer() const { return /* style()->opacity() < 1.0f || */ hasOverflowClip() || isRelPositioned(); } -void RenderTableCell::repaintRectangle(int x, int y, int w, int h, Priority p, bool f) +void RenderTableCell::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) { - RenderBlock::repaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f); + RenderBlock::tqrepaintRectangle(x, y, w, h + _topExtra + _bottomExtra, p, f); } bool RenderTableCell::absolutePosition(int &xPos, int &yPos, bool f) const diff --git a/khtml/rendering/render_table.h b/khtml/rendering/render_table.h index a6de6cfaf..b620b512c 100644 --- a/khtml/rendering/render_table.h +++ b/khtml/rendering/render_table.h @@ -396,7 +396,7 @@ public: // lie position to outside observers virtual int yPos() const { return m_y + _topExtra; } - virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); + virtual void tqrepaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); virtual bool absolutePosition(int &xPos, int &yPos, bool f = false) const; virtual short baselinePosition( bool = false ) const; diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp index 0bded06fc..788110a6d 100644 --- a/khtml/rendering/render_text.cpp +++ b/khtml/rendering/render_text.cpp @@ -230,7 +230,7 @@ void InlineTextBox::paintSelection(const Font *f, RenderText *text, TQPainter *p // In this case, simply swap the colors, thus in compliance with // NN4 (win32 only), IE, and Mozilla. if (!khtml::hasSufficientContrast(hbg, bg)) - qSwap(hc, hbg); + tqSwap(hc, hbg); } p->setPen(hc); @@ -319,9 +319,9 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, const int w = m_width+2*thickness; const int h = m_height+2*thickness; const QRgb color = shadow->color.rgb(); - const int gray = qGray(color); + const int gray = tqGray(color); const bool inverse = (gray < 100); - const QRgb bgColor = (inverse) ? qRgb(255,255,255) : qRgb(0,0,0); + const QRgb bgColor = (inverse) ? tqRgb(255,255,255) : tqRgb(0,0,0); TQPixmap pixmap(w, h); pixmap.fill(bgColor); TQPainter p; @@ -365,7 +365,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, for(int i=thickness; i<w-thickness; i++) { QRgb col= img.pixel(i,j); if (col == bgColor) continue; - float g = qGray(col); + float g = tqGray(col); if (inverse) g = (255-g)/(255-gray); else @@ -383,9 +383,9 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, TQImage res(w,h,32); res.setAlphaBuffer(true); - int r = qRed(color); - int g = qGreen(color); - int b = qBlue(color); + int r = tqRed(color); + int g = tqGreen(color); + int b = tqBlue(color); // divide by factor factor = 1.0/factor; @@ -394,7 +394,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, for(int i=0; i<w; i++) { int a = (int)(amap[i+j*w] * factor * 255.0); if (a > 255) a = 255; - res.setPixel(i,j, qRgba(r,g,b,a)); + res.setPixel(i,j, tqRgba(r,g,b,a)); } } @@ -1036,7 +1036,7 @@ void RenderText::calcMinMaxWidth() bool firstLine = true; for(int i = 0; i < len; i++) { - unsigned short c = str->s[i].unicode(); + unsigned short c = str->s[i].tqunicode(); bool isNewline = false; // If line-breaks survive to here they are preserved @@ -1056,7 +1056,7 @@ void RenderText::calcMinMaxWidth() continue; int wordlen = 0; - while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].unicode() != SOFT_HYPHEN) && + while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].tqunicode() != SOFT_HYPHEN) && !(isBreakable( str->s, i+wordlen, str->l )) ) wordlen++; @@ -1328,11 +1328,11 @@ short RenderText::width() const return w; } -void RenderText::repaint(Priority p) +void RenderText::tqrepaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->repaint(p); + cb->tqrepaint(p); } bool RenderText::isFixedWidthFont() const @@ -1470,7 +1470,7 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s) } else if (c == '"') { result += "\\\""; } else { - ushort u = c.unicode(); + ushort u = c.tqunicode(); if (u >= 0x20 && u < 0x7F) { result += c; } else { diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h index d91782b47..2e14b95cd 100644 --- a/khtml/rendering/render_text.h +++ b/khtml/rendering/render_text.h @@ -36,7 +36,7 @@ class TQPainter; class TQFontMetrics; -// Define a constant for soft hyphen's unicode value. +// Define a constant for soft hyphen's tqunicode value. #define SOFT_HYPHEN 173 const int cNoTruncation = -1; @@ -247,7 +247,7 @@ public: virtual short marginLeft() const { return style()->marginLeft().minWidth(0); } virtual short marginRight() const { return style()->marginRight().minWidth(0); } - virtual void repaint(Priority p=NormalPriority); + virtual void tqrepaint(Priority p=NormalPriority); bool hasBreakableChar() const { return m_hasBreakableChar; } const TQFontMetrics &metrics(bool firstLine) const; diff --git a/khtml/test/align2.html b/khtml/test/align2.html index 56f3feb70..789fa3203 100644 --- a/khtml/test/align2.html +++ b/khtml/test/align2.html @@ -4,14 +4,14 @@ </HEAD> <BODY> <H1>Align Test 2</H1> -This page contains regression tests for vertical alignment of images. +This page contains regression tests for vertical tqalignment of images. Each test consist of a table with a colored background. Within the table an empty image is shown with a border of 1 pixel around it. <HR> <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=10 width=50 border=1> -<FONT size=7>This image has no alignment</FONT> +<FONT size=7>This image has no tqalignment</FONT> </td></tr> </TABLE> <HR> @@ -39,7 +39,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=150 width=50 border=1> -<FONT size=7>This image has no alignment</FONT> +<FONT size=7>This image has no tqalignment</FONT> <IMG SRC="unknown.gif" height=50 width=50 border=1> </td></tr> </TABLE> @@ -68,7 +68,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=10 width=50 border=1> -<FONT>This image has no alignment</FONT> +<FONT>This image has no tqalignment</FONT> </td></tr> </TABLE> <HR> @@ -96,7 +96,7 @@ Within the table an empty image is shown with a border of 1 pixel around it. <TABLE width = 100%> <tr><td bgcolor="0000ff"> <IMG SRC="unknown.gif" height=150 width=50 border=1> -<FONT>This image has no alignment</FONT> +<FONT>This image has no tqalignment</FONT> <IMG SRC="unknown.gif" height=50 width=50 border=1> </td></tr> </TABLE> diff --git a/khtml/test/image_map.html b/khtml/test/image_map.html index 21e002382..35d170d2a 100644 --- a/khtml/test/image_map.html +++ b/khtml/test/image_map.html @@ -13,11 +13,11 @@ Moving the mouse cursor over the image should show different destinations <!-- =============== TOP IMAGE MAP =========== --> <MAP name="topbar"> -<AREA shape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html"> -<AREA shape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/"> -<AREA shape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html"> -<AREA shape="rect" coords="305,0,355,18" href="relative_url_index.html"> -<AREA shape="default" nohref> +<AREA tqshape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html"> +<AREA tqshape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/"> +<AREA tqshape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html"> +<AREA tqshape="rect" coords="305,0,355,18" href="relative_url_index.html"> +<AREA tqshape="default" nohref> </MAP> </BODY> diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 288f0df6b..c756dc2ea 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -215,7 +215,7 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar switch (id) { case Print: { UString str = args[0].toString(exec); - if ( str.qstring().lower().find( "failed!" ) >= 0 ) + if ( str.qstring().lower().tqfind( "failed!" ) >= 0 ) m_regTest->saw_failure = true; TQString res = str.qstring().replace('\007', ""); m_regTest->m_currentOutput += res + "\n"; @@ -943,7 +943,7 @@ TQString RegressionTest::getPartOutput( OutputType type) getPartDOMOutput( outputStream, m_part, 0 ); } - dump.replace( m_baseDir + "/tests", TQString::fromLatin1( "REGRESSION_SRCDIR" ) ); + dump.replace( m_baseDir + "/tests", TQString::tqfromLatin1( "REGRESSION_SRCDIR" ) ); return dump; } @@ -1000,9 +1000,9 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi ) for ( int x = 0; x < w; ++x ) { QRgb l = ls[x]; QRgb r = rs[x]; - if ( ( abs( qRed( l ) - qRed(r ) ) < 20 ) && - ( abs( qGreen( l ) - qGreen(r ) ) < 20 ) && - ( abs( qBlue( l ) - qBlue(r ) ) < 20 ) ) + if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) && + ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) && + ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) ) continue; kdDebug() << "pixel (" << x << ", " << y << ") is different " << TQColor( lhsi.pixel ( x, y ) ) << " " << TQColor( rhsi.pixel ( x, y ) ) << endl; return false; @@ -1077,10 +1077,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) int pos = 0; do { pos++; - int newpos = absBase.find('/', pos); + int newpos = absBase.tqfind('/', pos); if (newpos == -1) newpos = absBase.length(); - TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos); - TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos); + TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); + TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos); // kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl; // kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl; // kdDebug() << "pos: " << pos << " newpos: " << newpos << endl; @@ -1094,8 +1094,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) TQString rel; { - TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos); - TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos); + TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos); + TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos); // generate as many .. as there are path elements in relBase if (relBase.string().length() > 0) { for (int i = relBase.string().contains('/'); i > 0; --i) @@ -1138,7 +1138,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & RenderFailure ) { renderDiff += "<pre>"; - FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-render %3/%2-render" ) + FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-render %3/%2-render" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { @@ -1154,7 +1154,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & DomFailure ) { domDiff += "<pre>"; - FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-dom %3/%2-dom" ) + FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-dom %3/%2-dom" ) .arg ( test, test, relOutputDir ).latin1(), "r" ); TQTextIStream *is = new TQTextIStream( pipe ); for ( int line = 0; line < 100 && !is->eof(); ++line ) { @@ -1254,7 +1254,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) void RegressionTest::testStaticFile(const TQString & filename) { - qApp->mainWidget()->resize( 800, 600); // restore size + tqApp->mainWidget()->resize( 800, 600); // restore size // Set arguments KParts::URLArgs args; @@ -1400,7 +1400,7 @@ public: void RegressionTest::testJSFile(const TQString & filename ) { - qApp->mainWidget()->resize( 800, 600); // restore size + tqApp->mainWidget()->resize( 800, 600); // restore size // create interpreter // note: this is different from the interpreter used by the part, @@ -1636,7 +1636,7 @@ bool RegressionTest::svnIgnored( const TQString &filename ) void RegressionTest::resizeTopLevelWidget( int w, int h ) { - qApp->mainWidget()->resize( w, h ); + tqApp->mainWidget()->resize( w, h ); // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event TQApplication::sendPostedEvents( 0, TQEvent::Resize ); } diff --git a/khtml/test_regression.h b/khtml/test_regression.h index 1ec4e7d33..df76f4439 100644 --- a/khtml/test_regression.h +++ b/khtml/test_regression.h @@ -36,7 +36,7 @@ class TQTimer; /** * @internal */ -class PartMonitor : public QObject +class PartMonitor : public TQObject { Q_OBJECT public: @@ -122,7 +122,7 @@ class ScriptInterpreter; /** * @internal */ -class RegressionTest : public QObject +class RegressionTest : public TQObject { Q_OBJECT public: diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp index a10146480..93f698ed2 100644 --- a/khtml/test_regression_fontoverload.cpp +++ b/khtml/test_regression_fontoverload.cpp @@ -98,7 +98,7 @@ QFakeFontEngine::QFakeFontEngine( XFontStruct *fs, const char *name, int size ) : QFontEngineXLFD( fs, name, 0) { pixS = size; - ahem = TQString::fromLatin1(name).contains("ahem"); + ahem = TQString::tqfromLatin1(name).contains("ahem"); } QFakeFontEngine::~QFakeFontEngine() @@ -152,7 +152,7 @@ int QFakeFontEngine::leading() const // the original uses double and creates quite random results depending // on the compiler flags int l = ( _size * 15 + 50) / 100; - // only valid on i386 without -O2 assert(l == int(qRound(_size * 0.15))); + // only valid on i386 without -O2 assert(l == int(tqRound(_size * 0.15))); return (l > 0) ? l : 1; } diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp index 7765cee8a..d98d875b2 100644 --- a/khtml/testkhtml.cpp +++ b/khtml/testkhtml.cpp @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) ); - if (args->url(0).url().right(4).find(".xml", 0, false) == 0) { + if (args->url(0).url().right(4).tqfind(".xml", 0, false) == 0) { KParts::URLArgs ags(doc->browserExtension()->urlArgs()); ags.serviceType = "text/xml"; doc->browserExtension()->setURLArgs(ags); @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) doc->setURLCursor(TQCursor(Qt::PointingHandCursor)); a.setTopWidget(doc->widget()); TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)), - doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &))); + doc->widget()->tqtopLevelWidget(), TQT_SLOT(setCaption(const TQString &))); doc->widget()->show(); toplevel->show(); ((TQScrollView *)doc->widget())->viewport()->show(); @@ -142,7 +142,7 @@ void Dummy::doBenchmark() results.clear(); TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(), - TQString::fromLatin1("Please select directory with tests")); + TQString::tqfromLatin1("Please select directory with tests")); if (!directory.isEmpty()) { settings.writePathEntry("path", directory); @@ -184,14 +184,14 @@ void Dummy::nextRun() for (int pos = 0; pos < timings.size(); ++pos) { int t = timings[pos]; if (pos < COLD_RUNS) - m_part->write(TQString::fromLatin1("<td>(Cold):") + TQString::number(t) + "</td>"); + m_part->write(TQString::tqfromLatin1("<td>(Cold):") + TQString::number(t) + "</td>"); else { total += t; - m_part->write(TQString::fromLatin1("<td><i>") + TQString::number(t) + "</i></td>"); + m_part->write(TQString::tqfromLatin1("<td><i>") + TQString::number(t) + "</i></td>"); } } - m_part->write(TQString::fromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>"); + m_part->write(TQString::tqfromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>"); m_part->write("</tr>"); } diff --git a/khtml/testkhtml.h b/khtml/testkhtml.h index b945ec942..4fd76d044 100644 --- a/khtml/testkhtml.h +++ b/khtml/testkhtml.h @@ -8,7 +8,7 @@ /** * @internal */ -class Dummy : public QObject +class Dummy : public TQObject { Q_OBJECT public: diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp index bcc2fca3a..c648ed63e 100644 --- a/khtml/xml/dom2_eventsimpl.cpp +++ b/khtml/xml/dom2_eventsimpl.cpp @@ -48,7 +48,7 @@ EventImpl::EventImpl() m_currentTarget = 0; m_eventPhase = 0; m_target = 0; - m_createTime = TQDateTime::currentDateTime(); + m_createTime = TQDateTime::tqcurrentDateTime(); m_defaultHandled = false; } @@ -67,7 +67,7 @@ EventImpl::EventImpl(EventId _id, bool canBubbleArg, bool cancelableArg) m_currentTarget = 0; m_eventPhase = 0; m_target = 0; - m_createTime = TQDateTime::currentDateTime(); + m_createTime = TQDateTime::tqcurrentDateTime(); m_defaultHandled = false; } @@ -499,14 +499,14 @@ public: } L toLeft(R r) { - TQMapIterator<R,L> i( m_rToL.find(r) ); + TQMapIterator<R,L> i( m_rToL.tqfind(r) ); if (i != m_rToL.end()) return *i; return L(); } R toRight(L l) { - TQMapIterator<L,R> i = m_lToR.find(l); + TQMapIterator<L,R> i = m_lToR.tqfind(l); if (i != m_lToR.end()) return *i; return R(); @@ -590,10 +590,10 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl m_keyVal = key->ascii(); m_virtKeyVal = virtKeyToQtKey()->toLeft(key->key()); - // m_keyVal should contain the unicode value + // m_keyVal should contain the tqunicode value // of the pressed key if available. if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty()) - m_keyVal = key->text().unicode()[0]; + m_keyVal = key->text().tqunicode()[0]; // key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together. m_modifier = key->state(); @@ -739,10 +739,10 @@ DOMString KeyboardEventImpl::keyIdentifier() const { if (unsigned special = virtKeyVal()) if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special)) - return TQString::fromLatin1(id); + return TQString::tqfromLatin1(id); - if (unsigned unicode = keyVal()) - return TQString(TQChar(unicode)); + if (unsigned tqunicode = keyVal()) + return TQString(TQChar(tqunicode)); return "Unidentified"; } @@ -773,9 +773,9 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg, //Figure out the code information from the key identifier. if (keyIdentifierArg.length() == 1) { - //Likely to be normal unicode id, unless it's one of the few + //Likely to be normal tqunicode id, unless it's one of the few //special values. - unsigned short code = keyIdentifierArg.unicode()[0]; + unsigned short code = keyIdentifierArg.tqunicode()[0]; if (code > 0x20 && code != 0x7F) keyVal = code; } @@ -819,7 +819,7 @@ int KeyboardEventImpl::keyCode() const if (m_virtKeyVal != DOM_VK_UNDEFINED) return m_virtKeyVal; else - return TQChar((unsigned short)m_keyVal).upper().unicode(); + return TQChar((unsigned short)m_keyVal).upper().tqunicode(); } int KeyboardEventImpl::charCode() const @@ -856,14 +856,14 @@ void TextEventImpl::initTextEvent(const DOMString &typeArg, //See whether we can get a key out of this. unsigned keyCode = 0; if (text.length() == 1) - keyCode = text.unicode()[0].unicode(); + keyCode = text.tqunicode()[0].tqunicode(); initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg, keyCode, 0, 0); } int TextEventImpl::keyCode() const { - //Mozilla returns 0 here unless this is a non-unicode key. + //Mozilla returns 0 here unless this is a non-tqunicode key. //IE stuffs everything here, and so we try to match it.. if (m_keyVal) return m_keyVal; @@ -872,8 +872,8 @@ int TextEventImpl::keyCode() const int TextEventImpl::charCode() const { - //On text events, in Mozilla charCode is 0 for non-unicode keys, - //and the unicode key otherwise... IE doesn't support this. + //On text events, in Mozilla charCode is 0 for non-tqunicode keys, + //and the tqunicode key otherwise... IE doesn't support this. if (m_virtKeyVal) return 0; return m_keyVal; diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp index 36570d69a..347adb510 100644 --- a/khtml/xml/dom_docimpl.cpp +++ b/khtml/xml/dom_docimpl.cpp @@ -232,7 +232,7 @@ void ElementMappingCache::add(const TQString& id, ElementImpl* nd) { if (id.isEmpty()) return; - ItemInfo* info = m_dict.find(id); + ItemInfo* info = m_dict.tqfind(id); if (info) { info->ref++; @@ -251,7 +251,7 @@ void ElementMappingCache::set(const TQString& id, ElementImpl* nd) { if (id.isEmpty()) return; - ItemInfo* info = m_dict.find(id); + ItemInfo* info = m_dict.tqfind(id); info->nd = nd; } @@ -259,7 +259,7 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd) { if (id.isEmpty()) return; - ItemInfo* info = m_dict.find(id); + ItemInfo* info = m_dict.tqfind(id); info->ref--; if (info->ref == 0) { @@ -276,13 +276,13 @@ void ElementMappingCache::remove(const TQString& id, ElementImpl* nd) bool ElementMappingCache::contains(const TQString& id) { if (id.isEmpty()) return false; - return m_dict.find(id); + return m_dict.tqfind(id); } ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id) { if (id.isEmpty()) return 0; - return m_dict.find(id); + return m_dict.tqfind(id); } static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter; @@ -337,7 +337,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v) m_namespaceMap = new IdNameMapping(1); TQString xhtml(XHTML_NAMESPACE); m_namespaceMap->names.insert(emptyNamespace, new DOMStringImpl("")); - m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.unicode(), xhtml.length())); + m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.tqunicode(), xhtml.length())); m_namespaceMap->names[emptyNamespace]->ref(); m_namespaceMap->names[xhtmlNamespace]->ref(); m_namespaceMap->count+=2; @@ -1387,7 +1387,7 @@ void DocumentImpl::write( const TQString &text ) if (m_view) m_view->part()->resetFromScript(); m_tokenizer->setAutoClose(); - write(TQString::fromLatin1("<html>")); + write(TQString::tqfromLatin1("<html>")); } m_tokenizer->write(text, false); } @@ -1668,9 +1668,9 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con { // get delay and url TQString str = content.string().stripWhiteSpace(); - int pos = str.find(TQRegExp("[;,]")); + int pos = str.tqfind(TQRegExp("[;,]")); if ( pos == -1 ) - pos = str.find(TQRegExp("[ \t]")); + pos = str.tqfind(TQRegExp("[ \t]")); bool ok = false; int delay = kMax( 0, content.implementation()->toInt(&ok) ); @@ -1685,7 +1685,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con pos++; while(pos < (int)str.length() && str[pos].isSpace()) pos++; str = str.mid(pos); - if(str.find("url", 0, false ) == 0) str = str.mid(3); + if(str.tqfind("url", 0, false ) == 0) str = str.mid(3); str = str.stripWhiteSpace(); if ( str.length() && str[0] == '=' ) str = str.mid( 1 ).stripWhiteSpace(); while(str.length() && @@ -1881,17 +1881,17 @@ NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI, TQString name = cs ? n.string() : n.string().upper(); if (!_nsURI) { - id = (NodeImpl::Id)(long) map->ids.find( name ); + id = (NodeImpl::Id)(long) map->ids.tqfind( name ); if (!id && _type != NodeImpl::NamespaceId) { - id = (NodeImpl::Id)(long) map->ids.find( "aliases: " + name ); + id = (NodeImpl::Id)(long) map->ids.tqfind( "aliases: " + name ); } } else { - id = (NodeImpl::Id)(long) map->ids.find( name ); + id = (NodeImpl::Id)(long) map->ids.tqfind( name ); if (!readonly && id && _prefix && _prefix->l) { // we were called in registration mode... check if the alias exists TQConstString px( _prefix->s, _prefix->l ); TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name); - if (!map->ids.find( qn )) { + if (!map->ids.tqfind( qn )) { map->ids.insert( qn, (void*)id ); } } @@ -2690,7 +2690,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo( //Check to see if we have this sort of item cached. NodeListImpl::Cache* cached = - (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.find(key.hash()); + (type == NodeListImpl::UNCACHEABLE) ? 0 : m_nodeListCache.tqfind(key.hash()); if (cached) { if (cached->key == key) { diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h index 5e50c09a4..a4aec9223 100644 --- a/khtml/xml/dom_docimpl.h +++ b/khtml/xml/dom_docimpl.h @@ -198,7 +198,7 @@ public: DocumentFragmentImpl *createDocumentFragment (); TextImpl *createTextNode ( DOMStringImpl* data ) { return new TextImpl( docPtr(), data); } TextImpl *createTextNode ( const TQString& data ) - { return createTextNode(new DOMStringImpl(data.unicode(), data.length())); } + { return createTextNode(new DOMStringImpl(data.tqunicode(), data.length())); } CommentImpl *createComment ( DOMStringImpl* data ); CDATASectionImpl *createCDATASection ( DOMStringImpl* data ); ProcessingInstructionImpl *createProcessingInstruction ( const DOMString &target, DOMStringImpl* data ); @@ -616,7 +616,7 @@ protected: TQConstString px( _prefix->s, _prefix->l ); TQString name = cs ? n.string() : n.string().upper(); TQString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name); - if (!ids.find( qn )) { + if (!ids.tqfind( qn )) { ids.insert( qn, (void*)id ); } } diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp index c41bef3dc..f4506c8ba 100644 --- a/khtml/xml/dom_elementimpl.cpp +++ b/khtml/xml/dom_elementimpl.cpp @@ -855,7 +855,7 @@ DOMString ElementImpl::toString() const for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) { DOMString kid = child->toString(); - result += TQConstString(kid.unicode(), kid.length()).string(); + result += TQConstString(kid.tqunicode(), kid.length()).string(); } result += "</"; diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp index 137928c81..f38be728a 100644 --- a/khtml/xml/dom_nodeimpl.cpp +++ b/khtml/xml/dom_nodeimpl.cpp @@ -588,7 +588,7 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture) Event ev = evt; // removeEventListener (e.g. called from a JS event listener) might - // invalidate the item after the current iterator (which "it" is pointing to). + // tqinvalidate the item after the current iterator (which "it" is pointing to). // So we make a copy of the list. TQValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners; TQValueList<RegisteredEventListener>::iterator it; @@ -989,7 +989,7 @@ DOMStringImpl* NodeImpl::textContent() const delete kidText; } } - return new DOMStringImpl(out.unicode(), out.length()); + return new DOMStringImpl(out.tqunicode(), out.length()); } //------------------------------------------------------------------------- diff --git a/khtml/xml/dom_nodeimpl.h b/khtml/xml/dom_nodeimpl.h index 1e53edf19..275452d69 100644 --- a/khtml/xml/dom_nodeimpl.h +++ b/khtml/xml/dom_nodeimpl.h @@ -86,17 +86,17 @@ private: #define NodeImpl_IdNSMask 0xffff0000 #define NodeImpl_IdLocalMask 0x0000ffff -const Q_UINT16 defaultNamespace = 0; -const Q_UINT16 xhtmlNamespace = 1; -const Q_UINT16 emptyNamespace = 2; -const Q_UINT16 anyNamespace = 0xffff; -const Q_UINT16 anyLocalName = 0xffff; +const TQ_UINT16 defaultNamespace = 0; +const TQ_UINT16 xhtmlNamespace = 1; +const TQ_UINT16 emptyNamespace = 2; +const TQ_UINT16 anyNamespace = 0xffff; +const TQ_UINT16 anyLocalName = 0xffff; -inline Q_UINT16 localNamePart(Q_UINT32 id) { return id & NodeImpl_IdLocalMask; } -inline Q_UINT16 namespacePart(Q_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; } -inline Q_UINT32 makeId(Q_UINT16 n, Q_UINT16 l) { return (n << 16) | l; } +inline TQ_UINT16 localNamePart(TQ_UINT32 id) { return id & NodeImpl_IdLocalMask; } +inline TQ_UINT16 namespacePart(TQ_UINT32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; } +inline TQ_UINT32 makeId(TQ_UINT16 n, TQ_UINT16 l) { return (n << 16) | l; } -const Q_UINT32 anyQName = makeId(anyNamespace, anyLocalName); +const TQ_UINT32 anyQName = makeId(anyNamespace, anyLocalName); class NodeImpl : public khtml::TreeShared<NodeImpl> { @@ -155,7 +155,7 @@ public: // appendChild(), and returns the node into which will be parsed next. virtual NodeImpl *addChild(NodeImpl *newChild); - typedef Q_UINT32 Id; + typedef TQ_UINT32 Id; // id() is used to easily and exactly identify a node. It // is optimized for quick comparison and low memory consumption. // its value depends on the owner document of the node and is diff --git a/khtml/xml/dom_restyler.cpp b/khtml/xml/dom_restyler.cpp index 0050c4a03..699a5ab59 100644 --- a/khtml/xml/dom_restyler.cpp +++ b/khtml/xml/dom_restyler.cpp @@ -45,7 +45,7 @@ void DynamicDomRestyler::removeDependency(ElementImpl* subject, ElementImpl* dep void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type) { - KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject); + KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject); if (!my_dependencies) return; @@ -60,7 +60,7 @@ void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDepe void DynamicDomRestyler::resetDependencies(ElementImpl* subject) { - KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject); + KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject); if (!my_dependencies) return; @@ -78,7 +78,7 @@ void DynamicDomRestyler::resetDependencies(ElementImpl* subject) void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type) { assert(type < LastStructuralDependency); - KMultiMap<ElementImpl>::List* dep = dependency_map[type].find(dependency); + KMultiMap<ElementImpl>::List* dep = dependency_map[type].tqfind(dependency); if (!dep) return; diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp index bb1a728e9..d4e568408 100644 --- a/khtml/xml/dom_stringimpl.cpp +++ b/khtml/xml/dom_stringimpl.cpp @@ -61,8 +61,8 @@ bool DOMStringImpl::containsOnlyWhitespace() const for (uint i = 0; i < l; i++) { TQChar c = s[i]; - if (c.unicode() <= 0x7F) { - if (c.unicode() > ' ') + if (c.tqunicode() <= 0x7F) { + if (c.tqunicode() > ' ') return false; } else { if (c.direction() != TQChar::DirWS) @@ -293,11 +293,11 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const int pos = 0; int pos2; - while((pos2 = str.find(' ', pos)) != -1) { - r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos); + while((pos2 = str.tqfind(' ', pos)) != -1) { + r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos); pos = pos2+1; } - r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos); + r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos); return r; } @@ -319,14 +319,14 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const int pos = 0; int pos2; - while((pos2 = str.find(',', pos)) != -1) { - r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos); + while((pos2 = str.tqfind(',', pos)) != -1) { + r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos); pos = pos2+1; } /* IE Quirk: If the last comma is the last char skip it and reduce len by one */ if (str.length()-pos > 0) - r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos); + r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos); else len--; diff --git a/khtml/xml/dom_stringimpl.h b/khtml/xml/dom_stringimpl.h index cd7128967..edac46755 100644 --- a/khtml/xml/dom_stringimpl.h +++ b/khtml/xml/dom_stringimpl.h @@ -92,7 +92,7 @@ public: DOMStringImpl *capitalize(bool noFirstCap=false) const; DOMStringImpl *escapeHTML(); - TQChar *unicode() const { return s; } + TQChar *tqunicode() const { return s; } uint length() const { return l; } TQString string() const; diff --git a/khtml/xml/dom_xmlimpl.h b/khtml/xml/dom_xmlimpl.h index a394579d2..d88dc041f 100644 --- a/khtml/xml/dom_xmlimpl.h +++ b/khtml/xml/dom_xmlimpl.h @@ -163,7 +163,7 @@ protected: CSSStyleSheetImpl *m_sheet; }; -class XMLAttributeReader : public QXmlDefaultHandler +class XMLAttributeReader : public TQXmlDefaultHandler { public: XMLAttributeReader(const TQString& _attrString); diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp index 7c043815a..a0f3f665c 100644 --- a/khtml/xml/xml_tokenizer.cpp +++ b/khtml/xml/xml_tokenizer.cpp @@ -42,7 +42,7 @@ using namespace DOM; using namespace khtml; XMLIncrementalSource::XMLIncrementalSource() - : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ), + : TQXmlInputSource(), m_pos( 0 ), m_tqunicode( 0 ), m_finished( false ) { } @@ -59,13 +59,13 @@ TQChar XMLIncrementalSource::next() else if ( m_data.length() <= m_pos ) return TQXmlInputSource::EndOfData; else - return m_unicode[m_pos++]; + return m_tqunicode[m_pos++]; } void XMLIncrementalSource::setData( const TQString& str ) { m_data = str; - m_unicode = m_data.unicode(); + m_tqunicode = m_data.tqunicode(); m_pos = 0; if ( !str.isEmpty() ) m_finished = false; @@ -78,7 +78,7 @@ void XMLIncrementalSource::setData( const TQByteArray& data ) void XMLIncrementalSource::appendXML( const TQString& str ) { m_data += str; - m_unicode = m_data.unicode(); + m_tqunicode = m_data.tqunicode(); } TQString XMLIncrementalSource::data() @@ -152,7 +152,7 @@ void XMLHandler::fixUpNSURI(TQString& uri, const TQString& qname) { /* QXml does not resolve the namespaces of attributes in the same tag that preceed the xmlns declaration. This fixes up that case */ - if (uri.isEmpty() && qname.find(':') != -1) { + if (uri.isEmpty() && qname.tqfind(':') != -1) { TQXmlNamespaceSupport ns; TQString localName, prefix; ns.splitName(qname, prefix, localName); @@ -289,7 +289,7 @@ bool XMLHandler::comment(const TQString & ch) if (currentNode()->nodeType() == Node::TEXT_NODE) exitText(); // ### handle exceptions - currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.unicode(), ch.length()))); + currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.tqunicode(), ch.length()))); return true; } @@ -299,7 +299,7 @@ bool XMLHandler::processingInstruction(const TQString &target, const TQString &d exitText(); // ### handle exceptions ProcessingInstructionImpl *pi = - m_doc->createProcessingInstruction(target, new DOMStringImpl(data.unicode(), data.length())); + m_doc->createProcessingInstruction(target, new DOMStringImpl(data.tqunicode(), data.length())); currentNode()->addChild(pi); pi->checkStyleSheet(); return true; @@ -364,7 +364,7 @@ bool XMLHandler::internalEntityDecl(const TQString &name, const TQString &value) { EntityImpl *e = new EntityImpl(m_doc,name); // ### further parse entities inside the value and add them as separate nodes (or entityreferences)? - e->addChild(m_doc->createTextNode(new DOMStringImpl(value.unicode(), value.length()))); + e->addChild(m_doc->createTextNode(new DOMStringImpl(value.tqunicode(), value.length()))); if (m_doc->doctype()) static_cast<GenericRONamedNodeMapImpl*>(m_doc->doctype()->entities())->addNode(e); return true; diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h index cbf5cd5dd..d2910472e 100644 --- a/khtml/xml/xml_tokenizer.h +++ b/khtml/xml/xml_tokenizer.h @@ -48,7 +48,7 @@ namespace DOM { namespace khtml { -class XMLHandler : public QXmlDefaultHandler +class XMLHandler : public TQXmlDefaultHandler { public: XMLHandler(DOM::DocumentImpl *_doc, KHTMLView *_view); @@ -116,7 +116,7 @@ private: State state; }; -class Tokenizer : public QObject +class Tokenizer : public TQObject { Q_OBJECT public: @@ -139,7 +139,7 @@ signals: }; -class XMLIncrementalSource : public QXmlInputSource +class XMLIncrementalSource : public TQXmlInputSource { public: XMLIncrementalSource(); @@ -155,7 +155,7 @@ public: private: TQString m_data; uint m_pos; - const TQChar *m_unicode; + const TQChar *m_tqunicode; bool m_finished; }; diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp index caacb2a3c..bdf1ae750 100644 --- a/kimgio/dds.cpp +++ b/kimgio/dds.cpp @@ -33,9 +33,9 @@ #define sqrtf(x) ((float)sqrt(x)) #endif -typedef Q_UINT32 uint; -typedef Q_UINT16 ushort; -typedef Q_UINT8 uchar; +typedef TQ_UINT32 uint; +typedef TQ_UINT16 ushort; +typedef TQ_UINT8 uchar; namespace { // Private. @@ -298,7 +298,7 @@ namespace { // Private. for( uint x = 0; x < w; x++ ) { uchar r, g, b, a; s >> b >> g >> r >> a; - scanline[x] = qRgba(r, g, b, a); + scanline[x] = tqRgba(r, g, b, a); } } @@ -315,7 +315,7 @@ namespace { // Private. for( uint x = 0; x < w; x++ ) { uchar r, g, b; s >> b >> g >> r; - scanline[x] = qRgb(r, g, b); + scanline[x] = tqRgb(r, g, b); } } @@ -336,7 +336,7 @@ namespace { // Private. uchar r = (color.c.r << 3) | (color.c.r >> 2); uchar g = (color.c.g << 3) | (color.c.g >> 2); uchar b = (color.c.b << 3) | (color.c.b >> 2); - scanline[x] = qRgba(r, g, b, a); + scanline[x] = tqRgba(r, g, b, a); } } @@ -357,7 +357,7 @@ namespace { // Private. uchar r = (color.c.r << 4) | color.c.r; uchar g = (color.c.g << 4) | color.c.g; uchar b = (color.c.b << 4) | color.c.b; - scanline[x] = qRgba(r, g, b, a); + scanline[x] = tqRgba(r, g, b, a); } } @@ -377,7 +377,7 @@ namespace { // Private. uchar r = (color.c.r << 3) | (color.c.r >> 2); uchar g = (color.c.g << 2) | (color.c.g >> 4); uchar b = (color.c.b << 3) | (color.c.b >> 2); - scanline[x] = qRgb(r, g, b); + scanline[x] = tqRgb(r, g, b); } } @@ -548,7 +548,7 @@ namespace { // Private. for( uint i = 0; i < 4; i++ ) { if( img.valid( x+i, y+j ) ) { uint idx = (block.row[j] & masks[i]) >> shift[i]; - scanline[j][x+i] = qRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a); + scanline[j][x+i] = tqRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a); } } } @@ -592,7 +592,7 @@ namespace { // Private. uint idx = (block.row[j] & masks[i]) >> shift[i]; color_array[idx].a = a & 0x0f; color_array[idx].a = color_array[idx].a | (color_array[idx].a << 4); - scanline[j][x+i] = qRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a); + scanline[j][x+i] = tqRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a); } a >>= 4; } @@ -648,7 +648,7 @@ namespace { // Private. if( img.valid( x+i, y+j ) ) { uint idx = (block.row[j] & masks[i]) >> shift[i]; color_array[idx].a = alpha_array[bit_array[j*4+i]]; - scanline[j][x+i] = qRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a); + scanline[j][x+i] = tqRgba(color_array[idx].r, color_array[idx].g, color_array[idx].b, color_array[idx].a); } } } @@ -703,7 +703,7 @@ namespace { // Private. if( img.valid( x+i, y+j ) ) { uint idx = (block.row[j] & masks[i]) >> shift[i]; color_array[idx].a = alpha_array[bit_array[j*4+i]]; - scanline[j][x+i] = qRgb(color_array[idx].a, color_array[idx].g, color_array[idx].b); + scanline[j][x+i] = tqRgb(color_array[idx].a, color_array[idx].g, color_array[idx].b); } } } @@ -757,7 +757,7 @@ namespace { // Private. const float fz = sqrtf(1.0f - fx*fx - fy*fy); const uchar nz = uchar((fz + 1.0f) * 127.5f); - scanline[j][x+i] = qRgb(nx, ny, nz); + scanline[j][x+i] = tqRgb(nx, ny, nz); } } } @@ -910,7 +910,7 @@ namespace { // Private. return false; } - int offset = s.device()->at(); + int offset = s.tqdevice()->at(); int size = FaceOffset( header ); for( int i = 0; i < 6; i++ ) { @@ -921,7 +921,7 @@ namespace { // Private. } // Seek device. - s.device()->at( offset ); + s.tqdevice()->at( offset ); offset += size; // Load face from stream. @@ -963,8 +963,8 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io ) s >> fourcc; if( fourcc != FOURCC_DDS ) { kdDebug(399) << "This is not a DDS file." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } @@ -975,16 +975,16 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io ) // Check image file format. if( s.atEnd() || !IsValid( header ) ) { kdDebug(399) << "This DDS file is not valid." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } // Determine image type, by now, we only support 2d textures. if( !IsSupported( header ) ) { kdDebug(399) << "This DDS file is not supported." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } @@ -1001,13 +1001,13 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io ) if( result == false ) { kdDebug(399) << "Error loading DDS file." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } io->setImage( img ); - io->setStatus( 0 ); + io->setqStatus( 0 ); } diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp index 5067fb8e1..e5495aaf1 100644 --- a/kimgio/eps.cpp +++ b/kimgio/eps.cpp @@ -15,7 +15,7 @@ #define BBOX "%%BoundingBox:" #define BBOX_LEN strlen(BBOX) -static bool seekToCodeStart( TQIODevice * io, Q_UINT32 & ps_offset, Q_UINT32 & ps_size ) +static bool seekToCodeStart( TQIODevice * io, TQ_UINT32 & ps_offset, TQ_UINT32 & ps_size ) { char buf[4]; // We at most need to read 4 bytes at a time ps_offset=0L; @@ -134,7 +134,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image) TQString tmp; TQIODevice* io = image->ioDevice(); - Q_UINT32 ps_offset, ps_size; + TQ_UINT32 ps_offset, ps_size; // find start of PostScript code if ( !seekToCodeStart(io, ps_offset, ps_size) ) @@ -210,7 +210,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image) return; } - fprintf (ghostfd, "\n%d %d translate\n", -qRound(x1*xScale), -qRound(y1*yScale)); + fprintf (ghostfd, "\n%d %d translate\n", -tqRound(x1*xScale), -tqRound(y1*yScale)); if ( needsScaling ) fprintf (ghostfd, "%g %g scale\n", xScale, yScale); @@ -234,7 +234,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image) TQImage myimage; if( myimage.load (tmpFile.name()) ) { image->setImage (myimage); - image->setStatus (0); + image->setqStatus (0); kdDebug(399) << "kimgio EPS: success!" << endl; } else @@ -290,5 +290,5 @@ KDE_EXPORT void kimgio_eps_write( TQImageIO *imageio ) inFile.close(); - imageio->setStatus(0); + imageio->setqStatus(0); } diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp index e45812700..2af22b345 100644 --- a/kimgio/exr.cpp +++ b/kimgio/exr.cpp @@ -110,7 +110,7 @@ QRgb RgbaToQrgba(struct Rgba imagePixel) // the display's maximum intensity). // // 7) Clamp the values to [0, 255]. - return qRgba( char (Imath::clamp ( r * 84.66f, 0.f, 255.f ) ), + return tqRgba( char (Imath::clamp ( r * 84.66f, 0.f, 255.f ) ), char (Imath::clamp ( g * 84.66f, 0.f, 255.f ) ), char (Imath::clamp ( b * 84.66f, 0.f, 255.f ) ), char (Imath::clamp ( a * 84.66f, 0.f, 255.f ) ) ); @@ -148,7 +148,7 @@ KDE_EXPORT void kimgio_exr_read( TQImageIO *io ) } io->setImage( image ); - io->setStatus( 0 ); + io->setqStatus( 0 ); } catch (const std::exception &exc) { diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp index bf8bc5f03..b96cddcb0 100644 --- a/kimgio/hdr.cpp +++ b/kimgio/hdr.cpp @@ -16,7 +16,7 @@ #include <kdebug.h> #include <kglobal.h> -typedef Q_UINT8 uchar; +typedef TQ_UINT8 uchar; namespace { // Private. @@ -85,7 +85,7 @@ namespace { // Private. v = 1.0f / float(1 << -e); } - scanline[j] = qRgb( ClipToByte(float(image[0]) * v), + scanline[j] = tqRgb( ClipToByte(float(image[0]) * v), ClipToByte(float(image[1]) * v), ClipToByte(float(image[2]) * v) ); @@ -127,7 +127,7 @@ namespace { // Private. if (val != 2) { - s.device()->at( s.device()->at() - 1 ); + s.tqdevice()->at( s.tqdevice()->at() - 1 ); Read_Old_Line(image.data(), width, s); RGBE_To_QRgbLine(image.data(), scanline, width); continue; @@ -224,8 +224,8 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io ) if( /*!validHeader ||*/ !validFormat ) { kdDebug(399) << "Unknown HDR format." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } @@ -237,8 +237,8 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io ) //if( sscanf(line, "-Y %d +X %d", &height, &width) < 2 ) { kdDebug(399) << "Invalid HDR file." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } @@ -248,13 +248,13 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io ) if( !LoadHDR(s, width, height, img) ) { kdDebug(399) << "Error loading HDR file." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } io->setImage( img ); - io->setStatus( 0 ); + io->setqStatus( 0 ); } diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp index 01ee37a1b..daaeb3de7 100644 --- a/kimgio/ico.cpp +++ b/kimgio/ico.cpp @@ -29,9 +29,9 @@ namespace struct IcoHeader { enum Type { Icon = 1, Cursor }; - Q_UINT16 reserved; - Q_UINT16 type; - Q_UINT16 count; + TQ_UINT16 reserved; + TQ_UINT16 type; + TQ_UINT16 count; }; inline TQDataStream& operator >>( TQDataStream& s, IcoHeader& h ) @@ -43,21 +43,21 @@ namespace // (c) 1992-2002 Trolltech AS. struct BMP_INFOHDR { - static const Q_UINT32 Size = 40; - Q_UINT32 biSize; // size of this struct - Q_UINT32 biWidth; // pixmap width - Q_UINT32 biHeight; // pixmap height - Q_UINT16 biPlanes; // should be 1 - Q_UINT16 biBitCount; // number of bits per pixel + static const TQ_UINT32 Size = 40; + TQ_UINT32 biSize; // size of this struct + TQ_UINT32 biWidth; // pixmap width + TQ_UINT32 biHeight; // pixmap height + TQ_UINT16 biPlanes; // should be 1 + TQ_UINT16 biBitCount; // number of bits per pixel enum Compression { RGB = 0 }; - Q_UINT32 biCompression; // compression method - Q_UINT32 biSizeImage; // size of image - Q_UINT32 biXPelsPerMeter; // horizontal resolution - Q_UINT32 biYPelsPerMeter; // vertical resolution - Q_UINT32 biClrUsed; // number of colors used - Q_UINT32 biClrImportant; // number of important colors + TQ_UINT32 biCompression; // compression method + TQ_UINT32 biSizeImage; // size of image + TQ_UINT32 biXPelsPerMeter; // horizontal resolution + TQ_UINT32 biYPelsPerMeter; // vertical resolution + TQ_UINT32 biClrUsed; // number of colors used + TQ_UINT32 biClrImportant; // number of important colors }; - const Q_UINT32 BMP_INFOHDR::Size; + const TQ_UINT32 BMP_INFOHDR::Size; TQDataStream& operator >>( TQDataStream &s, BMP_INFOHDR &bi ) { @@ -92,11 +92,11 @@ namespace { unsigned char width; unsigned char height; - Q_UINT16 colors; - Q_UINT16 hotspotX; - Q_UINT16 hotspotY; - Q_UINT32 size; - Q_UINT32 offset; + TQ_UINT16 colors; + TQ_UINT16 hotspotX; + TQ_UINT16 hotspotY; + TQ_UINT32 size; + TQ_UINT32 offset; }; inline TQDataStream& operator >>( TQDataStream& s, IconRec& r ) @@ -177,7 +177,7 @@ namespace unsigned char rgb[ 4 ]; stream.readRawBytes( reinterpret_cast< char* >( &rgb ), sizeof( rgb ) ); - colorTable[ i ] = qRgb( rgb[ 2 ], rgb[ 1 ], rgb[ 0 ] ); + colorTable[ i ] = tqRgb( rgb[ 2 ], rgb[ 1 ], rgb[ 0 ] ); } unsigned bpl = ( rec.width * header.biBitCount + 31 ) / 32 * 4; @@ -207,13 +207,13 @@ namespace break; case 24: for ( unsigned x = 0; x < rec.width; ++x ) - *p++ = qRgb( pixel[ 3 * x + 2 ], + *p++ = tqRgb( pixel[ 3 * x + 2 ], pixel[ 3 * x + 1 ], pixel[ 3 * x ] ); break; case 32: for ( unsigned x = 0; x < rec.width; ++x ) - *p++ = qRgba( pixel[ 4 * x + 2 ], + *p++ = tqRgba( pixel[ 4 * x + 2 ], pixel[ 4 * x + 1 ], pixel[ 4 * x ], pixel[ 4 * x + 3] ); @@ -233,7 +233,7 @@ namespace QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] ); for ( unsigned x = 0; x < rec.width; ++x, ++p ) if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) ) - *p &= RGB_MASK; + *p &= TQRGB_MASK; } delete[] buf; } @@ -306,7 +306,7 @@ extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) icon.setText( "X-HotspotY", 0, TQString::number( selected->hotspotY ) ); } io->setImage(icon); - io->setStatus(0); + io->setqStatus(0); } } diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp index 71b260375..ed5ef99c3 100644 --- a/kimgio/jp2.cpp +++ b/kimgio/jp2.cpp @@ -60,7 +60,7 @@ read_image( const TQImageIO* io ) TQFile* out = tempf->file(); // 4096 (=4k) is a common page size. TQByteArray b( 4096 ); - Q_LONG size; + TQ_LONG size; // 0 or -1 is EOF / error while( ( size = io->ioDevice()->readBlock( b.data(), 4096 ) ) > 0 ) { // in case of a write error, still give the decoder a try @@ -139,7 +139,7 @@ render_view( gs_t& gs, TQImage& qti ) else if( v[k] > 255 ) v[k] = 255; } // for k - *data++ = qRgb( v[0], v[1], v[2] ); + *data++ = tqRgb( v[0], v[1], v[2] ); } // for x } // for y return true; @@ -163,7 +163,7 @@ kimgio_jp2_read( TQImageIO* io ) if( gs.altimage ) jas_image_destroy( gs.altimage ); io->setImage( image ); - io->setStatus( 0 ); + io->setqStatus( 0 ); } // kimgio_jp2_read @@ -211,19 +211,19 @@ write_components( jas_image_t* ji, const TQImage& qi ) jas_image_setcmpttype( ji, 0, JAS_IMAGE_CT_RGB_R ); for( uint y = 0; y < height; ++y ) for( uint x = 0; x < width; ++x ) - jas_matrix_set( m, y, x, qRed( qi.pixel( x, y ) ) ); + jas_matrix_set( m, y, x, tqRed( qi.pixel( x, y ) ) ); jas_image_writecmpt( ji, 0, 0, 0, width, height, m ); jas_image_setcmpttype( ji, 1, JAS_IMAGE_CT_RGB_G ); for( uint y = 0; y < height; ++y ) for( uint x = 0; x < width; ++x ) - jas_matrix_set( m, y, x, qGreen( qi.pixel( x, y ) ) ); + jas_matrix_set( m, y, x, tqGreen( qi.pixel( x, y ) ) ); jas_image_writecmpt( ji, 1, 0, 0, width, height, m ); jas_image_setcmpttype( ji, 2, JAS_IMAGE_CT_RGB_B ); for( uint y = 0; y < height; ++y ) for( uint x = 0; x < width; ++x ) - jas_matrix_set( m, y, x, qBlue( qi.pixel( x, y ) ) ); + jas_matrix_set( m, y, x, tqBlue( qi.pixel( x, y ) ) ); jas_image_writecmpt( ji, 2, 0, 0, width, height, m ); jas_matrix_destroy( m ); @@ -288,7 +288,7 @@ kimgio_jp2_write( TQImageIO* io ) TQFile* in = ktempf->file(); TQByteArray b( 4096 ); - Q_LONG size; + TQ_LONG size; // seek to the beginning of the file. if( !in->at( 0 ) ) { delete ktempf; return; } @@ -309,7 +309,7 @@ kimgio_jp2_write( TQImageIO* io ) // everything went fine - io->setStatus( IO_Ok ); + io->setqStatus( IO_Ok ); } // kimgio_jp2_write #endif // HAVE_JASPER diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp index 3d866ad0a..37361e848 100644 --- a/kimgio/pcx.cpp +++ b/kimgio/pcx.cpp @@ -45,8 +45,8 @@ static TQDataStream &operator>>( TQDataStream &s, PCXHEADER &ph ) s >> ph.VScreenSize; // Skip the rest of the header - Q_UINT8 byte; - while ( s.device()->at() < 128 ) + TQ_UINT8 byte; + while ( s.tqdevice()->at() < 128 ) s >> byte; return s; @@ -83,7 +83,7 @@ static TQDataStream &operator<<( TQDataStream &s, const PCXHEADER &ph ) s << ph.HScreenSize; s << ph.VScreenSize; - Q_UINT8 byte = 0; + TQ_UINT8 byte = 0; for ( int i=0; i<54; ++i ) s << byte; @@ -101,9 +101,9 @@ PCXHEADER::PCXHEADER() static void readLine( TQDataStream &s, TQByteArray &buf, const PCXHEADER &header ) { - Q_UINT32 i=0; - Q_UINT32 size = buf.size(); - Q_UINT8 byte, count; + TQ_UINT32 i=0; + TQ_UINT32 size = buf.size(); + TQ_UINT8 byte, count; if ( header.isCompressed() ) { @@ -149,14 +149,14 @@ static void readImage1( TQImage &img, TQDataStream &s, const PCXHEADER &header ) readLine( s, buf, header ); uchar *p = img.scanLine( y ); - unsigned int bpl = QMIN((header.width()+7)/8, header.BytesPerLine); + unsigned int bpl = TQMIN((header.width()+7)/8, header.BytesPerLine); for ( unsigned int x=0; x< bpl; ++x ) p[ x ] = buf[x]; } // Set the color palette - img.setColor( 0, qRgb( 0, 0, 0 ) ); - img.setColor( 1, qRgb( 255, 255, 255 ) ); + img.setColor( 0, tqRgb( 0, 0, 0 ) ); + img.setColor( 1, tqRgb( 255, 255, 255 ) ); } static void readImage4( TQImage &img, TQDataStream &s, const PCXHEADER &header ) @@ -180,10 +180,10 @@ static void readImage4( TQImage &img, TQDataStream &s, const PCXHEADER &header ) for ( int i=0; i<4; i++ ) { - Q_UINT32 offset = i*header.BytesPerLine; + TQ_UINT32 offset = i*header.BytesPerLine; for ( unsigned int x=0; x<header.width(); ++x ) if ( buf[ offset + ( x/8 ) ] & ( 128 >> ( x%8 ) ) ) - pixbuf[ x ] += ( 1 << i ); + pixbuf[ x ] = pixbuf.at(x) + ( 1 << i ); } uchar *p = img.scanLine( y ); @@ -214,23 +214,23 @@ static void readImage8( TQImage &img, TQDataStream &s, const PCXHEADER &header ) readLine( s, buf, header ); uchar *p = img.scanLine( y ); - unsigned int bpl = QMIN(header.BytesPerLine, header.width()); + unsigned int bpl = TQMIN(header.BytesPerLine, header.width()); for ( unsigned int x=0; x<bpl; ++x ) p[ x ] = buf[ x ]; } - Q_UINT8 flag; + TQ_UINT8 flag; s >> flag; kdDebug( 399 ) << "Palette Flag: " << flag << endl; if ( flag == 12 && ( header.Version == 5 || header.Version == 2 ) ) { // Read the palette - Q_UINT8 r, g, b; + TQ_UINT8 r, g, b; for ( int i=0; i<256; ++i ) { s >> r >> g >> b; - img.setColor( i, qRgb( r, g, b ) ); + img.setColor( i, tqRgb( r, g, b ) ); } } } @@ -258,7 +258,7 @@ static void readImage24( TQImage &img, TQDataStream &s, const PCXHEADER &header uint *p = ( uint * )img.scanLine( y ); for ( unsigned int x=0; x<header.width(); ++x ) - p[ x ] = qRgb( r_buf[ x ], g_buf[ x ], b_buf[ x ] ); + p[ x ] = tqRgb( r_buf[ x ], g_buf[ x ], b_buf[ x ] ); } } @@ -267,9 +267,9 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) TQDataStream s( io->ioDevice() ); s.setByteOrder( TQDataStream::LittleEndian ); - if ( s.device()->size() < 128 ) + if ( s.tqdevice()->size() < 128 ) { - io->setStatus( -1 ); + io->setqStatus( -1 ); return; } @@ -279,7 +279,7 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) if ( header.Manufacturer != 10 || s.atEnd()) { - io->setStatus( -1 ); + io->setqStatus( -1 ); return; } @@ -323,19 +323,19 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) if ( !img.isNull() ) { io->setImage( img ); - io->setStatus( 0 ); + io->setqStatus( 0 ); } else { - io->setStatus( -1 ); + io->setqStatus( -1 ); } } static void writeLine( TQDataStream &s, TQByteArray &buf ) { - Q_UINT32 i = 0; - Q_UINT32 size = buf.size(); - Q_UINT8 count, data; + TQ_UINT32 i = 0; + TQ_UINT32 size = buf.size(); + TQ_UINT8 count, data; char byte; while ( i < size ) @@ -343,7 +343,7 @@ static void writeLine( TQDataStream &s, TQByteArray &buf ) count = 1; byte = buf[ i++ ]; - while ( ( i < size ) && ( byte == buf[ i ] ) && ( count < 63 ) ) + while ( ( i < size ) && ( byte == buf.at(i) ) && ( count < 63 ) ) { ++i; ++count; @@ -375,7 +375,7 @@ static void writeImage1( TQImage &img, TQDataStream &s, PCXHEADER &header ) for ( int y=0; y<header.height(); ++y ) { - Q_UINT8 *p = img.scanLine( y ); + TQ_UINT8 *p = img.scanLine( y ); // Invert as TQImage uses reverse palette for monochrome images? for ( int i=0; i<header.BytesPerLine; ++i ) @@ -403,7 +403,7 @@ static void writeImage4( TQImage &img, TQDataStream &s, PCXHEADER &header ) for ( int y=0; y<header.height(); ++y ) { - Q_UINT8 *p = img.scanLine( y ); + TQ_UINT8 *p = img.scanLine( y ); for ( int i=0; i<4; ++i ) buf[ i ].fill( 0 ); @@ -412,7 +412,7 @@ static void writeImage4( TQImage &img, TQDataStream &s, PCXHEADER &header ) { for ( int i=0; i<4; ++i ) if ( *( p+x ) & ( 1 << i ) ) - buf[ i ][ x/8 ] |= 1 << ( 7-x%8 ); + buf[ i ][ x/8 ] = buf[ i ].at(x/8) | 1 << ( 7-x%8 ); } for ( int i=0; i<4; ++i ) @@ -432,7 +432,7 @@ static void writeImage8( TQImage &img, TQDataStream &s, PCXHEADER &header ) for ( int y=0; y<header.height(); ++y ) { - Q_UINT8 *p = img.scanLine( y ); + TQ_UINT8 *p = img.scanLine( y ); for ( int i=0; i<header.BytesPerLine; ++i ) buf[ i ] = p[ i ]; @@ -441,7 +441,7 @@ static void writeImage8( TQImage &img, TQDataStream &s, PCXHEADER &header ) } // Write palette flag - Q_UINT8 byte = 12; + TQ_UINT8 byte = 12; s << byte; // Write palette @@ -468,9 +468,9 @@ static void writeImage24( TQImage &img, TQDataStream &s, PCXHEADER &header ) for ( unsigned int x=0; x<header.width(); ++x ) { QRgb rgb = *p++; - r_buf[ x ] = qRed( rgb ); - g_buf[ x ] = qGreen( rgb ); - b_buf[ x ] = qBlue( rgb ); + r_buf[ x ] = tqRed( rgb ); + g_buf[ x ] = tqGreen( rgb ); + b_buf[ x ] = tqBlue( rgb ); } writeLine( s, r_buf ); @@ -526,7 +526,7 @@ KDE_EXPORT void kimgio_pcx_write( TQImageIO *io ) writeImage24( img, s, header ); } - io->setStatus( 0 ); + io->setqStatus( 0 ); } /* vim: et sw=2 ts=2 diff --git a/kimgio/pcx.h b/kimgio/pcx.h index eef3293c5..c312979b0 100644 --- a/kimgio/pcx.h +++ b/kimgio/pcx.h @@ -29,14 +29,14 @@ class RGB RGB( const QRgb color ) { - r = qRed( color ); - g = qGreen( color ); - b = qBlue( color ); + r = tqRed( color ); + g = tqGreen( color ); + b = tqBlue( color ); } - Q_UINT8 r; - Q_UINT8 g; - Q_UINT8 b; + TQ_UINT8 r; + TQ_UINT8 g; + TQ_UINT8 b; }; class Palette @@ -51,7 +51,7 @@ class Palette QRgb color( int i ) const { - return qRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b ); + return tqRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b ); } struct RGB rgb[ 16 ]; @@ -66,37 +66,37 @@ class PCXHEADER inline int height() const { return ( YMax-YMin ) + 1; } inline bool isCompressed() const { return ( Encoding==1 ); } - Q_UINT8 Manufacturer; // Constant Flag, 10 = ZSoft .pcx - Q_UINT8 Version; // Version information· - // 0 = Version 2.5 of PC Paintbrush· - // 2 = Version 2.8 w/palette information· - // 3 = Version 2.8 w/o palette information· + TQ_UINT8 Manufacturer; // Constant Flag, 10 = ZSoft .pcx + TQ_UINT8 Version; // Version information + // 0 = Version 2.5 of PC Paintbrush + // 2 = Version 2.8 w/palette information + // 3 = Version 2.8 w/o palette information // 4 = PC Paintbrush for Windows(Plus for - // Windows uses Ver 5)· + // Windows uses Ver 5) // 5 = Version 3.0 and > of PC Paintbrush // and PC Paintbrush +, includes // Publisher's Paintbrush . Includes - // 24-bit .PCX files· - Q_UINT8 Encoding; // 1 = .PCX run length encoding - Q_UINT8 Bpp; // Number of bits to represent a pixel - // (per Plane) - 1, 2, 4, or 8· - Q_UINT16 XMin; - Q_UINT16 YMin; - Q_UINT16 XMax; - Q_UINT16 YMax; - Q_UINT16 HDpi; - Q_UINT16 YDpi; + // 24-bit .PCX files + TQ_UINT8 Encoding; // 1 = .PCX run length encoding + TQ_UINT8 Bpp; // Number of bits to represent a pixel + // (per Plane) - 1, 2, 4, or 8 + TQ_UINT16 XMin; + TQ_UINT16 YMin; + TQ_UINT16 XMax; + TQ_UINT16 YMax; + TQ_UINT16 HDpi; + TQ_UINT16 YDpi; Palette ColorMap; - Q_UINT8 Reserved; // Should be set to 0. - Q_UINT8 NPlanes; // Number of color planes - Q_UINT16 BytesPerLine; // Number of bytes to allocate for a scanline + TQ_UINT8 Reserved; // Should be set to 0. + TQ_UINT8 NPlanes; // Number of color planes + TQ_UINT16 BytesPerLine; // Number of bytes to allocate for a scanline // plane. MUST be an EVEN number. Do NOT - // calculate from Xmax-Xmin.· - Q_UINT16 PaletteInfo; // How to interpret palette- 1 = Color/BW, - // 2 = Grayscale ( ignored in PB IV/ IV + )· - Q_UINT16 HScreenSize; // Horizontal screen size in pixels. New field + // calculate from Xmax-Xmin. + TQ_UINT16 PaletteInfo; // How to interpret palette- 1 = Color/BW, + // 2 = Grayscale ( ignored in PB IV/ IV + ) + TQ_UINT16 HScreenSize; // Horizontal screen size in pixels. New field // found only in PB IV/IV Plus - Q_UINT16 VScreenSize; // Vertical screen size in pixels. New field + TQ_UINT16 VScreenSize; // Vertical screen size in pixels. New field // found only in PB IV/IV Plus } KDE_PACKED; diff --git a/kimgio/psd.cpp b/kimgio/psd.cpp index 13070a0c2..2374b6a97 100644 --- a/kimgio/psd.cpp +++ b/kimgio/psd.cpp @@ -24,9 +24,9 @@ #include <kdebug.h> -typedef Q_UINT32 uint; -typedef Q_UINT16 ushort; -typedef Q_UINT8 uchar; +typedef TQ_UINT32 uint; +typedef TQ_UINT16 ushort; +typedef TQ_UINT8 uchar; namespace { // Private. @@ -119,15 +119,15 @@ namespace { // Private. // Skip mode data. s >> tmp; - s.device()->at( s.device()->at() + tmp ); + s.tqdevice()->at( s.tqdevice()->at() + tmp ); // Skip image resources. s >> tmp; - s.device()->at( s.device()->at() + tmp ); + s.tqdevice()->at( s.tqdevice()->at() + tmp ); // Skip the reserved data. s >> tmp; - s.device()->at( s.device()->at() + tmp ); + s.tqdevice()->at( s.tqdevice()->at() + tmp ); // Find out if the data is compressed. // Known values: @@ -145,7 +145,7 @@ namespace { // Private. // Clear the image. if( channel_num < 4 ) { - img.fill(qRgba(0, 0, 0, 0xFF)); + img.fill(tqRgba(0, 0, 0, 0xFF)); } else { // Enable alpha. @@ -249,29 +249,29 @@ void kimgio_psd_read( TQImageIO *io ) // Check image file format. if( s.atEnd() || !IsValid( header ) ) { kdDebug(399) << "This PSD file is not valid." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } // Check if it's a supported format. if( !IsSupported( header ) ) { kdDebug(399) << "This PSD file is not supported." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } TQImage img; if( !LoadPSD(s, header, img) ) { kdDebug(399) << "Error loading PSD file." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } io->setImage( img ); - io->setStatus( 0 ); + io->setqStatus( 0 ); } diff --git a/kimgio/rgb.cpp b/kimgio/rgb.cpp index 71976685a..da3888c99 100644 --- a/kimgio/rgb.cpp +++ b/kimgio/rgb.cpp @@ -37,13 +37,13 @@ KDE_EXPORT void kimgio_rgb_read(TQImageIO *io) TQImage img; if (!sgi.readImage(img)) { - io->setImage(0); - io->setStatus(-1); + io->setImage(TQImage()); + io->setqStatus(-1); return; } io->setImage(img); - io->setStatus(0); + io->setqStatus(0); } @@ -53,9 +53,9 @@ KDE_EXPORT void kimgio_rgb_write(TQImageIO *io) TQImage img = io->image(); if (!sgi.writeImage(img)) - io->setStatus(-1); + io->setqStatus(-1); - io->setStatus(0); + io->setqStatus(0); } @@ -121,7 +121,7 @@ bool SGIImage::getRow(uchar *dest) bool SGIImage::readData(TQImage& img) { QRgb *c; - Q_UINT32 *start = m_starttab; + TQ_UINT32 *start = m_starttab; TQByteArray lguard(m_xsize); uchar *line = (uchar *)lguard.data(); unsigned x, y; @@ -136,7 +136,7 @@ bool SGIImage::readData(TQImage& img) return false; c = (QRgb *)img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) - *c = qRgb(line[x], line[x], line[x]); + *c = tqRgb(line[x], line[x], line[x]); } if (m_zsize == 1) @@ -150,7 +150,7 @@ bool SGIImage::readData(TQImage& img) return false; c = (QRgb *)img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) - *c = qRgb(qRed(*c), line[x], line[x]); + *c = tqRgb(tqRed(*c), line[x], line[x]); } for (y = 0; y < m_ysize; y++) { @@ -160,7 +160,7 @@ bool SGIImage::readData(TQImage& img) return false; c = (QRgb *)img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) - *c = qRgb(qRed(*c), qGreen(*c), line[x]); + *c = tqRgb(tqRed(*c), tqGreen(*c), line[x]); } if (m_zsize == 3) @@ -174,7 +174,7 @@ bool SGIImage::readData(TQImage& img) return false; c = (QRgb *)img.scanLine(m_ysize - y - 1); for (x = 0; x < m_xsize; x++, c++) - *c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]); + *c = tqRgba(tqRed(*c), tqGreen(*c), tqBlue(*c), line[x]); } return true; @@ -183,9 +183,9 @@ bool SGIImage::readData(TQImage& img) bool SGIImage::readImage(TQImage& img) { - Q_INT8 u8; - Q_INT16 u16; - Q_INT32 u32; + TQ_INT8 u8; + TQ_INT16 u16; + TQ_INT32 u32; kdDebug(399) << "reading '" << m_io->fileName() << '\'' << endl; @@ -256,13 +256,13 @@ bool SGIImage::readImage(TQImage& img) if (m_rle) { uint l; - m_starttab = new Q_UINT32[m_numrows]; + m_starttab = new TQ_UINT32[m_numrows]; for (l = 0; !m_stream.atEnd() && l < m_numrows; l++) { m_stream >> m_starttab[l]; - m_starttab[l] -= 512 + m_numrows * 2 * sizeof(Q_UINT32); + m_starttab[l] -= 512 + m_numrows * 2 * sizeof(TQ_UINT32); } - m_lengthtab = new Q_UINT32[m_numrows]; + m_lengthtab = new TQ_UINT32[m_numrows]; for (l = 0; l < m_numrows; l++) m_stream >> m_lengthtab[l]; } @@ -389,7 +389,7 @@ uint SGIImage::compact(uchar *d, uchar *s) bool SGIImage::scanData(const TQImage& img) { - Q_UINT32 *start = m_starttab; + TQ_UINT32 *start = m_starttab; TQCString lineguard(m_xsize * 2); TQCString bufguard(m_xsize); uchar *line = (uchar *)lineguard.data(); @@ -399,9 +399,9 @@ bool SGIImage::scanData(const TQImage& img) uint len; for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1)); + c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) - buf[x] = intensity(qRed(*c++)); + buf[x] = intensity(tqRed(*c++)); len = compact(line, buf); *start++ = m_rlemap.insert(line, len); } @@ -411,17 +411,17 @@ bool SGIImage::scanData(const TQImage& img) if (m_zsize != 2) { for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1)); + c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) - buf[x] = intensity(qGreen(*c++)); + buf[x] = intensity(tqGreen(*c++)); len = compact(line, buf); *start++ = m_rlemap.insert(line, len); } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1)); + c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) - buf[x] = intensity(qBlue(*c++)); + buf[x] = intensity(tqBlue(*c++)); len = compact(line, buf); *start++ = m_rlemap.insert(line, len); } @@ -431,9 +431,9 @@ bool SGIImage::scanData(const TQImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1)); + c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) - buf[x] = intensity(qAlpha(*c++)); + buf[x] = intensity(tqAlpha(*c++)); len = compact(line, buf); *start++ = m_rlemap.insert(line, len); } @@ -444,11 +444,11 @@ bool SGIImage::scanData(const TQImage& img) void SGIImage::writeHeader() { - m_stream << Q_UINT16(0x01da); + m_stream << TQ_UINT16(0x01da); m_stream << m_rle << m_bpc << m_dim; m_stream << m_xsize << m_ysize << m_zsize; m_stream << m_pixmin << m_pixmax; - m_stream << Q_UINT32(0); + m_stream << TQ_UINT32(0); uint i; TQString desc = m_io->description(); @@ -463,7 +463,7 @@ void SGIImage::writeHeader() m_stream << m_colormap; for (i = 0; i < 404; i++) - m_stream << Q_UINT8(0); + m_stream << TQ_UINT8(0); } @@ -476,11 +476,11 @@ void SGIImage::writeRle() // write start table for (i = 0; i < m_numrows; i++) - m_stream << Q_UINT32(m_rlevector[m_starttab[i]]->offset()); + m_stream << TQ_UINT32(m_rlevector[m_starttab[i]]->offset()); // write length table for (i = 0; i < m_numrows; i++) - m_stream << Q_UINT32(m_rlevector[m_starttab[i]]->size()); + m_stream << TQ_UINT32(m_rlevector[m_starttab[i]]->size()); // write data for (i = 0; i < m_rlevector.size(); i++) @@ -498,9 +498,9 @@ void SGIImage::writeVerbatim(const TQImage& img) unsigned x, y; for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1)); + c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) - m_stream << Q_UINT8(qRed(*c++)); + m_stream << TQ_UINT8(tqRed(*c++)); } if (m_zsize == 1) @@ -508,15 +508,15 @@ void SGIImage::writeVerbatim(const TQImage& img) if (m_zsize != 2) { for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1)); + c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) - m_stream << Q_UINT8(qGreen(*c++)); + m_stream << TQ_UINT8(tqGreen(*c++)); } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1)); + c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) - m_stream << Q_UINT8(qBlue(*c++)); + m_stream << TQ_UINT8(tqBlue(*c++)); } if (m_zsize == 3) @@ -524,9 +524,9 @@ void SGIImage::writeVerbatim(const TQImage& img) } for (y = 0; y < m_ysize; y++) { - c = reinterpret_cast<QRgb *>(img.scanLine(m_ysize - y - 1)); + c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1)); for (x = 0; x < m_xsize; x++) - m_stream << Q_UINT8(qAlpha(*c++)); + m_stream << TQ_UINT8(tqAlpha(*c++)); } } @@ -558,8 +558,8 @@ bool SGIImage::writeImage(TQImage& img) m_numrows = m_ysize * m_zsize; - m_starttab = new Q_UINT32[m_numrows]; - m_rlemap.setBaseOffset(512 + m_numrows * 2 * sizeof(Q_UINT32)); + m_starttab = new TQ_UINT32[m_numrows]; + m_rlemap.setBaseOffset(512 + m_numrows * 2 * sizeof(TQ_UINT32)); if (!scanData(img)) { kdDebug(399) << "this can't happen" << endl; @@ -569,7 +569,7 @@ bool SGIImage::writeImage(TQImage& img) m_rlevector = m_rlemap.vector(); long verbatim_size = m_numrows * m_xsize; - long rle_size = m_numrows * 2 * sizeof(Q_UINT32); + long rle_size = m_numrows * 2 * sizeof(TQ_UINT32); for (uint i = 0; i < m_rlevector.size(); i++) rle_size += m_rlevector[i]->size(); diff --git a/kimgio/rgb.h b/kimgio/rgb.h index fae42a900..4bcc3191a 100644 --- a/kimgio/rgb.h +++ b/kimgio/rgb.h @@ -59,23 +59,23 @@ public: private: enum { NORMAL, DITHERED, SCREEN, COLORMAP }; // colormap - QImageIO *m_io; - QIODevice *m_dev; - QDataStream m_stream; - - Q_UINT8 m_rle; - Q_UINT8 m_bpc; - Q_UINT16 m_dim; - Q_UINT16 m_xsize; - Q_UINT16 m_ysize; - Q_UINT16 m_zsize; - Q_UINT32 m_pixmin; - Q_UINT32 m_pixmax; + TQImageIO *m_io; + TQIODevice *m_dev; + TQDataStream m_stream; + + TQ_UINT8 m_rle; + TQ_UINT8 m_bpc; + TQ_UINT16 m_dim; + TQ_UINT16 m_xsize; + TQ_UINT16 m_ysize; + TQ_UINT16 m_zsize; + TQ_UINT32 m_pixmin; + TQ_UINT32 m_pixmax; char m_imagename[80]; - Q_UINT32 m_colormap; + TQ_UINT32 m_colormap; - Q_UINT32 *m_starttab; - Q_UINT32 *m_lengthtab; + TQ_UINT32 *m_starttab; + TQ_UINT32 *m_lengthtab; QByteArray m_data; TQByteArray::Iterator m_pos; RLEMap m_rlemap; diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp index 8fb5fbd7f..46ecb0624 100644 --- a/kimgio/tga.cpp +++ b/kimgio/tga.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> -typedef Q_UINT32 uint; -typedef Q_UINT16 ushort; -typedef Q_UINT8 uchar; +typedef TQ_UINT32 uint; +typedef TQ_UINT16 ushort; +typedef TQ_UINT8 uchar; namespace { // Private. @@ -268,13 +268,13 @@ namespace { // Private. // Paletted. for( int x = 0; x < tga.width; x++ ) { uchar idx = *src++; - scanline[x] = qRgb( palette[3*idx+2], palette[3*idx+1], palette[3*idx+0] ); + scanline[x] = tqRgb( palette[3*idx+2], palette[3*idx+1], palette[3*idx+0] ); } } else if( info.grey ) { // Greyscale. for( int x = 0; x < tga.width; x++ ) { - scanline[x] = qRgb( *src, *src, *src ); + scanline[x] = tqRgb( *src, *src, *src ); src++; } } @@ -283,13 +283,13 @@ namespace { // Private. if( tga.pixel_size == 16 ) { for( int x = 0; x < tga.width; x++ ) { Color555 c = *reinterpret_cast<Color555 *>(src); - scanline[x] = qRgb( (c.r << 3) | (c.r >> 2), (c.g << 3) | (c.g >> 2), (c.b << 3) | (c.b >> 2) ); + scanline[x] = tqRgb( (c.r << 3) | (c.r >> 2), (c.g << 3) | (c.g >> 2), (c.b << 3) | (c.b >> 2) ); src += 2; } } else if( tga.pixel_size == 24 ) { for( int x = 0; x < tga.width; x++ ) { - scanline[x] = qRgb( src[2], src[1], src[0] ); + scanline[x] = tqRgb( src[2], src[1], src[0] ); src += 3; } } @@ -297,7 +297,7 @@ namespace { // Private. for( int x = 0; x < tga.width; x++ ) { // ### TODO: verify with images having really some alpha data const uchar alpha = ( src[3] << ( 8 - numAlphaBits ) ); - scanline[x] = qRgba( src[2], src[1], src[0], alpha ); + scanline[x] = tqRgba( src[2], src[1], src[0], alpha ); src += 4; } } @@ -324,21 +324,21 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) // Read image header. TgaHeader tga; s >> tga; - s.device()->at( TgaHeader::SIZE + tga.id_length ); + s.tqdevice()->at( TgaHeader::SIZE + tga.id_length ); // Check image file format. if( s.atEnd() ) { kdDebug(399) << "This TGA file is not valid." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } // Check supported file types. if( !IsSupported(tga) ) { kdDebug(399) << "This TGA file is not supported." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } @@ -348,14 +348,14 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) if( result == false ) { kdDebug(399) << "Error loading TGA file." << endl; - io->setImage( 0 ); - io->setStatus( -1 ); + io->setImage( TQImage() ); + io->setqStatus( -1 ); return; } io->setImage( img ); - io->setStatus( 0 ); + io->setqStatus( 0 ); } @@ -370,21 +370,21 @@ KDE_EXPORT void kimgio_tga_write( TQImageIO *io ) s << targaMagic[i]; // write header - s << Q_UINT16( img.width() ); // width - s << Q_UINT16( img.height() ); // height - s << Q_UINT8( hasAlpha ? 32 : 24 ); // depth (24 bit RGB + 8 bit alpha) - s << Q_UINT8( hasAlpha ? 0x24 : 0x20 ); // top left image (0x20) + 8 bit alpha (0x4) + s << TQ_UINT16( img.width() ); // width + s << TQ_UINT16( img.height() ); // height + s << TQ_UINT8( hasAlpha ? 32 : 24 ); // depth (24 bit RGB + 8 bit alpha) + s << TQ_UINT8( hasAlpha ? 0x24 : 0x20 ); // top left image (0x20) + 8 bit alpha (0x4) for( int y = 0; y < img.height(); y++ ) for( int x = 0; x < img.width(); x++ ) { const QRgb color = img.pixel( x, y ); - s << Q_UINT8( qBlue( color ) ); - s << Q_UINT8( qGreen( color ) ); - s << Q_UINT8( qRed( color ) ); + s << TQ_UINT8( tqBlue( color ) ); + s << TQ_UINT8( tqGreen( color ) ); + s << TQ_UINT8( tqRed( color ) ); if( hasAlpha ) - s << Q_UINT8( qAlpha( color ) ); + s << TQ_UINT8( tqAlpha( color ) ); } - io->setStatus( 0 ); + io->setqStatus( 0 ); } diff --git a/kimgio/tiffr.cpp b/kimgio/tiffr.cpp index f8022d2dd..96b259b39 100644 --- a/kimgio/tiffr.cpp +++ b/kimgio/tiffr.cpp @@ -133,14 +133,14 @@ KDE_EXPORT void kimgio_tiff_read( TQImageIO *io ) // for( int ctr = (image.numBytes() / sizeof(uint32))+1; ctr ; ctr-- ) { // // TODO: manage alpha with TIFFGetA -// *data = qRgb( TIFFGetR( *data ), +// *data = tqRgb( TIFFGetR( *data ), // TIFFGetG( *data ), TIFFGetB( *data ) ); // data++; // } TIFFClose( tiff ); io->setImage( image ); - io->setStatus ( 0 ); + io->setqStatus ( 0 ); } KDE_EXPORT void kimgio_tiff_write( TQImageIO * ) diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp index 298d17109..64b18f060 100644 --- a/kimgio/xcf.cpp +++ b/kimgio/xcf.cpp @@ -42,7 +42,7 @@ KDE_EXPORT void kimgio_xcf_read(TQImageIO *io) KDE_EXPORT void kimgio_xcf_write(TQImageIO *io) { kdDebug(399) << "XCF: write support not implemented" << endl; - io->setStatus(-1); + io->setqStatus(-1); } /////////////////////////////////////////////////////////////////////////////// @@ -78,9 +78,9 @@ const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = { //! Change a QRgb value's alpha only. -inline QRgb qRgba ( QRgb rgb, int a ) +inline QRgb tqRgba ( QRgb rgb, int a ) { - return ((a & 0xff) << 24 | (rgb & RGB_MASK)); + return ((a & 0xff) << 24 | (rgb & TQRGB_MASK)); } @@ -127,14 +127,14 @@ void XCFImageFormat::readXCF(TQImageIO *io) char tag[14]; xcf_io.readRawBytes(tag, sizeof(tag)); - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on header tag" << endl; return; } xcf_io >> xcf_image.width >> xcf_image.height >> xcf_image.type; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on image info" << endl; return; } @@ -149,14 +149,14 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << // all the data of all layers before beginning to construct the // merged image). - TQValueStack<Q_INT32> layer_offsets; + TQValueStack<TQ_INT32> layer_offsets; while (true) { - Q_INT32 layer_offset; + TQ_INT32 layer_offset; xcf_io >> layer_offset; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer offsets" << endl; return; } @@ -176,9 +176,9 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << // Load each layer and add it to the image while (!layer_offsets.isEmpty()) { - Q_INT32 layer_offset = layer_offsets.pop(); + TQ_INT32 layer_offset = layer_offsets.pop(); - xcf_io.device()->at(layer_offset); + xcf_io.tqdevice()->at(layer_offset); if (!loadLayer(xcf_io, xcf_image)) return; @@ -190,7 +190,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << } io->setImage(xcf_image.image); - io->setStatus(0); + io->setqStatus(0); } @@ -233,11 +233,11 @@ bool XCFImageFormat::loadImageProperties(TQDataStream& xcf_io, XCFImage& xcf_ima case PROP_PARASITES: while (!property.atEnd()) { char* tag; - Q_UINT32 size; + TQ_UINT32 size; property.readBytes(tag, size); - Q_UINT32 flags; + TQ_UINT32 flags; char* data=0; property >> flags >> data; @@ -269,7 +269,7 @@ bool XCFImageFormat::loadImageProperties(TQDataStream& xcf_io, XCFImage& xcf_ima for (int i = 0; i < xcf_image.num_colors; i++) { uchar r, g, b; property >> r >> g >> b; - xcf_image.palette.push_back( qRgb(r,g,b) ); + xcf_image.palette.push_back( tqRgb(r,g,b) ); } break; @@ -290,17 +290,17 @@ bool XCFImageFormat::loadImageProperties(TQDataStream& xcf_io, XCFImage& xcf_ima * \return true if there were no IO errors. */ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteArray& bytes) { - Q_UINT32 foo; + TQ_UINT32 foo; xcf_io >> foo; type=PropType(foo); // TODO urks - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property type" << type << endl; return false; } char* data; - Q_UINT32 size; + TQ_UINT32 size; // The colormap property size is not the correct number of bytes: // The GIMP source xcf.c has size = 4 + ncolors, but it should be @@ -309,7 +309,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr if (type == PROP_COLORMAP) { xcf_io >> size; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << " size" << endl; return false; } @@ -324,12 +324,12 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr } else if (type == PROP_USER_UNIT) { // The USER UNIT property size is not correct. I'm not sure why, though. float factor; - Q_INT32 digits; + TQ_INT32 digits; char* unit_strings; xcf_io >> size >> factor >> digits; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << endl; return false; } @@ -337,7 +337,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr for (int i = 0; i < 5; i++) { xcf_io >> unit_strings; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << endl; return false; } @@ -354,7 +354,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr xcf_io.readRawBytes(data, size); } - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << " data, size " << size << endl; return false; } @@ -382,7 +382,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) xcf_io >> layer.width >> layer.height >> layer.type >> layer.name; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer" << endl; return false; } @@ -405,7 +405,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) // If there are any more layers, merge them into the final TQImage. xcf_io >> layer.hierarchy_offset >> layer.mask_offset; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer image offsets" << endl; return false; } @@ -415,7 +415,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) if( !composeTiles(xcf_image)) return false; - xcf_io.device()->at(layer.hierarchy_offset); + xcf_io.tqdevice()->at(layer.hierarchy_offset); // As tiles are loaded, they are copied into the layers tiles by // this routine. (loadMask(), below, uses a slightly different @@ -427,7 +427,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) return false; if (layer.mask_offset != 0) { - xcf_io.device()->at(layer.mask_offset); + xcf_io.tqdevice()->at(layer.mask_offset); if (!loadMask(xcf_io, layer)) return false; @@ -643,7 +643,7 @@ bool XCFImageFormat::composeTiles(XCFImage& xcf_image) void XCFImageFormat::setGrayPalette(TQImage& image) { for (int i = 0; i < 256; i++) - image.setColor(i, qRgb(i, i, i)); + image.setColor(i, tqRgb(i, i, i)); } @@ -675,7 +675,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j) for (int l = 0; l < layer.image_tiles[j][i].height(); l++) { for (int k = 0; k < layer.image_tiles[j][i].width(); k++) { layer.image_tiles[j][i].setPixel(k, l, - qRgb(tile[0], tile[1], tile[2])); + tqRgb(tile[0], tile[1], tile[2])); tile += sizeof(QRgb); } } @@ -685,7 +685,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j) for ( int l = 0; l < layer.image_tiles[j][i].height(); l++ ) { for ( int k = 0; k < layer.image_tiles[j][i].width(); k++ ) { layer.image_tiles[j][i].setPixel(k, l, - qRgba(tile[0], tile[1], tile[2], tile[3])); + tqRgba(tile[0], tile[1], tile[2], tile[3])); tile += sizeof(QRgb); } } @@ -732,14 +732,14 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j) */ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer) { - Q_INT32 width; - Q_INT32 height; - Q_INT32 bpp; - Q_UINT32 offset; + TQ_INT32 width; + TQ_INT32 height; + TQ_INT32 bpp; + TQ_UINT32 offset; xcf_io >> width >> height >> bpp >> offset; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " image header" << endl; return false; } @@ -748,23 +748,23 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer) // increasingly lower resolution). Only the top level is used here, // however. - Q_UINT32 junk; + TQ_UINT32 junk; do { xcf_io >> junk; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offsets" << endl; return false; } } while (junk != 0); - TQIODevice::Offset saved_pos = xcf_io.device()->at(); + TQIODevice::Offset saved_pos = xcf_io.tqdevice()->at(); - xcf_io.device()->at(offset); + xcf_io.tqdevice()->at(offset); if (!loadLevel(xcf_io, layer, bpp)) return false; - xcf_io.device()->at(saved_pos); + xcf_io.tqdevice()->at(saved_pos); return true; } @@ -777,15 +777,15 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer) * \return true if there were no I/O errors. * \sa loadTileRLE(). */ -bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, Q_INT32 bpp) +bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) { - Q_INT32 width; - Q_INT32 height; - Q_UINT32 offset; + TQ_INT32 width; + TQ_INT32 height; + TQ_UINT32 offset; xcf_io >> width >> height >> offset; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level info" << endl; return false; } @@ -801,11 +801,11 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, Q_INT32 bpp) return false; } - TQIODevice::Offset saved_pos = xcf_io.device()->at(); - Q_UINT32 offset2; + TQIODevice::Offset saved_pos = xcf_io.tqdevice()->at(); + TQ_UINT32 offset2; xcf_io >> offset2; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offset look-ahead" << endl; return false; } @@ -815,7 +815,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, Q_INT32 bpp) if (offset2 == 0) offset2 = offset + (uint)(TILE_WIDTH * TILE_HEIGHT * 4 * 1.5); - xcf_io.device()->at(offset); + xcf_io.tqdevice()->at(offset); int size = layer.image_tiles[j][i].width() * layer.image_tiles[j][i].height(); if (!loadTileRLE(xcf_io, layer.tile, size, offset2 - offset, bpp)) @@ -827,10 +827,10 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, Q_INT32 bpp) layer.assignBytes(layer, i, j); - xcf_io.device()->at(saved_pos); + xcf_io.tqdevice()->at(saved_pos); xcf_io >> offset; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offset" << endl; return false; } @@ -849,13 +849,13 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, Q_INT32 bpp) */ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer) { - Q_INT32 width; - Q_INT32 height; + TQ_INT32 width; + TQ_INT32 height; char* name; xcf_io >> width >> height >> name; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on mask info" << endl; return false; } @@ -865,15 +865,15 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer) if (!loadChannelProperties(xcf_io, layer)) return false; - Q_UINT32 hierarchy_offset; + TQ_UINT32 hierarchy_offset; xcf_io >> hierarchy_offset; - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on mask image offset" << endl; return false; } - xcf_io.device()->at(hierarchy_offset); + xcf_io.tqdevice()->at(hierarchy_offset); layer.assignBytes = assignMaskBytes; if (!loadHierarchy(xcf_io, layer)) @@ -907,7 +907,7 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer) * the RLE data. */ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_size, - int data_length, Q_INT32 bpp) + int data_length, TQ_INT32 bpp) { uchar* data; @@ -919,7 +919,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si xcf_io.readRawBytes((char*)xcfdata, data_length); - if (xcf_io.device()->status() != IO_Ok) { + if (xcf_io.tqdevice()->status() != IO_Ok) { delete[] xcfodata; kdDebug(399) << "XCF: read failure on tile" << endl; return false; @@ -1117,7 +1117,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image) image.create( xcf_image.width, xcf_image.height, 32); if( image.isNull()) return false; - image.fill(qRgb(255, 255, 255)); + image.fill(tqRgb(255, 255, 255)); break; } // else, fall through to 32-bit representation @@ -1125,7 +1125,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image) image.create(xcf_image.width, xcf_image.height, 32); if( image.isNull()) return false; - image.fill(qRgba(255, 255, 255, 0)); + image.fill(tqRgba(255, 255, 255, 0)); // Turning this on prevents fill() from affecting the alpha channel, // by the way. image.setAlphaBuffer(true); @@ -1145,7 +1145,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image) image.create(xcf_image.width, xcf_image.height, 32); if( image.isNull()) return false; - image.fill(qRgba(255, 255, 255, 0)); + image.fill(tqRgba(255, 255, 255, 0)); image.setAlphaBuffer(true); break; @@ -1187,7 +1187,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image) xcf_image.num_colors++; xcf_image.palette.resize(xcf_image.num_colors); xcf_image.palette[1] = xcf_image.palette[0]; - xcf_image.palette[0] = qRgba(255, 255, 255, 0); + xcf_image.palette[0] = tqRgba(255, 255, 255, 0); image.create(xcf_image.width, xcf_image.height, 1, xcf_image.num_colors, @@ -1204,7 +1204,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image) for (int c = xcf_image.num_colors - 1; c >= 1; c--) xcf_image.palette[c] = xcf_image.palette[c - 1]; - xcf_image.palette[0] = qRgba(255, 255, 255, 0); + xcf_image.palette[0] = tqRgba(255, 255, 255, 0); image.create( xcf_image.width, xcf_image.height, 8, xcf_image.num_colors); if( image.isNull()) @@ -1219,7 +1219,7 @@ bool XCFImageFormat::initializeImage(XCFImage& xcf_image) image.create(xcf_image.width, xcf_image.height, 32); if( image.isNull()) return false; - image.fill(qRgba(255, 255, 255, 0)); + image.fill(tqRgba(255, 255, 255, 0)); image.setAlphaBuffer(true); } break; @@ -1324,7 +1324,7 @@ void XCFImageFormat::copyRGBToRGB(Layer& layer, uint i, uint j, int k, int l, uchar src_a = layer.opacity; if (layer.type == RGBA_GIMAGE) - src_a = INT_MULT(src_a, qAlpha(src)); + src_a = INT_MULT(src_a, tqAlpha(src)); // Apply the mask (if any) @@ -1332,7 +1332,7 @@ void XCFImageFormat::copyRGBToRGB(Layer& layer, uint i, uint j, int k, int l, layer.mask_tiles[j].size() > i) src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l)); - image.setPixel(m, n, qRgba(src, src_a)); + image.setPixel(m, n, tqRgba(src, src_a)); } @@ -1373,7 +1373,7 @@ void XCFImageFormat::copyGrayToRGB(Layer& layer, uint i, uint j, int k, int l, { QRgb src = layer.image_tiles[j][i].pixel(k, l); uchar src_a = layer.opacity; - image.setPixel(m, n, qRgba(src, src_a)); + image.setPixel(m, n, tqRgba(src, src_a)); } @@ -1403,7 +1403,7 @@ void XCFImageFormat::copyGrayAToRGB(Layer& layer, uint i, uint j, int k, int l, layer.mask_tiles[j].size() > i) src_a = INT_MULT(src_a, layer.mask_tiles[j][i].pixelIndex(k, l)); - image.setPixel(m, n, qRgba(src, src_a)); + image.setPixel(m, n, tqRgba(src, src_a)); } @@ -1489,7 +1489,7 @@ void XCFImageFormat::copyIndexedAToRGB(Layer& layer, uint i, uint j, int k, int else src_a = OPAQUE_OPACITY; - image.setPixel(m, n, qRgba(src, src_a)); + image.setPixel(m, n, tqRgba(src, src_a)); } @@ -1586,15 +1586,15 @@ void XCFImageFormat::mergeRGBToRGB(Layer& layer, uint i, uint j, int k, int l, QRgb src = layer.image_tiles[j][i].pixel(k, l); QRgb dst = image.pixel(m, n); - uchar src_r = qRed(src); - uchar src_g = qGreen(src); - uchar src_b = qBlue(src); - uchar src_a = qAlpha(src); + uchar src_r = tqRed(src); + uchar src_g = tqGreen(src); + uchar src_b = tqBlue(src); + uchar src_a = tqAlpha(src); - uchar dst_r = qRed(dst); - uchar dst_g = qGreen(dst); - uchar dst_b = qBlue(dst); - uchar dst_a = qAlpha(dst); + uchar dst_r = tqRed(dst); + uchar dst_g = tqGreen(dst); + uchar dst_b = tqBlue(dst); + uchar dst_a = tqAlpha(dst); switch (layer.mode) { case MULTIPLY_MODE: { @@ -1756,7 +1756,7 @@ void XCFImageFormat::mergeRGBToRGB(Layer& layer, uint i, uint j, int k, int l, if (!layer_modes[layer.mode].affect_alpha) new_a = dst_a; - image.setPixel(m, n, qRgba(new_r, new_g, new_b, new_a)); + image.setPixel(m, n, tqRgba(new_r, new_g, new_b, new_a)); } @@ -1793,7 +1793,7 @@ void XCFImageFormat::mergeGrayToGray(Layer& layer, uint i, uint j, int k, int l, void XCFImageFormat::mergeGrayAToGray(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - int src = qGray(layer.image_tiles[j][i].pixel(k, l)); + int src = tqGray(layer.image_tiles[j][i].pixel(k, l)); int dst = image.pixelIndex(m, n); uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l); @@ -1874,7 +1874,7 @@ void XCFImageFormat::mergeGrayToRGB(Layer& layer, uint i, uint j, int k, int l, { QRgb src = layer.image_tiles[j][i].pixel(k, l); uchar src_a = layer.opacity; - image.setPixel(m, n, qRgba(src, src_a)); + image.setPixel(m, n, tqRgba(src, src_a)); } @@ -1894,11 +1894,11 @@ void XCFImageFormat::mergeGrayToRGB(Layer& layer, uint i, uint j, int k, int l, void XCFImageFormat::mergeGrayAToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n) { - int src = qGray(layer.image_tiles[j][i].pixel(k, l)); - int dst = qGray(image.pixel(m, n)); + int src = tqGray(layer.image_tiles[j][i].pixel(k, l)); + int dst = tqGray(image.pixel(m, n)); uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l); - uchar dst_a = qAlpha(image.pixel(m, n)); + uchar dst_a = tqAlpha(image.pixel(m, n)); switch (layer.mode) { case MULTIPLY_MODE: { @@ -1965,7 +1965,7 @@ void XCFImageFormat::mergeGrayAToRGB(Layer& layer, uint i, uint j, int k, int l, if (!layer_modes[layer.mode].affect_alpha) new_a = dst_a; - image.setPixel(m, n, qRgba(new_g, new_g, new_g, new_a)); + image.setPixel(m, n, tqRgba(new_g, new_g, new_g, new_a)); } @@ -2049,7 +2049,7 @@ void XCFImageFormat::mergeIndexedAToRGB(Layer& layer, uint i, uint j, int k, int else src_a = OPAQUE_OPACITY; - image.setPixel(m, n, qRgba(src, src_a)); + image.setPixel(m, n, tqRgba(src, src_a)); } @@ -2075,8 +2075,8 @@ void XCFImageFormat::dissolveRGBPixels ( TQImage& image, int x, int y ) int rand_val = rand() & 0xff; QRgb pixel = image.pixel(k, l); - if (rand_val > qAlpha(pixel)) { - image.setPixel(k, l, qRgba(pixel, 0)); + if (rand_val > tqAlpha(pixel)) { + image.setPixel(k, l, tqRgba(pixel, 0)); } } } diff --git a/kimgio/xcf.h b/kimgio/xcf.h index 3e92f27c2..d3b4302a9 100644 --- a/kimgio/xcf.h +++ b/kimgio/xcf.h @@ -64,12 +64,12 @@ private: */ class Layer { public: - Q_UINT32 width; //!< Width of the layer - Q_UINT32 height; //!< Height of the layer - Q_INT32 type; //!< Type of the layer (GimpImageType) + TQ_UINT32 width; //!< Width of the layer + TQ_UINT32 height; //!< Height of the layer + TQ_INT32 type; //!< Type of the layer (GimpImageType) char* name; //!< Name of the layer - Q_UINT32 hierarchy_offset; //!< File position of Tile hierarchy - Q_UINT32 mask_offset; //!< File position of mask image + TQ_UINT32 hierarchy_offset; //!< File position of Tile hierarchy + TQ_UINT32 mask_offset; //!< File position of mask image uint nrows; //!< Number of rows of tiles (y direction) uint ncols; //!< Number of columns of tiles (x direction) @@ -82,25 +82,25 @@ private: //! Additional information about a layer mask. struct { - Q_UINT32 opacity; - Q_UINT32 visible; - Q_UINT32 show_masked; + TQ_UINT32 opacity; + TQ_UINT32 visible; + TQ_UINT32 show_masked; uchar red, green, blue; - Q_UINT32 tattoo; + TQ_UINT32 tattoo; } mask_channel; bool active; //!< Is this layer the active layer? - Q_UINT32 opacity; //!< The opacity of the layer - Q_UINT32 visible; //!< Is the layer visible? - Q_UINT32 linked; //!< Is this layer linked (geometrically) - Q_UINT32 preserve_transparency; //!< Preserve alpha when drawing on layer? - Q_UINT32 apply_mask; //!< Apply the layer mask? - Q_UINT32 edit_mask; //!< Is the layer mask the being edited? - Q_UINT32 show_mask; //!< Show the layer mask rather than the image? - Q_INT32 x_offset; //!< x offset of the layer relative to the image - Q_INT32 y_offset; //!< y offset of the layer relative to the image - Q_UINT32 mode; //!< Combining mode of layer (LayerModeEffects) - Q_UINT32 tattoo; //!< (unique identifier?) + TQ_UINT32 opacity; //!< The opacity of the layer + TQ_UINT32 visible; //!< Is the layer visible? + TQ_UINT32 linked; //!< Is this layer linked (geometrically) + TQ_UINT32 preserve_transparency; //!< Preserve alpha when drawing on layer? + TQ_UINT32 apply_mask; //!< Apply the layer mask? + TQ_UINT32 edit_mask; //!< Is the layer mask the being edited? + TQ_UINT32 show_mask; //!< Show the layer mask rather than the image? + TQ_INT32 x_offset; //!< x offset of the layer relative to the image + TQ_INT32 y_offset; //!< y offset of the layer relative to the image + TQ_UINT32 mode; //!< Combining mode of layer (LayerModeEffects) + TQ_UINT32 tattoo; //!< (unique identifier?) //! As each tile is read from the file, it is buffered here. uchar tile[TILE_WIDTH * TILE_HEIGHT * sizeof(QRgb)]; @@ -122,16 +122,16 @@ private: */ class XCFImage { public: - Q_UINT32 width; //!< width of the XCF image - Q_UINT32 height; //!< height of the XCF image - Q_INT32 type; //!< type of the XCF image (GimpImageBaseType) + TQ_UINT32 width; //!< width of the XCF image + TQ_UINT32 height; //!< height of the XCF image + TQ_INT32 type; //!< type of the XCF image (GimpImageBaseType) - Q_UINT8 compression; //!< tile compression method (CompressionType) + TQ_UINT8 compression; //!< tile compression method (CompressionType) float x_resolution; //!< x resolution in dots per inch float y_resolution; //!< y resolution in dots per inch - Q_INT32 tattoo; //!< (unique identifier?) - Q_UINT32 unit; //!< Units of The GIMP (inch, mm, pica, etc...) - Q_INT32 num_colors; //!< number of colors in an indexed image + TQ_INT32 tattoo; //!< (unique identifier?) + TQ_UINT32 unit; //!< Units of The GIMP (inch, mm, pica, etc...) + TQ_INT32 num_colors; //!< number of colors in an indexed image TQValueVector<QRgb> palette; //!< indexed image color palette int num_layers; //!< number of layers @@ -182,13 +182,13 @@ private: void setPalette(XCFImage& xcf_image, TQImage& image); static void assignImageBytes(Layer& layer, uint i, uint j); bool loadHierarchy(TQDataStream& xcf_io, Layer& layer); - bool loadLevel(TQDataStream& xcf_io, Layer& layer, Q_INT32 bpp); + bool loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp); static void assignMaskBytes(Layer& layer, uint i, uint j); bool loadMask(TQDataStream& xcf_io, Layer& layer); bool loadChannelProperties(TQDataStream& xcf_io, Layer& layer); bool initializeImage(XCFImage& xcf_image); bool loadTileRLE(TQDataStream& xcf_io, uchar* tile, int size, - int data_length, Q_INT32 bpp); + int data_length, TQ_INT32 bpp); static void copyLayerToImage(XCFImage& xcf_image); static void copyRGBToRGB(Layer& layer, uint i, uint j, int k, int l, TQImage& image, int m, int n); diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp index 746ddc6bc..00d604cf6 100644 --- a/kimgio/xview.cpp +++ b/kimgio/xview.cpp @@ -84,7 +84,7 @@ KDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio ) r = rg_255_7[((j >> 5) & 0x07)]; g = rg_255_7[((j >> 2) & 0x07)]; b = b_255_3[((j >> 0) & 0x03)]; - image.setColor( j, qRgb( r, g, b ) ); + image.setColor( j, tqRgb( r, g, b ) ); } for ( int py = 0; py < y; py++ ) @@ -94,7 +94,7 @@ KDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio ) } _imageio->setImage( image ); - _imageio->setStatus( 0 ); + _imageio->setqStatus( 0 ); free(block); return; @@ -138,24 +138,24 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio ) for ( int py = 0; py < h; py++ ) { - uchar *data = image.scanLine( py ); + uchar *data = const_cast<TQImage&>(image).scanLine( py ); for ( int px = 0; px < w; px++ ) { int r, g, b; if ( image.depth() == 32 ) { QRgb *data32 = (QRgb*) data; - r = qRed( *data32 ) >> 5; - g = qGreen( *data32 ) >> 5; - b = qBlue( *data32 ) >> 6; + r = tqRed( *data32 ) >> 5; + g = tqGreen( *data32 ) >> 5; + b = tqBlue( *data32 ) >> 6; data += sizeof( QRgb ); } else { QRgb color = image.color( *data ); - r = qRed( color ) >> 5; - g = qGreen( color ) >> 5; - b = qBlue( color ) >> 6; + r = tqRed( color ) >> 5; + g = tqGreen( color ) >> 5; + b = tqBlue( color ) >> 6; data++; } buffer[ px ] = ( r << 5 ) | ( g << 2 ) | b; @@ -164,6 +164,6 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio ) } delete[] buffer; - imageio->setStatus( 0 ); + imageio->setqStatus( 0 ); } diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index f34a6a219..b7588d280 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -535,7 +535,7 @@ static pid_t launch(int argc, const char *_name, const char *args, ++it ) { TQCString tmp( it.current()); - int pos = tmp.find( '=' ); + int pos = tmp.tqfind( '=' ); if( pos >= 0 ) unsetenv( tmp.left( pos )); } diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 2b49a0ac8..7d09590f9 100644 --- a/kinit/klauncher.cpp +++ b/kinit/klauncher.cpp @@ -102,7 +102,7 @@ IdleSlave::gotInput() pid_t pid; TQCString protocol; TQString host; - Q_INT8 b; + TQ_INT8 b; stream >> pid >> protocol >> host >> b; // Overload with (bool) onHold, (KURL) url. if (!stream.atEnd()) @@ -181,7 +181,7 @@ KLauncher::KLauncher(int _kdeinitSocket, bool new_startup) objId(), "terminateKDE()", false ); TQString prefix = locateLocal("socket", "klauncher"); - KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket")); + KTempFile domainname(prefix, TQString::tqfromLatin1(".slave-socket")); if (domainname.status() != 0) { // Sever error! diff --git a/kinit/klauncher.h b/kinit/klauncher.h index e681939e1..5ff5b66c3 100644 --- a/kinit/klauncher.h +++ b/kinit/klauncher.h @@ -39,7 +39,7 @@ #include "autostart.h" -class IdleSlave : public QObject +class IdleSlave : public TQObject { Q_OBJECT public: diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp index c42fdf686..ff1ae0fd1 100644 --- a/kinit/tests/klaunchertest.cpp +++ b/kinit/tests/klaunchertest.cpp @@ -39,13 +39,13 @@ int main(int argc, char *argv[]) TQCString dcopService; int pid; int result = KApplication::startServiceByDesktopName( - TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid ); + TQString::tqfromLatin1("konsole"), TQString::null, &error, &dcopService, &pid ); printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n", result, error.ascii(), dcopService.data(), pid); result = KApplication::startServiceByDesktopName( - TQString::fromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid ); + TQString::tqfromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid ); printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n", result, error.ascii(), dcopService.data(), pid); diff --git a/kio/bookmarks/dptrtemplate.h b/kio/bookmarks/dptrtemplate.h index 2a69d6a54..a34f021be 100644 --- a/kio/bookmarks/dptrtemplate.h +++ b/kio/bookmarks/dptrtemplate.h @@ -34,10 +34,10 @@ public: d_ptr = new TQPtrDict<PrivateData>; qAddPostRoutine( cleanup_d_ptr ); } - PrivateData* ret = d_ptr->find( (void*) instance ); + PrivateData* ret = d_ptr->tqfind( (void*) instance ); if ( ! ret ) { ret = new PrivateData; - d_ptr->replace( (void*) instance, ret ); + d_ptr->tqreplace( (void*) instance, ret ); } return ret; } diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc index 44b8b496c..2d456ddeb 100644 --- a/kio/bookmarks/kbookmark.cc +++ b/kio/bookmarks/kbookmark.cc @@ -271,7 +271,7 @@ bool KBookmark::isSeparator() const bool KBookmark::hasParent() const { - TQDomElement parent = element.parentNode().toElement(); + TQDomElement parent = element.tqparentNode().toElement(); return !parent.isNull(); } @@ -311,7 +311,7 @@ TQString KBookmark::icon() const KBookmarkGroup KBookmark::parentGroup() const { - return KBookmarkGroup( element.parentNode().toElement() ); + return KBookmarkGroup( element.tqparentNode().toElement() ); } KBookmarkGroup KBookmark::toGroup() const @@ -447,7 +447,7 @@ void KBookmark::updateAccessMetadata() { kdDebug(7043) << "KBookmark::updateAccessMetadata " << address() << " " << url().prettyURL() << endl; - const uint timet = TQDateTime::currentDateTime().toTime_t(); + const uint timet = TQDateTime::tqcurrentDateTime().toTime_t(); setMetaDataItem( "time_added", TQString::number( timet ), DontOverwriteMetaData ); setMetaDataItem( "time_visited", TQString::number( timet ) ); diff --git a/kio/bookmarks/kbookmark.h b/kio/bookmarks/kbookmark.h index 84f177522..0046eb689 100644 --- a/kio/bookmarks/kbookmark.h +++ b/kio/bookmarks/kbookmark.h @@ -130,13 +130,13 @@ public: * @return address of parent */ static TQString parentAddress( const TQString & address ) - { return address.left( address.findRev('/') ); } + { return address.left( address.tqfindRev('/') ); } /** * @return position in parent (e.g. /4/5/2 -> 2) */ static uint positionInParent( const TQString & address ) - { return address.mid( address.findRev('/') + 1 ).toInt(); } + { return address.mid( address.tqfindRev('/') + 1 ).toInt(); } /** * @return address of previous sibling (e.g. /4/5/2 -> /4/5/1) diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc index ec1e3e670..4709988a4 100644 --- a/kio/bookmarks/kbookmarkbar.cc +++ b/kio/bookmarks/kbookmarkbar.cc @@ -252,7 +252,7 @@ bool KBookmarkBar::isReadOnly() const return dptr()->m_readOnly; } -void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, Qt::ButtonState state ) +void KBookmarkBar::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state ) { if (!m_pOwner) return; // this view doesn't handle bookmarks... @@ -313,7 +313,7 @@ static TQString handleToolbarDragMoveEvent( int index = 0; KToolBarButton* b; - b = dynamic_cast<KToolBarButton*>(tb->childAt(pos)); + b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos)); KAction *a = 0; TQString address; atFirst = false; @@ -394,7 +394,7 @@ static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions Q_ASSERT(tb); KToolBarButton *b; - b = dynamic_cast<KToolBarButton*>(tb->childAt(pos)); + b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos)); if (!b) return 0; diff --git a/kio/bookmarks/kbookmarkbar.h b/kio/bookmarks/kbookmarkbar.h index 71c2dcc8c..4eefbb9a1 100644 --- a/kio/bookmarks/kbookmarkbar.h +++ b/kio/bookmarks/kbookmarkbar.h @@ -39,9 +39,10 @@ class TQPopupMenu; * identical to using KBookmarkMenu so follow the directions * there. */ -class KIO_EXPORT KBookmarkBar : public QObject +class KIO_EXPORT KBookmarkBar : public TQObject { Q_OBJECT + TQ_OBJECT friend class RMB; public: /** @@ -86,7 +87,7 @@ signals: /** * @since 3.4 */ - void openBookmark( const TQString& url, Qt::ButtonState state ); + void openBookmark( const TQString& url, TQt::ButtonState state ); public slots: void clear(); @@ -97,7 +98,7 @@ public slots: /** * @since 3.4 */ - void slotBookmarkSelected( KAction::ActivationReason reason, Qt::ButtonState state ); + void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state ); /// @since 3.2 void slotRMBActionRemove( int ); diff --git a/kio/bookmarks/kbookmarkdrag.cc b/kio/bookmarks/kbookmarkdrag.cc index d13893eed..358e329a9 100644 --- a/kio/bookmarks/kbookmarkdrag.cc +++ b/kio/bookmarks/kbookmarkdrag.cc @@ -54,8 +54,8 @@ KBookmarkDrag::KBookmarkDrag( const TQValueList<KBookmark> & bookmarks, const TQ : TQUriDrag( urls, dragSource, name ), m_bookmarks( bookmarks ), m_doc("xbel") { // We need to create the XML for this drag right now and not - // in encodedData because when cutting a folder, the children - // wouldn't be part of the bookmarks anymore, when encodedData + // in tqencodedData because when cutting a folder, the children + // wouldn't be part of the bookmarks anymore, when tqencodedData // is requested. TQDomElement elem = m_doc.createElement("xbel"); m_doc.appendChild( elem ); @@ -76,16 +76,16 @@ const char* KBookmarkDrag::format( int i ) const else return 0; } -TQByteArray KBookmarkDrag::encodedData( const char* mime ) const +TQByteArray KBookmarkDrag::tqencodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "text/uri-list" ) - return TQUriDrag::encodedData( mime ); + return TQUriDrag::tqencodedData( mime ); else if ( mimetype == "application/x-xbel" ) { a = m_doc.toCString(); - //kdDebug(7043) << "KBookmarkDrag::encodedData " << m_doc.toCString() << endl; + //kdDebug(7043) << "KBookmarkDrag::tqencodedData " << m_doc.toCString() << endl; } else if ( mimetype == "text/plain" ) { @@ -117,7 +117,7 @@ TQValueList<KBookmark> KBookmarkDrag::decode( const TQMimeSource * e ) TQValueList<KBookmark> bookmarks; if ( e->provides("application/x-xbel") ) { - TQByteArray s( e->encodedData("application/x-xbel") ); + TQByteArray s( e->tqencodedData("application/x-xbel") ); //kdDebug(7043) << "KBookmarkDrag::decode s=" << TQCString(s) << endl; TQDomDocument doc; doc.setContent( s ); diff --git a/kio/bookmarks/kbookmarkdrag.h b/kio/bookmarks/kbookmarkdrag.h index 98aa3b881..c67f1ea19 100644 --- a/kio/bookmarks/kbookmarkdrag.h +++ b/kio/bookmarks/kbookmarkdrag.h @@ -25,7 +25,7 @@ #include <kbookmark.h> // Clipboard/dnd data : URLs + XML for bookmarks -class KIO_EXPORT KBookmarkDrag : public QUriDrag +class KIO_EXPORT KBookmarkDrag : public TQUriDrag { public: static KBookmarkDrag * newDrag( const TQValueList<KBookmark> & bookmarks, @@ -43,7 +43,7 @@ public: virtual ~KBookmarkDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray encodedData( const char* mime ) const; + virtual TQByteArray tqencodedData( const char* mime ) const; static bool canDecode( const TQMimeSource * e ); static TQValueList<KBookmark> decode( const TQMimeSource * e ); diff --git a/kio/bookmarks/kbookmarkimporter.h b/kio/bookmarks/kbookmarkimporter.h index bf8d61137..8fb684c7e 100644 --- a/kio/bookmarks/kbookmarkimporter.h +++ b/kio/bookmarks/kbookmarkimporter.h @@ -34,7 +34,7 @@ * and KActionMenu uses it to create actions directly. * @since 3.2 */ -class KIO_EXPORT KBookmarkImporterBase : public QObject +class KIO_EXPORT KBookmarkImporterBase : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_crash.cc b/kio/bookmarks/kbookmarkimporter_crash.cc index 594dc0239..7e0831e83 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.cc +++ b/kio/bookmarks/kbookmarkimporter_crash.cc @@ -104,7 +104,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() { TQCString &clientId = *it; - if ( qstrncmp(clientId, "konqueror", 9) != 0 ) + if ( tqstrncmp(clientId, "konqueror", 9) != 0 ) continue; TQByteArray data, replyData; @@ -132,8 +132,8 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() d.setFilter( TQDir::Files ); d.setNameFilter( "konqueror-crash-*.log" ); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; TQStringList crashFiles; @@ -141,7 +141,7 @@ TQStringList KCrashBookmarkImporterImpl::getCrashLogs() int count = 0; for ( ; (( fi = it.current() ) != 0) && (count < 20); ++it, ++count ) { - bool stillAlive = activeLogs.contains( fi->absFilePath() ); + bool stillAlive = activeLogs.tqcontains( fi->absFilePath() ); if ( !stillAlive ) crashFiles << fi->absFilePath(); } diff --git a/kio/bookmarks/kbookmarkimporter_crash.h b/kio/bookmarks/kbookmarkimporter_crash.h index e22ef1b9e..a5ae08d96 100644 --- a/kio/bookmarks/kbookmarkimporter_crash.h +++ b/kio/bookmarks/kbookmarkimporter_crash.h @@ -34,7 +34,7 @@ * A class for importing all crash sessions as bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public QObject +class KIO_EXPORT_DEPRECATED KCrashBookmarkImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_ie.cc b/kio/bookmarks/kbookmarkimporter_ie.cc index f37a6a4be..8d1372194 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.cc +++ b/kio/bookmarks/kbookmarkimporter_ie.cc @@ -51,7 +51,7 @@ void KIEBookmarkImporter::parseIEBookmarks_url_file( TQString filename, TQString TQCString t = s.stripWhiteSpace(); TQRegExp rx( "URL=(.*)" ); if (rx.exactMatch(t)) { - emit newBookmark( name, rx.cap(1).latin1(), TQString("") ); + emit newBookmark( name, TQString(rx.cap(1)).latin1(), TQString("") ); } } @@ -69,13 +69,13 @@ void KIEBookmarkImporter::parseIEBookmarks_dir( TQString dirname, TQString folde dir.setNameFilter("*.url"); // AK - possibly add ";index.ini" ? dir.setMatchAllDirs(true); - const QFileInfoList *list = dir.entryInfoList(); + const TQFileInfoList *list = dir.entryInfoList(); if (!list) return; if (dirname != m_fileName) emit newFolder( foldername, false, "" ); - QFileInfoListIterator it( *list ); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { diff --git a/kio/bookmarks/kbookmarkimporter_ie.h b/kio/bookmarks/kbookmarkimporter_ie.h index 2a9ddac6d..eddf20f41 100644 --- a/kio/bookmarks/kbookmarkimporter_ie.h +++ b/kio/bookmarks/kbookmarkimporter_ie.h @@ -33,7 +33,7 @@ * A class for importing IE bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public QObject +class KIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_kde1.cc b/kio/bookmarks/kbookmarkimporter_kde1.cc index 49999e675..79568be02 100644 --- a/kio/bookmarks/kbookmarkimporter_kde1.cc +++ b/kio/bookmarks/kbookmarkimporter_kde1.cc @@ -48,7 +48,7 @@ void KBookmarkImporter::scanIntern( TQDomElement & parentElem, const TQString & TQDir dir( _path ); TQString canonical = dir.canonicalPath(); - if ( m_lstParsedDirs.contains(canonical) ) + if ( m_lstParsedDirs.tqcontains(canonical) ) { kdWarning() << "Directory " << canonical << " already parsed" << endl; return; diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc index 5521bee7e..f7b438f78 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.cc +++ b/kio/bookmarks/kbookmarkimporter_ns.cc @@ -61,14 +61,14 @@ void KNSBookmarkImporterImpl::parse() TQCString t = s.stripWhiteSpace(); if(t.left(12).upper() == "<DT><A HREF=" || t.left(16).upper() == "<DT><H3><A HREF=") { - int firstQuotes = t.find('"')+1; - int secondQuotes = t.find('"', firstQuotes); + int firstQuotes = t.tqfind('"')+1; + int secondQuotes = t.tqfind('"', firstQuotes); if (firstQuotes != -1 && secondQuotes != -1) { TQCString link = t.mid(firstQuotes, secondQuotes-firstQuotes); - int endTag = t.find('>', secondQuotes+1); + int endTag = t.tqfind('>', secondQuotes+1); TQCString name = t.mid(endTag+1); - name = name.left(name.findRev('<')); + name = name.left(name.tqfindRev('<')); if ( name.right(4) == "</A>" ) name = name.left( name.length() - 4 ); TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) ); @@ -79,9 +79,9 @@ void KNSBookmarkImporterImpl::parse() } } else if(t.left(7).upper() == "<DT><H3") { - int endTag = t.find('>', 7); + int endTag = t.tqfind('>', 7); TQCString name = t.mid(endTag+1); - name = name.left(name.findRev('<')); + name = name.left(name.tqfindRev('<')); TQString qname = KCharsets::resolveEntities( codec->toUnicode( name ) ); TQCString additionalInfo = t.mid( 8, endTag-8 ); bool folded = (additionalInfo.left(6) == "FOLDED"); @@ -191,7 +191,7 @@ void KNSBookmarkExporterImpl::write(KBookmarkGroup parent) { fstream.setEncoding(m_utf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); TQString charset - = m_utf8 ? "UTF-8" : TQString::fromLatin1(TQTextCodec::codecForLocale()->name()).upper(); + = m_utf8 ? "UTF-8" : TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()).upper(); fstream << "<!DOCTYPE NETSCAPE-Bookmark-file-1>" << endl << i18n("<!-- This file was generated by Konqueror -->") << endl diff --git a/kio/bookmarks/kbookmarkimporter_ns.h b/kio/bookmarks/kbookmarkimporter_ns.h index 8b5c76338..fdf79a3b9 100644 --- a/kio/bookmarks/kbookmarkimporter_ns.h +++ b/kio/bookmarks/kbookmarkimporter_ns.h @@ -34,7 +34,7 @@ * A class for importing NS bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public QObject +class KIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkimporter_opera.h b/kio/bookmarks/kbookmarkimporter_opera.h index e87df2efe..0f9a3ba00 100644 --- a/kio/bookmarks/kbookmarkimporter_opera.h +++ b/kio/bookmarks/kbookmarkimporter_opera.h @@ -32,7 +32,7 @@ * A class for importing Opera bookmarks * @deprecated */ -class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public QObject +class KIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc index 1a9e5dc4e..fa4ce416b 100644 --- a/kio/bookmarks/kbookmarkmanager.cc +++ b/kio/bookmarks/kbookmarkmanager.cc @@ -234,7 +234,7 @@ void KBookmarkManager::parse() const if ( n.isProcessingInstruction() ) { TQDomProcessingInstruction pi = n.toProcessingInstruction(); - pi.parentNode().removeChild(pi); + pi.tqparentNode().removeChild(pi); } TQDomProcessingInstruction pi; @@ -329,7 +329,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co // Save the bookmark toolbar folder for quick loading // but only when it will actually make things quicker - const TQString cacheFilename = filename + TQString::fromLatin1(".tbcache"); + const TQString cacheFilename = filename + TQString::tqfromLatin1(".tbcache"); if(toolbarCache && !root().isToolbarGroup()) { KSaveFile cacheFile( cacheFilename ); @@ -367,7 +367,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co "of the error needs to be fixed as quickly as possible, " "which is most likely a full hard drive.") .arg(filename).arg(TQString::fromLocal8Bit(strerror(file.status()))); - if (qApp->type() != TQApplication::Tty) + if (tqApp->type() != TQApplication::Tty) KMessageBox::error( 0L, error ); else kdError() << error << endl; @@ -388,7 +388,7 @@ KBookmarkGroup KBookmarkManager::toolbar() if(!m_docIsLoaded) { kdDebug(7043) << "KBookmarkManager::toolbar trying cache" << endl; - const TQString cacheFilename = m_bookmarksFile + TQString::fromLatin1(".tbcache"); + const TQString cacheFilename = m_bookmarksFile + TQString::tqfromLatin1(".tbcache"); TQFileInfo bmInfo(m_bookmarksFile); TQFileInfo cacheInfo(cacheFilename); if (m_toolbarDoc.isNull() && @@ -614,11 +614,11 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser ) void KBookmarkManager::slotEditBookmarks() { KProcess proc; - proc << TQString::fromLatin1("keditbookmarks"); + proc << TQString::tqfromLatin1("keditbookmarks"); if (!dptr()->m_editorCaption.isNull()) - proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption; + proc << TQString::tqfromLatin1("--customcaption") << dptr()->m_editorCaption; if (!dptr()->m_browserEditor) - proc << TQString::fromLatin1("--nobrowser"); + proc << TQString::tqfromLatin1("--nobrowser"); proc << m_bookmarksFile; proc.start(KProcess::DontCare); } @@ -626,8 +626,8 @@ void KBookmarkManager::slotEditBookmarks() void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address ) { KProcess proc; - proc << TQString::fromLatin1("keditbookmarks") - << TQString::fromLatin1("--address") << address + proc << TQString::tqfromLatin1("keditbookmarks") + << TQString::tqfromLatin1("--address") << address << m_bookmarksFile; proc.start(KProcess::DontCare); } @@ -690,7 +690,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic TQString KBookmarkManager::userBookmarksFile() { - return locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); + return locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); } KBookmarkManager* KBookmarkManager::userBookmarksManager() diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index 69c9debd6..916690c19 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -403,9 +403,9 @@ void RMB::slotRMBActionCopyLocation( int val ) if ( !bookmark.isGroup() ) { - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), QClipboard::Selection ); - kapp->clipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), + kapp->tqclipboard()->setData( KBookmarkDrag::newDrag(bookmark, 0), QClipboard::Clipboard ); } } @@ -537,7 +537,7 @@ void KBookmarkMenu::addNewFolder() TQString title = i18n( "&New Bookmark Folder..." ); int p; - while ( ( p = title.find( '&' ) ) >= 0 ) + while ( ( p = title.tqfind( '&' ) ) >= 0 ) title.remove( p, 1 ); KAction * paNewFolder = new KAction( title, @@ -743,7 +743,7 @@ void KBookmarkMenu::slotNewFolder() } } -void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/, Qt::ButtonState state ) +void KBookmarkMenu::slotBookmarkSelected( KAction::ActivationReason /*reason*/, TQt::ButtonState state ) { kdDebug(7043) << "KBookmarkMenu::slotBookmarkSelected()" << endl; if ( !m_pOwner ) return; // this view doesn't handle bookmarks... @@ -1175,7 +1175,7 @@ void KBookmarkMenu::setDynamicBookmarks(const TQString &id, const DynMenuInfo &n // make sure list includes type config.setGroup("Bookmarks"); - if (elist.contains(id) < 1) { + if (elist.tqcontains(id) < 1) { elist << id; config.writeEntry("DynamicMenus", elist); } diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index f3d1c75b6..fa0368b68 100644 --- a/kio/bookmarks/kbookmarkmenu.h +++ b/kio/bookmarks/kbookmarkmenu.h @@ -76,7 +76,7 @@ namespace KIO { class Job; } * 1a) Reimplement your own KBookmarkOwner * 1b) Reimplement and instantiate your own KBookmarkManager */ -class KIO_EXPORT KBookmarkMenu : public QObject +class KIO_EXPORT KBookmarkMenu : public TQObject { Q_OBJECT friend class KBookmarkMenuNSImporter; @@ -162,7 +162,7 @@ signals: /** * @since 3.4 */ - void openBookmark( const TQString& url, Qt::ButtonState state ); + void openBookmark( const TQString& url, TQt::ButtonState state ); public slots: // public for bookmark bar void slotBookmarksChanged( const TQString & ); @@ -182,7 +182,7 @@ protected slots: /** * @ since 3.4 */ - void slotBookmarkSelected( KAction::ActivationReason reason, Qt::ButtonState state ); + void slotBookmarkSelected( KAction::ActivationReason reason, TQt::ButtonState state ); void slotAddBookmarksList(); void slotAddBookmark(); void slotNewFolder(); @@ -238,7 +238,7 @@ protected: /** * A class connected to KNSBookmarkImporter, to fill KActionMenus. */ -class KIO_EXPORT KBookmarkMenuNSImporter : public QObject +class KIO_EXPORT KBookmarkMenuNSImporter : public TQObject { Q_OBJECT public: diff --git a/kio/bookmarks/kbookmarkmenu_p.h b/kio/bookmarks/kbookmarkmenu_p.h index 9d979e505..4ea245b1a 100644 --- a/kio/bookmarks/kbookmarkmenu_p.h +++ b/kio/bookmarks/kbookmarkmenu_p.h @@ -165,7 +165,7 @@ private: TQString m_address; }; -class KBookmarkFolderTreeItem : public QListViewItem +class KBookmarkFolderTreeItem : public TQListViewItem { // make this an accessor friend class KBookmarkFolderTree; diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc index 6a5a1346c..a7e8c87c9 100644 --- a/kio/httpfilter/httpfilter.cc +++ b/kio/httpfilter/httpfilter.cc @@ -81,7 +81,7 @@ HTTPFilterMD5::HTTPFilterMD5() TQString HTTPFilterMD5::md5() { - return TQString::fromLatin1(context.base64Digest()); + return TQString::tqfromLatin1(context.base64Digest()); } void diff --git a/kio/httpfilter/httpfilter.h b/kio/httpfilter/httpfilter.h index 6d74a56ea..520a1c627 100644 --- a/kio/httpfilter/httpfilter.h +++ b/kio/httpfilter/httpfilter.h @@ -33,7 +33,7 @@ #include <tqobject.h> #include <kmdcodec.h> -class HTTPFilterBase : public QObject +class HTTPFilterBase : public TQObject { Q_OBJECT public: diff --git a/kio/kfile/config-kfile.h b/kio/kfile/config-kfile.h index 8715ed273..3c5b7c09b 100644 --- a/kio/kfile/config-kfile.h +++ b/kio/kfile/config-kfile.h @@ -3,7 +3,7 @@ const int kfile_area = 250; -#define DefaultViewStyle TQString::fromLatin1("SimpleView") +#define DefaultViewStyle TQString::tqfromLatin1("SimpleView") #define DefaultPannerPosition 40 #define DefaultMixDirsAndFiles false #define DefaultShowStatusLine false @@ -14,19 +14,19 @@ const int kfile_area = 250; #define DefaultRecentURLsNumber 15 #define DefaultDirectoryFollowing true #define DefaultAutoSelectExtChecked true -#define ConfigGroup TQString::fromLatin1("KFileDialog Settings") -#define RecentURLs TQString::fromLatin1("Recent URLs") -#define RecentFiles TQString::fromLatin1("Recent Files") -#define RecentURLsNumber TQString::fromLatin1("Maximum of recent URLs") -#define RecentFilesNumber TQString::fromLatin1("Maximum of recent files") -#define DialogWidth TQString::fromLatin1("Width (%1)") -#define DialogHeight TQString::fromLatin1("Height (%1)") -#define ConfigShowStatusLine TQString::fromLatin1("ShowStatusLine") -#define AutoDirectoryFollowing TQString::fromLatin1("Automatic directory following") -#define PathComboCompletionMode TQString::fromLatin1("PathCombo Completionmode") -#define LocationComboCompletionMode TQString::fromLatin1("LocationCombo Completionmode") -#define ShowSpeedbar TQString::fromLatin1("Show Speedbar") -#define ShowBookmarks TQString::fromLatin1("Show Bookmarks") -#define AutoSelectExtChecked TQString::fromLatin1("Automatically select filename extension") +#define ConfigGroup TQString::tqfromLatin1("KFileDialog Settings") +#define RecentURLs TQString::tqfromLatin1("Recent URLs") +#define RecentFiles TQString::tqfromLatin1("Recent Files") +#define RecentURLsNumber TQString::tqfromLatin1("Maximum of recent URLs") +#define RecentFilesNumber TQString::tqfromLatin1("Maximum of recent files") +#define DialogWidth TQString::tqfromLatin1("Width (%1)") +#define DialogHeight TQString::tqfromLatin1("Height (%1)") +#define ConfigShowStatusLine TQString::tqfromLatin1("ShowStatusLine") +#define AutoDirectoryFollowing TQString::tqfromLatin1("Automatic directory following") +#define PathComboCompletionMode TQString::tqfromLatin1("PathCombo Completionmode") +#define LocationComboCompletionMode TQString::tqfromLatin1("LocationCombo Completionmode") +#define ShowSpeedbar TQString::tqfromLatin1("Show Speedbar") +#define ShowBookmarks TQString::tqfromLatin1("Show Bookmarks") +#define AutoSelectExtChecked TQString::tqfromLatin1("Automatically select filename extension") #endif diff --git a/kio/kfile/images.h b/kio/kfile/images.h index f544e2f0a..62e42afeb 100644 --- a/kio/kfile/images.h +++ b/kio/kfile/images.h @@ -248,7 +248,7 @@ static struct EmbedImage { static const TQImage& qembed_findImage( const TQString& name ) { static TQDict<TQImage> dict; - TQImage* img = dict.find( name ); + TQImage* img = dict.tqfind( name ); if ( !img ) { for ( int i = 0; embed_image_vec[i].data; i++ ) { if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) { diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp index 7f253f8c5..0e58aee6e 100644 --- a/kio/kfile/kacleditwidget.cpp +++ b/kio/kfile/kacleditwidget.cpp @@ -85,7 +85,7 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name ) m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" ); connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) ); TQWidget *spacer = new TQWidget( vbox ); - spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); slotUpdateButtons(); } @@ -148,7 +148,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent, qualifier( _qualifier ), isPartial( false ) { m_pACLListView = dynamic_cast<KACLListView*>( parent ); - repaint(); + tqrepaint(); } @@ -192,7 +192,7 @@ TQString KACLListViewItem::key( int, bool ) const } void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { TQColorGroup mycg = cg; if ( isDefault ) { @@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) ); p->setFont( font ); } - KListViewItem::paintCell( p, mycg, column, width, alignment ); + KListViewItem::paintCell( p, mycg, column, width, tqalignment ); KACLListViewItem *below =0; if ( itemBelow() ) @@ -247,7 +247,7 @@ void KACLListViewItem::updatePermPixmaps() setPixmap( 4, TQPixmap() ); } -void KACLListViewItem::repaint() +void KACLListViewItem::tqrepaint() { int idx = 0; switch ( type ) @@ -495,17 +495,17 @@ void EditACLEntryDialog::slotUpdateAllowedUsersAndGroups() m_groupsCombo->clear(); if ( m_defaultCB && m_defaultCB->isChecked() ) { m_usersCombo->insertStringList( m_defaultUsers ); - if ( m_defaultUsers.find( oldUser ) != m_defaultUsers.end() ) + if ( m_defaultUsers.tqfind( oldUser ) != m_defaultUsers.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_defaultGroups ); - if ( m_defaultGroups.find( oldGroup ) != m_defaultGroups.end() ) + if ( m_defaultGroups.tqfind( oldGroup ) != m_defaultGroups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } else { m_usersCombo->insertStringList( m_users ); - if ( m_users.find( oldUser ) != m_users.end() ) + if ( m_users.tqfind( oldUser ) != m_users.end() ) m_usersCombo->setCurrentText( oldUser ); m_groupsCombo->insertStringList( m_groups ); - if ( m_groups.find( oldGroup ) != m_groups.end() ) + if ( m_groups.tqfind( oldGroup ) != m_groups.end() ) m_groupsCombo->setCurrentText( oldGroup ); } } @@ -527,7 +527,7 @@ void EditACLEntryDialog::slotOk() } if ( m_defaultCB ) m_item->isDefault = m_defaultCB->isChecked(); - m_item->repaint(); + m_item->tqrepaint(); KDialogBase::slotOk(); } @@ -582,14 +582,14 @@ KACLListView::KACLListView( TQWidget* parent, const char* name ) struct passwd *user = 0; setpwent(); while ( ( user = getpwent() ) != 0 ) { - m_allUsers << TQString::fromLatin1( user->pw_name ); + m_allUsers << TQString::tqfromLatin1( user->pw_name ); } endpwent(); struct group *gr = 0; setgrent(); while ( ( gr = getgrent() ) != 0 ) { - m_allGroups << TQString::fromLatin1( gr->gr_name ); + m_allGroups << TQString::tqfromLatin1( gr->gr_name ); } endgrent(); m_allUsers.sort(); @@ -1019,7 +1019,7 @@ void KACLListView::slotRemoveEntry() delete item; } else { item->value = 0; - item->repaint(); + item->tqrepaint(); } if ( !itemWasDefault ) calculateEffectiveRights(); @@ -1030,7 +1030,7 @@ void KACLListView::slotRemoveEntry() || item->type == Group || item->type == Others ) ) { item->value = 0; - item->repaint(); + item->tqrepaint(); } else { delete item; } diff --git a/kio/kfile/kacleditwidget.h b/kio/kfile/kacleditwidget.h index 70e7ab54f..e436f16e6 100644 --- a/kio/kfile/kacleditwidget.h +++ b/kio/kfile/kacleditwidget.h @@ -24,6 +24,10 @@ #include <config.h> #endif +#ifdef Q_MOC_RUN +#define USE_POSIX_ACL +#endif // Q_MOC_RUN + #ifdef USE_POSIX_ACL #include <klistview.h> @@ -34,9 +38,10 @@ class KACLListViewItem; class KACLListView; class TQPushButton; -class KACLEditWidget : QWidget +class KACLEditWidget : TQWidget { Q_OBJECT + TQ_OBJECT public: KACLEditWidget( TQWidget *parent = 0, const char *name = 0 ); KACL getACL() const; diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h index 8bd0292d3..9b4d9d48e 100644 --- a/kio/kfile/kacleditwidget_p.h +++ b/kio/kfile/kacleditwidget_p.h @@ -24,6 +24,10 @@ #include <config.h> #endif +#ifdef Q_MOC_RUN +#define USE_POSIX_ACL +#endif // Q_MOC_RUN + #ifdef USE_POSIX_ACL #include <klistview.h> #include <sys/acl.h> @@ -45,7 +49,8 @@ class TQCheckBox; */ class KACLListView : public KListView { -Q_OBJECT + Q_OBJECT + TQ_OBJECT friend class KACLListViewItem; public: enum Types @@ -129,6 +134,7 @@ private: class EditACLEntryDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: EditACLEntryDialog( KACLListView *listView, KACLListViewItem *item, const TQStringList &users, @@ -180,10 +186,10 @@ public: void togglePerm( acl_perm_t perm ); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); void updatePermPixmaps(); - void repaint(); + void tqrepaint(); KACLListView::EntryType type; unsigned short value; diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp index 6baf6d36f..41b4176fa 100644 --- a/kio/kfile/kcombiview.cpp +++ b/kio/kfile/kcombiview.cpp @@ -300,7 +300,7 @@ void KCombiView::slotSortingChanged( TQDir::SortSpec sorting ) KFileView *KCombiView::focusView( KFileView *preferred ) const { - TQWidget *w = focusWidget(); + TQWidget *w = tqfocusWidget(); KFileView *other = (right == preferred) ? left : right; return (preferred && w == preferred->widget()) ? preferred : other; } @@ -358,9 +358,9 @@ bool KCombiView::eventFilter( TQObject *o, TQEvent *e ) // only the focused view may have a selection if ( type == TQEvent::FocusIn ) { - if ( o == left ) + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(left) ) right->clearSelection(); - else if ( o == right->widget() ) + else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(right->widget()) ) left->clearSelection(); } diff --git a/kio/kfile/kcustommenueditor.cpp b/kio/kfile/kcustommenueditor.cpp index aec3c10f1..30513bbf3 100644 --- a/kio/kfile/kcustommenueditor.cpp +++ b/kio/kfile/kcustommenueditor.cpp @@ -35,7 +35,7 @@ #include "kcustommenueditor.h" -class KCustomMenuEditor::Item : public QListViewItem +class KCustomMenuEditor::Item : public TQListViewItem { public: Item(TQListView *parent, KService::Ptr service) @@ -94,11 +94,11 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) m_listView->addColumn(i18n("Menu")); m_listView->setFullWidth(true); m_listView->setSorting(-1); - KButtonBox *buttonBox = new KButtonBox(page, Vertical); - buttonBox->addButton(i18n("New..."), this, TQT_SLOT(slotNewItem())); - d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem())); - d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp())); - d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown())); + KButtonBox *buttonBox = new KButtonBox(page, Qt::Vertical); + buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem())); + d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem())); + d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp())); + d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveDown())); buttonBox->layout(); connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); refreshButton(); diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp index 6013b7c57..af3e25eec 100644 --- a/kio/kfile/kdiroperator.cpp +++ b/kio/kfile/kdiroperator.cpp @@ -111,13 +111,13 @@ KDirOperator::KDirOperator(const KURL& _url, TQString strPath = TQDir::currentDirPath(); strPath.append('/'); currUrl = KURL(); - currUrl.setProtocol(TQString::fromLatin1("file")); + currUrl.setProtocol(TQString::tqfromLatin1("file")); currUrl.setPath(strPath); } else { currUrl = _url; if ( currUrl.protocol().isEmpty() ) - currUrl.setProtocol(TQString::fromLatin1("file")); + currUrl.setProtocol(TQString::tqfromLatin1("file")); currUrl.addPath("/"); // make sure we have a trailing slash! } @@ -144,7 +144,7 @@ KDirOperator::KDirOperator(const KURL& _url, setupActions(); setupMenu(); - setFocusPolicy(TQWidget::WheelFocus); + setFocusPolicy(TQ_WheelFocus); } KDirOperator::~KDirOperator() @@ -414,7 +414,7 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory ) { url.addPath( *it ); exists = KIO::NetAccess::exists( url, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() ); + writeOk = !exists && KIO::NetAccess::mkdir( url, tqtopLevelWidget() ); } if ( exists ) // url was already existant @@ -484,7 +484,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items, if ( doIt ) { KIO::DeleteJob *job = KIO::del( urls, false, showProgress ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; } @@ -547,7 +547,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, if ( doIt ) { KIO::CopyJob *job = KIO::trash( urls, showProgress ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); job->setAutoErrorHandlingEnabled( true, parent ); return job; } @@ -555,12 +555,12 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items, return 0L; } -void KDirOperator::trashSelected(KAction::ActivationReason reason, Qt::ButtonState state) +void KDirOperator::trashSelected(KAction::ActivationReason reason, TQt::ButtonState state) { if ( !m_fileView ) return; - if ( reason == KAction::PopupMenuActivation && ( state & Qt::ShiftButton ) ) { + if ( reason == KAction::PopupMenuActivation && ( state & ShiftButton ) ) { deleteSelected(); return; } @@ -590,7 +590,7 @@ void KDirOperator::checkPath(const TQString &, bool /*takeFiles*/) // SLOT text = text.stripWhiteSpace(); // if the argument is no URL (the check is quite fragil) and it's // no absolute path, we add the current directory to get a correct url - if (text.find(':') < 0 && text[0] != '/') + if (text.tqfind(':') < 0 && text[0] != '/') text.insert(0, currUrl); // in case we have a selection defined and someone patched the file- @@ -651,7 +651,7 @@ void KDirOperator::setURL(const KURL& _newurl, bool clearforward) if ( !isReadable( newurl ) ) { // maybe newurl is a file? check its parent directory - newurl.cd(TQString::fromLatin1("..")); + newurl.cd(TQString::tqfromLatin1("..")); if ( !isReadable( newurl ) ) { resetCursor(); KMessageBox::error(viewWidget(), @@ -719,7 +719,7 @@ void KDirOperator::pathChanged() TQApplication::restoreOverrideCursor(); // when KIO::Job emits finished, the slot will restore the cursor - TQApplication::setOverrideCursor( waitCursor ); + TQApplication::setOverrideCursor( tqwaitCursor ); if ( !isReadable( currUrl )) { KMessageBox::error(viewWidget(), @@ -777,7 +777,7 @@ KURL KDirOperator::url() const void KDirOperator::cdUp() { KURL tmp(currUrl); - tmp.cd(TQString::fromLatin1("..")); + tmp.cd(TQString::tqfromLatin1("..")); setURL(tmp, true); } @@ -825,7 +825,7 @@ bool KDirOperator::checkPreviewInternal() const { TQStringList supported = KIO::PreviewJob::supportedMimeTypes(); // no preview support for directories? - if ( dirOnlyMode() && supported.findIndex( "inode/directory" ) == -1 ) + if ( dirOnlyMode() && supported.tqfindIndex( "inode/directory" ) == -1 ) return false; TQStringList mimeTypes = dir->mimeFilters(); @@ -1071,7 +1071,7 @@ void KDirOperator::connectView(KFileView *view) m_fileView->widget()->show(); if ( listDir ) { - TQApplication::setOverrideCursor( waitCursor ); + TQApplication::setOverrideCursor( tqwaitCursor ); openURL( currUrl ); } else @@ -1120,7 +1120,7 @@ void KDirOperator::setDirLister( KDirLister *lister ) dir->setAutoUpdate( true ); - TQWidget* mainWidget = topLevelWidget(); + TQWidget* mainWidget = tqtopLevelWidget(); dir->setMainWindow (mainWidget); kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl; @@ -1253,27 +1253,27 @@ void KDirOperator::slotCompletionMatch(const TQString& match) void KDirOperator::setupActions() { - myActionCollection = new KActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); + myActionCollection = new KActionCollection( tqtopLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" ); actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); - upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" ); + upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" ); upAction->setText( i18n("Parent Folder") ); - backAction = KStdAction::back( this, TQT_SLOT( back() ), myActionCollection, "back" ); - forwardAction = KStdAction::forward( this, TQT_SLOT(forward()), myActionCollection, "forward" ); - homeAction = KStdAction::home( this, TQT_SLOT( home() ), myActionCollection, "home" ); + backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" ); + forwardAction = KStdAction::forward( TQT_TQOBJECT(this), TQT_SLOT(forward()), myActionCollection, "forward" ); + homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" ); homeAction->setText(i18n("Home Folder")); - reloadAction = KStdAction::redisplay( this, TQT_SLOT(rereadDir()), myActionCollection, "reload" ); + reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" ); actionSeparator = new KActionSeparator( myActionCollection, "separator" ); d->viewActionSeparator = new KActionSeparator( myActionCollection, "viewActionSeparator" ); mkdirAction = new KAction( i18n("New Folder..."), 0, - this, TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); + TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); KAction* trash = new KAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), this, TQT_SLOT( trashSelected( KAction::ActivationReason, Qt::ButtonState ) ) ); - new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, this, + new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); - mkdirAction->setIcon( TQString::fromLatin1("folder_new") ); + mkdirAction->setIcon( TQString::tqfromLatin1("folder_new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload )); @@ -1281,19 +1281,19 @@ void KDirOperator::setupActions() // the sort menu actions sortActionMenu = new KActionMenu( i18n("Sorting"), myActionCollection, "sorting menu"); byNameAction = new KRadioAction( i18n("By Name"), 0, - this, TQT_SLOT( slotSortByName() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ), myActionCollection, "by name" ); byDateAction = new KRadioAction( i18n("By Date"), 0, - this, TQT_SLOT( slotSortByDate() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ), myActionCollection, "by date" ); bySizeAction = new KRadioAction( i18n("By Size"), 0, - this, TQT_SLOT( slotSortBySize() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ), myActionCollection, "by size" ); reverseAction = new KToggleAction( i18n("Reverse"), 0, - this, TQT_SLOT( slotSortReversed() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); - TQString sortGroup = TQString::fromLatin1("sort"); + TQString sortGroup = TQString::tqfromLatin1("sort"); byNameAction->setExclusiveGroup( sortGroup ); byDateAction->setExclusiveGroup( sortGroup ); bySizeAction->setExclusiveGroup( sortGroup ); @@ -1325,7 +1325,7 @@ void KDirOperator::setupActions() myActionCollection, "show hidden" ); // showHiddenAction->setCheckedState( i18n("Hide Hidden Files") ); separateDirsAction = new KToggleAction( i18n("Separate Folders"), KShortcut(), - this, + TQT_TQOBJECT(this), TQT_SLOT(slotSeparateDirs()), myActionCollection, "separate dirs" ); KToggleAction *previewAction = new KToggleAction(i18n("Show Preview"), @@ -1337,7 +1337,7 @@ void KDirOperator::setupActions() TQT_SLOT( togglePreview( bool ))); - TQString viewGroup = TQString::fromLatin1("view"); + TQString viewGroup = TQString::tqfromLatin1("view"); shortAction->setExclusiveGroup( viewGroup ); detailedAction->setExclusiveGroup( viewGroup ); @@ -1348,7 +1348,7 @@ void KDirOperator::setupActions() connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleHidden( bool ) )); - new KAction( i18n("Properties"), KShortcut(ALT+Key_Return), this, + new KAction( i18n("Properties"), KShortcut(ALT+Key_Return), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), myActionCollection, "properties" ); } @@ -1383,11 +1383,11 @@ void KDirOperator::setupMenu(int whichActions) if (whichActions & FileActions) { actionMenu->insert( mkdirAction ); - if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & Qt::ShiftButton)) + if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton)) actionMenu->insert( myActionCollection->action( "trash" ) ); KConfig *globalconfig = KGlobal::config(); - KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") ); - if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & Qt::ShiftButton) || + KConfigGroupSaver cs( globalconfig, TQString::tqfromLatin1("KDE") ); + if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) || globalconfig->readBoolEntry("ShowDeleteCommand", false)) actionMenu->insert( myActionCollection->action( "delete" ) ); actionMenu->insert( actionSeparator ); @@ -1450,45 +1450,45 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group ) defaultView = 0; int sorting = 0; - TQString viewStyle = kc->readEntry( TQString::fromLatin1("View Style"), - TQString::fromLatin1("Simple") ); - if ( viewStyle == TQString::fromLatin1("Detail") ) + TQString viewStyle = kc->readEntry( TQString::tqfromLatin1("View Style"), + TQString::tqfromLatin1("Simple") ); + if ( viewStyle == TQString::tqfromLatin1("Detail") ) defaultView |= KFile::Detail; else defaultView |= KFile::Simple; - if ( kc->readBoolEntry( TQString::fromLatin1("Separate Directories"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Separate Directories"), DefaultMixDirsAndFiles ) ) defaultView |= KFile::SeparateDirs; - if ( kc->readBoolEntry(TQString::fromLatin1("Show Preview"), false)) + if ( kc->readBoolEntry(TQString::tqfromLatin1("Show Preview"), false)) defaultView |= KFile::PreviewContents; - if ( kc->readBoolEntry( TQString::fromLatin1("Sort case insensitively"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort case insensitively"), DefaultCaseInsensitive ) ) sorting |= TQDir::IgnoreCase; - if ( kc->readBoolEntry( TQString::fromLatin1("Sort directories first"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort directories first"), DefaultDirsFirst ) ) sorting |= TQDir::DirsFirst; - TQString name = TQString::fromLatin1("Name"); - TQString sortBy = kc->readEntry( TQString::fromLatin1("Sort by"), name ); + TQString name = TQString::tqfromLatin1("Name"); + TQString sortBy = kc->readEntry( TQString::tqfromLatin1("Sort by"), name ); if ( sortBy == name ) sorting |= TQDir::Name; - else if ( sortBy == TQString::fromLatin1("Size") ) + else if ( sortBy == TQString::tqfromLatin1("Size") ) sorting |= TQDir::Size; - else if ( sortBy == TQString::fromLatin1("Date") ) + else if ( sortBy == TQString::tqfromLatin1("Date") ) sorting |= TQDir::Time; mySorting = static_cast<TQDir::SortSpec>( sorting ); setSorting( mySorting ); - if ( kc->readBoolEntry( TQString::fromLatin1("Show hidden files"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Show hidden files"), DefaultShowHidden ) ) { showHiddenAction->setChecked( true ); dir->setShowingDotFiles( true ); } - if ( kc->readBoolEntry( TQString::fromLatin1("Sort reversed"), + if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort reversed"), DefaultSortReversed ) ) reverseAction->setChecked( true ); @@ -1505,18 +1505,18 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group ) if ( !group.isEmpty() ) kc->setGroup( group ); - TQString sortBy = TQString::fromLatin1("Name"); + TQString sortBy = TQString::tqfromLatin1("Name"); if ( KFile::isSortBySize( mySorting ) ) - sortBy = TQString::fromLatin1("Size"); + sortBy = TQString::tqfromLatin1("Size"); else if ( KFile::isSortByDate( mySorting ) ) - sortBy = TQString::fromLatin1("Date"); - kc->writeEntry( TQString::fromLatin1("Sort by"), sortBy ); + sortBy = TQString::tqfromLatin1("Date"); + kc->writeEntry( TQString::tqfromLatin1("Sort by"), sortBy ); - kc->writeEntry( TQString::fromLatin1("Sort reversed"), + kc->writeEntry( TQString::tqfromLatin1("Sort reversed"), reverseAction->isChecked() ); - kc->writeEntry( TQString::fromLatin1("Sort case insensitively"), + kc->writeEntry( TQString::tqfromLatin1("Sort case insensitively"), caseInsensitiveAction->isChecked() ); - kc->writeEntry( TQString::fromLatin1("Sort directories first"), + kc->writeEntry( TQString::tqfromLatin1("Sort directories first"), dirsFirstAction->isChecked() ); // don't save the separate dirs or preview when an application specific @@ -1530,26 +1530,26 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group ) if ( !appSpecificPreview ) { if ( separateDirsAction->isEnabled() ) - kc->writeEntry( TQString::fromLatin1("Separate Directories"), + kc->writeEntry( TQString::tqfromLatin1("Separate Directories"), separateDirsAction->isChecked() ); KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview")); if ( previewAction->isEnabled() ) { bool hasPreview = previewAction->isChecked(); - kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview ); + kc->writeEntry( TQString::tqfromLatin1("Show Preview"), hasPreview ); } } - kc->writeEntry( TQString::fromLatin1("Show hidden files"), + kc->writeEntry( TQString::tqfromLatin1("Show hidden files"), showHiddenAction->isChecked() ); KFile::FileView fv = static_cast<KFile::FileView>( m_viewKind ); TQString style; if ( KFile::isDetailView( fv ) ) - style = TQString::fromLatin1("Detail"); + style = TQString::tqfromLatin1("Detail"); else if ( KFile::isSimpleView( fv ) ) - style = TQString::fromLatin1("Simple"); - kc->writeEntry( TQString::fromLatin1("View Style"), style ); + style = TQString::tqfromLatin1("Simple"); + kc->writeEntry( TQString::tqfromLatin1("View Style"), style ); kc->setGroup( oldGroup ); } diff --git a/kio/kfile/kdiroperator.h b/kio/kfile/kdiroperator.h index a2d318b96..85bcf9187 100644 --- a/kio/kfile/kdiroperator.h +++ b/kio/kfile/kdiroperator.h @@ -94,7 +94,7 @@ namespace KIO { * @short A widget for displaying files and browsing directories. * @author Stephan Kulow <coolo@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org> */ -class KIO_EXPORT KDirOperator : public QWidget +class KIO_EXPORT KDirOperator : public TQWidget { Q_OBJECT @@ -710,7 +710,7 @@ public slots: * @since 3.4 */ // ### KDE4: make virtual - void trashSelected(KAction::ActivationReason, Qt::ButtonState); + void trashSelected(KAction::ActivationReason, TQt::ButtonState); protected slots: /** diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index a361a8bde..1b546148e 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -122,11 +122,11 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQT_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - KAction* newFolder = new KAction( i18n("New Folder..."), "folder_new", 0, this, TQT_SLOT( slotMkdir() ), this); + KAction* newFolder = new KAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this)); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); - m_showHiddenFolders = new KToggleAction ( i18n( "Show Hidden Folders" ), 0, this, - TQT_SLOT( slotShowHiddenFoldersToggled() ), this); + m_showHiddenFolders = new KToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this), + TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this)); m_showHiddenFolders->plug(m_contextMenu); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); @@ -211,7 +211,7 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) { while ( pos > 0 ) { - pos = path.findRev( '/', pos -1 ); + pos = path.tqfindRev( '/', pos -1 ); if ( pos >= 0 ) { dirToList.setPath( path.left( pos +1 ) ); @@ -248,7 +248,7 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) { // scroll to make item the topmost item view()->ensureItemVisible( item ); - TQRect r = view()->itemRect( item ); + TQRect r = view()->tqitemRect( item ); if ( r.isValid() ) { int x, y; @@ -390,8 +390,8 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text ) if ( item ) { item->setSelected( false ); - // 2002/12/27, deselected item is not repainted, so force it - item->repaint(); + // 2002/12/27, deselected item is not tqrepainted, so force it + item->tqrepaint(); } } @@ -426,7 +426,7 @@ void KDirSelectDialog::slotMkdir() { folderurl.addPath( *it ); exists = KIO::NetAccess::exists( folderurl, false, 0 ); - writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() ); + writeOk = !exists && KIO::NetAccess::mkdir( folderurl, tqtopLevelWidget() ); } if ( exists ) // url was already existant diff --git a/kio/kfile/kdirsize.cpp b/kio/kfile/kdirsize.cpp index 3c9bfbb8c..86dfc756d 100644 --- a/kio/kfile/kdirsize.cpp +++ b/kio/kfile/kdirsize.cpp @@ -63,7 +63,7 @@ void KDirSize::processList() } kdDebug(kfile_area) << "KDirSize::processList finished" << endl; if ( !m_bAsync ) - qApp->exit_loop(); + tqApp->exit_loop(); emitResult(); } @@ -139,7 +139,7 @@ KIO::filesize_t KDirSize::dirSize( const KURL & directory ) { KDirSize * dirSize = dirSizeJob( directory ); dirSize->setSync(); - qApp->enter_loop(); + tqApp->enter_loop(); return dirSize->totalSize(); } @@ -155,7 +155,7 @@ void KDirSize::slotResult( KIO::Job * job ) else { if ( !m_bAsync ) - qApp->exit_loop(); + tqApp->exit_loop(); KIO::Job::slotResult( job ); } } diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp index 179b69f72..5fe26f696 100644 --- a/kio/kfile/kdiskfreesp.cpp +++ b/kio/kfile/kdiskfreesp.cpp @@ -100,7 +100,7 @@ void KDiskFreeSp::dfDone() TQTextStream t (dfStringErrOut, IO_ReadOnly); TQString s=t.readLine(); - if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("Filesystem") ) ) + if ( (s.isEmpty()) || ( s.left(10) != TQString::tqfromLatin1("Filesystem") ) ) kdError() << "Error running df command... got [" << s << "]" << endl; while ( !t.eof() ) { TQString u,v; @@ -109,7 +109,7 @@ void KDiskFreeSp::dfDone() if ( !s.isEmpty() ) { //kdDebug(kfile_area) << "GOT: [" << s << "]" << endl; - if (s.find(BLANK)<0) // devicename was too long, rest in next line + if (s.tqfind(BLANK)<0) // devicename was too long, rest in next line if ( !t.eof() ) { // just appends the next line v=t.readLine(); s=s.append(v); @@ -119,30 +119,30 @@ void KDiskFreeSp::dfDone() //kdDebug(kfile_area) << "[" << s << "]" << endl; - //TQString deviceName = s.left(s.find(BLANK)); - s=s.remove(0,s.find(BLANK)+1 ); + //TQString deviceName = s.left(s.tqfind(BLANK)); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " DeviceName: [" << deviceName << "]" << endl; if (!NO_FS_TYPE) - s=s.remove(0,s.find(BLANK)+1 ); // eat fs type + s=s.remove(0,s.tqfind(BLANK)+1 ); // eat fs type - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBSize = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Size: [" << kBSize << "]" << endl; - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBUsed = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Used: [" << kBUsed << "]" << endl; - u=s.left(s.find(BLANK)); + u=s.left(s.tqfind(BLANK)); unsigned long kBAvail = u.toULong(); - s=s.remove(0,s.find(BLANK)+1 ); + s=s.remove(0,s.tqfind(BLANK)+1 ); //kdDebug(kfile_area) << " Avail: [" << kBAvail << "]" << endl; - s=s.remove(0,s.find(BLANK)+1 ); // delete the capacity 94% + s=s.remove(0,s.tqfind(BLANK)+1 ); // delete the capacity 94% TQString mountPoint = s.stripWhiteSpace(); //kdDebug(kfile_area) << " MountPoint: [" << mountPoint << "]" << endl; diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h index 6a0591d6f..5fccfe3b0 100644 --- a/kio/kfile/kdiskfreesp.h +++ b/kio/kfile/kdiskfreesp.h @@ -37,7 +37,7 @@ class KProcess; * This class parses the output of "df" to find the disk usage * information for a given partition (mount point). */ -class KIO_EXPORT KDiskFreeSp : public QObject +class KIO_EXPORT KDiskFreeSp : public TQObject { Q_OBJECT public: KDiskFreeSp( TQObject *parent=0, const char *name=0 ); diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index 396006504..be5ca033b 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -54,7 +54,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin d->encoding->clear (); TQString sEncoding = encoding; if (sEncoding.isEmpty()) - sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); + sEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); int insert = 0; diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index 823714396..6643d5a4c 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -317,7 +317,7 @@ void KFileDetailView::updateView( const KFileItem *i ) item->init(); setSortingKey( item, i ); - //item->repaint(); // only repaints if visible + //item->tqrepaint(); // only tqrepaints if visible } void KFileDetailView::setSortingKey( KFileListViewItem *item, diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h index 937c8f56c..7e0baff83 100644 --- a/kio/kfile/kfiledetailview.h +++ b/kio/kfile/kfiledetailview.h @@ -78,7 +78,7 @@ public: TQRect rect() const { - TQRect r = listView()->itemRect(this); + TQRect r = listView()->tqitemRect(this); return TQRect( listView()->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 0c9364943..586b34d62 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -100,7 +100,7 @@ enum Buttons { HOTLIST_BUTTON, template class TQPtrList<KIO::StatJob>; namespace { - static void silenceQToolBar(QtMsgType, const char *) + static void silenceQToolBar(TQtMsgType, const char *) { } } @@ -204,7 +204,7 @@ void KFileDialog::setLocationLabel(const TQString& text) void KFileDialog::setFilter(const TQString& filter) { - int pos = filter.find('/'); + int pos = filter.tqfind('/'); // Check for an un-escaped '/', if found // interpret as a MIME filter. @@ -219,7 +219,7 @@ void KFileDialog::setFilter(const TQString& filter) // escaped '/' characters. TQString copy (filter); - for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos) + for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos) copy.remove(pos, 1); ops->clearFilter(); @@ -258,7 +258,7 @@ void KFileDialog::setMimeFilter( const TQStringList& mimeTypes, filterWidget->setMimeFilter( mimeTypes, defaultType ); TQStringList types = TQStringList::split(" ", filterWidget->currentFilter()); - types.append( TQString::fromLatin1( "inode/directory" )); + types.append( TQString::tqfromLatin1( "inode/directory" )); ops->clearFilter(); ops->setMimeFilter( types ); d->hasDefaultFilter = !defaultType.isEmpty(); @@ -357,7 +357,7 @@ void KFileDialog::slotOk() bool multi = (mode() & KFile::Files) != 0; KFileItemListIterator it( *items ); - TQString endQuote = TQString::fromLatin1("\" "); + TQString endQuote = TQString::tqfromLatin1("\" "); TQString name, files; while ( it.current() ) { name = (*it)->name(); @@ -402,7 +402,7 @@ void KFileDialog::slotOk() } } - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { // ### after message freeze, add message for directories! @@ -446,7 +446,7 @@ void KFileDialog::slotOk() return; } - KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(selectedURL,tqtopLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && !url.isLocalFile() ) { KMessageBox::sorry( d->mainWidget, @@ -555,7 +555,7 @@ void KFileDialog::slotOk() it != list.end(); ++it ) { job = KIO::stat( *it, !(*it).isLocalFile() ); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); KIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), @@ -565,7 +565,7 @@ void KFileDialog::slotOk() } job = KIO::stat(d->url,!d->url.isLocalFile()); - job->setWindow (topLevelWidget()); + job->setWindow (tqtopLevelWidget()); d->statJobs.append( job ); connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*))); } @@ -831,10 +831,10 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->autoSelectExtChecked = false; d->urlBar = 0; // delayed loading - QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); + TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true); toolbar->setFlat(true); - qInstallMsgHandler( oldHandler ); + tqInstallMsgHandler( oldHandler ); d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, toolbar, "path combo" ); @@ -934,7 +934,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleBookmarks( bool )) ); - KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", this, "extra menu" ); + KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " "Various options can be accessed from this menu including: <ul>" "<li>how files are sorted in the list</li>" @@ -965,7 +965,7 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge menu->plug( toolbar ); //Insert a separator. - KToolBarSeparator* spacerWidget = new KToolBarSeparator(Horizontal, false /*no line*/, + KToolBarSeparator* spacerWidget = new KToolBarSeparator(Qt::Horizontal, false /*no line*/, toolbar); d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget); toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo); @@ -1076,17 +1076,17 @@ void KFileDialog::initGUI() TQGridLayout* lafBox= new TQGridLayout(2, 3, KDialog::spacingHint()); - lafBox->addWidget(d->locationLabel, 0, 0, AlignVCenter); - lafBox->addWidget(locationEdit, 0, 1, AlignVCenter); - lafBox->addWidget(d->okButton, 0, 2, AlignVCenter); + lafBox->addWidget(d->locationLabel, 0, 0, Qt::AlignVCenter); + lafBox->addWidget(locationEdit, 0, 1, Qt::AlignVCenter); + lafBox->addWidget(d->okButton, 0, 2, Qt::AlignVCenter); - lafBox->addWidget(d->filterLabel, 1, 0, AlignVCenter); - lafBox->addWidget(filterWidget, 1, 1, AlignVCenter); - lafBox->addWidget(d->cancelButton, 1, 2, AlignVCenter); + lafBox->addWidget(d->filterLabel, 1, 0, Qt::AlignVCenter); + lafBox->addWidget(filterWidget, 1, 1, Qt::AlignVCenter); + lafBox->addWidget(d->cancelButton, 1, 2, Qt::AlignVCenter); lafBox->setColStretch(1, 4); - vbox->addLayout(lafBox, 0); + vbox->addLayout(TQT_TQLAYOUT(lafBox), 0); vbox->addSpacing(3); // add the Automatically Select Extension checkbox @@ -1133,7 +1133,7 @@ void KFileDialog::slotFilterChanged() TQString filter = filterWidget->currentFilter(); ops->clearFilter(); - if ( filter.find( '/' ) > -1 ) { + if ( filter.tqfind( '/' ) > -1 ) { TQStringList types = TQStringList::split( " ", filter ); types.prepend( "inode/directory" ); ops->setMimeFilter( types ); @@ -1250,7 +1250,7 @@ void KFileDialog::setSelection(const TQString& url) } else { TQString filename = u.url(); - int sep = filename.findRev('/'); + int sep = filename.tqfindRev('/'); if (sep >= 0) { // there is a / in it if ( KProtocolInfo::supportsListing( u )) { KURL dir(u); @@ -1335,7 +1335,7 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir, const TQString& filter, WId parent_id, const TQString& caption) { - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KFileDialog dlg(startDir, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) @@ -1474,7 +1474,7 @@ KURL::List& KFileDialog::parseSelectedURLs() const if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename static const TQString &prot = KGlobal::staticQString(":/"); KURL u; - if ( d->filenames.find( prot ) != -1 ) + if ( d->filenames.tqfind( prot ) != -1 ) u = d->filenames; else u.setPath( d->filenames ); @@ -1504,7 +1504,7 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const KURL u( ops->url() ); TQString name; - int count = line.contains( '"' ); + int count = line.tqcontains( '"' ); if ( count == 0 ) { // no " " -> assume one single file u.setFileName( line ); if ( u.isValid() ) @@ -1526,8 +1526,8 @@ KURL::List KFileDialog::tokenize( const TQString& line ) const int start = 0; int index1 = -1, index2 = -1; while ( true ) { - index1 = line.find( '"', start ); - index2 = line.find( '"', index1 + 1 ); + index1 = line.tqfind( '"', start ); + index2 = line.tqfind( '"', index1 + 1 ); if ( index1 < 0 ) break; @@ -1548,7 +1548,7 @@ TQString KFileDialog::selectedFile() const { if ( result() == TQDialog::Accepted ) { - KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget()); if (url.isLocalFile()) return url.path(); else { @@ -1570,7 +1570,7 @@ TQStringList KFileDialog::selectedFiles() const KURL::List urls = parseSelectedURLs(); TQValueListConstIterator<KURL> it = urls.begin(); while ( it != urls.end() ) { - url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget()); + url = KIO::NetAccess::mostLocalURL(*it,tqtopLevelWidget()); if ( url.isLocalFile() ) list.append( url.path() ); ++it; @@ -1617,7 +1617,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi const TQString& caption) { bool specialDir = dir.at(0) == ':'; - TQWidget* parent = TQWidget::find( parent_id ); + TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); #ifdef Q_WS_X11 if( parent == NULL && parent_id != 0 ) @@ -1737,8 +1737,8 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group ) d->autoSelectExtChecked = kc->readBoolEntry (AutoSelectExtChecked, DefaultAutoSelectExtChecked); updateAutoSelectExtension (); - int w1 = minimumSize().width(); - int w2 = toolbar->sizeHint().width() + 10; + int w1 = tqminimumSize().width(); + int w2 = toolbar->tqsizeHint().width() + 10; if (w1 < w2) setMinimumWidth(w2); @@ -1885,7 +1885,7 @@ static TQString getExtensionFromPatternList (const TQStringList &patternList) // *.JP? if ((*it).startsWith ("*.") && (*it).length () > 2 && - (*it).find ('*', 2) < 0 && (*it).find ('?', 2) < 0) + (*it).tqfind ('*', 2) < 0 && (*it).tqfind ('?', 2) < 0) { ret = (*it).mid (1); break; @@ -1937,7 +1937,7 @@ void KFileDialog::updateAutoSelectExtension (void) if (!filter.isEmpty ()) { // e.g. "*.cpp" - if (filter.find ('/') < 0) + if (filter.tqfind ('/') < 0) { d->extension = getExtensionFromPatternList (TQStringList::split (" ", filter)).lower (); kdDebug (kfile_area) << "\tsetFilter-style: pattern ext=\'" @@ -2056,10 +2056,10 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) KURL url = getCompleteURL (urlStr); kdDebug (kfile_area) << "updateLocationEditExtension (" << url << ")" << endl; - const int fileNameOffset = urlStr.findRev ('/') + 1; + const int fileNameOffset = urlStr.tqfindRev ('/') + 1; TQString fileName = urlStr.mid (fileNameOffset); - const int dot = fileName.findRev ('.'); + const int dot = fileName.tqfindRev ('.'); const int len = fileName.length (); if (dot > 0 && // has an extension already and it's not a hidden file // like ".hidden" (but we do accept ".hidden.ext") @@ -2068,7 +2068,7 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension) { // exists? KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + if (KIO::NetAccess::stat (url, t, tqtopLevelWidget())) { kdDebug (kfile_area) << "\tfile exists" << endl; @@ -2115,7 +2115,7 @@ void KFileDialog::updateFilter () KMimeType::Ptr mime = KMimeType::findByPath(urlStr, 0, true); if (mime && mime->name() != KMimeType::defaultMimeType()) { if (filterWidget->currentFilter() != mime->name() && - filterWidget->filters.findIndex(mime->name()) != -1) { + filterWidget->filters.tqfindIndex(mime->name()) != -1) { filterWidget->setCurrentFilter(mime->name()); } } @@ -2135,7 +2135,7 @@ void KFileDialog::appendExtension (KURL &url) kdDebug (kfile_area) << "appendExtension(" << url << ")" << endl; const int len = fileName.length (); - const int dot = fileName.findRev ('.'); + const int dot = fileName.tqfindRev ('.'); const bool suppressExtension = (dot == len - 1); const bool unspecifiedExtension = (dot <= 0); @@ -2146,7 +2146,7 @@ void KFileDialog::appendExtension (KURL &url) // exists? KIO::UDSEntry t; - if (KIO::NetAccess::stat (url, t, topLevelWidget())) + if (KIO::NetAccess::stat (url, t, tqtopLevelWidget())) { kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl; return; @@ -2265,7 +2265,7 @@ void KFileDialog::toggleBookmarks(bool show) connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), TQT_SLOT( enterURL( const TQString& ))); - toolbar->insertButton(TQString::fromLatin1("bookmark"), + toolbar->insertButton(TQString::tqfromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, i18n("Bookmarks"), 5); toolbar->getButton(HOTLIST_BUTTON)->setPopup(d->bookmarkHandler->menu(), @@ -2361,11 +2361,11 @@ void KFileDialog::setNonExtSelection() TQString pattern, filename = locationEdit->currentText().stripWhiteSpace(); KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 ) + if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.tqfind( '*' , 1 ) == -1 ) locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 ); else { - int lastDot = filename.findRev( '.' ); + int lastDot = filename.tqfindRev( '.' ); if ( lastDot > 0 ) locationEdit->lineEdit()->setSelection( 0, lastDot ); } diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp index c865cc0e1..771cc76b0 100644 --- a/kio/kfile/kfilefiltercombo.cpp +++ b/kio/kfile/kfilefiltercombo.cpp @@ -68,11 +68,11 @@ void KFileFilterCombo::setFilter(const TQString& filter) if (!filter.isEmpty()) { TQString tmp = filter; - int index = tmp.find('\n'); + int index = tmp.tqfind('\n'); while (index > 0) { filters.append(tmp.left(index)); tmp = tmp.mid(index + 1); - index = tmp.find('\n'); + index = tmp.tqfind('\n'); } filters.append(tmp); } @@ -82,7 +82,7 @@ void KFileFilterCombo::setFilter(const TQString& filter) TQStringList::ConstIterator it; TQStringList::ConstIterator end(filters.end()); for (it = filters.begin(); it != end; ++it) { - int tab = (*it).find('|'); + int tab = (*it).tqfind('|'); insertItem((tab < 0) ? *it : (*it).mid(tab + 1)); } @@ -101,7 +101,7 @@ TQString KFileFilterCombo::currentFilter() const } } - int tab = f.find('|'); + int tab = f.tqfind('|'); if (tab < 0) return f; else @@ -129,7 +129,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types, { clear(); filters.clear(); - TQString delim = TQString::fromLatin1(", "); + TQString delim = TQString::tqfromLatin1(", "); d->hasAllSupportedFiles = false; m_allTypes = defaultType.isEmpty() && (types.count() > 1); @@ -179,7 +179,7 @@ void KFileFilterCombo::slotFilterChanged() bool KFileFilterCombo::eventFilter( TQObject *o, TQEvent *e ) { - if ( o == lineEdit() && e->type() == TQEvent::FocusOut ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit()) && e->type() == TQEvent::FocusOut ) { if ( currentText() != d->lastFilter ) emit filterChanged(); } diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index a4c65924d..38bdec9b3 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -60,25 +60,25 @@ public: noArrangement = false; ignoreMaximumSize = false; - smallColumns = new KRadioAction( i18n("Small Icons"), 0, parent, + smallColumns = new KRadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent), TQT_SLOT( slotSmallColumns() ), parent->actionCollection(), "small columns" ); - largeRows = new KRadioAction( i18n("Large Icons"), 0, parent, + largeRows = new KRadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent), TQT_SLOT( slotLargeRows() ), parent->actionCollection(), "large rows" ); - smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode")); - largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode")); + smallColumns->setExclusiveGroup(TQString::tqfromLatin1("IconView mode")); + largeRows->setExclusiveGroup(TQString::tqfromLatin1("IconView mode")); previews = new KToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), "show previews" ); - zoomIn = KStdAction::zoomIn( parent, TQT_SLOT( zoomIn() ), + zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ), parent->actionCollection(), "zoomIn" ); - zoomOut = KStdAction::zoomOut( parent, TQT_SLOT( zoomOut() ), + zoomOut = KStdAction::zoomOut( TQT_TQOBJECT(parent), TQT_SLOT( zoomOut() ), parent->actionCollection(), "zoomOut" ); previews->setGroup("previews"); @@ -191,7 +191,7 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group ) { TQString gr = group.isEmpty() ? TQString("KFileIconView") : group; KConfigGroupSaver cs( kc, gr ); - TQString small = TQString::fromLatin1("SmallColumns"); + TQString small = TQString::tqfromLatin1("SmallColumns"); d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE ); d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) ); @@ -214,8 +214,8 @@ void KFileIconView::writeConfig( KConfig *kc, const TQString& group ) KConfigGroupSaver cs( kc, gr ); TQString viewMode = d->smallColumns->isChecked() ? - TQString::fromLatin1("SmallColumns") : - TQString::fromLatin1("LargeRows"); + TQString::tqfromLatin1("SmallColumns") : + TQString::tqfromLatin1("LargeRows"); if(!kc->hasDefault( "ViewMode" ) && viewMode == DEFAULT_VIEW_MODE ) kc->revertToDefault( "ViewMode" ); else @@ -251,12 +251,12 @@ void KFileIconView::showToolTip( TQIconViewItem *item ) int w = maxItemWidth() - ( itemTextPos() == TQIconView::Bottom ? 0 : item->pixmapRect().width() ) - 4; if ( fontMetrics().width( item->text() ) >= w ) { - toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(item->text()), 0, + toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").arg(item->text()), 0, "myToolTip", - WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ); + (WFlags)(WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM) ); toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box ); toolTip->setLineWidth( 1 ); - toolTip->setAlignment( AlignLeft | AlignTop ); + toolTip->tqsetAlignment( AlignLeft | AlignTop ); toolTip->move( TQCursor::pos() + TQPoint( 14, 14 ) ); toolTip->adjustSize(); TQRect screen = TQApplication::desktop()->screenGeometry( @@ -268,7 +268,7 @@ void KFileIconView::showToolTip( TQIconViewItem *item ) toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y()); } toolTip->setFont( TQToolTip::font() ); - toolTip->setPalette( TQToolTip::palette(), true ); + toolTip->tqsetPalette( TQToolTip::palette(), true ); toolTip->show(); } } @@ -338,7 +338,7 @@ void KFileIconView::insertItem( KFileItem *i ) KFileView::insertItem( i ); TQIconView* qview = static_cast<TQIconView*>( this ); - // Since creating and initializing an item leads to a repaint, + // Since creating and initializing an item leads to a tqrepaint, // we disable updates on the IconView for a while. qview->setUpdatesEnabled( false ); KFileIconViewItem *item = new KFileIconViewItem( qview, i ); @@ -450,7 +450,7 @@ void KFileIconView::updateView( bool b ) if ( !item->pixmapSize().isNull() ) item->setPixmapSize( TQSize( 0, 0 ) ); } - // recalculate item parameters but avoid an in-place repaint + // recalculate item parameters but avoid an in-place tqrepaint item->setPixmap( (item->fileInfo())->pixmap( myIconSize ), true, false ); item = static_cast<KFileIconViewItem *>(item->nextItem()); } while ( item != 0L ); @@ -736,7 +736,7 @@ void KFileIconView::listingCompleted() // need to remove our tooltip, eventually bool KFileIconView::eventFilter( TQObject *o, TQEvent *e ) { - if ( o == viewport() || o == this ) { + if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { int type = e->type(); if ( type == TQEvent::Leave || type == TQEvent::FocusOut ) @@ -763,7 +763,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i, if ( updateTextAndPixmap ) { - // this causes a repaint of the item, which we want to avoid during + // this causes a tqrepaint of the item, which we want to avoid during // directory listing, when all items are created. We want to paint all // items at once, not every single item in that case. item->setText( i->text() , false, false ); @@ -866,7 +866,7 @@ void KFileIconView::contentsDragEnterEvent( TQDragEnterEvent *e ) if ((dropOptions() & AutoOpenDirs) == 0) return; - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); if ( item ) { // are we over an item ? d->dropItem = item; d->autoOpenTimer.start( autoOpenDelay() ); // restart timer @@ -889,7 +889,7 @@ void KFileIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) if ((dropOptions() & AutoOpenDirs) == 0) return; - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); if ( item ) { // are we over an item ? if (d->dropItem != item) { @@ -921,7 +921,7 @@ void KFileIconView::contentsDropEvent( TQDropEvent *e ) } e->acceptAction(); // Yes - KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(findItem( contentsToViewport( e->pos() ) )); + KFileIconViewItem *item = dynamic_cast<KFileIconViewItem*>(tqfindItem( contentsToViewport( e->pos() ) )); KFileItem * fileItem = 0; if (item) fileItem = item->fileInfo(); diff --git a/kio/kfile/kfilemetainfowidget.cpp b/kio/kfile/kfilemetainfowidget.cpp index c9328f026..4b8adefc3 100644 --- a/kio/kfile/kfilemetainfowidget.cpp +++ b/kio/kfile/kfilemetainfowidget.cpp @@ -272,7 +272,7 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() TQWidget* KFileMetaInfoWidget::makeDateWidget() { - TQWidget *e = new QDateEdit(m_item.value().toDate(), this); + TQWidget *e = new TQDateEdit(m_item.value().toDate(), this); connect(e, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotDateChanged(const TQDate&))); return e; @@ -280,12 +280,12 @@ TQWidget* KFileMetaInfoWidget::makeDateWidget() TQWidget* KFileMetaInfoWidget::makeTimeWidget() { - return new QTimeEdit(m_item.value().toTime(), this); + return new TQTimeEdit(m_item.value().toTime(), this); } TQWidget* KFileMetaInfoWidget::makeDateTimeWidget() { - return new QDateTimeEdit(m_item.value().toDateTime(), this); + return new TQDateTimeEdit(m_item.value().toDateTime(), this); } void KFileMetaInfoWidget::reparentValidator( TQWidget *widget, diff --git a/kio/kfile/kfilemetainfowidget.h b/kio/kfile/kfilemetainfowidget.h index c22936b5e..96614950b 100644 --- a/kio/kfile/kfilemetainfowidget.h +++ b/kio/kfile/kfilemetainfowidget.h @@ -27,7 +27,7 @@ /*! * A widget to display file meta infos (like id3 for mp3) */ -class KIO_EXPORT KFileMetaInfoWidget: public QWidget +class KIO_EXPORT KFileMetaInfoWidget: public TQWidget { Q_OBJECT public: diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp index 1be7743a1..676549a29 100644 --- a/kio/kfile/kfilemetapreview.cpp +++ b/kio/kfile/kfilemetapreview.cpp @@ -43,7 +43,7 @@ void KFileMetaPreview::initPreviewProviders() KImageFilePreview *imagePreview = new KImageFilePreview( m_stack ); (void) m_stack->addWidget( imagePreview ); m_stack->raiseWidget( imagePreview ); - resize( imagePreview->sizeHint() ); + resize( imagePreview->tqsizeHint() ); TQStringList mimeTypes = imagePreview->supportedMimeTypes(); TQStringList::ConstIterator it = mimeTypes.begin(); @@ -62,7 +62,7 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT if ( mimeType == "inode/directory" ) return 0L; - KPreviewWidgetBase *provider = m_previewProviders.find( mimeType ); + KPreviewWidgetBase *provider = m_previewProviders.tqfind( mimeType ); if ( provider ) return provider; @@ -87,15 +87,15 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT } // with the new mimetypes from the audio-preview, try again - provider = m_previewProviders.find( mimeType ); + provider = m_previewProviders.tqfind( mimeType ); if ( provider ) return provider; // ### mimetype may be image/* for example, try that - int index = mimeType.find( '/' ); + int index = mimeType.tqfind( '/' ); if ( index > 0 ) { - provider = m_previewProviders.find( mimeType.left( index + 1 ) + "*" ); + provider = m_previewProviders.tqfind( mimeType.left( index + 1 ) + "*" ); if ( provider ) return provider; } @@ -107,7 +107,7 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT TQString parentMimeType = mimeInfo->parentMimeType(); while ( !parentMimeType.isEmpty() ) { - provider = m_previewProviders.find( parentMimeType ); + provider = m_previewProviders.tqfind( parentMimeType ); if ( provider ) return provider; @@ -123,11 +123,11 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT { if ( textProperty.toBool() ) { - provider = m_previewProviders.find( "text/plain" ); + provider = m_previewProviders.tqfind( "text/plain" ); if ( provider ) return provider; - provider = m_previewProviders.find( "text/*" ); + provider = m_previewProviders.tqfind( "text/*" ); if ( provider ) return provider; } @@ -188,7 +188,7 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent ) return 0L; } - return dynamic_cast<KPreviewWidgetBase*>( factory->create( parent, "kfileaudiopreview" )); + return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "kfileaudiopreview" )); } void KFileMetaPreview::virtual_hook( int, void* ) {} diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index b221a1ebb..c0f73949e 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -53,7 +53,7 @@ KFilePreview::~KFilePreview() // don't delete the preview, we can reuse it // (it will get deleted by ~KDirOperator) - if ( preview && preview->parentWidget() == this ) { + if ( preview && preview->tqparentWidget() == this ) { preview->reparent(0L, 0, TQPoint(0, 0), false); } } @@ -68,9 +68,9 @@ void KFilePreview::init( KFileView *view ) preview = new TQWidget((TQSplitter*)this, "preview"); TQString tmp = i18n("No preview available."); TQLabel *l = new TQLabel(tmp, preview); - l->setMinimumSize(l->sizeHint()); + l->setMinimumSize(l->tqsizeHint()); l->move(10, 5); - preview->setMinimumWidth(l->sizeHint().width()+20); + preview->setMinimumWidth(l->tqsizeHint().width()+20); setResizeMode(preview, TQSplitter::KeepSize); // Why copy the actions? --ellis, 13 Jan 02. @@ -123,7 +123,7 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &) delete preview; preview = const_cast<TQWidget*>(w); preview->reparent((TQSplitter*)this, 0, TQPoint(0, 0), true); - preview->resize(preview->sizeHint()); + preview->resize(preview->tqsizeHint()); preview->show(); } @@ -149,7 +149,7 @@ void KFilePreview::updateView(bool b) { left->updateView(b); if(preview) - preview->repaint(b); + preview->tqrepaint(b); } void KFilePreview::updateView(const KFileItem *i) diff --git a/kio/kfile/kfilesharedlg.cpp b/kio/kfile/kfilesharedlg.cpp index 329bd19dc..c396a1b58 100644 --- a/kio/kfile/kfilesharedlg.cpp +++ b/kio/kfile/kfilesharedlg.cpp @@ -184,13 +184,13 @@ void KFileSharePropsPlugin::init() // Some help text TQLabel *label = new TQLabel( i18n("Sharing this folder makes it available under Linux/UNIX (NFS) and Windows (Samba).") , m_widget ); - label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak ); vbox->addWidget( label, 0 ); KSeparator* sep=new KSeparator(m_widget); vbox->addWidget( sep, 0 ); label = new TQLabel( i18n("You can also reconfigure file sharing authorization.") , m_widget ); - label->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak ); vbox->addWidget( label, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); diff --git a/kio/kfile/kfilespeedbar.cpp b/kio/kfile/kfilespeedbar.cpp index 154009625..c3449ca9b 100644 --- a/kio/kfile/kfilespeedbar.cpp +++ b/kio/kfile/kfilespeedbar.cpp @@ -133,15 +133,15 @@ void KFileSpeedBar::save( KConfig *config ) writeConfig( config, "KFileDialog Speedbar" ); } -TQSize KFileSpeedBar::sizeHint() const +TQSize KFileSpeedBar::tqsizeHint() const { - TQSize sizeHint = KURLBar::sizeHint(); + TQSize tqsizeHint = KURLBar::tqsizeHint(); int ems = fontMetrics().width("mmmmmmmmmmmm"); - if (sizeHint.width() < ems) + if (tqsizeHint.width() < ems) { - sizeHint.setWidth(ems); + tqsizeHint.setWidth(ems); } - return sizeHint; + return tqsizeHint; } #include "kfilespeedbar.moc" diff --git a/kio/kfile/kfilespeedbar.h b/kio/kfile/kfilespeedbar.h index 28c621651..171081101 100644 --- a/kio/kfile/kfilespeedbar.h +++ b/kio/kfile/kfilespeedbar.h @@ -31,7 +31,7 @@ public: ~KFileSpeedBar(); virtual void save( KConfig *config ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private: bool m_initializeSpeedbar : 1; diff --git a/kio/kfile/kfiletreebranch.cpp b/kio/kfile/kfiletreebranch.cpp index 352bd875e..4f7539490 100644 --- a/kio/kfile/kfiletreebranch.cpp +++ b/kio/kfile/kfiletreebranch.cpp @@ -182,7 +182,7 @@ void KFileTreeBranch::addItems( const KFileItemList& list ) if( !m_showExtensions && !currItem->isDir() ) /* Need to cut the extension */ { TQString name = currItem->text(); - int mPoint = name.findRev( '.' ); + int mPoint = name.tqfindRev( '.' ); if( mPoint > 0 ) name = name.left( mPoint ); newKFTVI->setText( 0, name ); diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp index e8451077d..14a365392 100644 --- a/kio/kfile/kfiletreeview.cpp +++ b/kio/kfile/kfiletreeview.cpp @@ -342,7 +342,7 @@ void KFileTreeView::slotAutoOpenFolder() return; m_dropItem->setOpen( true ); - m_dropItem->repaint(); + m_dropItem->tqrepaint(); } @@ -413,7 +413,7 @@ KFileTreeBranchList& KFileTreeView::branches() bool KFileTreeView::removeBranch( KFileTreeBranch *branch ) { - if(m_branches.contains(branch)) + if(m_branches.tqcontains(branch)) { delete (branch->root()); m_branches.remove( branch ); @@ -522,7 +522,7 @@ void KFileTreeView::slotAnimation() } uint & iconNumber = it.data().iconNumber; - TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); + TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); // kdDebug(250) << "Loading icon " << icon << endl; item->setPixmap( 0, DesktopIcon( icon,KIcon::SizeSmall,KIcon::ActiveState )); // KFileTreeViewFactory::instance() ) ); @@ -558,7 +558,7 @@ void KFileTreeView::stopAnimation( KFileTreeViewItem * item ) kdDebug(250) << "Stoping Animation !" << endl; - MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item); + MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item); if ( it != m_mapCurrentOpeningFolders.end() ) { if( item->isDir() && isOpen( item) ) @@ -666,7 +666,7 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & ) if ( item ) { TQString text = static_cast<KFileViewItem*>( item )->toolTipText(); if ( !text.isEmpty() ) - tip ( m_view->itemRect( item ), text ); + tip ( m_view->tqitemRect( item ), text ); } #endif } diff --git a/kio/kfile/kfiletreeview.h b/kio/kfile/kfiletreeview.h index 92565269d..fb242b2c6 100644 --- a/kio/kfile/kfiletreeview.h +++ b/kio/kfile/kfiletreeview.h @@ -37,7 +37,7 @@ class TQTimer; -class KIO_EXPORT KFileTreeViewToolTip : public QToolTip +class KIO_EXPORT KFileTreeViewToolTip : public TQToolTip { public: KFileTreeViewToolTip( TQListView *view ) : TQToolTip( view ), m_view( view ) {} diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index 165801652..eb12a9498 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -258,7 +258,7 @@ sort_by_name: void KFileView::updateView(bool f) { - widget()->repaint(f); + widget()->tqrepaint(f); } void KFileView::updateView(const KFileItem *) diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index 05b32e863..1a13e264e 100644 --- a/kio/kfile/kfileview.h +++ b/kio/kfile/kfileview.h @@ -34,7 +34,7 @@ class KActionCollection; * internal class to make easier to use signals possible * @internal **/ -class KIO_EXPORT KFileViewSignaler : public QObject +class KIO_EXPORT KFileViewSignaler : public TQObject { Q_OBJECT @@ -146,11 +146,11 @@ public: virtual void clear(); /** - * does a repaint of the view. + * does a tqrepaint of the view. * * The default implementation calls * \code - * widget()->repaint(f) + * widget()->tqrepaint(f) * \endcode **/ virtual void updateView(bool f = true); diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index 164abd35a..2b1b68d68 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -60,7 +60,7 @@ class KIconCanvas::KIconCanvasPrivate /** * Helper class for sorting icon paths by icon name */ -class IconPath : public QString +class IconPath : public TQString { protected: TQString m_iconName; @@ -68,7 +68,7 @@ protected: public: IconPath(const TQString &ip) : TQString (ip) { - int n = findRev('/'); + int n = tqfindRev('/'); m_iconName = (n==-1) ? static_cast<TQString>(*this) : mid(n+1); } @@ -119,7 +119,7 @@ void KIconCanvas::loadFiles(const TQStringList& files) void KIconCanvas::slotLoadFiles() { setResizeMode(Fixed); - TQApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(tqwaitCursor); // disable updates to not trigger paint events when adding child items setUpdatesEnabled( false ); @@ -136,8 +136,8 @@ void KIconCanvas::slotLoadFiles() for (it=mFiles.begin(), i=0; it!=end; ++it, i++) { // Calling kapp->processEvents() makes the iconview flicker like hell - // (it's being repainted once for every new item), so we don't do this. - // Instead, we directly repaint the progress bar without going through + // (it's being tqrepainted once for every new item), so we don't do this. + // Instead, we directly tqrepaint the progress bar without going through // the event-loop. We do that just once for every 10th item so that // the progress bar doesn't flicker in turn. (pfeiffer) if ( emitProgress >= 10 ) { @@ -259,7 +259,7 @@ void KIconDialog::init() mGroupOrSize = KIcon::Desktop; mContext = KIcon::Any; mType = 0; - mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); + mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::tqfromLatin1("*.png")); TQWidget *main = new TQWidget( this ); setMainWidget(main); @@ -367,7 +367,7 @@ void KIconDialog::init() mContextMap[ mNumContext++ ] = context_id[ i ]; } } - mpCombo->setFixedSize(mpCombo->sizeHint()); + mpCombo->setFixedSize(mpCombo->tqsizeHint()); mpBrowseBut->setFixedWidth(mpCombo->width()); @@ -631,8 +631,8 @@ void KIconDialog::slotProgress(int p) { mpProgress->setProgress(p); // commented out the following since setProgress already paints ther - // progress bar. ->repaint() only makes it flicker - //mpProgress->repaint(); + // progress bar. ->tqrepaint() only makes it flicker + //mpProgress->tqrepaint(); } void KIconDialog::slotFinished() diff --git a/kio/kfile/kicondialog.h b/kio/kfile/kicondialog.h index 54b9ea921..e15b76884 100644 --- a/kio/kfile/kicondialog.h +++ b/kio/kfile/kicondialog.h @@ -254,7 +254,7 @@ private: * @see KIconDialog * @short A push button that allows selection of an icon. */ -class KIO_EXPORT KIconButton: public QPushButton +class KIO_EXPORT KIconButton: public TQPushButton { Q_OBJECT Q_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon ) diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp index 2d9f7881a..f2869314c 100644 --- a/kio/kfile/kimagefilepreview.cpp +++ b/kio/kfile/kimagefilepreview.cpp @@ -43,8 +43,8 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) imageLabel = new TQLabel( this ); imageLabel->setFrameStyle( TQFrame::NoFrame ); - imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); - imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); + imageLabel->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter ); + imageLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); vb->addWidget( imageLabel ); TQHBoxLayout *hb = new TQHBoxLayout( 0 ); @@ -137,7 +137,7 @@ void KImageFilePreview::resizeEvent( TQResizeEvent * ) timer->start( 100, true ); // forces a new preview } -TQSize KImageFilePreview::sizeHint() const +TQSize KImageFilePreview::tqsizeHint() const { return TQSize( 20, 200 ); // otherwise it ends up huge??? } diff --git a/kio/kfile/kimagefilepreview.h b/kio/kfile/kimagefilepreview.h index 864fc5d31..3e64f2a7b 100644 --- a/kio/kfile/kimagefilepreview.h +++ b/kio/kfile/kimagefilepreview.h @@ -36,7 +36,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase KImageFilePreview(TQWidget *parent); ~KImageFilePreview(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: virtual void showPreview(const KURL &url); diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp index 281fbc622..d3d3f7c41 100644 --- a/kio/kfile/kmetaprops.cpp +++ b/kio/kfile/kmetaprops.cpp @@ -38,7 +38,7 @@ #undef Bool -class MetaPropsScrollView : public QScrollView +class MetaPropsScrollView : public TQScrollView { public: MetaPropsScrollView(TQWidget* parent = 0, const char* name = 0) @@ -56,8 +56,8 @@ protected: virtual void viewportResizeEvent(TQResizeEvent* ev) { TQScrollView::viewportResizeEvent(ev); - m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()), - kMax(m_frame->sizeHint().height(), ev->size().height())); + m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()), + kMax(m_frame->tqsizeHint().height(), ev->size().height())); }; private: @@ -179,7 +179,7 @@ void KFileMetaPropsPlugin::createLayout() iit!=editItems.end(); ++iit) { TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox); - l->setAlignment( AlignAuto | AlignTop | ExpandTabs ); + l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); TQValidator* val = mtinfo->createValidator(*git, (*iit).key()); if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl; w = new KFileMetaInfoWidget(*iit, val, groupBox); @@ -192,7 +192,7 @@ void KFileMetaPropsPlugin::createLayout() iit!=readItems.end(); ++iit) { TQLabel* l = new TQLabel((*iit).translatedKey() + ":", groupBox); - l->setAlignment( AlignAuto | AlignTop | ExpandTabs ); + l->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); (new KFileMetaInfoWidget(*iit, KFileMetaInfoWidget::ReadOnly, 0L, groupBox)); } } @@ -201,7 +201,7 @@ void KFileMetaPropsPlugin::createLayout() // the add key (disabled until fully implemented) /* d->m_add = new TQPushButton(i18n("&Add"), topframe); - d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + d->m_add->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); tmp->addWidget(d->m_add); @@ -216,7 +216,7 @@ void KFileMetaPropsPlugin::createLayout() d->m_add->setEnabled(false); for (TQStringList::Iterator it = sk.begin(); it!=sk.end(); ++it) { - if ( l.find(*it)==l.end() ) + if ( l.tqfind(*it)==l.end() ) { d->m_add->setEnabled(true); kdDebug(250) << "**first addable key is " << (*it).latin1() << "**" <<endl; diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index 9e370643f..47461dbce 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -112,7 +112,7 @@ namespace KNotify }; // Needed for displaying tooltips in the listview's QHeader - class KNotifyToolTip : public QToolTip + class KNotifyToolTip : public TQToolTip { public: KNotifyToolTip( TQHeader *header ) @@ -130,10 +130,10 @@ namespace KNotify protected: virtual void maybeTip ( const TQPoint& p ) { - TQHeader *header = static_cast<TQHeader*>( parentWidget() ); + TQHeader *header = static_cast<TQHeader*>( tqparentWidget() ); int section = 0; - if ( header->orientation() == Horizontal ) + if ( header->orientation() == Qt::Horizontal ) section= header->sectionAt( p.x() ); else section= header->sectionAt( p.y() ); @@ -181,7 +181,7 @@ KNotifyDialog::~KNotifyDialog() void KNotifyDialog::addApplicationEvents( const char *appName ) { addApplicationEvents( TQString::fromUtf8( appName ) + - TQString::fromLatin1( "/eventsrc" ) ); + TQString::tqfromLatin1( "/eventsrc" ) ); } void KNotifyDialog::addApplicationEvents( const TQString& path ) @@ -514,7 +514,7 @@ void KNotifyWidget::updatePixmaps( ListViewItem *item ) void KNotifyWidget::addVisibleApp( Application *app ) { - if ( !app || (m_visibleApps.findRef( app ) != -1) ) + if ( !app || (m_visibleApps.tqfindRef( app ) != -1) ) return; m_visibleApps.append( app ); @@ -820,7 +820,7 @@ void KNotifyWidget::save() { if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("knotify", "", "reconfigure()", ""); + kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); } emit changed( false ); @@ -830,8 +830,8 @@ void KNotifyWidget::save() // "/opt/kde3/share/apps/kwin/eventsrc" TQString KNotifyWidget::makeRelative( const TQString& fullPath ) { - int slash = fullPath.findRev( '/' ) - 1; - slash = fullPath.findRev( '/', slash ); + int slash = fullPath.tqfindRev( '/' ) - 1; + slash = fullPath.tqfindRev( '/', slash ); if ( slash < 0 ) return TQString::null; @@ -1001,17 +1001,17 @@ void KNotifyWidget::enableAll( int what, bool enable ) Application::Application( const TQString &path ) { TQString config_file = path; - config_file[config_file.find('/')] = '.'; + config_file[config_file.tqfind('/')] = '.'; m_events = 0L; config = new KConfig(config_file, false, false); kc = new KConfig(path, true, false, "data"); - kc->setGroup( TQString::fromLatin1("!Global!") ); - m_icon = kc->readEntry(TQString::fromLatin1("IconName"), - TQString::fromLatin1("misc")); - m_description = kc->readEntry( TQString::fromLatin1("Comment"), + kc->setGroup( TQString::tqfromLatin1("!Global!") ); + m_icon = kc->readEntry(TQString::tqfromLatin1("IconName"), + TQString::tqfromLatin1("misc")); + m_description = kc->readEntry( TQString::tqfromLatin1("Comment"), i18n("No description available") ); - int index = path.find( '/' ); + int index = path.tqfind( '/' ); if ( index >= 0 ) m_appname = path.left( index ); else @@ -1070,10 +1070,10 @@ void Application::reloadEvents( bool revertToDefaults ) Event *e = 0L; - TQString global = TQString::fromLatin1("!Global!"); - TQString default_group = TQString::fromLatin1("<default>"); - TQString name = TQString::fromLatin1("Name"); - TQString comment = TQString::fromLatin1("Comment"); + TQString global = TQString::tqfromLatin1("!Global!"); + TQString default_group = TQString::tqfromLatin1("<default>"); + TQString name = TQString::tqfromLatin1("Name"); + TQString comment = TQString::tqfromLatin1("Comment"); TQStringList conflist = kc->groupList(); TQStringList::ConstIterator it = conflist.begin(); diff --git a/kio/kfile/knotifydialog.h b/kio/kfile/knotifydialog.h index 70e195aba..337f4d1be 100644 --- a/kio/kfile/knotifydialog.h +++ b/kio/kfile/knotifydialog.h @@ -323,7 +323,7 @@ namespace KNotify /** * @internal */ - class ListViewItem : public QListViewItem + class ListViewItem : public TQListViewItem { public: ListViewItem( TQListView *view, Event *event ); diff --git a/kio/kfile/knotifywidgetbase.ui b/kio/kfile/knotifywidgetbase.ui index 99fd07582..c2ce7ab68 100644 --- a/kio/kfile/knotifywidgetbase.ui +++ b/kio/kfile/knotifywidgetbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KNotifyWidgetBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KNotifyWidgetBase</cstring> </property> @@ -109,7 +109,7 @@ </sizepolicy> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_controlsBox</cstring> </property> @@ -120,7 +120,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>m_affectAllApps</cstring> </property> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -155,14 +155,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>318</width> <height>16</height> </size> </property> </spacer> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>m_buttonDisable</cstring> </property> @@ -173,7 +173,7 @@ <string>Allows you to change the behavior for all events at once</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_buttonEnable</cstring> </property> @@ -196,7 +196,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_actionsBox</cstring> </property> @@ -207,7 +207,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_stderr</cstring> </property> @@ -215,7 +215,7 @@ <string>Print a message to standard &error output</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_messageBox</cstring> </property> @@ -223,7 +223,7 @@ <string>Show a &message in a pop-up window</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_execute</cstring> </property> @@ -231,7 +231,7 @@ <string>E&xecute a program:</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout25</cstring> </property> @@ -239,7 +239,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_playSound</cstring> </property> @@ -247,7 +247,7 @@ <string>Play a &sound:</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_playButton</cstring> </property> @@ -260,7 +260,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_taskbar</cstring> </property> @@ -268,7 +268,7 @@ <string>Mark &taskbar entry</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_logToFile</cstring> </property> @@ -286,7 +286,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -341,7 +341,7 @@ </sizepolicy> </property> </widget> - <widget class="QCheckBox" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>m_passivePopup</cstring> </property> @@ -354,7 +354,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -362,7 +362,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_extension</cstring> </property> @@ -391,14 +391,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_playerButton</cstring> </property> diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp index 2a3e7e690..8d79dadae 100644 --- a/kio/kfile/kopenwith.cpp +++ b/kio/kfile/kopenwith.cpp @@ -131,7 +131,7 @@ void KAppTreeListItem::activate() void KAppTreeListItem::setOpen( bool o ) { if( o && !parsed ) { // fill the children before opening - ((KApplicationTree *) parent())->addDesktopGroup( path, this ); + ((KApplicationTree *) tqparent())->addDesktopGroup( path, this ); parsed = true; } TQListViewItem::setOpen( o ); @@ -279,8 +279,8 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i) void KApplicationTree::resizeEvent( TQResizeEvent * e) { - setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent) - -2*TQApplication::style().pixelMetric(TQStyle::PM_DefaultFrameWidth)); + setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) + -2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth)); KListView::resizeEvent(e); } @@ -340,7 +340,7 @@ KOpenWithDlg::KOpenWithDlg( const KURL::List& _urls, const TQString&_text, { TQString caption = KStringHandler::csqueeze( _urls.first().prettyURL() ); if (_urls.count() > 1) - caption += TQString::fromLatin1("..."); + caption += TQString::tqfromLatin1("..."); setCaption(caption); setServiceType( _urls ); init( _text, _value ); @@ -376,7 +376,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls ) if ( _urls.count() == 1 ) { qServiceType = KMimeType::findByURL( _urls.first())->name(); - if (qServiceType == TQString::fromLatin1("application/octet-stream")) + if (qServiceType == TQString::tqfromLatin1("application/octet-stream")) qServiceType = TQString::null; } else @@ -401,7 +401,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQToolButton *clearButton = new TQToolButton( this ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); - clearButton->setFixedSize( clearButton->sizeHint() ); + clearButton->setFixedSize( clearButton->tqsizeHint() ); connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) ); @@ -413,13 +413,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) KHistoryCombo *combo = new KHistoryCombo(); combo->setDuplicatesEnabled( false ); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); - int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") ); + int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); - int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"), + int mode = kc->readNumEntry(TQString::tqfromLatin1("CompletionMode"), KGlobalSettings::completionMode()); combo->setCompletionMode((KGlobalSettings::Completion)mode); - TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); + TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") ); combo->setHistoryItems( list, true ); edit = new KURLRequester( combo, this ); } @@ -483,8 +483,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) // check to see if we use konsole if not disable the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); - TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); if (bReadOnly || preferredTerminal != "konsole") nocloseonexit->hide(); @@ -518,7 +518,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) //edit->setText( _value ); // This is what caused "can't click on items before clicking on Name header". // Probably due to the resizeEvent handler using width(). - //resize( minimumWidth(), sizeHint().height() ); + //resize( minimumWidth(), tqsizeHint().height() ); edit->setFocus(); slotTextChanged(); } @@ -634,12 +634,12 @@ void KOpenWithDlg::slotOK() { TQString exec = serv->exec(); fullExec = exec; - exec.replace("%u", "", false); - exec.replace("%f", "", false); - exec.replace("-caption %c", ""); - exec.replace("-caption \"%c\"", ""); - exec.replace("%i", ""); - exec.replace("%m", ""); + exec.tqreplace("%u", "", false); + exec.tqreplace("%f", "", false); + exec.tqreplace("-caption %c", ""); + exec.tqreplace("-caption \"%c\"", ""); + exec.tqreplace("%i", ""); + exec.tqreplace("%m", ""); exec = exec.simplifyWhiteSpace(); if (exec == typedExec) { @@ -666,13 +666,13 @@ void KOpenWithDlg::slotOK() if (terminal->isChecked()) { - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); - preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); + preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); m_command = preferredTerminal; // only add --noclose when we are sure it is konsole we're using if (preferredTerminal == "konsole" && nocloseonexit->isChecked()) - m_command += TQString::fromLatin1(" --noclose"); - m_command += TQString::fromLatin1(" -e "); + m_command += TQString::tqfromLatin1(" --noclose"); + m_command += TQString::tqfromLatin1(" -e "); m_command += edit->url(); kdDebug(250) << "Setting m_command to " << m_command << endl; } @@ -740,7 +740,7 @@ void KOpenWithDlg::slotOK() { desktop = new KDesktopFile(newPath); } - desktop->writeEntry("Type", TQString::fromLatin1("Application")); + desktop->writeEntry("Type", TQString::tqfromLatin1("Application")); desktop->writeEntry("Name", initialServiceName); desktop->writePathEntry("Exec", fullExec); if (terminal->isChecked()) @@ -760,7 +760,7 @@ void KOpenWithDlg::slotOK() if (bRemember || d->saveNewApps) { TQStringList mimeList = desktop->readListEntry("MimeType", ';'); - if (!qServiceType.isEmpty() && !mimeList.contains(qServiceType)) + if (!qServiceType.isEmpty() && !mimeList.tqcontains(qServiceType)) mimeList.append(qServiceType); desktop->writeEntry("MimeType", mimeList, ';'); @@ -814,9 +814,9 @@ void KOpenWithDlg::accept() combo->addToHistory( edit->url() ); KConfig *kc = KGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") ); - kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() ); - kc->writeEntry(TQString::fromLatin1("CompletionMode"), + KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") ); + kc->writeEntry( TQString::tqfromLatin1("History"), combo->historyItems() ); + kc->writeEntry(TQString::tqfromLatin1("CompletionMode"), combo->completionMode()); // don't store the completion-list, as it contains all of KURLCompletion's // executables diff --git a/kio/kfile/kopenwith_p.h b/kio/kfile/kopenwith_p.h index 5583b03d9..f395d94bd 100644 --- a/kio/kfile/kopenwith_p.h +++ b/kio/kfile/kopenwith_p.h @@ -37,7 +37,7 @@ class TQStringList; /** * @internal */ -class KAppTreeListItem : public QListViewItem +class KAppTreeListItem : public TQListViewItem { bool parsed; bool directory; diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h index 3a2a49b31..e8f2ca48c 100644 --- a/kio/kfile/kpreviewwidgetbase.h +++ b/kio/kfile/kpreviewwidgetbase.h @@ -41,7 +41,7 @@ class KURL; * @short Abstract baseclass for all preview widgets. * @author Frerich Raabe <raabe@kde.org> */ -class KIO_EXPORT KPreviewWidgetBase : public QWidget +class KIO_EXPORT KPreviewWidgetBase : public TQWidget { Q_OBJECT @@ -84,7 +84,7 @@ protected: private: class KPreviewWidgetBasePrivate; KPreviewWidgetBasePrivate * d() const { - return s_private->find( const_cast<KPreviewWidgetBase*>( this ) ); + return s_private->tqfind( const_cast<KPreviewWidgetBase*>( this ) ); } static TQPtrDict<KPreviewWidgetBasePrivate> * s_private; }; diff --git a/kio/kfile/kpropertiesdesktopadvbase.ui b/kio/kfile/kpropertiesdesktopadvbase.ui index fe1122136..a4ac75d4f 100644 --- a/kio/kfile/kpropertiesdesktopadvbase.ui +++ b/kio/kfile/kpropertiesdesktopadvbase.ui @@ -1,6 +1,7 @@ + <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KPropertiesDesktopAdvBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>widget11</cstring> </property> @@ -19,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -40,14 +41,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>terminalCheck</cstring> </property> @@ -58,7 +59,7 @@ <string>Check this option if the application you want to run is a text mode application or if you want the information that is provided by the terminal emulator window.</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>terminalEditLabel</cstring> </property> @@ -69,7 +70,7 @@ <cstring>terminalEdit</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>terminalCloseCheck</cstring> </property> @@ -87,7 +88,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2_2</cstring> </property> @@ -98,7 +99,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>suidCheck</cstring> </property> @@ -119,14 +120,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>suidEditLabel</cstring> </property> @@ -150,7 +151,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup4</cstring> </property> @@ -161,7 +162,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>startupInfoCheck</cstring> </property> @@ -172,7 +173,7 @@ <string>Check this option if you want to make clear that your application has started. This visual feedback may appear as a busy cursor or in the taskbar.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>systrayCheck</cstring> </property> @@ -183,7 +184,7 @@ <string>Check this option if you want to have a system tray handle for your application.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -194,7 +195,7 @@ <cstring>dcopCombo</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>None</string> @@ -229,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> diff --git a/kio/kfile/kpropertiesdesktopbase.ui b/kio/kfile/kpropertiesdesktopbase.ui index 7809d5135..73e6d953c 100644 --- a/kio/kfile/kpropertiesdesktopbase.ui +++ b/kio/kfile/kpropertiesdesktopbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KPropertiesDesktopBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KPropertiesDesktopBase</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="7"> + <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="7"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -95,7 +95,7 @@ <p>If you want to associate this application with one or more mimetypes that are not in this list, click on the button <b>Add</b> below. If there are one or more filetypes that this application cannot handle, you may want to remove them from the list clicking on the button <b>Remove</b> below.</p></qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>nameLabel</cstring> </property> @@ -117,7 +117,7 @@ <string>Type the name you want to give to this application here. This application will appear under this name in the applications menu and in the panel.</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -139,7 +139,7 @@ <string>Type the description of this application, based on its use, here. Examples: a dial up application (KPPP) would be "Dial up tool".</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -161,7 +161,7 @@ <string>Type any comment you think is useful here.</string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -205,7 +205,7 @@ Following the command, you can have several place holders which will be replaced %c - the caption</string> </property> </widget> - <widget class="QPushButton" row="3" column="6"> + <widget class="TQPushButton" row="3" column="6"> <property name="name"> <cstring>browseButton</cstring> </property> @@ -216,7 +216,7 @@ Following the command, you can have several place holders which will be replaced <string>Click here to browse your file system in order to find the desired executable.</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -238,7 +238,7 @@ Following the command, you can have several place holders which will be replaced <string>Sets the working directory for your application.</string> </property> </widget> - <widget class="QPushButton" row="8" column="0"> + <widget class="TQPushButton" row="8" column="0"> <property name="name"> <cstring>addFiletypeButton</cstring> </property> @@ -259,14 +259,14 @@ Following the command, you can have several place holders which will be replaced <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>53</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="8" column="3"> + <widget class="TQPushButton" row="8" column="3"> <property name="name"> <cstring>delFiletypeButton</cstring> </property> @@ -287,14 +287,14 @@ Following the command, you can have several place holders which will be replaced <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>53</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton" row="8" column="5" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="8" column="5" rowspan="1" colspan="2"> <property name="name"> <cstring>advancedButton</cstring> </property> diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 0116123f1..a7be5de64 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -516,7 +516,7 @@ void KPropertiesDialog::insertPages() if ( mimetype.isEmpty() ) return; - TQString query = TQString::fromLatin1( + TQString query = TQString::tqfromLatin1( "('KPropsDlg/Plugin' in ServiceTypes) and " "((not exist [X-KDE-Protocol]) or " " ([X-KDE-Protocol] == '%1' ) )" ).arg(item->url().protocol()); @@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages() { KPropsDlgPlugin *plugin = KParts::ComponentFactory ::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(), - this, + TQT_TQOBJECT(this), (*it)->name().latin1() ); if ( !plugin ) continue; @@ -704,7 +704,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) d = new KFilePropsPluginPrivate; d->bMultiple = (properties->items().count() > 1); d->bIconChanged = false; - d->bKDesktopMode = (TQCString(qApp->name()) == "kdesktop"); // nasty heh? + d->bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh? d->bDesktopFile = KDesktopPropsPlugin::supports(properties->items()); kdDebug(250) << "KFilePropsPlugin::KFilePropsPlugin bMultiple=" << d->bMultiple << endl; @@ -718,7 +718,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) kdDebug() << "url=" << url << " bDesktopFile=" << bDesktopFile << " isLocal=" << isLocal << " isReallyLocal=" << isReallyLocal << endl; mode_t mode = item->mode(); bool hasDirs = item->isDir() && !item->isLink(); - bool hasRoot = url.path() == TQString::fromLatin1("/"); + bool hasRoot = url.path() == TQString::tqfromLatin1("/"); TQString iconStr = KMimeType::iconForURL(url, mode); TQString directory = properties->kurl().directory(); TQString protocol = properties->kurl().protocol(); @@ -752,15 +752,15 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->setColStretch(1, 0); grid->setColStretch(2, 1); grid->addColSpacing(1, KDialog::spacingHint()); - vbl->addLayout(grid); + vbl->addLayout(TQT_TQLAYOUT(grid)); int curRow = 0; if ( !d->bMultiple ) { TQString path; if ( !m_bFromTemplate ) { - isTrash = ( properties->kurl().protocol().find( "trash", 0, false)==0 ); - if ( properties->kurl().protocol().find("device", 0, false)==0) + isTrash = ( properties->kurl().protocol().tqfind( "trash", 0, false)==0 ); + if ( properties->kurl().protocol().tqfind("device", 0, false)==0) isDevice = true; // Extract the full name, but without file: for local files if ( isReallyLocal ) @@ -831,7 +831,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) magicMimeComment = TQString::null; } - if ( url.path() == TQString::fromLatin1("/") ) + if ( url.path() == TQString::tqfromLatin1("/") ) hasRoot = true; if ( (*it)->isDir() && !(*it)->isLink() ) { @@ -859,7 +859,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) if ( !isDevice && !isTrash && (bDesktopFile || S_ISDIR(mode)) && !d->bMultiple /*not implemented for multiple*/ ) { KIconButton *iconButton = new KIconButton( d->m_frame ); - int bsize = 66 + 2 * iconButton->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * iconButton->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin); iconButton->setFixedSize(bsize, bsize); iconButton->setIconSize(48); iconButton->setStrictIconSize(false); @@ -883,12 +883,12 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) this, TQT_SLOT( slotIconChanged() ) ); } else { TQLabel *iconLabel = new TQLabel( d->m_frame ); - int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * iconLabel->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin); iconLabel->setFixedSize(bsize, bsize); iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) ); iconArea = iconLabel; } - grid->addWidget(iconArea, curRow, 0, AlignLeft); + grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft); if (d->bMultiple || isTrash || isDevice || hasRoot) { @@ -908,11 +908,11 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // Enhanced rename: Don't highlight the file extension. TQString pattern; KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) + if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1) d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1); else { - int lastDot = filename.findRev('.'); + int lastDot = filename.tqfindRev('.'); if (lastDot > 0) d->m_lined->setSelection(0, lastDot); } @@ -942,7 +942,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) //TODO: wrap for win32 or mac? TQPushButton *button = new TQPushButton(box); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("configure")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("configure")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); button->setIconSet( iconSet ); button->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -1127,7 +1127,7 @@ void KFilePropsPlugin::slotEditFileType() #ifdef Q_WS_X11 TQString mime; if ( d->mimeType == KMimeType::defaultMimeType() ) { - int pos = d->oldFileName.findRev( '.' ); + int pos = d->oldFileName.tqfindRev( '.' ); if ( pos != -1 ) mime = "*" + d->oldFileName.mid(pos); else @@ -1136,9 +1136,9 @@ void KFilePropsPlugin::slotEditFileType() else mime = d->mimeType; //TODO: wrap for win32 or mac? - TQString keditfiletype = TQString::fromLatin1("keditfiletype"); + TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); KRun::runCommand( keditfiletype - + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId()) + + " --parent " + TQString::number( (ulong)properties->tqtopLevelWidget()->winId()) + " " + KProcess::quote(mime), keditfiletype, keditfiletype /*unused*/); #endif @@ -1234,7 +1234,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job ) KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize(); KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles(); KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs(); - m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4") + m_sizeLabel->setText( TQString::tqfromLatin1("%1 (%2)\n%3, %4") .arg(KIO::convertSize(totalSize)) .arg(KGlobal::locale()->formatNumber(totalSize, 0)) .arg(i18n("1 file","%n files",totalFiles)) @@ -1362,9 +1362,9 @@ void KFilePropsPlugin::applyChanges() connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL &, const KURL & ) ), TQT_SLOT( slotFileRenamed( KIO::Job *, const KURL &, const KURL & ) ) ); // wait for job - TQWidget dummy(0,0,WType_Dialog|WShowModal); + TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); return; } @@ -1384,7 +1384,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) if (job) { // allow apply() to return - qApp->exit_loop(); + tqApp->exit_loop(); if ( job->error() ) { job->showErrorDialog( d->m_frame ); @@ -1427,7 +1427,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job ) void KFilePropsPlugin::applyIconChanges() { - KIconButton *iconButton = ::qt_cast<KIconButton *>( iconArea ); + KIconButton *iconButton = ::tqqt_cast<KIconButton *>( iconArea ); if ( !iconButton || !d->bIconChanged ) return; // handle icon changes - only local files (or pseudo-local) for now @@ -1439,7 +1439,7 @@ void KFilePropsPlugin::applyIconChanges() if (S_ISDIR(properties->item()->mode())) { - path = url.path(1) + TQString::fromLatin1(".directory"); + path = url.path(1) + TQString::tqfromLatin1(".directory"); // don't call updateUrl because the other tabs (i.e. permissions) // apply to the directory, not the .directory file. } @@ -1563,7 +1563,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TQString path = properties->kurl().path(-1); TQString fname = properties->kurl().fileName(); bool isLocal = properties->kurl().isLocalFile(); - bool isTrash = ( properties->kurl().protocol().find("trash", 0, false)==0 ); + bool isTrash = ( properties->kurl().protocol().tqfind("trash", 0, false)==0 ); bool IamRoot = (geteuid() == 0); KFileItem * item = properties->item(); @@ -1710,11 +1710,11 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr "sense for programs and scripts. It is required when you want to " "execute them.")); - TQLayoutItem *spacer = new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding); + TQLayoutItem *spacer = TQT_TQLAYOUTITEM(new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); gl->addMultiCell(spacer, 5, 5, 0, 1); pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb); - gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, AlignRight); + gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, Qt::AlignRight); connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() )); } else @@ -1753,7 +1753,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr kcom->setOrder(KCompletion::Sorted); setpwent(); for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(user->pw_name)); + kcom->addItem(TQString::tqfromLatin1(user->pw_name)); endpwent(); usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto : KGlobalSettings::CompletionNone); @@ -1781,7 +1781,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++) { if (IamRoot) - groupList += TQString::fromLatin1(ge->gr_name); + groupList += TQString::tqfromLatin1(ge->gr_name); else { /* pick the groups to which the user belongs */ @@ -1802,14 +1802,14 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr /* add the effective Group to the list .. */ ge = getgrgid (getegid()); if (ge) { - TQString name = TQString::fromLatin1(ge->gr_name); + TQString name = TQString::tqfromLatin1(ge->gr_name); if (name.isEmpty()) name.setNum(ge->gr_gid); - if (groupList.find(name) == groupList.end()) + if (groupList.tqfind(name) == groupList.end()) groupList += name; } - bool isMyGroup = groupList.contains(strGroup); + bool isMyGroup = groupList.tqcontains(strGroup); /* add the group the file currently belongs to .. * .. if its not there already @@ -1843,7 +1843,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr { grpCombo = new TQComboBox(gb, "combogrouplist"); grpCombo->insertStringList(groupList); - grpCombo->setCurrentItem(groupList.findIndex(strGroup)); + grpCombo->setCurrentItem(groupList.tqfindIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); connect( grpCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( changed() ) ); @@ -1966,7 +1966,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() { TQWhatsThis::add(l, execWhatsThis); theNotSpecials.append( l ); // GJ: Add space between normal and special modes - TQSize size = l->sizeHint(); + TQSize size = l->tqsizeHint(); size.setWidth(size.width() + 15); l->setFixedSize(size); gl->addWidget (l, 1, 3); @@ -2518,9 +2518,9 @@ void KFilePermissionsPropsPlugin::applyChanges() connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); // Wait for job - TQWidget dummy(0,0,WType_Dialog|WShowModal); + TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } if (dirs.count() > 0) { @@ -2534,9 +2534,9 @@ void KFilePermissionsPropsPlugin::applyChanges() connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotChmodResult( KIO::Job * ) ) ); // Wait for job - TQWidget dummy(0,0,WType_Dialog|WShowModal); + TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } } @@ -2547,7 +2547,7 @@ void KFilePermissionsPropsPlugin::slotChmodResult( KIO::Job * job ) if (job->error()) job->showErrorDialog( d->m_frame ); // allow apply() to return - qApp->exit_loop(); + tqApp->exit_loop(); } @@ -2639,7 +2639,7 @@ void KURLPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Link")); + config.writeEntry( "Type", TQString::tqfromLatin1("Link")); config.writePathEntry( "URL", URLEdit->url() ); // Users can't create a Link .desktop file with a Name field, // but distributions can. Update the Name field in that case. @@ -2685,35 +2685,35 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl tmpQLabel = new TQLabel( d->m_frame, "Label_1" ); tmpQLabel->setText( i18n("Pattern ( example: *.html;*.htm )") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); mainlayout->addWidget(tmpQLabel, 1); //patternEdit->setGeometry( 10, 40, 210, 30 ); //patternEdit->setText( "" ); patternEdit->setMaxLength( 512 ); - patternEdit->setMinimumSize( patternEdit->sizeHint() ); + patternEdit->setMinimumSize( patternEdit->tqsizeHint() ); patternEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(patternEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_2" ); tmpQLabel->setText( i18n("Mime Type") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); mainlayout->addWidget(tmpQLabel, 1); //mimeEdit->setGeometry( 10, 160, 210, 30 ); mimeEdit->setMaxLength( 256 ); - mimeEdit->setMinimumSize( mimeEdit->sizeHint() ); + mimeEdit->setMinimumSize( mimeEdit->tqsizeHint() ); mimeEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(mimeEdit, 1); tmpQLabel = new TQLabel( d->m_frame, "Label_3" ); tmpQLabel->setText( i18n("Comment") ); - tmpQLabel->setMinimumSize(tmpQLabel->sizeHint()); + tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); mainlayout->addWidget(tmpQLabel, 1); //commentEdit->setGeometry( 10, 100, 210, 30 ); commentEdit->setMaxLength( 256 ); - commentEdit->setMinimumSize( commentEdit->sizeHint() ); + commentEdit->setMinimumSize( commentEdit->tqsizeHint() ); commentEdit->setFixedHeight( fontHeight ); mainlayout->addWidget(commentEdit, 1); @@ -2796,7 +2796,7 @@ void KBindingPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("MimeType") ); + config.writeEntry( "Type", TQString::tqfromLatin1("MimeType") ); config.writeEntry( "Patterns", patternEdit->text() ); config.writeEntry( "Comment", commentEdit->text() ); @@ -2852,8 +2852,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP if ((mountPoint != "-") && (mountPoint != "none") && !mountPoint.isEmpty() && device != "none") { - devices.append( device + TQString::fromLatin1(" (") - + mountPoint + TQString::fromLatin1(")") ); + devices.append( device + TQString::tqfromLatin1(" (") + + mountPoint + TQString::tqfromLatin1(")") ); m_devicelist.append(device); d->mountpointlist.append(mountPoint); } @@ -2916,7 +2916,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP layout->addMultiCellWidget(sep, 6, 6, 0, 1); unmounted = new KIconButton( d->m_frame ); - int bsize = 66 + 2 * unmounted->style().pixelMetric(TQStyle::PM_ButtonMargin); + int bsize = 66 + 2 * unmounted->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin); unmounted->setFixedSize(bsize, bsize); unmounted->setIconType(KIcon::Desktop, KIcon::Device); layout->addWidget(unmounted, 7, 0); @@ -2945,7 +2945,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP device->setEditText( deviceStr ); if ( !deviceStr.isEmpty() ) { // Set default options for this device (first matching entry) - int index = m_devicelist.findIndex(deviceStr); + int index = m_devicelist.tqfindIndex(deviceStr); if (index != -1) { //kdDebug(250) << "found it " << index << endl; @@ -3020,7 +3020,7 @@ void KDevicePropsPlugin::slotActivated( int index ) void KDevicePropsPlugin::slotDeviceChanged() { // Update mountpoint so that it matches the typed device - int index = m_devicelist.findIndex( device->currentText() ); + int index = m_devicelist.tqfindIndex( device->currentText() ); if ( index != -1 ) mountpoint->setText( d->mountpointlist[index] ); else @@ -3077,7 +3077,7 @@ void KDevicePropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("FSDevice") ); + config.writeEntry( "Type", TQString::tqfromLatin1("FSDevice") ); config.writeEntry( "Dev", device->currentText() ); config.writeEntry( "MountPoint", mountpoint->text() ); @@ -3107,7 +3107,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) w = new KPropertiesDesktopBase(frame); mainlayout->addWidget(w); - bool bKDesktopMode = (TQCString(qApp->name()) == "kdesktop"); // nasty heh? + bool bKDesktopMode = (TQCString(tqApp->name()) == "kdesktop"); // nasty heh? if (bKDesktopMode) { @@ -3255,11 +3255,11 @@ void KDesktopPropsPlugin::slotAddFiletype() TQString mimetype = (*it)->name(); if (mimetype == KMimeType::defaultMimeType()) continue; - int index = mimetype.find("/"); + int index = mimetype.tqfind("/"); TQString maj = mimetype.left(index); TQString min = mimetype.mid(index+1); - TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( maj ); + TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( maj ); if ( mit == majorMap.end() ) { majorGroup = new TQListViewItem( mw->listView, maj ); majorGroup->setExpandable(true); @@ -3274,7 +3274,7 @@ void KDesktopPropsPlugin::slotAddFiletype() TQListViewItem *item = new TQListViewItem(majorGroup, min, (*it)->comment()); item->setPixmap(0, (*it)->pixmap(KIcon::Small, IconSize(KIcon::Small))); } - TQMapIterator<TQString,TQListViewItem*> mit = majorMap.find( "all" ); + TQMapIterator<TQString,TQListViewItem*> mit = majorMap.tqfind( "all" ); if ( mit != majorMap.end()) { mw->listView->setCurrentItem(mit.data()); @@ -3362,7 +3362,7 @@ void KDesktopPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writeEntry( "Comment", w->commentEdit->text() ); config.writeEntry( "Comment", w->commentEdit->text(), true, false, true ); // for compat config.writeEntry( "GenericName", w->genNameEdit->text() ); @@ -3446,9 +3446,9 @@ void KDesktopPropsPlugin::slotAdvanced() // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", - TQString::fromLatin1("konsole")); + TQString::tqfromLatin1("konsole")); bool terminalCloseBool = false; @@ -3493,7 +3493,7 @@ void KDesktopPropsPlugin::slotAdvanced() int i, maxEntries = 1000; setpwent(); for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(pw->pw_name)); + kcom->addItem(TQString::tqfromLatin1(pw->pw_name)); endpwent(); if (i < maxEntries) { @@ -3672,9 +3672,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) // check to see if we use konsole if not do not add the nocloseonexit // because we don't know how to do this on other terminal applications - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", - TQString::fromLatin1("konsole")); + TQString::tqfromLatin1("konsole")); int posOptions = 1; d->nocloseonexitCheck = 0L; @@ -3767,7 +3767,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) int i, maxEntries = 1000; setpwent(); for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++) - kcom->addItem(TQString::fromLatin1(pw->pw_name)); + kcom->addItem(TQString::tqfromLatin1(pw->pw_name)); endpwent(); if (i < maxEntries) { @@ -3854,7 +3854,7 @@ void KExecPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writePathEntry( "Exec", execEdit->text() ); config.writePathEntry( "SwallowExec", swallowExecEdit->text() ); config.writeEntry( "SwallowTitle", swallowTitleEdit->text() ); @@ -3862,7 +3862,7 @@ void KExecPropsPlugin::applyChanges() TQString temp = terminalEdit->text(); if (d->nocloseonexitCheck ) if ( d->nocloseonexitCheck->isChecked() ) - temp += TQString::fromLatin1("--noclose "); + temp += TQString::tqfromLatin1("--noclose "); temp = temp.stripWhiteSpace(); config.writeEntry( "TerminalOptions", temp ); config.writeEntry( "X-KDE-SubstituteUID", suidCheck->isChecked() ); @@ -3892,7 +3892,7 @@ class KApplicationPropsPlugin::KApplicationPropsPluginPrivate public: KApplicationPropsPluginPrivate() { - m_kdesktopMode = TQCString(qApp->name()) == "kdesktop"; // nasty heh? + m_kdesktopMode = TQCString(tqApp->name()) == "kdesktop"; // nasty heh? } ~KApplicationPropsPluginPrivate() { @@ -3931,7 +3931,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - toplayout->addLayout(grid); + toplayout->addLayout(TQT_TQLAYOUT(grid)); if ( d->m_kdesktopMode ) { @@ -3967,7 +3967,7 @@ KApplicationPropsPlugin::KApplicationPropsPlugin( KPropertiesDialog *_props ) grid->setColStretch(2, 1); grid->setRowStretch( 0, 1 ); grid->setRowStretch( 3, 1 ); - toplayout->addLayout(grid, 2); + toplayout->addLayout(TQT_TQLAYOUT(grid), 2); extensionsList = new TQListBox( d->m_frame ); extensionsList->setSelectionMode( TQListBox::Extended ); @@ -4097,7 +4097,7 @@ void KApplicationPropsPlugin::applyChanges() KSimpleConfig config( path ); config.setDesktopGroup(); - config.writeEntry( "Type", TQString::fromLatin1("Application")); + config.writeEntry( "Type", TQString::tqfromLatin1("Application")); config.writeEntry( "Comment", commentEdit->text() ); config.writeEntry( "Comment", commentEdit->text(), true, false, true ); // for compat config.writeEntry( "GenericName", genNameEdit->text() ); diff --git a/kio/kfile/kpropertiesdialog.h b/kio/kfile/kpropertiesdialog.h index dc6a621f9..4243bf602 100644 --- a/kio/kfile/kpropertiesdialog.h +++ b/kio/kfile/kpropertiesdialog.h @@ -434,7 +434,7 @@ private: * You can also include X-KDE-Protocol=file if you want that plugin * to be loaded only for local files, for instance. */ -class KIO_EXPORT KPropsDlgPlugin : public QObject +class KIO_EXPORT KPropsDlgPlugin : public TQObject { Q_OBJECT public: diff --git a/kio/kfile/kpropertiesmimetypebase.ui b/kio/kfile/kpropertiesmimetypebase.ui index 0223f22a6..df7c796da 100644 --- a/kio/kfile/kpropertiesmimetypebase.ui +++ b/kio/kfile/kpropertiesmimetypebase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KPropertiesMimetypeBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>widget2</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp index 22b4cd477..85cdebb02 100644 --- a/kio/kfile/krecentdirs.cpp +++ b/kio/kfile/krecentdirs.cpp @@ -52,13 +52,13 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re if (key[1] == ':') { key = key.mid(2); - config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly); + config = new KSimpleConfig(TQString::tqfromLatin1("krecentdirsrc"), readOnly); } else { key = key.mid(1); config = KGlobal::config(); - config->setGroup(TQString::fromLatin1("Recent Dirs")); + config->setGroup(TQString::tqfromLatin1("Recent Dirs")); } result=config->readPathListEntry(key); diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp index 69fd63df5..7b5c6908a 100644 --- a/kio/kfile/krecentdocument.cpp +++ b/kio/kfile/krecentdocument.cpp @@ -45,7 +45,7 @@ TQString KRecentDocument::recentDocumentDirectory() { // need to change this path, not sure where - return locateLocal("data", TQString::fromLatin1("RecentDocuments/")); + return locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")); } TQStringList KRecentDocument::recentDocuments() @@ -74,7 +74,7 @@ TQStringList KRecentDocument::recentDocuments() void KRecentDocument::add(const KURL& url) { - KRecentDocument::add(url, qApp->argv()[0]); // ### argv[0] might not match the service filename! + KRecentDocument::add(url, tqApp->argv()[0]); // ### argv[0] might not match the service filename! } void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) @@ -88,9 +88,9 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) kdDebug(250) << "KRecentDocument::add for " << openStr << endl; KConfig *config = KGlobal::config(); TQString oldGrp = config->group(); - config->setGroup(TQString::fromLatin1("RecentDocuments")); - bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true); - int maxEntries = config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); + config->setGroup(TQString::tqfromLatin1("RecentDocuments")); + bool useRecent = config->readBoolEntry(TQString::tqfromLatin1("UseRecent"), true); + int maxEntries = config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10); config->setGroup(oldGrp); if(!useRecent) @@ -100,7 +100,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) TQString dStr = path + url.fileName(); - TQString ddesktop = dStr + TQString::fromLatin1(".desktop"); + TQString ddesktop = dStr + TQString::tqfromLatin1(".desktop"); int i=1; // check for duplicates @@ -108,7 +108,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) // see if it points to the same file and application KSimpleConfig tmp(ddesktop); tmp.setDesktopGroup(); - if(tmp.readEntry(TQString::fromLatin1("X-KDE-LastOpenedWith")) + if(tmp.readEntry(TQString::tqfromLatin1("X-KDE-LastOpenedWith")) == desktopEntryName) { utime(TQFile::encodeName(ddesktop), NULL); @@ -118,7 +118,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) ++i; if ( i > maxEntries ) break; - ddesktop = dStr + TQString::fromLatin1("[%1].desktop").arg(i); + ddesktop = dStr + TQString::tqfromLatin1("[%1].desktop").arg(i); } TQDir dir(path); @@ -129,7 +129,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) TQStringList::Iterator it; it = list.begin(); while(i > maxEntries-1){ - TQFile::remove(dir.absPath() + TQString::fromLatin1("/") + (*it)); + TQFile::remove(dir.absPath() + TQString::tqfromLatin1("/") + (*it)); --i, ++it; } } @@ -137,15 +137,15 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName) // create the applnk KSimpleConfig conf(ddesktop); conf.setDesktopGroup(); - conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); - conf.writePathEntry( TQString::fromLatin1("URL"), openStr ); + conf.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") ); + conf.writePathEntry( TQString::tqfromLatin1("URL"), openStr ); // If you change the line below, change the test in the above loop - conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); + conf.writeEntry( TQString::tqfromLatin1("X-KDE-LastOpenedWith"), desktopEntryName ); TQString name = url.fileName(); if (name.isEmpty()) name = openStr; - conf.writeEntry( TQString::fromLatin1("Name"), name ); - conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) ); + conf.writeEntry( TQString::tqfromLatin1("Name"), name ); + conf.writeEntry( TQString::tqfromLatin1("Icon"), KMimeType::iconForURL( url ) ); } void KRecentDocument::add(const TQString &openStr, bool isUrl) @@ -170,8 +170,8 @@ void KRecentDocument::clear() int KRecentDocument::maximumItems() { KConfig *config = KGlobal::config(); - KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments")); - return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10); + KConfigGroupSaver sa(config, TQString::tqfromLatin1("RecentDocuments")); + return config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10); } diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index d1a9de4ea..692fbd8de 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -53,7 +53,7 @@ * Handles tooltips in the KURLBar * @internal */ -class KURLBarToolTip : public QToolTip +class KURLBarToolTip : public TQToolTip { public: KURLBarToolTip( TQListBox *view ) : TQToolTip( view ), m_view( view ) {} @@ -64,7 +64,7 @@ protected: if ( item ) { TQString text = static_cast<KURLBarItem*>( item )->toolTip(); if ( !text.isEmpty() ) - tip( m_view->itemRect( item ), text ); + tip( m_view->tqitemRect( item ), text ); } } @@ -188,11 +188,11 @@ void KURLBarItem::paint( TQPainter *p ) if ( isCurrent() || isSelected() ) { int h = height( box ); - TQBrush brush = box->colorGroup().brush( TQColorGroup::Highlight ); + TQBrush brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); p->fillRect( 0, 0, w, h, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->colorGroup().mid() ); + pen.setColor( box->tqcolorGroup().mid() ); p->setPen( pen ); p->drawPoint( 0, 0 ); @@ -225,10 +225,10 @@ void KURLBarItem::paint( TQPainter *p ) int xPos = pm->width() + margin + 2; if ( isCurrent() || isSelected() ) { - p->setPen( box->colorGroup().highlight().dark(115) ); + p->setPen( box->tqcolorGroup().highlight().dark(115) ); p->drawText( xPos + ( TQApplication::reverseLayout() ? -1 : 1), yPos + 1, visibleText ); - p->setPen( box->colorGroup().highlightedText() ); + p->setPen( box->tqcolorGroup().highlightedText() ); } p->drawText( xPos, yPos, visibleText ); @@ -257,10 +257,10 @@ void KURLBarItem::paint( TQPainter *p ) x = QMAX( x, margin ); if ( isCurrent() || isSelected() ) { - p->setPen( box->colorGroup().highlight().dark(115) ); + p->setPen( box->tqcolorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, visibleText ); - p->setPen( box->colorGroup().highlightedText() ); + p->setPen( box->tqcolorGroup().highlightedText() ); } p->drawText( x, y, visibleText ); @@ -268,7 +268,7 @@ void KURLBarItem::paint( TQPainter *p ) } } -TQSize KURLBarItem::sizeHint() const +TQSize KURLBarItem::tqsizeHint() const { int wmin = 0; int hmin = 0; @@ -284,9 +284,9 @@ TQSize KURLBarItem::sizeHint() const } if ( lb->isVertical() ) - wmin = QMIN( wmin, lb->viewport()->sizeHint().width() ); + wmin = QMIN( wmin, lb->viewport()->tqsizeHint().width() ); else - hmin = QMIN( hmin, lb->viewport()->sizeHint().height() ); + hmin = QMIN( hmin, lb->viewport()->tqsizeHint().height() ); return TQSize( wmin, hmin ); } @@ -294,17 +294,17 @@ TQSize KURLBarItem::sizeHint() const int KURLBarItem::width( const TQListBox *lb ) const { if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) - return QMAX( sizeHint().width(), lb->viewport()->width() ); + return QMAX( tqsizeHint().width(), lb->viewport()->width() ); else - return sizeHint().width(); + return tqsizeHint().width(); } int KURLBarItem::height( const TQListBox *lb ) const { if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) - return sizeHint().height(); + return tqsizeHint().height(); else - return QMAX( sizeHint().height(), lb->viewport()->height() ); + return QMAX( tqsizeHint().height(), lb->viewport()->height() ); } bool KURLBarItem::isPersistent() const @@ -341,7 +341,7 @@ KURLBar::KURLBar( bool useGlobalItems, TQWidget *parent, const char *name, WFlag d = new KURLBarPrivate(); setListBox( 0L ); - setSizePolicy( TQSizePolicy( isVertical() ? + tqsetSizePolicy( TQSizePolicy( isVertical() ? TQSizePolicy::Maximum : TQSizePolicy::Preferred, isVertical() ? @@ -378,7 +378,7 @@ KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& descri void KURLBar::setOrientation( Qt::Orientation orient ) { m_listBox->setOrientation( orient ); - setSizePolicy( TQSizePolicy( isVertical() ? + tqsetSizePolicy( TQSizePolicy( isVertical() ? TQSizePolicy::Maximum : TQSizePolicy::Preferred, isVertical() ? @@ -397,18 +397,18 @@ void KURLBar::setListBox( KURLBarListBox *view ) if ( !view ) { m_listBox = new KURLBarListBox( this, "urlbar listbox" ); - setOrientation( Vertical ); + setOrientation( Qt::Vertical ); } else { m_listBox = view; - if ( m_listBox->parentWidget() != this ) + if ( m_listBox->tqparentWidget() != this ) m_listBox->reparent( this, TQPoint(0,0) ); m_listBox->resize( width(), height() ); } m_listBox->setSelectionMode( KListBox::Single ); paletteChange( palette() ); - m_listBox->setFocusPolicy( TabFocus ); + m_listBox->setFocusPolicy( TQ_TabFocus ); connect( m_listBox, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), TQT_SLOT( slotSelected( int, TQListBoxItem * ))); @@ -435,7 +435,7 @@ void KURLBar::setIconSize( int size ) item = static_cast<KURLBarItem*>( item->next() ); } - resize( sizeHint() ); + resize( tqsizeHint() ); updateGeometry(); } @@ -466,14 +466,14 @@ void KURLBar::paletteChange( const TQPalette & ) setPalette( pal ); } -TQSize KURLBar::sizeHint() const +TQSize KURLBar::tqsizeHint() const { - return m_listBox->sizeHint(); + return m_listBox->tqsizeHint(); #if 0 // this code causes vertical and or horizontal scrollbars appearing // depending on the text, font, moonphase and earth rotation. Just using - // m_listBox->sizeHint() fixes this (although the widget can then be + // m_listBox->tqsizeHint() fixes this (although the widget can then be // resized to a smaller size so that scrollbars appear). int w = 0; int h = 0; @@ -484,7 +484,7 @@ TQSize KURLBar::sizeHint() const item; item = static_cast<KURLBarItem*>( item->next() ) ) { - TQSize sh = item->sizeHint(); + TQSize sh = item->tqsizeHint(); if ( vertical ) { w = QMAX( w, sh.width() ); @@ -508,9 +508,9 @@ TQSize KURLBar::sizeHint() const #endif } -TQSize KURLBar::minimumSizeHint() const +TQSize KURLBar::tqminimumSizeHint() const { - TQSize s = sizeHint(); // ### + TQSize s = tqsizeHint(); // ### int w = s.width() + m_listBox->verticalScrollBar()->width(); int h = s.height() + m_listBox->horizontalScrollBar()->height(); return TQSize( w, h ); @@ -844,7 +844,7 @@ KURLBarListBox::~KURLBarListBox() void KURLBarListBox::paintEvent( TQPaintEvent* ) { TQPainter p(this); - p.setPen( colorGroup().mid() ); + p.setPen( tqcolorGroup().mid() ); p.drawRect( 0, 0, width(), height() ); } @@ -886,7 +886,7 @@ void KURLBarListBox::contextMenuEvent( TQContextMenuEvent *e ) void KURLBarListBox::setOrientation( Qt::Orientation orient ) { - if ( orient == Vertical ) { + if ( orient == Qt::Vertical ) { setColumnMode( 1 ); setRowMode( Variable ); } @@ -980,7 +980,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, if ( KGlobal::instance()->aboutData() ) appName = KGlobal::instance()->aboutData()->programName(); if ( appName.isEmpty() ) - appName = TQString::fromLatin1( KGlobal::instance()->instanceName() ); + appName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() ); m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box ); m_appLocal->setChecked( appLocal ); TQWhatsThis::add( m_appLocal, diff --git a/kio/kfile/kurlbar.h b/kio/kfile/kurlbar.h index 8da43ff15..32969cff7 100644 --- a/kio/kfile/kurlbar.h +++ b/kio/kfile/kurlbar.h @@ -39,7 +39,7 @@ class KURLBar; * @see KURLBar * @see KURLBarListBox */ -class KIO_EXPORT KURLBarItem : public QListBoxPixmap +class KIO_EXPORT KURLBarItem : public TQListBoxPixmap { public: /** @@ -109,7 +109,7 @@ public: * returns the preferred size of this item * @since 3.1 */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * returns the width of this item. @@ -227,7 +227,7 @@ class KURLBarListBox; * @author Carsten Pfeiffer <pfeiffer@kde.org> * @short A URL-bar widget, as used in the KFileDialog */ -class KIO_EXPORT KURLBar : public QFrame +class KIO_EXPORT KURLBar : public TQFrame { Q_OBJECT @@ -319,12 +319,12 @@ public: * @returns a proper sizehint, depending on the orientation and the number * of items available. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * @returns a proper minimum size (reimplemented) */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** * Call this method to read a saved configuration from @p config, @@ -382,7 +382,7 @@ public: /** * @returns true if the bar is in vertical mode. */ - bool isVertical() const { return orientation() == Vertical; } + bool isVertical() const { return orientation() == Qt::Vertical; } public slots: /** diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 72c7cbd07..f7bf58bc0 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -31,7 +31,7 @@ class KURLComboBox::KURLComboBoxPrivate { public: KURLComboBoxPrivate() { - dirpix = SmallIcon(TQString::fromLatin1("folder")); + dirpix = SmallIcon(TQString::tqfromLatin1("folder")); } TQPixmap dirpix; @@ -70,9 +70,9 @@ void KURLComboBox::init( Mode mode ) defaultList.setAutoDelete( true ); setInsertionPolicy( NoInsertion ); setTrapReturnKey( true ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); - opendirPix = SmallIcon(TQString::fromLatin1("folder_open")); + opendirPix = SmallIcon(TQString::tqfromLatin1("folder_open")); connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int ))); } @@ -152,7 +152,7 @@ void KURLComboBox::setURLs( TQStringList urls, OverLoadResolving remove ) // kill duplicates TQString text; while ( it != urls.end() ) { - while ( urls.contains( *it ) > 1 ) { + while ( urls.tqcontains( *it ) > 1 ) { it = urls.remove( it ); continue; } diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp index ae8f5b623..66b79925e 100644 --- a/kio/kfile/kurlrequester.cpp +++ b/kio/kfile/kurlrequester.cpp @@ -112,9 +112,9 @@ public: void connectSignals( TQObject *receiver ) { TQObject *sender; if ( combo ) - sender = combo; + sender = TQT_TQOBJECT(combo); else - sender = edit; + sender = TQT_TQOBJECT(edit); connect( sender, TQT_SIGNAL( textChanged( const TQString& )), receiver, TQT_SIGNAL( textChanged( const TQString& ))); @@ -206,7 +206,7 @@ void KURLRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KURLDragPushButton( this, "kfile button"); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -220,14 +220,14 @@ void KURLRequester::init() widget->installEventFilter( this ); setFocusProxy( widget ); - d->connectSignals( this ); + d->connectSignals( TQT_TQOBJECT(this) ); connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() )); myCompletion = new KURLCompletion(); d->setCompletionObject( myCompletion ); KAccel *accel = new KAccel( this ); - accel->insert( KStdAccel::Open, this, TQT_SLOT( slotOpenDialog() )); + accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() )); accel->readSettings(); } @@ -340,7 +340,7 @@ TQString KURLRequester::filter( ) const KFileDialog * KURLRequester::fileDialog() const { if ( !myFileDialog ) { - TQWidget *p = parentWidget(); + TQWidget *p = tqparentWidget(); myFileDialog = new KFileDialog( TQString::null, d->fileDialogFilter, p, "file dialog", true ); @@ -386,7 +386,7 @@ void KURLRequester::slotUpdateURL() bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev ) { - if ( ( d->edit == obj ) || ( d->combo == obj ) ) + if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) ) { if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut )) // Forward focusin/focusout events to the urlrequester; needed by file form element in khtml @@ -402,7 +402,7 @@ KPushButton * KURLRequester::button() const KEditListBox::CustomEditor KURLRequester::customEditor() { - setSizePolicy(TQSizePolicy( TQSizePolicy::Preferred, + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed)); KLineEdit *edit = d->edit; diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h index 1bdbeee3e..fa40d0656 100644 --- a/kio/kfile/kurlrequester.h +++ b/kio/kfile/kurlrequester.h @@ -53,7 +53,7 @@ class TQTimer; * @short A widget to request a filename/url from the user * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KIO_EXPORT KURLRequester : public QHBox +class KIO_EXPORT KURLRequester : public TQHBox { Q_OBJECT Q_PROPERTY( TQString url READ url WRITE setURL ) diff --git a/kio/kfile/kurlrequesterdlg.cpp b/kio/kfile/kurlrequesterdlg.cpp index 19409afdc..defa09264 100644 --- a/kio/kfile/kurlrequesterdlg.cpp +++ b/kio/kfile/kurlrequesterdlg.cpp @@ -67,7 +67,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) topLayout->addWidget( label ); urlRequester_ = new KURLRequester( urlName, plainPage(), "urlRequester" ); - urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); + urlRequester_->setMinimumWidth( urlRequester_->tqsizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); urlRequester_->setFocus(); connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp index 47fcd02ca..c66ed3ff2 100644 --- a/kio/kfile/tests/kdirselectdialogtest.cpp +++ b/kio/kfile/tests/kdirselectdialogtest.cpp @@ -10,7 +10,7 @@ int main( int argc, char **argv ) KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null ); if ( u.isValid() ) KMessageBox::information( 0L, - TQString::fromLatin1("You selected the url: %1") + TQString::tqfromLatin1("You selected the url: %1") .arg( u.prettyURL() ), "Selected URL" ); return 0; diff --git a/kio/kfile/tests/kfdtest.cpp b/kio/kfile/tests/kfdtest.cpp index 25e2da949..43dbb4fd0 100644 --- a/kio/kfile/tests/kfdtest.cpp +++ b/kio/kfile/tests/kfdtest.cpp @@ -25,10 +25,10 @@ void KFDTest::doit() if ( dlg->exec() == KDialog::Accepted ) { - KMessageBox::information(0, TQString::fromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() )); + KMessageBox::information(0, TQString::tqfromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() )); } -// qApp->quit(); +// tqApp->quit(); } #include "kfdtest.moc" diff --git a/kio/kfile/tests/kfdtest.h b/kio/kfile/tests/kfdtest.h index 3f980bc94..6c59550b8 100644 --- a/kio/kfile/tests/kfdtest.h +++ b/kio/kfile/tests/kfdtest.h @@ -10,7 +10,7 @@ #include <tqobject.h> -class KFDTest : public QObject +class KFDTest : public TQObject { Q_OBJECT diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp index 5c520dd5d..bad100809 100644 --- a/kio/kfile/tests/kfiletreeviewtest.cpp +++ b/kio/kfile/tests/kfiletreeviewtest.cpp @@ -148,7 +148,7 @@ int main(int argc, char **argv) { for( int i = 1; i < argc; i++ ) { - argv1 = TQString::fromLatin1(argv[i]); + argv1 = TQString::tqfromLatin1(argv[i]); kdDebug() << "Opening " << argv1 << endl; if( argv1 == "-d" ) tf->setDirOnly(); diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp index b84cbc967..48c8a1a2b 100644 --- a/kio/kfile/tests/kfstest.cpp +++ b/kio/kfile/tests/kfstest.cpp @@ -51,11 +51,11 @@ int main(int argc, char **argv) TQString argv1; TQString startDir; if (argc > 1) - argv1 = TQString::fromLatin1(argv[1]); + argv1 = TQString::tqfromLatin1(argv[1]); if ( argc > 2 ) - startDir = TQString::fromLatin1( argv[2]); + startDir = TQString::tqfromLatin1( argv[2]); - if (argv1 == TQString::fromLatin1("diroperator")) { + if (argv1 == TQString::tqfromLatin1("diroperator")) { KDirOperator *op = new KDirOperator(startDir, 0, "operator"); op->setViewConfig( KGlobal::config(), "TestGroup" ); op->setView(KFile::Simple); @@ -64,24 +64,24 @@ int main(int argc, char **argv) a.exec(); } - else if (argv1 == TQString::fromLatin1("justone")) { + else if (argv1 == TQString::tqfromLatin1("justone")) { TQString name = KFileDialog::getOpenFileName(startDir); qDebug("filename=%s",name.latin1()); } - else if (argv1 == TQString::fromLatin1("existingURL")) { + else if (argv1 == TQString::tqfromLatin1("existingURL")) { KURL url = KFileDialog::getExistingURL(); qDebug("URL=%s",url.url().latin1()); name1 = url.url(); } - else if (argv1 == TQString::fromLatin1("preview")) { + else if (argv1 == TQString::tqfromLatin1("preview")) { KURL u = KFileDialog::getImageOpenURL(); qDebug("filename=%s", u.url().latin1()); } - else if (argv1 == TQString::fromLatin1("preselect")) { - names = KFileDialog::getOpenFileNames(TQString::fromLatin1("/etc/passwd")); + else if (argv1 == TQString::tqfromLatin1("preselect")) { + names = KFileDialog::getOpenFileNames(TQString::tqfromLatin1("/etc/passwd")); TQStringList::Iterator it = names.begin(); while ( it != names.end() ) { qDebug("selected file: %s", (*it).latin1()); @@ -89,10 +89,10 @@ int main(int argc, char **argv) } } - else if (argv1 == TQString::fromLatin1("dirs")) + else if (argv1 == TQString::tqfromLatin1("dirs")) name1 = KFileDialog::getExistingDirectory(); - else if (argv1 == TQString::fromLatin1("heap")) { + else if (argv1 == TQString::tqfromLatin1("heap")) { KFileDialog *dlg = new KFileDialog( startDir, TQString::null, 0L, "file dialog", true ); dlg->setMode( KFile::File); @@ -104,33 +104,33 @@ int main(int argc, char **argv) if ( urlBar ) { urlBar->insertDynamicItem( KURL("ftp://ftp.kde.org"), - TQString::fromLatin1("KDE FTP Server") ); + TQString::tqfromLatin1("KDE FTP Server") ); } if ( dlg->exec() == KDialog::Accepted ) name1 = dlg->selectedURL().url(); } - else if ( argv1 == TQString::fromLatin1("eventloop") ) + else if ( argv1 == TQString::tqfromLatin1("eventloop") ) { KFDTest *test = new KFDTest( startDir ); return a.exec(); } - else if (argv1 == TQString::fromLatin1("save")) { + else if (argv1 == TQString::tqfromLatin1("save")) { KURL u = KFileDialog::getSaveURL(); -// TQString(TQDir::homeDirPath() + TQString::fromLatin1("/testfile")), +// TQString(TQDir::homeDirPath() + TQString::tqfromLatin1("/testfile")), // TQString::null, 0L); name1 = u.url(); } - else if (argv1 == TQString::fromLatin1("icon")) { + else if (argv1 == TQString::tqfromLatin1("icon")) { KIconDialog dlg; TQString icon = dlg.selectIcon(); kdDebug() << icon << endl; } -// else if ( argv1 == TQString::fromLatin1("dirselect") ) { +// else if ( argv1 == TQString::tqfromLatin1("dirselect") ) { // KURL url; // url.setPath( "/" ); // KURL selected = KDirSelectDialog::selectDirectory( url ); @@ -140,7 +140,7 @@ int main(int argc, char **argv) else { KFileDialog dlg(startDir, - TQString::fromLatin1("*|All Files\n" + TQString::tqfromLatin1("*|All Files\n" "*.lo *.o *.la|All libtool Files"), 0, 0, true); // dlg.setFilter( "*.kdevelop" ); @@ -177,7 +177,7 @@ int main(int argc, char **argv) } if (!(name1.isNull())) - KMessageBox::information(0, TQString::fromLatin1("You selected the file " ) + name1, - TQString::fromLatin1("Your Choice")); + KMessageBox::information(0, TQString::tqfromLatin1("You selected the file " ) + name1, + TQString::tqfromLatin1("Your Choice")); return 0; } diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp index 9248eec5d..4a1d4bec0 100644 --- a/kio/kfile/tests/kurlrequestertest.cpp +++ b/kio/kfile/tests/kurlrequestertest.cpp @@ -10,7 +10,7 @@ int main( int argc, char **argv ) qDebug( "Selected url: %s", url.url().latin1()); KURLRequester *req = new KURLRequester(); - KEditListBox *el = new KEditListBox( TQString::fromLatin1("Test"), req->customEditor() ); + KEditListBox *el = new KEditListBox( TQString::tqfromLatin1("Test"), req->customEditor() ); el->show(); return app.exec(); } diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp index d4aa27353..318e99277 100644 --- a/kio/kio/authinfo.cpp +++ b/kio/kio/authinfo.cpp @@ -76,17 +76,17 @@ TQDataStream& KIO::operator<< (TQDataStream& s, const AuthInfo& a) { s << a.url << a.username << a.password << a.prompt << a.caption << a.comment << a.commentLabel << a.realmValue << a.digestInfo - << Q_UINT8(a.verifyPath ? 1:0) << Q_UINT8(a.readOnly ? 1:0) - << Q_UINT8(a.keepPassword ? 1:0) << Q_UINT8(a.modified ? 1:0); + << TQ_UINT8(a.verifyPath ? 1:0) << TQ_UINT8(a.readOnly ? 1:0) + << TQ_UINT8(a.keepPassword ? 1:0) << TQ_UINT8(a.modified ? 1:0); return s; } TQDataStream& KIO::operator>> (TQDataStream& s, AuthInfo& a) { - Q_UINT8 verify = 0; - Q_UINT8 ro = 0; - Q_UINT8 keep = 0; - Q_UINT8 mod = 0; + TQ_UINT8 verify = 0; + TQ_UINT8 ro = 0; + TQ_UINT8 keep = 0; + TQ_UINT8 mod = 0; s >> a.url >> a.username >> a.password >> a.prompt >> a.caption >> a.comment >> a.commentLabel >> a.realmValue >> a.digestInfo @@ -146,7 +146,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc, return false; } - if ( !loginMap.contains( type ) ) + if ( !loginMap.tqcontains( type ) ) return false; LoginList l = loginMap[type]; @@ -158,7 +158,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc, AutoLogin &log = *it; if ( (mode & defaultOnly) == defaultOnly && - log.machine == TQString::fromLatin1("default") && + log.machine == TQString::tqfromLatin1("default") && (login.login.isEmpty() || login.login == log.login) ) { login.type = log.type; @@ -169,7 +169,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc, } if ( (mode & presetOnly) == presetOnly && - log.machine == TQString::fromLatin1("preset") && + log.machine == TQString::tqfromLatin1("preset") && (login.login.isEmpty() || login.login == log.login) ) { login.type = log.type; @@ -237,7 +237,7 @@ TQString NetRC::extract( const char* buf, const char* key, int& pos ) if ( idx > start ) { pos = idx; - return TQString::fromLatin1( buf+start, idx-start); + return TQString::tqfromLatin1( buf+start, idx-start); } } } @@ -280,7 +280,7 @@ bool NetRC::parse( int fd ) while( buf[tail-1] == '\n' || buf[tail-1] =='\r' ) tail--; - TQString mac = TQString::fromLatin1(buf, tail).stripWhiteSpace(); + TQString mac = TQString::tqfromLatin1(buf, tail).stripWhiteSpace(); if ( !mac.isEmpty() ) loginMap[type][index].macdef[macro].append( mac ); @@ -294,12 +294,12 @@ bool NetRC::parse( int fd ) if (strncasecmp(buf+pos, "default", 7) == 0 ) { pos += 7; - l.machine = TQString::fromLatin1("default"); + l.machine = TQString::tqfromLatin1("default"); } else if (strncasecmp(buf+pos, "preset", 6) == 0 ) { pos += 6; - l.machine = TQString::fromLatin1("preset"); + l.machine = TQString::tqfromLatin1("preset"); } } // kdDebug() << "Machine: " << l.machine << endl; @@ -314,7 +314,7 @@ bool NetRC::parse( int fd ) type = l.type = extract( buf, "type", pos ); if ( l.type.isEmpty() && !l.machine.isEmpty() ) - type = l.type = TQString::fromLatin1("ftp"); + type = l.type = TQString::tqfromLatin1("ftp"); // kdDebug() << "Type: " << l.type << endl; macro = extract( buf, "macdef", pos ); diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp index e1d343c10..56c24b072 100644 --- a/kio/kio/chmodjob.cpp +++ b/kio/kio/chmodjob.cpp @@ -121,7 +121,7 @@ void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list ) break; } } - if ( !isLink && relativePath != TQString::fromLatin1("..") ) + if ( !isLink && relativePath != TQString::tqfromLatin1("..") ) { ChmodInfo info; info.url = m_lstItems.first()->url(); // base directory diff --git a/kio/kio/connection.h b/kio/kio/connection.h index 6858c8422..758202968 100644 --- a/kio/kio/connection.h +++ b/kio/kio/connection.h @@ -46,7 +46,7 @@ namespace KIO { * It handles a queue of commands to be sent which makes it possible to * queue data before an actual connection has been established. */ - class KIO_EXPORT Connection : public QObject + class KIO_EXPORT Connection : public TQObject { Q_OBJECT public: diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp index 161c82296..bcbd3191e 100644 --- a/kio/kio/dataprotocol.cpp +++ b/kio/kio/dataprotocol.cpp @@ -121,7 +121,7 @@ inline TQString extract(const TQString &buf, int &pos, TQChar c1, TQChar c2 = '\0', TQChar c3 = '\0') { int oldpos = pos; pos = find(buf,oldpos,c1,c2,c3); - return TQString(buf.unicode() + oldpos, pos - oldpos); + return TQString(buf.tqunicode() + oldpos, pos - oldpos); } /** ignores all whitespaces @@ -186,11 +186,11 @@ static void parseDataHeader(const KURL &url, DataHeader &header_info) { header_info.is_base64 = false; // decode url and save it - TQString &raw_url = header_info.url = TQString::fromLatin1("data:") + url.path(); + TQString &raw_url = header_info.url = TQString::tqfromLatin1("data:") + url.path(); int raw_url_len = (int)raw_url.length(); // jump over scheme part (must be "data:", we don't even check that) - header_info.data_offset = raw_url.find(':'); + header_info.data_offset = raw_url.tqfind(':'); header_info.data_offset++; // jump over colon or to begin if scheme was missing // read mime type diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp index d16ecc0d4..8ec90b2a7 100644 --- a/kio/kio/dataslave.cpp +++ b/kio/kio/dataslave.cpp @@ -137,7 +137,7 @@ void DataSlave::send(int cmd, const TQByteArray &arr) { break; default: error(ERR_UNSUPPORTED_ACTION, - unsupportedActionErrorString(TQString::fromLatin1("data"),cmd)); + unsupportedActionErrorString(TQString::tqfromLatin1("data"),cmd)); }/*end switch*/ } diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 8293901ae..fea74a037 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -98,7 +98,7 @@ void DefaultProgress::init() topLayout->addStrut( 360 ); // makes dlg at least that wide TQGridLayout *grid = new TQGridLayout( 2, 3 ); - topLayout->addLayout(grid); + topLayout->addLayout(TQT_TQLAYOUT(grid)); grid->addColSpacing(1, KDialog::spacingHint()); // filenames or action name grid->addWidget(new TQLabel(i18n("Source:"), this), 0, 0); @@ -130,9 +130,9 @@ void DefaultProgress::init() hBox->addWidget(resumeLabel); progressLabel = new TQLabel( this ); -/* progressLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, +/* progressLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ) );*/ - progressLabel->setAlignment( TQLabel::AlignRight ); + progressLabel->tqsetAlignment( TQLabel::AlignRight ); hBox->addWidget( progressLabel ); hBox = new TQHBoxLayout(); @@ -171,8 +171,8 @@ void DefaultProgress::init() connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); hBox->addWidget( d->cancelClose ); - resize( sizeHint() ); - setMaximumHeight(sizeHint().height()); + resize( tqsizeHint() ); + setMaximumHeight(tqsizeHint().height()); d->keepOpenChecked = false; d->noCaptionYet = true; @@ -273,7 +273,7 @@ void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent ) void DefaultProgress::slotInfoMessage( KIO::Job*, const TQString & msg ) { speedLabel->setText( msg ); - speedLabel->setAlignment( speedLabel->alignment() & ~Qt::WordBreak ); + speedLabel->tqsetAlignment( speedLabel->tqalignment() & ~TQt::WordBreak ); } diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp index 5caa08465..c83d5750c 100644 --- a/kio/kio/forwardingslavebase.cpp +++ b/kio/kio/forwardingslavebase.cpp @@ -126,7 +126,7 @@ void ForwardingSlaveBase::get(const KURL &url) KIO::TransferJob *job = KIO::get(new_url, false, false); connectTransferJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -142,7 +142,7 @@ void ForwardingSlaveBase::put(const KURL &url, int permissions, resume, false); connectTransferJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -156,7 +156,7 @@ void ForwardingSlaveBase::stat(const KURL &url) KIO::SimpleJob *job = KIO::stat(new_url, false); connectSimpleJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -170,7 +170,7 @@ void ForwardingSlaveBase::mimetype(const KURL &url) KIO::TransferJob *job = KIO::mimetype(new_url, false); connectTransferJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -184,7 +184,7 @@ void ForwardingSlaveBase::listDir(const KURL &url) KIO::ListJob *job = KIO::listDir(new_url, false); connectListJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -198,7 +198,7 @@ void ForwardingSlaveBase::mkdir(const KURL &url, int permissions) KIO::SimpleJob *job = KIO::mkdir(new_url, permissions); connectSimpleJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -213,7 +213,7 @@ void ForwardingSlaveBase::rename(const KURL &src, const KURL &dest, KIO::Job *job = KIO::rename(new_src, new_dest, overwrite); connectJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -228,7 +228,7 @@ void ForwardingSlaveBase::symlink(const TQString &target, const KURL &dest, KIO::SimpleJob *job = KIO::symlink(target, new_dest, overwrite, false); connectSimpleJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -242,7 +242,7 @@ void ForwardingSlaveBase::chmod(const KURL &url, int permissions) KIO::SimpleJob *job = KIO::chmod(new_url, permissions); connectSimpleJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -258,7 +258,7 @@ void ForwardingSlaveBase::copy(const KURL &src, const KURL &dest, overwrite, false); connectJob(job); - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -280,7 +280,7 @@ void ForwardingSlaveBase::del(const KURL &url, bool isfile) connectSimpleJob(job); } - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } } @@ -363,7 +363,7 @@ void ForwardingSlaveBase::slotResult(KIO::Job *job) finished(); } - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } void ForwardingSlaveBase::slotWarning(KIO::Job* /*job*/, const TQString &msg) @@ -399,7 +399,7 @@ void ForwardingSlaveBase::slotRedirection(KIO::Job *job, const KURL &url) job->kill( true ); finished(); - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } void ForwardingSlaveBase::slotEntries(KIO::Job* /*job*/, diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index f99219524..6cf30c505 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -97,7 +97,7 @@ KIO_EXPORT TQString KIO::number( KIO::filesize_t size ) { char charbuf[256]; sprintf(charbuf, "%lld", size); - return TQString::fromLatin1(charbuf); + return TQString::tqfromLatin1(charbuf); } KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize, @@ -167,12 +167,12 @@ KIO_EXPORT TQString KIO::encodeFileName( const TQString & _str ) TQString str( _str ); int i = 0; - while ( ( i = str.find( "%", i ) ) != -1 ) + while ( ( i = str.tqfind( "%", i ) ) != -1 ) { str.replace( i, 1, "%%"); i += 2; } - while ( ( i = str.find( "/" ) ) != -1 ) + while ( ( i = str.tqfind( "/" ) ) != -1 ) str.replace( i, 1, "%2f"); return str; } @@ -284,7 +284,7 @@ KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorTe result = i18n( "Could not create socket for accessing %1." ).arg( errorText ); break; case KIO::ERR_COULD_NOT_CONNECT: - result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("localhost") : errorText ); + result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::tqfromLatin1("localhost") : errorText ); break; case KIO::ERR_CONNECTION_BROKEN: result = i18n( "Connection to host %1 is broken." ).arg( errorText ); @@ -477,16 +477,16 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0 url = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); ret << errorName; - ret << TQString::fromLatin1( "<qt><p><b>" ) + errorName + - TQString::fromLatin1( "</b></p><p>" ) + description + - TQString::fromLatin1( "</p>" ); - ret2 = TQString::fromLatin1( "<qt><p>" ); + ret << TQString::tqfromLatin1( "<qt><p><b>" ) + errorName + + TQString::tqfromLatin1( "</b></p><p>" ) + description + + TQString::tqfromLatin1( "</p>" ); + ret2 = TQString::tqfromLatin1( "<qt><p>" ); if ( !techName.isEmpty() ) - ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::fromLatin1( "</p>" ); + ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::tqfromLatin1( "</p>" ); ret2 += i18n( "</p><p><b>Details of the request</b>:" ); ret2 += i18n( "</p><ul><li>URL: %1</li>" ).arg( url ); if ( !protocol.isEmpty() ) { @@ -497,12 +497,12 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0 if ( !causes.isEmpty() ) { ret2 += i18n( "<p><b>Possible causes</b>:</p><ul><li>" ); ret2 += causes.join( "</li><li>" ); - ret2 += TQString::fromLatin1( "</li></ul>" ); + ret2 += TQString::tqfromLatin1( "</li></ul>" ); } if ( !solutions.isEmpty() ) { ret2 += i18n( "<p><b>Possible solutions</b>:</p><ul><li>" ); ret2 += solutions.join( "</li><li>" ); - ret2 += TQString::fromLatin1( "</li></ul>" ); + ret2 += TQString::tqfromLatin1( "</li></ul>" ); } ret << ret2; return ret; @@ -559,7 +559,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT protocol = i18n( "(unknown)" ); } - datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), + datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); TQString errorName, techName, description; @@ -1738,7 +1738,7 @@ static TQString get_mount_info(const TQString& filename, if ( is_my_mountpoint( mounted[i].f_mntonname, realname, max ) ) { mountPoint = TQFile::decodeName(mounted[i].f_mntonname); - fstype = TQString::fromLatin1(mounttype); + fstype = TQString::tqfromLatin1(mounttype); check_mount_point( mounttype, mounted[i].f_mntfromname, isautofs, isslow ); // keep going, looking for a potentially better one @@ -1805,7 +1805,7 @@ static TQString get_mount_info(const TQString& filename, if ( is_my_mountpoint( mountedto, realname, max ) ) { mountPoint = TQFile::decodeName(mountedto); - fstype = TQString::fromLatin1(ent->vfsent_name); + fstype = TQString::tqfromLatin1(ent->vfsent_name); check_mount_point(ent->vfsent_name, device_name, isautofs, isslow); if (ismanual == Unseen) diff --git a/kio/kio/global.h b/kio/kio/global.h index 402d7b431..ea42f3e1d 100644 --- a/kio/kio/global.h +++ b/kio/kio/global.h @@ -34,9 +34,9 @@ namespace KIO { /// 64-bit file offset - typedef Q_LLONG fileoffset_t; + typedef TQ_LLONG fileoffset_t; /// 64-bit file size - typedef Q_ULLONG filesize_t; + typedef TQ_ULLONG filesize_t; /** * Converts @p size from bytes to the string representation. @@ -536,7 +536,7 @@ public: it != metaData.end(); ++it) { - replace(it.key(), it.data()); + tqreplace(it.key(), it.data()); } return *this; } diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index b20c09c10..2b82d2411 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -318,10 +318,10 @@ void Job::showErrorDialog( TQWidget * parent ) } } -void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget ) +void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget ) { d->m_autoErrorHandling = enable; - d->m_errorParentWidget = parentWidget; + d->m_errorParentWidget = tqparentWidget; } bool Job::isAutoErrorHandlingEnabled() const @@ -392,7 +392,7 @@ MetaData Job::metaData() const TQString Job::queryMetaData(const TQString &key) { - if (!m_incomingMetaData.contains(key)) + if (!m_incomingMetaData.tqcontains(key)) return TQString::null; return m_incomingMetaData[key]; } @@ -758,7 +758,7 @@ SimpleJob *KIO::mkdir( const KURL& url, int permissions ) SimpleJob *KIO::rmdir( const KURL& url ) { //kdDebug(7007) << "rmdir " << url << endl; - KIO_ARGS << url << Q_INT8(false); // isFile is false + KIO_ARGS << url << TQ_INT8(false); // isFile is false return new SimpleJob(url, CMD_DEL, packedArgs, false); } @@ -772,14 +772,14 @@ SimpleJob *KIO::chmod( const KURL& url, int permissions ) SimpleJob *KIO::rename( const KURL& src, const KURL & dest, bool overwrite ) { //kdDebug(7007) << "rename " << src << " " << dest << endl; - KIO_ARGS << src << dest << (Q_INT8) overwrite; + KIO_ARGS << src << dest << (TQ_INT8) overwrite; return new SimpleJob(src, CMD_RENAME, packedArgs, false); } SimpleJob *KIO::symlink( const TQString& target, const KURL & dest, bool overwrite, bool showProgressInfo ) { //kdDebug(7007) << "symlink target=" << target << " " << dest << endl; - KIO_ARGS << target << dest << (Q_INT8) overwrite; + KIO_ARGS << target << dest << (TQ_INT8) overwrite; return new SimpleJob(dest, CMD_SYMLINK, packedArgs, showProgressInfo); } @@ -791,8 +791,8 @@ SimpleJob *KIO::special(const KURL& url, const TQByteArray & data, bool showProg SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo ) { - KIO_ARGS << int(1) << Q_INT8( ro ? 1 : 0 ) - << TQString::fromLatin1(fstype) << dev << point; + KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 ) + << TQString::tqfromLatin1(fstype) << dev << point; SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo ); if ( showProgressInfo ) Observer::self()->mounting( job, dev, point ); @@ -821,8 +821,8 @@ StatJob::StatJob( const KURL& url, int command, void StatJob::start(Slave *slave) { - m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); - m_outgoingMetaData.replace( "details", TQString::number(m_details) ); + m_outgoingMetaData.tqreplace( "statSide", m_bSource ? "source" : "dest" ); + m_outgoingMetaData.tqreplace( "details", TQString::number(m_details) ); connect( slave, TQT_SIGNAL( statEntry( const KIO::UDSEntry& ) ), TQT_SLOT( slotStatEntry( const KIO::UDSEntry & ) ) ); @@ -946,7 +946,7 @@ void TransferJob::slotRedirection( const KURL &url) // Some websites keep redirecting to themselves where each redirection // acts as the stage in a state-machine. We define "endless redirections" // as 5 redirections to the same URL. - if (m_redirectionList.contains(url) > 5) + if (m_redirectionList.tqcontains(url) > 5) { kdDebug(7007) << "TransferJob::slotRedirection: CYCLIC REDIRECTION!" << endl; m_error = ERR_CYCLIC_LINK; @@ -997,7 +997,7 @@ void TransferJob::slotFinished() } case CMD_PUT: { int permissions; - Q_INT8 iOverwrite, iResume; + TQ_INT8 iOverwrite, iResume; istream >> dummyUrl >> iOverwrite >> iResume >> permissions; m_packedArgs.truncate(0); TQDataStream stream( m_packedArgs, IO_WriteOnly ); @@ -1328,7 +1328,7 @@ TransferJob *KIO::http_post( const KURL& url, const TQByteArray &postData, bool for( TQValueList< int >::ConstIterator it = overriden_ports->begin(); it != overriden_ports->end(); ++it ) - if( overriden_ports->contains( url.port())) + if( overriden_ports->tqcontains( url.port())) _error = 0; } @@ -1380,7 +1380,7 @@ void TransferJob::slotPostRedirection() TransferJob *KIO::put( const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo ) { - KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions; + KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; TransferJob * job = new TransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo ); return job; } @@ -1413,7 +1413,7 @@ void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data ) if ( data.size() == 0 ) return; unsigned int oldSize = m_data.size(); - m_data.resize( oldSize + data.size(), TQGArray::SpeedOptim ); + m_data.tqresize( oldSize + data.size(), TQGArray::SpeedOptim ); memcpy( m_data.data() + oldSize, data.data(), data.size() ); } @@ -1451,7 +1451,7 @@ StoredTransferJob *KIO::storedGet( const KURL& url, bool reload, bool showProgre StoredTransferJob *KIO::storedPut( const TQByteArray& arr, const KURL& url, int permissions, bool overwrite, bool resume, bool showProgressInfo ) { - KIO_ARGS << url << Q_INT8( overwrite ? 1 : 0 ) << Q_INT8( resume ? 1 : 0 ) << permissions; + KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions; StoredTransferJob * job = new StoredTransferJob( url, CMD_PUT, packedArgs, TQByteArray(), showProgressInfo ); job->setData( arr ); return job; @@ -1480,7 +1480,7 @@ void MimetypeJob::slotFinished( ) // Due to the "protocol doesn't support listing" code in KRun, we // assumed it was a file. kdDebug(7007) << "It is in fact a directory!" << endl; - m_mimetype = TQString::fromLatin1("inode/directory"); + m_mimetype = TQString::tqfromLatin1("inode/directory"); emit TransferJob::mimetype( this, m_mimetype ); m_error = 0; } @@ -1663,7 +1663,7 @@ void FileCopyJob::startCopyJob() void FileCopyJob::startCopyJob(const KURL &slave_url) { //kdDebug(7007) << "FileCopyJob::startCopyJob()" << endl; - KIO_ARGS << m_src << m_dest << m_permissions << (Q_INT8) m_overwrite; + KIO_ARGS << m_src << m_dest << m_permissions << (TQ_INT8) m_overwrite; m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false); addSubjob( m_copyJob ); connectSubjob( m_copyJob ); @@ -1673,7 +1673,7 @@ void FileCopyJob::startCopyJob(const KURL &slave_url) void FileCopyJob::startRenameJob(const KURL &slave_url) { - KIO_ARGS << m_src << m_dest << (Q_INT8) m_overwrite; + KIO_ARGS << m_src << m_dest << (TQ_INT8) m_overwrite; m_moveJob = new SimpleJob(slave_url, CMD_RENAME, packedArgs, false); addSubjob( m_moveJob ); connectSubjob( m_moveJob ); @@ -1974,7 +1974,7 @@ FileCopyJob *KIO::file_move( const KURL& src, const KURL& dest, int permissions, SimpleJob *KIO::file_delete( const KURL& src, bool showProgressInfo) { - KIO_ARGS << src << Q_INT8(true); // isFile + KIO_ARGS << src << TQ_INT8(true); // isFile return new SimpleJob(src, CMD_DEL, packedArgs, showProgressInfo ); } @@ -2571,11 +2571,11 @@ void CopyJob::slotEntries(KIO::Job* job, const UDSEntryList& list) KProtocolInfo::fileNameUsedForCopying( url ) == KProtocolInfo::FromURL ) { //destFileName = url.fileName(); // Doesn't work for recursive listing // Count the number of prefixes used by the recursive listjob - int numberOfSlashes = displayName.contains( '/' ); // don't make this a find()! + int numberOfSlashes = displayName.tqcontains( '/' ); // don't make this a find()! TQString path = url.path(); int pos = 0; for ( int n = 0; n < numberOfSlashes + 1; ++n ) { - pos = path.findRev( '/', pos - 1 ); + pos = path.tqfindRev( '/', pos - 1 ); if ( pos == -1 ) { // error kdWarning(7007) << "kioslave bug: not enough slashes in UDS_URL " << path << " - looking for " << numberOfSlashes << " slashes" << endl; break; @@ -2763,7 +2763,7 @@ void CopyJob::startRenameJob( const KURL& slave_url ) files.append(info); emit aboutToCreate( this, files ); - KIO_ARGS << m_currentSrcURL << dest << (Q_INT8) false /*no overwrite*/; + KIO_ARGS << m_currentSrcURL << dest << (TQ_INT8) false /*no overwrite*/; SimpleJob * newJob = new SimpleJob(slave_url, CMD_RENAME, packedArgs, false); Scheduler::scheduleJob(newJob); addSubjob( newJob ); @@ -2789,7 +2789,7 @@ void CopyJob::skip( const KURL & sourceUrl ) // Check if this is one if toplevel sources // If yes, remove it from m_srcList, for a correct FilesRemoved() signal //kdDebug(7007) << "CopyJob::skip: looking for " << sourceUrl << endl; - KURL::List::Iterator sit = m_srcList.find( sourceUrl ); + KURL::List::Iterator sit = m_srcList.tqfind( sourceUrl ); if ( sit != m_srcList.end() ) { //kdDebug(7007) << "CopyJob::skip: removing " << sourceUrl << " from list" << endl; @@ -2967,7 +2967,7 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job ) TQString path = (*renamedirit).uDest.path(); if ( path.left(oldPath.length()) == oldPath ) { TQString n = path; - n.replace( 0, oldPath.length(), newPath ); + n.tqreplace( 0, oldPath.length(), newPath ); kdDebug(7007) << "dirs list: " << (*renamedirit).uSource.path() << " was going to be " << path << ", changed into " << n << endl; @@ -2981,7 +2981,7 @@ void CopyJob::slotResultConflictCreatingDirs( KIO::Job * job ) TQString path = (*renamefileit).uDest.path(); if ( path.left(oldPath.length()) == oldPath ) { TQString n = path; - n.replace( 0, oldPath.length(), newPath ); + n.tqreplace( 0, oldPath.length(), newPath ); kdDebug(7007) << "files list: " << (*renamefileit).uSource.path() << " was going to be " << path << ", changed into " << n << endl; @@ -3107,7 +3107,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) } else { - if ( m_bCurrentOperationIsLink && ::qt_cast<KIO::DeleteJob*>( job ) ) + if ( m_bCurrentOperationIsLink && ::tqqt_cast<KIO::DeleteJob*>( job ) ) { // Very special case, see a few lines below // We are deleting the source of a symlink we successfully moved... ignore error @@ -3124,7 +3124,7 @@ void CopyJob::slotResultCopyingFiles( Job * job ) { // Special case for moving links. That operation needs two jobs, unlike others. if ( m_bCurrentOperationIsLink && m_mode == Move - && !::qt_cast<KIO::DeleteJob *>( job ) // Deleting source not already done + && !::tqqt_cast<KIO::DeleteJob *>( job ) // Deleting source not already done ) { subjobs.remove( job ); @@ -3359,7 +3359,7 @@ void CopyJob::copyNextFile() bool devicesOk=false; // if the source is a devices url, handle it a littlebit special - if ((*it).uSource.protocol()==TQString::fromLatin1("devices")) + if ((*it).uSource.protocol()==TQString::tqfromLatin1("devices")) { TQByteArray data; TQByteArray param; @@ -3395,20 +3395,20 @@ void CopyJob::copyNextFile() config.setDesktopGroup(); KURL url = (*it).uSource; url.setPass( "" ); - config.writePathEntry( TQString::fromLatin1("URL"), url.url() ); - config.writeEntry( TQString::fromLatin1("Name"), url.url() ); - config.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") ); + config.writePathEntry( TQString::tqfromLatin1("URL"), url.url() ); + config.writeEntry( TQString::tqfromLatin1("Name"), url.url() ); + config.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") ); TQString protocol = (*it).uSource.protocol(); - if ( protocol == TQString::fromLatin1("ftp") ) - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("ftp") ); - else if ( protocol == TQString::fromLatin1("http") ) - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("www") ); - else if ( protocol == TQString::fromLatin1("info") ) - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("info") ); - else if ( protocol == TQString::fromLatin1("mailto") ) // sven: - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("kmail") ); // added mailto: support + if ( protocol == TQString::tqfromLatin1("ftp") ) + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("ftp") ); + else if ( protocol == TQString::tqfromLatin1("http") ) + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("www") ); + else if ( protocol == TQString::tqfromLatin1("info") ) + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("info") ); + else if ( protocol == TQString::tqfromLatin1("mailto") ) // sven: + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("kmail") ); // added mailto: support else - config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("unknown") ); + config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("unknown") ); config.sync(); files.remove( it ); m_processedFiles++; @@ -4305,7 +4305,7 @@ void DeleteJob::slotResult( Job *job ) { // Add toplevel dir in list of dirs dirs.append( url ); - if ( url.isLocalFile() && !m_parentDirs.contains( url.path(-1) ) ) + if ( url.isLocalFile() && !m_parentDirs.tqcontains( url.path(-1) ) ) m_parentDirs.append( url.path(-1) ); if ( !KProtocolInfo::canDeleteRecursive( url ) ) { @@ -4334,7 +4334,7 @@ void DeleteJob::slotResult( Job *job ) //kdDebug(7007) << " Target is a file" << endl; files.append( url ); } - if ( url.isLocalFile() && !m_parentDirs.contains( url.directory(false) ) ) + if ( url.isLocalFile() && !m_parentDirs.tqcontains( url.directory(false) ) ) m_parentDirs.append( url.directory(false) ); ++m_currentStat; statNextSrc(); @@ -4435,7 +4435,7 @@ void MultiGetJob::flushQueue(TQPtrList<GetRequest> &queue) } } // Send number of URLs, (URL, metadata)* - KIO_ARGS << (Q_INT32) queue.count(); + KIO_ARGS << (TQ_INT32) queue.count(); for(entry = queue.first(); entry; entry = queue.next()) { stream << entry->url << entry->metaData; @@ -4585,12 +4585,12 @@ TQString CacheInfo::cachedFileName() TQString CEF = m_url.path(); - int p = CEF.find('/'); + int p = CEF.tqfind('/'); while(p != -1) { CEF[p] = separator; - p = CEF.find('/', p); + p = CEF.tqfind('/', p); } TQString host = m_url.host().lower(); @@ -4651,7 +4651,7 @@ TQFile *CacheInfo::cachedFile() ok = false; time_t date; - time_t currentDate = time(0); + time_t tqcurrentDate = time(0); // URL if (ok && (!fgets(buffer, 400, fs))) @@ -4673,10 +4673,10 @@ TQFile *CacheInfo::cachedFile() if (ok) { date = (time_t) strtoul(buffer, 0, 10); - if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge)) + if (m_maxCacheAge && (difftime(tqcurrentDate, date) > m_maxCacheAge)) { m_bMustRevalidate = true; - m_expireDate = currentDate; + m_expireDate = tqcurrentDate; } } @@ -4690,7 +4690,7 @@ TQFile *CacheInfo::cachedFile() { date = (time_t) strtoul(buffer, 0, 10); // After the expire date we need to revalidate. - if (!date || difftime(currentDate, date) >= 0) + if (!date || difftime(tqcurrentDate, date) >= 0) m_bMustRevalidate = true; m_expireDate = date; } diff --git a/kio/kio/jobclasses.h b/kio/kio/jobclasses.h index 03ff3d452..6651565f1 100644 --- a/kio/kio/jobclasses.h +++ b/kio/kio/jobclasses.h @@ -155,17 +155,17 @@ namespace KIO { /** * Enable or disable the automatic error handling. When automatic * error handling is enabled and an error occurs, then showErrorDialog() - * is called with the specified @p parentWidget (if supplied) , right before + * is called with the specified @p tqparentWidget (if supplied) , right before * the emission of the result signal. * * The default is false. * * @param enable enable or disable automatic error handling - * @param parentWidget the parent widget, passed to showErrorDialog. + * @param tqparentWidget the parent widget, passed to showErrorDialog. * Can be 0 for top-level * @see isAutoErrorHandlingEnabled(), showErrorDialog() */ - void setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget = 0 ); + void setAutoErrorHandlingEnabled( bool enable, TQWidget *tqparentWidget = 0 ); /** * Returns whether automatic error handling is enabled or disabled. diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp index 432a50d31..4d12bf3e9 100644 --- a/kio/kio/kacl.cpp +++ b/kio/kio/kacl.cpp @@ -447,7 +447,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, if ( currentTag == type ) { acl_delete_entry( newACL, entry ); // we have to start from the beginning, the iterator is - // invalidated, on deletion + // tqinvalidated, on deletion ret = acl_get_entry( newACL, ACL_FIRST_ENTRY, &entry ); } else { ret = acl_get_entry( newACL, ACL_NEXT_ENTRY, &entry ); @@ -619,12 +619,12 @@ TQString KACL::asString() const TQString KACL::KACLPrivate::getUserName( uid_t uid ) const { TQString *temp; - temp = m_usercache.find( uid ); + temp = m_usercache.tqfind( uid ); if ( !temp ) { struct passwd *user = getpwuid( uid ); if ( user ) { - m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) ); - return TQString::fromLatin1( user->pw_name ); + m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) ); + return TQString::tqfromLatin1( user->pw_name ); } else return TQString::number( uid ); @@ -637,12 +637,12 @@ TQString KACL::KACLPrivate::getUserName( uid_t uid ) const TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const { TQString *temp; - temp = m_groupcache.find( gid ); + temp = m_groupcache.tqfind( gid ); if ( !temp ) { struct group *grp = getgrgid( gid ); if ( grp ) { - m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) ); - return TQString::fromLatin1( grp->gr_name ); + m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) ); + return TQString::tqfromLatin1( grp->gr_name ); } else return TQString::number( gid ); @@ -654,7 +654,7 @@ TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const static TQString aclAsString(const acl_t acl) { char *aclString = acl_to_text( acl, 0 ); - TQString ret = TQString::fromLatin1( aclString ); + TQString ret = TQString::tqfromLatin1( aclString ); acl_free( (void*)aclString ); return ret; } diff --git a/kio/kio/kar.cpp b/kio/kio/kar.cpp index 9f9435294..92f923343 100644 --- a/kio/kio/kar.cpp +++ b/kio/kio/kar.cpp @@ -45,7 +45,7 @@ KAr::KAr( const TQString& filename ) //kdDebug(7042) << "KAr(filename) reached." << endl; m_filename = filename; d = new KArPrivate; - setDevice( new TQFile( filename ) ); + setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); } KAr::KAr( TQIODevice * dev ) @@ -86,7 +86,7 @@ bool KAr::openArchive( int mode ) char magic[8]; dev->readBlock (magic, 8); - if (qstrncmp(magic, "!<arch>", 7) != 0) { + if (tqstrncmp(magic, "!<arch>", 7) != 0) { kdWarning(7042) << "Invalid main magic" << endl; return false; } @@ -140,7 +140,7 @@ bool KAr::openArchive( int mode ) return false; } name = &ar_longnames[name.mid(1, 15).toInt()]; - name = name.left(name.find("/")); + name = name.left(name.tqfind("/")); } } if (skip_entry) continue; diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp index 592e513d4..9f1ec3c79 100644 --- a/kio/kio/karchive.cpp +++ b/kio/kio/karchive.cpp @@ -90,7 +90,7 @@ KArchive::~KArchive() bool KArchive::open( int mode ) { - if ( m_dev && !m_dev->open( mode ) ) + if ( m_dev && !m_dev->tqopen( mode ) ) return false; if ( m_open ) @@ -362,7 +362,7 @@ bool KArchive::writeData( const char* data, uint size ) bool KArchive::writeData_impl( const char* data, uint size ) { Q_ASSERT( device() ); - return device()->writeBlock( data, size ) == (Q_LONG)size; + return device()->writeBlock( data, size ) == (TQ_LONG)size; } KArchiveDirectory * KArchive::rootDir() @@ -375,7 +375,7 @@ KArchiveDirectory * KArchive::rootDir() TQString username = pw ? TQFile::decodeName(pw->pw_name) : TQString::number( getuid() ); TQString groupname = grp ? TQFile::decodeName(grp->gr_name) : TQString::number( getgid() ); - d->rootDir = new KArchiveDirectory( this, TQString::fromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null ); + d->rootDir = new KArchiveDirectory( this, TQString::tqfromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null ); } return d->rootDir; } @@ -406,7 +406,7 @@ KArchiveDirectory * KArchive::findOrCreate( const TQString & path ) } // Otherwise go up and try again - int pos = path.findRev( '/' ); + int pos = path.tqfindRev( '/' ); KArchiveDirectory * parent; TQString dirname; if ( pos == -1 ) // no more slash => create in root dir @@ -548,13 +548,13 @@ KArchiveEntry* KArchiveDirectory::entry( TQString name ) // not "const TQString & name" since we want a local copy // (to remove leading slash if any) { - int pos = name.find( '/' ); + int pos = name.tqfind( '/' ); if ( pos == 0 ) // ouch absolute path (see also KArchive::findOrCreate) { if (name.length()>1) { name = name.mid( 1 ); // remove leading slash - pos = name.find( '/' ); // look again + pos = name.tqfind( '/' ); // look again } else // "/" return this; @@ -563,7 +563,7 @@ KArchiveEntry* KArchiveDirectory::entry( TQString name ) if ( pos != -1 && pos == (int)name.length()-1 ) { name = name.left( pos ); - pos = name.find( '/' ); // look again + pos = name.tqfind( '/' ); // look again } if ( pos != -1 ) { diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h index dbfe02bff..ff1fe1f7c 100644 --- a/kio/kio/karchive.h +++ b/kio/kio/karchive.h @@ -512,12 +512,12 @@ public: * Position of the data in the [uncompressed] archive. * @return the position of the file */ - int position() const; // TODO use Q_LONG in KDE-4.0 + int position() const; // TODO use TQ_LONG in KDE-4.0 /** * Size of the data. * @return the size of the file */ - int size() const; // TODO use Q_LONG in KDE-4.0 + int size() const; // TODO use TQ_LONG in KDE-4.0 /** * Set size of data, usually after writing the file. * @param s the new size of the file @@ -555,8 +555,8 @@ public: void copyTo(const TQString& dest) const; private: - int m_pos; // TODO use Q_LONG in KDE-4.0 - int m_size; // TODO use Q_LONG in KDE-4.0 + int m_pos; // TODO use TQ_LONG in KDE-4.0 + int m_size; // TODO use TQ_LONG in KDE-4.0 protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h index 1d8662590..e73edec35 100644 --- a/kio/kio/kautomount.h +++ b/kio/kio/kautomount.h @@ -24,6 +24,10 @@ #include <kdelibs_export.h> +#ifdef Q_MOC_RUN +#define Q_OS_UNIX +#endif // Q_MOC_RUN + #ifdef Q_OS_UNIX namespace KIO { @@ -38,7 +42,7 @@ class Job; * * @short This class implements synchronous mounting of devices. */ -class KIO_EXPORT KAutoMount : public QObject +class KIO_EXPORT KAutoMount : public TQObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; @@ -83,7 +87,7 @@ private: * * @short This class implements synchronous unmounting of devices, */ -class KIO_EXPORT KAutoUnmount : public QObject +class KIO_EXPORT KAutoUnmount : public TQObject { Q_OBJECT friend class gcc_gives_a_warning_without_this; diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp index bb6462006..9708234d1 100644 --- a/kio/kio/kdatatool.cpp +++ b/kio/kio/kdatatool.cpp @@ -47,7 +47,7 @@ KDataToolInfo::KDataToolInfo( const KService::Ptr& service, KInstance* instance m_service = service; m_instance = instance; - if ( !!m_service && !m_service->serviceTypes().contains( "KDataTool" ) ) + if ( !!m_service && !m_service->serviceTypes().tqcontains( "KDataTool" ) ) { kdDebug(30003) << "The service " << m_service->name().latin1() << " does not feature the service type KDataTool" << endl; @@ -130,7 +130,7 @@ TQString KDataToolInfo::iconName() const TQStringList KDataToolInfo::commands() const { if ( !m_service ) - return TQString::null; + return TQString(); return m_service->property( "Commands" ).toStringList(); } @@ -138,7 +138,7 @@ TQStringList KDataToolInfo::commands() const TQStringList KDataToolInfo::userCommands() const { if ( !m_service ) - return TQString::null; + return TQString(); return TQStringList::split( ',', m_service->comment() ); } @@ -167,11 +167,11 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const if ( !datatype.isEmpty() ) { - constr = TQString::fromLatin1( "DataType == '%1'" ).arg( datatype ); + constr = TQString::tqfromLatin1( "DataType == '%1'" ).arg( datatype ); } if ( !mimetype.isEmpty() ) { - TQString tmp = TQString::fromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype ); + TQString tmp = TQString::tqfromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype ); if ( constr.isEmpty() ) constr = tmp; else @@ -180,7 +180,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const /* Bug in KTrader ? Test with HEAD-kdelibs! if ( instance ) { - TQString tmp = TQString::fromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() ); + TQString tmp = TQString::tqfromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() ); if ( constr.isEmpty() ) constr = tmp; else @@ -196,7 +196,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const { // Temporary replacement for the non-working trader query above if ( !instance || !(*it)->property("ExcludeFrom").toStringList() - .contains( instance->instanceName() ) ) + .tqcontains( instance->instanceName() ) ) lst.append( KDataToolInfo( *it, instance ) ); else kdDebug() << (*it)->entryPath() << " excluded." << endl; diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h index 69751db79..ec76ca5b2 100644 --- a/kio/kio/kdatatool.h +++ b/kio/kio/kdatatool.h @@ -194,6 +194,7 @@ private: class KIO_EXPORT KDataToolAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Constructs a new KDataToolAction. @@ -250,9 +251,10 @@ private: * @see KDataToolAction, and for activating a tool, passing it the data * (and possibly getting modified data from it). */ -class KIO_EXPORT KDataTool : public QObject +class KIO_EXPORT KDataTool : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 901f382b8..11721f751 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -113,7 +113,7 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u, lister->d->rootFileItem = 0; } - else if ( lister->d->lstDirs.find( _url ) != lister->d->lstDirs.end() ) + else if ( lister->d->lstDirs.tqfind( _url ) != lister->d->lstDirs.end() ) { // stop the job listing _url for this lister stop( lister, _url ); @@ -311,7 +311,7 @@ void KDirListerCache::stop( KDirLister *lister ) TQPtrList<KDirLister> *listers; while ( (listers = it.current()) ) { - if ( listers->findRef( lister ) > -1 ) + if ( listers->tqfindRef( lister ) > -1 ) { // lister is listing url TQString url = it.currentKey(); @@ -457,7 +457,7 @@ void KDirListerCache::forgetDirs( KDirLister *lister, const KURL& _url, bool not // that itemsInUse doesn't. When emitting the canceled signals lstDirs must // not contain anything that itemsInUse does not contain. (otherwise it // might crash in findByName()). - lister->d->lstDirs.remove( lister->d->lstDirs.find( url ) ); + lister->d->lstDirs.remove( lister->d->lstDirs.tqfind( url ) ); DirItem *item = itemsInUse[urlStr]; @@ -670,7 +670,7 @@ KFileItem *KDirListerCache::findByURL( const KDirLister *lister, const KURL& _u parentDir.setPath( parentDir.directory() ); // If lister is set, check that it contains this dir - if ( lister && !lister->d->lstDirs.contains( parentDir ) ) + if ( lister && !lister->d->lstDirs.tqcontains( parentDir ) ) return 0L; KFileItemList *itemList = itemsForDir( parentDir ); @@ -760,7 +760,7 @@ void KDirListerCache::FilesChanged( const KURL::List &fileList ) // Let's update the dir. KURL dir( *it ); dir.setPath( dir.directory( true ) ); - if ( dirsToUpdate.find( dir ) == dirsToUpdate.end() ) + if ( dirsToUpdate.tqfind( dir ) == dirsToUpdate.end() ) dirsToUpdate.prepend( dir ); } } @@ -890,7 +890,7 @@ void KDirListerCache::slotFileDirty( const TQString& _file ) // delayed updating of files, FAM is flooding us with events void KDirListerCache::slotFileDirtyDelayed() { - TQString file = TQString::fromUtf8( sender()->name() ); + TQString file = TQString::fromUtf8( TQT_TQOBJECT_CONST(sender())->name() ); kdDebug(7004) << k_funcinfo << file << endl; @@ -1110,7 +1110,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) kdl->d->url = newUrl; } - *kdl->d->lstDirs.find( oldUrl ) = newUrl; + *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl; if ( kdl->d->lstDirs.count() == 1 ) { @@ -1147,7 +1147,7 @@ void KDirListerCache::slotRedirection( KIO::Job *j, const KURL& url ) kdl->d->url = newUrl; } - *kdl->d->lstDirs.find( oldUrl ) = newUrl; + *kdl->d->lstDirs.tqfind( oldUrl ) = newUrl; if ( kdl->d->lstDirs.count() == 1 ) { @@ -1429,7 +1429,7 @@ void KDirListerCache::emitRedirections( const KURL &oldUrl, const KURL &url ) // And notify the dirlisters of the redirection for ( KDirLister *kdl = holders->first(); kdl; kdl = holders->next() ) { - *kdl->d->lstDirs.find( oldUrl ) = url; + *kdl->d->lstDirs.tqfind( oldUrl ) = url; if ( kdl->d->lstDirs.count() == 1 ) emit kdl->redirection( url ); @@ -1478,7 +1478,7 @@ void KDirListerCache::slotUpdateResult( KIO::Job * j ) if ( listers ) for ( kdl = tmpLst->first(); kdl; kdl = tmpLst->next() ) { - Q_ASSERT( listers->containsRef( kdl ) == 0 ); + Q_ASSERT( listers->tqcontainsRef( kdl ) == 0 ); listers->append( kdl ); } else @@ -2095,8 +2095,8 @@ void KDirLister::setMimeFilter( const TQStringList& mimeFilter ) if ( !(d->changes & MIME_FILTER) ) d->oldMimeFilter = d->mimeFilter; - if ( mimeFilter.find("all/allfiles") != mimeFilter.end() || - mimeFilter.find("all/all") != mimeFilter.end() ) + if ( mimeFilter.tqfind("all/allfiles") != mimeFilter.end() || + mimeFilter.tqfind("all/all") != mimeFilter.end() ) d->mimeFilter.clear(); else d->mimeFilter = mimeFilter; diff --git a/kio/kio/kdirlister.h b/kio/kio/kdirlister.h index 8a0109e89..d088cc281 100644 --- a/kio/kio/kdirlister.h +++ b/kio/kio/kdirlister.h @@ -52,7 +52,7 @@ namespace KIO { class Job; class ListJob; } * @short Helper class for the kiojob used to list and update a directory. * @author Michael Brade <brade@kde.org> */ -class KIO_EXPORT KDirLister : public QObject +class KIO_EXPORT KDirLister : public TQObject { class KDirListerPrivate; friend class KDirListerPrivate; diff --git a/kio/kio/kdirwatch.cpp b/kio/kio/kdirwatch.cpp index bbea148fa..c9418ef9d 100644 --- a/kio/kio/kdirwatch.cpp +++ b/kio/kio/kdirwatch.cpp @@ -23,7 +23,7 @@ // Februar 2002 - Add file watching and remote mount check for STAT // Mar 30, 2001 - Native support for Linux dir change notification. // Jan 28, 2000 - Usage of FAM service on IRIX (Josef.Weidendorfer@in.tum.de) -// May 24. 1998 - List of times introduced, and some bugs are fixed. (sven) +// May 24. 1998 - List of times introduced, and some bugs are fixed. (sven)1 // May 23. 1998 - Removed static pointer - you can have more instances. // It was Needed for KRegistry. KDirWatch now emits signals and doesn't // call (or need) KFM. No more URL's - just plain paths. (sven) @@ -123,7 +123,7 @@ static int dnotify_signal = 0; * * As this is called asynchronously, only a flag is set and * a rescan is requested. - * This is done by writing into a pipe to trigger a QSocketNotifier + * This is done by writing into a pipe to trigger a TQSocketNotifier * watching on this pipe: a timer is started and after a timeout, * the rescan is done. */ @@ -135,7 +135,7 @@ void KDirWatchPrivate::dnotify_handler(int, siginfo_t *si, void *) // (Richard Stevens, Advanced programming in the Unix Environment) int saved_errno = errno; - Entry* e = dwp_self->fd_Entry.find(si->si_fd); + Entry* e = dwp_self->fd_Entry.tqfind(si->si_fd); // kdDebug(7001) << "DNOTIFY Handler: fd " << si->si_fd << " path " // << TQString(e ? e->path:"unknown") << endl; @@ -551,7 +551,7 @@ KDirWatchPrivate::Entry* KDirWatchPrivate::entry(const TQString& _path) if ( path.length() > 1 && path.right(1) == "/" ) path.truncate( path.length() - 1 ); - EntryMap::Iterator it = m_mapEntries.find( path ); + EntryMap::Iterator it = m_mapEntries.tqfind( path ); if ( it == m_mapEntries.end() ) return 0; else @@ -684,7 +684,7 @@ bool KDirWatchPrivate::useDNotify(Entry* e) return false; } - fd_Entry.replace(fd, e); + fd_Entry.tqreplace(fd, e); e->dn_fd = fd; kdDebug(7001) << " Setup DNotify (fd " << fd @@ -782,7 +782,7 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, if ( path.length() > 1 && path.right(1) == "/" ) path.truncate( path.length() - 1 ); - EntryMap::Iterator it = m_mapEntries.find( path ); + EntryMap::Iterator it = m_mapEntries.tqfind( path ); if ( it != m_mapEntries.end() ) { if (sub_entry) { @@ -830,7 +830,7 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, (*it).addClient(instance); kdDebug(7001) << "Added already watched Entry " << path << " (now " << (*it).clients() << " clients)" - << TQString(" [%1]").arg(instance->name()) << endl; + << TQString(TQString(" [%1]").arg(instance->name())) << endl; } return; } @@ -873,8 +873,8 @@ void KDirWatchPrivate::addEntry(KDirWatch* instance, const TQString& _path, kdDebug(7001) << "Added " << (e->isDir ? "Dir ":"File ") << path << (e->m_status == NonExistent ? " NotExisting" : "") - << (sub_entry ? TQString(" for %1").arg(sub_entry->path) : TQString("")) - << (instance ? TQString(" [%1]").arg(instance->name()) : TQString("")) + << (sub_entry ? TQString(TQString(" for %1").arg(sub_entry->path)) : TQString("")) + << (instance ? TQString(TQString(" [%1]").arg(instance->name())) : TQString("")) << endl; @@ -923,7 +923,7 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance, if (delayRemove) { // removeList is allowed to contain any entry at most once - if (removeList.findRef(e)==-1) + if (removeList.tqfindRef(e)==-1) removeList.append(e); // now e->isValid() is false return; @@ -998,8 +998,8 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance, } kdDebug(7001) << "Removed " << (e->isDir ? "Dir ":"File ") << e->path - << (sub_entry ? TQString(" for %1").arg(sub_entry->path) : TQString("")) - << (instance ? TQString(" [%1]").arg(instance->name()) : TQString("")) + << (sub_entry ? TQString(TQString(" for %1").arg(sub_entry->path)) : TQString("")) + << (instance ? TQString(TQString(" [%1]").arg(instance->name())) : TQString("")) << endl; m_mapEntries.remove( e->path ); // <e> not valid any more } @@ -1611,7 +1611,7 @@ KDirWatch::KDirWatch (TQObject* parent, const char* name) static int nameCounter = 0; nameCounter++; - setName(TQString("KDirWatch-%1").arg(nameCounter).ascii()); + setName(TQString(TQString("KDirWatch-%1").arg(nameCounter)).ascii()); } if (!dwp_self) diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h index 36f2737b3..e04b0ad1e 100644 --- a/kio/kio/kdirwatch.h +++ b/kio/kio/kdirwatch.h @@ -60,7 +60,7 @@ class KDirWatchPrivate; * @short Class for watching directory and file changes. * @author Sven Radej <sven@lisa.exp.univie.ac.at> */ -class KIO_EXPORT KDirWatch : public QObject +class KIO_EXPORT KDirWatch : public TQObject { Q_OBJECT diff --git a/kio/kio/kdirwatch_p.h b/kio/kio/kdirwatch_p.h index 9920b866d..1c0ec8fe7 100644 --- a/kio/kio/kdirwatch_p.h +++ b/kio/kio/kdirwatch_p.h @@ -1,6 +1,6 @@ /* Private Header for class of KDirWatchPrivate * - * this separate header file is needed for MOC processing + * this separate header file is needed for TQMOC processing * because KDirWatchPrivate has signals and slots */ @@ -18,7 +18,7 @@ /* KDirWatchPrivate is a singleton and does the watching * for every KDirWatch instance in the application. */ -class KDirWatchPrivate : public QObject +class KDirWatchPrivate : public TQObject { Q_OBJECT public: diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index 010832573..b15731f1c 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -973,12 +973,12 @@ void KFileItem::setExtraData( const void *key, void *value ) if ( !key ) return; - m_extra.replace( key, value ); + m_extra.tqreplace( key, value ); } const void * KFileItem::extraData( const void *key ) const { - TQMapConstIterator<const void*,void*> it = m_extra.find( key ); + TQMapConstIterator<const void*,void*> it = m_extra.tqfind( key ); if ( it != m_extra.end() ) return it.data(); return 0L; @@ -986,7 +986,7 @@ const void * KFileItem::extraData( const void *key ) const void * KFileItem::extraData( const void *key ) { - TQMapIterator<const void*,void*> it = m_extra.find( key ); + TQMapIterator<const void*,void*> it = m_extra.tqfind( key ); if ( it != m_extra.end() ) return it.data(); return 0L; @@ -1041,7 +1041,7 @@ TQString KFileItem::parsePermissions(mode_t perm) const if (hasExtendedACL()) p[10]='+'; - return TQString::fromLatin1(p); + return TQString::tqfromLatin1(p); } // check if we need to cache this @@ -1098,7 +1098,7 @@ void KFileItem::virtual_hook( int, void* ) TQDataStream & operator<< ( TQDataStream & s, const KFileItem & a ) { - // We don't need to save/restore anything that refresh() invalidates, + // We don't need to save/restore anything that refresh() tqinvalidates, // since that means we can re-determine those by ourselves. s << a.m_url; s << a.m_strName; diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp index fcab35f19..ee79e72a2 100644 --- a/kio/kio/kfilemetainfo.cpp +++ b/kio/kio/kfilemetainfo.cpp @@ -38,12 +38,12 @@ #include "kfilemetainfo.h" // shared data of a KFileMetaInfoItem -class KFileMetaInfoItem::Data : public QShared +class KFileMetaInfoItem::Data : public TQShared { public: Data( const KFileMimeTypeInfo::ItemInfo* mti, const TQString& _key, const TQVariant& _value ) - : QShared(), + : TQShared(), mimeTypeInfo( mti ), key( _key ), value( _value ), @@ -270,11 +270,11 @@ void KFileMetaInfoItem::deref() /////////////////////////////////////////////////////////////////// // shared data of a KFileMetaInfo -class KFileMetaInfo::Data : public QShared +class KFileMetaInfo::Data : public TQShared { public: Data(const KURL& _url, uint _what) - : QShared(), + : TQShared(), url(_url), what(_what), mimeTypeInfo( 0L ) @@ -410,7 +410,7 @@ TQStringList KFileMetaInfo::preferredGroups() const // move all keys from the preferred groups that are in our list to a new list for ( pref = preferred.begin(); pref != preferred.end(); ++pref ) { - TQStringList::Iterator group = list.find(*pref); + TQStringList::Iterator group = list.tqfind(*pref); if ( group != list.end() ) { newlist.append( *group ); @@ -440,7 +440,7 @@ TQStringList KFileMetaInfo::preferredKeys() const KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const { - TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.find( key ); + TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.tqfind( key ); if ( it != d->groups.end() ) return it.data(); else @@ -450,8 +450,8 @@ KFileMetaInfoGroup KFileMetaInfo::group(const TQString& key) const bool KFileMetaInfo::addGroup( const TQString& name ) { assert(isValid()); - if ( d->mimeTypeInfo->supportedGroups().contains(name) && - ! d->groups.contains(name) ) + if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) && + ! d->groups.tqcontains(name) ) { KFileMetaInfoGroup group( name, d->mimeTypeInfo ); @@ -486,7 +486,7 @@ bool KFileMetaInfo::addGroup( const TQString& name ) bool KFileMetaInfo::removeGroup( const TQString& name ) { - TQMapIterator<TQString, KFileMetaInfoGroup> it = d->groups.find(name); + TQMapIterator<TQString, KFileMetaInfoGroup> it = d->groups.tqfind(name); if ( (it==d->groups.end()) || !((*it).attributes() & KFileMimeTypeInfo::Removable)) return false; @@ -608,7 +608,7 @@ bool KFileMetaInfo::contains(const TQString& key) const bool KFileMetaInfo::containsGroup(const TQString& key) const { - return groups().contains(key); + return groups().tqcontains(key); } KFileMetaInfoItem KFileMetaInfo::item( const TQString& key) const @@ -642,15 +642,15 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, // try the preferred groups first if ( !preferredGroup.isEmpty() ) { TQMapIterator<TQString,KFileMetaInfoGroup> it = - d->groups.find( preferredGroup ); + d->groups.tqfind( preferredGroup ); // try to create the preferred group, if necessary if ( it == d->groups.end() && createGroup ) { const KFileMimeTypeInfo::GroupInfo *groupInfo = d->mimeTypeInfo->groupInfo( preferredGroup ); - if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) { + if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) ) { if ( addGroup( preferredGroup ) ) - it = d->groups.find( preferredGroup ); + it = d->groups.tqfind( preferredGroup ); } } @@ -668,7 +668,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, TQStringList::ConstIterator groupIt = groups.begin(); for ( ; groupIt != groups.end(); ++groupIt ) { - TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.find( *groupIt ); + TQMapIterator<TQString,KFileMetaInfoGroup> it = d->groups.tqfind( *groupIt ); if ( it != d->groups.end() ) { KFileMetaInfoGroup group = it.data(); @@ -680,7 +680,7 @@ KFileMetaInfoItem KFileMetaInfo::saveItem( const TQString& key, { const KFileMimeTypeInfo::GroupInfo *groupInfo = d->mimeTypeInfo->groupInfo( *groupIt ); - if ( groupInfo && groupInfo->supportedKeys().contains( key ) ) + if ( groupInfo && groupInfo->supportedKeys().tqcontains( key ) ) { if ( addGroup( *groupIt ) ) { @@ -717,8 +717,8 @@ KFileMetaInfoItem KFileMetaInfo::findEditableItem( KFileMetaInfoGroup& group, KFileMetaInfoGroup KFileMetaInfo::appendGroup(const TQString& name) { assert(isValid()); - if ( d->mimeTypeInfo->supportedGroups().contains(name) && - ! d->groups.contains(name) ) + if ( d->mimeTypeInfo->supportedGroups().tqcontains(name) && + ! d->groups.tqcontains(name) ) { KFileMetaInfoGroup group( name, d->mimeTypeInfo ); d->groups.insert(name, group); @@ -937,7 +937,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const query = "(not exist [X-KDE-Protocol])"; queryMimeType = mimeType; } else { - query = TQString::fromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol); + query = TQString::tqfromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol); // querying for a protocol: we have no mimetype, so we need to use KFilePlugin as one queryMimeType = "KFilePlugin"; // hopefully using KFilePlugin as genericMimeType too isn't a problem @@ -951,7 +951,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const return 0; KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService<KFilePlugin> - ( service, this, mimeType.local8Bit() ); + ( service, TQT_TQOBJECT(this), mimeType.local8Bit() ); if (!plugin) kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl; @@ -986,7 +986,7 @@ KFilePlugin* KFileMetaInfoProvider::loadAndRegisterPlugin( const TQString& mimeT first = false; } // Hopefully the above includes the mimetype we asked for! - if ( m_pendingMimetypeInfos.find( mimeType ) == 0 ) + if ( m_pendingMimetypeInfos.tqfind( mimeType ) == 0 ) kdWarning(7033) << plugin->className() << " was created for " << mimeType << " but doesn't call addMimeTypeInfo for it!" << endl; } m_pendingMimetypeInfos.clear(); @@ -1003,7 +1003,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt //kdDebug(7033) << "plugin() : looking for plugin for protocol=" << protocol << " mimeType=" << mimeType << endl; if ( !protocol.isEmpty() ) { - CachedPluginInfo *cache = m_plugins.find( protocol ); + CachedPluginInfo *cache = m_plugins.tqfind( protocol ); if ( cache && cache->plugin ) { return cache->plugin; } @@ -1014,7 +1014,7 @@ KFilePlugin * KFileMetaInfoProvider::plugin(const TQString& mimeType, const TQSt } } - CachedPluginInfo *cache = m_plugins.find( mimeType ); + CachedPluginInfo *cache = m_plugins.tqfind( mimeType ); if ( cache ) { return cache->plugin; } @@ -1072,27 +1072,27 @@ const KFileMimeTypeInfo * KFileMetaInfoProvider::mimeTypeInfo( const TQString& m { //kdDebug(7033) << "mimeTypeInfo() : looking for plugin for protocol=" << protocol << " mimeType=" << mimeType << endl; if ( !protocol.isEmpty() ) { - CachedPluginInfo *cache = m_plugins.find( protocol ); + CachedPluginInfo *cache = m_plugins.tqfind( protocol ); if ( cache && cache->mimeTypeInfo ) { return cache->mimeTypeInfo; } if ( !cache ) { loadAndRegisterPlugin( TQString::null, protocol ); - cache = m_plugins.find( protocol ); + cache = m_plugins.tqfind( protocol ); if ( cache && cache->mimeTypeInfo ) { return cache->mimeTypeInfo; } } } - CachedPluginInfo *cache = m_plugins.find( mimeType ); + CachedPluginInfo *cache = m_plugins.tqfind( mimeType ); if ( cache ) { return cache->mimeTypeInfo; } loadAndRegisterPlugin( mimeType, TQString::null ); - cache = m_plugins.find( mimeType ); + cache = m_plugins.tqfind( mimeType ); if ( cache ) { return cache->mimeTypeInfo; } @@ -1103,7 +1103,7 @@ KFileMimeTypeInfo * KFileMetaInfoProvider::addMimeTypeInfo( const TQString& mimeType ) { - KFileMimeTypeInfo *info = m_pendingMimetypeInfos.find( mimeType ); + KFileMimeTypeInfo *info = m_pendingMimetypeInfos.tqfind( mimeType ); Q_ASSERT( !info ); if ( !info ) { @@ -1129,7 +1129,7 @@ TQStringList KFileMetaInfoProvider::supportedMimeTypes() const const TQStringList mimeTypes = (*it)->serviceTypes(); TQStringList::ConstIterator it2 = mimeTypes.begin(); for ( ; it2 != mimeTypes.end(); ++it2 ) - if ( allMimeTypes.find( *it2 ) == allMimeTypes.end() && + if ( allMimeTypes.tqfind( *it2 ) == allMimeTypes.end() && *it2 != kfilePlugin ) // also in serviceTypes() allMimeTypes.append( *it2 ); } @@ -1144,11 +1144,11 @@ TQStringList KFileMetaInfoProvider::supportedMimeTypes() const // shared data of a KFileMetaInfoGroup -class KFileMetaInfoGroup::Data : public QShared +class KFileMetaInfoGroup::Data : public TQShared { public: Data(const TQString& _name) - : QShared(), + : TQShared(), name(_name), mimeTypeInfo(0L), dirty( false ), @@ -1235,7 +1235,7 @@ TQStringList KFileMetaInfoGroup::preferredKeys() const // move all keys from the preferred keys that are in our list to a new list for ( pref = begin; pref!=end; ++pref ) { - TQStringList::Iterator item = list.find(*pref); + TQStringList::Iterator item = list.tqfind(*pref); if ( item != list.end() ) { newlist.append( *item ); @@ -1288,12 +1288,12 @@ bool KFileMetaInfoGroup::supportsVariableKeys() const bool KFileMetaInfoGroup::contains( const TQString& key ) const { - return d->items.contains(key); + return d->items.tqcontains(key); } KFileMetaInfoItem KFileMetaInfoGroup::item( const TQString& key) const { - TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.find( key ); + TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.tqfind( key ); if ( it != d->items.end() ) return it.data(); @@ -1356,7 +1356,7 @@ void KFileMetaInfoGroup::deref() KFileMetaInfoItem KFileMetaInfoGroup::addItem( const TQString& key ) { assert(isValid()); - TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.find( key ); + TQMapIterator<TQString,KFileMetaInfoItem> it = d->items.tqfind( key ); if ( it != d->items.end() ) return it.data(); @@ -1395,7 +1395,7 @@ bool KFileMetaInfoGroup::removeItem( const TQString& key ) return false; } - TQMapIterator<TQString, KFileMetaInfoItem> it = d->items.find(key); + TQMapIterator<TQString, KFileMetaInfoItem> it = d->items.tqfind(key); if ( it==d->items.end() ) { kdDebug(7033) << "trying to remove the non existant item " << key << "\n"; @@ -1482,7 +1482,7 @@ KFileMimeTypeInfo::~KFileMimeTypeInfo() const KFileMimeTypeInfo::GroupInfo * KFileMimeTypeInfo::groupInfo( const TQString& group ) const { - return m_groups.find( group ); + return m_groups.tqfind( group ); } KFileMimeTypeInfo::GroupInfo * KFileMimeTypeInfo::addGroupInfo( @@ -1523,7 +1523,7 @@ TQStringList KFileMimeTypeInfo::supportedKeys() const for ( ; it.current(); ++it ) { // need to nuke dupes TQStringList list = it.current()->supportedKeys(); for ( lit = list.begin(); lit != list.end(); ++lit ) { - if ( keys.find( *lit ) == keys.end() ) + if ( keys.tqfind( *lit ) == keys.end() ) keys.append( *lit ); } } @@ -1564,7 +1564,7 @@ KFileMimeTypeInfo::GroupInfo::~GroupInfo() const KFileMimeTypeInfo::ItemInfo * KFileMimeTypeInfo::GroupInfo::itemInfo( const TQString& key ) const { - ItemInfo* item = m_itemDict.find( key ); + ItemInfo* item = m_itemDict.tqfind( key ); // if we the item isn't found and variable keys are supported, we need to // return the default variable key iteminfo. diff --git a/kio/kio/kfilemetainfo.h b/kio/kio/kfilemetainfo.h index d6a6e7e4c..1552ede9f 100644 --- a/kio/kio/kfilemetainfo.h +++ b/kio/kio/kfilemetainfo.h @@ -1391,7 +1391,7 @@ private: * PreferredItems=Items,Size * @endcode **/ -class KIO_EXPORT KFilePlugin : public QObject +class KIO_EXPORT KFilePlugin : public TQObject { Q_OBJECT diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp index 1f6dca285..8fea509d7 100644 --- a/kio/kio/kfileshare.cpp +++ b/kio/kio/kfileshare.cpp @@ -90,7 +90,7 @@ void KFileShare::readConfig() // static { // Create KFileSharePrivate instance KFileSharePrivate::self(); - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true); s_sharingEnabled = config.readEntry("FILESHARING", "yes") == "yes"; s_restricted = config.readEntry("RESTRICT", "yes") == "yes"; @@ -105,7 +105,7 @@ void KFileShare::readConfig() // static else { // check if current user is in fileshare group KUserGroup shareGroup(s_fileShareGroup); - if (shareGroup.users().findIndex(KUser()) > -1 ) + if (shareGroup.users().tqfindIndex(KUser()) > -1 ) s_authorization = Authorized; else s_authorization = UserNotAllowed; @@ -221,9 +221,9 @@ int KFileShare::isDirectoryShared( const TQString& _path ) if ( path[path.length()-1] != '/' ) path += '/'; //return s_shareList && s_shareList->contains( path ); - if( (*s_shareMap).contains(path) && !((*s_shareMap)[path].isEmpty()) ) { + if( (*s_shareMap).tqcontains(path) && !((*s_shareMap)[path].isEmpty()) ) { ret+=1; - if( (*s_shareMap)[path].find("readwrite") != -1 ) + if( (*s_shareMap)[path].tqfind("readwrite") != -1 ) ret+=2; } @@ -241,7 +241,7 @@ KFileShare::Authorization KFileShare::authorization() TQString KFileShare::findExe( const char* exeName ) { // /usr/sbin on Mandrake, $PATH allows flexibility for other distributions - TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::fromLatin1(":/usr/sbin"); + TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::tqfromLatin1(":/usr/sbin"); TQString exe = KStandardDirs::findExe( exeName, path ); if (exe.isEmpty()) kdError() << exeName << " not found in " << path << endl; diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h index 6fddebd65..a7158bf71 100644 --- a/kio/kio/kfileshare.h +++ b/kio/kio/kfileshare.h @@ -29,7 +29,7 @@ class KDirWatch; * @internal * Do not use, ever. */ -class KFileSharePrivate : public QObject +class KFileSharePrivate : public TQObject { Q_OBJECT diff --git a/kio/kio/kfilterdev.cpp b/kio/kio/kfilterdev.cpp index 224d68761..187b16654 100644 --- a/kio/kio/kfilterdev.cpp +++ b/kio/kio/kfilterdev.cpp @@ -70,9 +70,9 @@ TQIODevice* KFilterDev::createFilterDevice(KFilterBase* base, TQFile* file) //we don't need a filter if (base==0) - return new TQFile(file->name()); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) + return TQT_TQIODEVICE(new TQFile(file->name())); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF) - base->setDevice(file); + base->setDevice(TQT_TQIODEVICE(file)); return new KFilterDev(base); } #endif @@ -86,11 +86,11 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin : KFilterBase::findFilterByMimeType( mimetype ); if ( base ) { - base->setDevice(f, true); + base->setDevice(TQT_TQIODEVICE(f), true); return new KFilterDev(base, true); } if(!forceFilter) - return f; + return TQT_TQIODEVICE(f); else { delete f; @@ -132,7 +132,7 @@ bool KFilterDev::open( int mode ) d->bNeedHeader = !d->bSkipHeaders; filter->init( mode ); d->bOpenedUnderlyingDevice = !filter->device()->isOpen(); - bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( mode ) : true; + bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQIODevice_OpenModeFlag)mode ) : true; d->result = KFilterBase::OK; if ( !ret ) @@ -142,7 +142,7 @@ bool KFilterDev::open( int mode ) setState( IO_Open ); setMode( mode ); } - ioIndex = 0; + TQIODevice::at(0); return ret; } @@ -169,7 +169,11 @@ void KFilterDev::flush() // Hmm, might not be enough... } +#ifdef USE_QT4 +qint64 KFilterDev::size() const +#else // USE_QT4 TQIODevice::Offset KFilterDev::size() const +#endif // USE_QT4 { // Well, hmm, Houston, we have a problem. // We can't know the size of the uncompressed data @@ -184,21 +188,21 @@ TQIODevice::Offset KFilterDev::size() const TQIODevice::Offset KFilterDev::at() const { - return ioIndex; + return TQIODevice::at(); } bool KFilterDev::at( TQIODevice::Offset pos ) { - //kdDebug(7005) << "KFilterDev::at " << pos << " currently at " << ioIndex << endl; + //kdDebug(7005) << "KFilterDev::at " << pos << " currently at " << TQIODevice::at() << endl; - if ( ioIndex == pos ) + if ( TQIODevice::at() == pos ) return true; Q_ASSERT ( filter->mode() == IO_ReadOnly ); if ( pos == 0 ) { - ioIndex = 0; + TQIODevice::at(0); // We can forget about the cached data d->ungetchBuffer.resize(0); d->bNeedHeader = !d->bSkipHeaders; @@ -208,8 +212,8 @@ bool KFilterDev::at( TQIODevice::Offset pos ) return filter->device()->reset(); } - if ( ioIndex < pos ) // we can start from here - pos = pos - ioIndex; + if ( TQIODevice::at() < pos ) // we can start from here + pos = pos - TQIODevice::at(); else { // we have to start from 0 ! Ugly and slow, but better than the previous @@ -219,7 +223,7 @@ bool KFilterDev::at( TQIODevice::Offset pos ) } //kdDebug(7005) << "KFilterDev::at : reading " << pos << " dummy bytes" << endl; - TQByteArray dummy( QMIN( pos, 3*BUFFER_SIZE ) ); + TQByteArray dummy( TQMIN( pos, 3*BUFFER_SIZE ) ); d->bIgnoreData = true; bool result = ( (TQIODevice::Offset)readBlock( dummy.data(), pos ) == pos ); d->bIgnoreData = false; @@ -232,7 +236,7 @@ bool KFilterDev::atEnd() const && d->ungetchBuffer.isEmpty(); } -Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) +TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen ) { Q_ASSERT ( filter->mode() == IO_ReadOnly ); //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl; @@ -252,10 +256,10 @@ Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) } else { - dataReceived = QMIN( len, maxlen ); + dataReceived = TQMIN( len, maxlen ); } d->ungetchBuffer.truncate( len - dataReceived ); - ioIndex += dataReceived; + TQIODevice::at(TQIODevice::at() + dataReceived); } // If we came to the end of the stream @@ -268,17 +272,17 @@ Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) return -1; - Q_ULONG outBufferSize; + TQ_ULONG outBufferSize; if ( d->bIgnoreData ) { - outBufferSize = QMIN( maxlen, 3*BUFFER_SIZE ); + outBufferSize = TQMIN( maxlen, 3*BUFFER_SIZE ); } else { outBufferSize = maxlen; } outBufferSize -= dataReceived; - Q_ULONG availOut = outBufferSize; + TQ_ULONG availOut = outBufferSize; filter->setOutBuffer( data, outBufferSize ); bool decompressedAll = false; @@ -335,7 +339,7 @@ Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) { availOut = maxlen - dataReceived; } - ioIndex += outReceived; + TQIODevice::at(TQIODevice::at() + outReceived); if (d->result == KFilterBase::END) { //kdDebug(7005) << "KFilterDev::readBlock got END. dataReceived=" << dataReceived << endl; @@ -351,7 +355,7 @@ Q_LONG KFilterDev::readBlock( char *data, Q_ULONG maxlen ) return dataReceived; } -Q_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, Q_ULONG len ) +TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len ) { Q_ASSERT ( filter->mode() == IO_WriteOnly ); // If we had an error, return 0. @@ -394,7 +398,7 @@ Q_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, Q_ULONG len ) // Move on in the input buffer data += wrote; dataWritten += wrote; - ioIndex += wrote; + TQIODevice::at(TQIODevice::at() + wrote); availIn = len - dataWritten; //kdDebug(7005) << " KFilterDev::writeBlock availIn=" << availIn << " dataWritten=" << dataWritten << " ioIndex=" << ioIndex << endl; @@ -439,7 +443,7 @@ int KFilterDev::getch() int len = d->ungetchBuffer.length(); int ch = d->ungetchBuffer[ len-1 ]; d->ungetchBuffer.truncate( len - 1 ); - ioIndex++; + TQIODevice::at(TQIODevice::at() + 1); //kdDebug(7005) << "KFilterDev::getch from ungetch: " << TQString(TQChar(ch)) << endl; return ch; } @@ -465,7 +469,7 @@ int KFilterDev::ungetch( int ch ) // pipe or similar => we cannot ungetch, so do it manually d->ungetchBuffer +=ch; - ioIndex--; + TQIODevice::at(TQIODevice::at() - 1); return ch; } diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h index d36229859..7d8fe5288 100644 --- a/kio/kio/kfilterdev.h +++ b/kio/kio/kfilterdev.h @@ -33,7 +33,7 @@ class KFilterBase; * * @author David Faure <faure@kde.org> */ -class KIO_EXPORT KFilterDev : public QIODevice +class KIO_EXPORT KFilterDev : public TQIODevice { public: /** @@ -77,7 +77,11 @@ public: void setSkipHeaders(); // Not implemented +#ifdef USE_QT4 + virtual qint64 size() const; +#else // USE_QT4 virtual TQIODevice::Offset size() const; +#endif // USE_QT4 virtual TQIODevice::Offset at() const; /** @@ -87,8 +91,8 @@ public: virtual bool atEnd() const; - virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ); - virtual Q_LONG writeBlock( const char *data, Q_ULONG len ); + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ); + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ); //int readLine( char *data, uint maxlen ); virtual int getch(); diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp index 8d4a45db4..87bbf6879 100644 --- a/kio/kio/kimageio.cpp +++ b/kio/kio/kimageio.cpp @@ -68,7 +68,7 @@ KImageIOFormat::~KImageIOFormat() void KImageIOFormat::load( TQDataStream& _str) { - Q_INT8 iRead, iWrite; + TQ_INT8 iRead, iWrite; KSycocaEntry::read(_str, mType); KSycocaEntry::read(_str, mHeader); KSycocaEntry::read(_str, mFlags); @@ -86,8 +86,8 @@ void KImageIOFormat::save( TQDataStream& _str) { KSycocaEntry::save( _str ); - Q_INT8 iRead = bRead ? 1 : 0; - Q_INT8 iWrite = bWrite ? 1 : 0; + TQ_INT8 iRead = bRead ? 1 : 0; + TQ_INT8 iWrite = bWrite ? 1 : 0; _str << mType << mHeader << mFlags << iRead << iWrite << mSuffices << mMimetype << mLib << mPattern << rPaths; @@ -100,18 +100,18 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) { if (mLib.isEmpty()) { - iio->setStatus(1); // Error + iio->setqStatus(1); // Error return; } TQString libpath = KLibLoader::findLibrary(mLib.ascii()); if ( libpath.isEmpty()) { - iio->setStatus(1); // Error + iio->setqStatus(1); // Error return; } lt_dlhandle libhandle = lt_dlopen( TQFile::encodeName(libpath) ); if (libhandle == 0) { - iio->setStatus(1); // error + iio->setqStatus(1); // error kdWarning() << "KImageIOFormat::callLibFunc: couldn't dlopen " << mLib << "(" << lt_dlerror() << ")" << endl; return; } @@ -123,7 +123,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) lt_ptr func = lt_dlsym(libhandle, funcName.ascii()); if (func == NULL) { - iio->setStatus(1); // error + iio->setqStatus(1); // error kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl; } mReadFunc = (void (*)(TQImageIO *))func; @@ -134,7 +134,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) lt_ptr func = lt_dlsym(libhandle, funcName.ascii()); if (func == NULL) { - iio->setStatus(1); // error + iio->setqStatus(1); // error kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl; } mWriteFunc = (void (*)(TQImageIO *))func; @@ -145,12 +145,12 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) if (mReadFunc) mReadFunc(iio); else - iio->setStatus(1); // Error + iio->setqStatus(1); // Error else if (mWriteFunc) mWriteFunc(iio); else - iio->setStatus(1); // Error + iio->setqStatus(1); // Error } @@ -193,7 +193,7 @@ KImageIOFactory::KImageIOFactory() : KSycocaFactory( KST_KImageIO ) } } -QString +TQString KImageIOFactory::createPattern( KImageIO::Mode _mode) { TQStringList patterns; @@ -232,7 +232,7 @@ KImageIOFactory::createPattern( KImageIO::Mode _mode) patterns.sort(); patterns.prepend(allPatterns); - TQString pattern = patterns.join(TQString::fromLatin1("\n")); + TQString pattern = patterns.join(TQString::tqfromLatin1("\n")); return pattern; } @@ -256,7 +256,7 @@ KImageIOFactory::readImage( TQImageIO *iio) } if (!format || !format->bRead) { - iio->setStatus(1); // error + iio->setqStatus(1); // error return; } @@ -283,7 +283,7 @@ KImageIOFactory::writeImage( TQImageIO *iio) } if (!format || !format->bWrite) { - iio->setStatus(1); // error + iio->setqStatus(1); // error return; } @@ -380,7 +380,7 @@ void KImageIO::registerFormats() (void) KImageIOFactory::self(); } -QString +TQString KImageIO::pattern(Mode _mode) { if (_mode == Reading) @@ -489,7 +489,7 @@ TQString KImageIO::type(const TQString& filename) { KImageIOFormatList *formatList = KImageIOFactory::self()->formatList; TQString suffix = filename; - int dot = suffix.findRev('.'); + int dot = suffix.tqfindRev('.'); if (dot >= 0) suffix = suffix.mid(dot + 1); @@ -500,7 +500,7 @@ TQString KImageIO::type(const TQString& filename) ++it ) { KImageIOFormat *format = (*it); - if (format->mSuffices.contains(suffix)) + if (format->mSuffices.tqcontains(suffix)) return format->mType; } } diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h index 035a3cd15..1b82e2e49 100644 --- a/kio/kio/klimitediodevice.h +++ b/kio/kio/klimitediodevice.h @@ -28,7 +28,7 @@ * @author David Faure <david@mandrakesoft.com> * @since 3.1 */ -class KIO_EXPORT KLimitedIODevice : public QIODevice +class KIO_EXPORT KLimitedIODevice : public TQIODevice { public: /** @@ -67,14 +67,18 @@ public: virtual void close() {} virtual void flush() {} +#ifdef USE_QT4 + virtual qint64 size() const { return m_length; } +#else // USE_QT4 virtual Offset size() const { return m_length; } +#endif // USE_QT4 - virtual Q_LONG readBlock ( char * data, Q_ULONG maxlen ) + virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen ) { maxlen = QMIN( maxlen, m_length - at() ); // Apply upper limit return m_dev->readBlock( data, maxlen ); } - virtual Q_LONG writeBlock ( const char *, Q_ULONG ) { return -1; } // unsupported + virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported virtual int putch( int ) { return -1; } // unsupported virtual int getch() { @@ -94,8 +98,8 @@ public: virtual bool atEnd() const { return m_dev->atEnd() || m_dev->at() >= m_start + m_length; } private: TQIODevice* m_dev; - Q_ULONG m_start; - Q_ULONG m_length; + TQ_ULONG m_start; + TQ_ULONG m_length; }; #endif diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp index 72b249249..f59ee9d10 100644 --- a/kio/kio/kmimemagic.cpp +++ b/kio/kio/kmimemagic.cpp @@ -525,7 +525,7 @@ class KMimeMagicUtimeConf public: KMimeMagicUtimeConf() { - tmpDirs << TQString::fromLatin1("/tmp"); // default value + tmpDirs << TQString::tqfromLatin1("/tmp"); // default value // The trick is that we also don't want the user to override globally set // directories. So we have to misuse KStandardDirs :} @@ -565,8 +565,8 @@ public: bool restoreAccessTime( const TQString & file ) const { - TQString dir = file.left( file.findRev( '/' ) ); - bool res = tmpDirs.contains( dir ); + TQString dir = file.left( file.tqfindRev( '/' ) ); + bool res = tmpDirs.tqcontains( dir ); //kdDebug(7018) << "restoreAccessTime " << file << " dir=" << dir << " result=" << res << endl; return res; } @@ -2270,7 +2270,7 @@ refineResult(KMimeMagicResult *r, const TQString & _filename) else if ( tmp == "application/x-sharedlib" ) { - if ( _filename.find( ".so" ) == -1 ) + if ( _filename.tqfind( ".so" ) == -1 ) { tmp = "application/x-executable"; r->setMimeType( tmp ); diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index a698e7495..ab65c4c24 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -265,7 +265,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, { // Assume inode/directory, if the protocol supports listing. if ( KProtocolInfo::supportsListing( _url ) ) - return mimeType( TQString::fromLatin1("inode/directory") ); + return mimeType( TQString::tqfromLatin1("inode/directory") ); else return defaultMimeTypePtr(); // == 'no idea', e.g. for "data:,foo/" } @@ -382,15 +382,15 @@ void KMimeType::init( KDesktopFile * config ) m_lstPatterns = config->readListEntry( "Patterns", ';' ); // Read the X-KDE-AutoEmbed setting and store it in the properties map - TQString XKDEAutoEmbed = TQString::fromLatin1("X-KDE-AutoEmbed"); + TQString XKDEAutoEmbed = TQString::tqfromLatin1("X-KDE-AutoEmbed"); if ( config->hasKey( XKDEAutoEmbed ) ) m_mapProps.insert( XKDEAutoEmbed, TQVariant( config->readBoolEntry( XKDEAutoEmbed ), 0 ) ); - TQString XKDEText = TQString::fromLatin1("X-KDE-text"); + TQString XKDEText = TQString::tqfromLatin1("X-KDE-text"); if ( config->hasKey( XKDEText ) ) m_mapProps.insert( XKDEText, config->readBoolEntry( XKDEText ) ); - TQString XKDEIsAlso = TQString::fromLatin1("X-KDE-IsAlso"); + TQString XKDEIsAlso = TQString::tqfromLatin1("X-KDE-IsAlso"); if ( config->hasKey( XKDEIsAlso ) ) { TQString inherits = config->readEntry( XKDEIsAlso ); if ( inherits != name() ) @@ -399,7 +399,7 @@ void KMimeType::init( KDesktopFile * config ) kdWarning(7009) << "Error: " << inherits << " inherits from itself!!!!" << endl; } - TQString XKDEPatternsAccuracy = TQString::fromLatin1("X-KDE-PatternsAccuracy"); + TQString XKDEPatternsAccuracy = TQString::tqfromLatin1("X-KDE-PatternsAccuracy"); if ( config->hasKey( XKDEPatternsAccuracy ) ) m_mapProps.insert( XKDEPatternsAccuracy, config->readEntry( XKDEPatternsAccuracy ) ); @@ -632,9 +632,9 @@ TQString KFolderType::icon( const KURL& _url, bool _is_local ) const entries.append( ep->d_name ); if ( readdir( dp ) == 0 ) { // only three // check if we got "." ".." and ".directory" - isempty = entries.find( "." ) != entries.end() && - entries.find( ".." ) != entries.end() && - entries.find( ".directory" ) != entries.end(); + isempty = entries.tqfind( "." ) != entries.end() && + entries.tqfind( ".." ) != entries.end() && + entries.tqfind( ".directory" ) != entries.end(); } } if (!isempty && !strcmp(ep->d_name, ".directory")) @@ -838,7 +838,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf KURL mpURL; mpURL.setPath( mp ); // Open a new window - retval = KRun::runURL( mpURL, TQString::fromLatin1("inode/directory") ); + retval = KRun::runURL( mpURL, TQString::tqfromLatin1("inode/directory") ); } else { @@ -995,15 +995,15 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices if( cfg.hasKey( "X-KDE-GetActionMenu" )) { TQString dcopcall = cfg.readEntry( "X-KDE-GetActionMenu" ); - const TQCString app = dcopcall.section(' ', 0,0).utf8(); + const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8(); TQByteArray dataToSend; TQDataStream dataStream(dataToSend, IO_WriteOnly); dataStream << file_list; TQCString replyType; TQByteArray replyData; - TQCString object = dcopcall.section(' ', 1,-2).utf8(); - TQString function = dcopcall.section(' ', -1); + TQCString object = TQString(dcopcall.section(' ', 1,-2)).utf8(); + TQString function = dcopcall.section(' ', -1); if(!function.endsWith("(KURL::List)")) { kdWarning() << "Desktop file " << path << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl; } else { diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp index d8ceb930b..7f041b722 100644 --- a/kio/kio/kmimetypechooser.cpp +++ b/kio/kio/kmimetypechooser.cpp @@ -134,15 +134,15 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) for (; it != mimetypes.end(); ++it) { TQString mimetype = (*it)->name(); - int index = mimetype.find("/"); + int index = mimetype.tqfind("/"); TQString maj = mimetype.left(index); - if ( d->groups.count() && !d->groups.contains( maj ) ) + if ( d->groups.count() && !d->groups.tqcontains( maj ) ) continue; TQString min = mimetype.right(mimetype.length() - (index+1)); - TQMapIterator<TQString,TQListViewItem*> mit = groups.find( maj ); + TQMapIterator<TQString,TQListViewItem*> mit = groups.tqfind( maj ); if ( mit == groups.end() ) { groupItem = new TQListViewItem( d->lvMimeTypes, maj ); @@ -167,7 +167,7 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) if ( d->visuals & Patterns ) item->setText( cl, (*it)->patterns().join("; ") ); - if ( selMimeTypes.contains(mimetype) ) + if ( selMimeTypes.tqcontains(mimetype) ) { item->setOn( true ); groupItem->setOpen( true ); @@ -189,15 +189,15 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes ) void KMimeTypeChooser::editMimeType() { - if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->parent()) ) + if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->tqparent()) ) return; - TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 ); + TQString mt = (d->lvMimeTypes->currentItem()->tqparent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 ); // thanks to libkonq/konq_operations.cc connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()), this, TQT_SLOT(slotSycocaDatabaseChanged()) ); - TQString keditfiletype = TQString::fromLatin1("keditfiletype"); + TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); KRun::runCommand( keditfiletype - + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) + + " --parent " + TQString::number( (ulong)tqtopLevelWidget()->winId()) + " " + KProcess::quote(mt), keditfiletype, keditfiletype /*unused*/); } @@ -205,7 +205,7 @@ void KMimeTypeChooser::editMimeType() void KMimeTypeChooser::slotCurrentChanged(TQListViewItem* i) { if ( d->btnEditMimeType ) - d->btnEditMimeType->setEnabled( i->parent() ); + d->btnEditMimeType->setEnabled( i->tqparent() ); } void KMimeTypeChooser::slotSycocaDatabaseChanged() @@ -220,8 +220,8 @@ TQStringList KMimeTypeChooser::mimeTypes() const TQListViewItemIterator it( d->lvMimeTypes ); for (; it.current(); ++it) { - if ( it.current()->parent() && ((TQCheckListItem*)it.current())->isOn() ) - l << it.current()->parent()->text(0) + "/" + it.current()->text(0); // FIXME uncecked, should be Ok unless someone changes mimetypes during this! + if ( it.current()->tqparent() && ((TQCheckListItem*)it.current())->isOn() ) + l << it.current()->tqparent()->text(0) + "/" + it.current()->text(0); // FIXME uncecked, should be Ok unless someone changes mimetypes during this! } return l; } @@ -234,9 +234,9 @@ TQStringList KMimeTypeChooser::patterns() const TQListViewItemIterator it( d->lvMimeTypes ); for (; it.current(); ++it) { - if ( it.current()->parent() && ((TQCheckListItem*)it.current())->isOn() ) + if ( it.current()->tqparent() && ((TQCheckListItem*)it.current())->isOn() ) { - p = KMimeType::mimeType( it.current()->parent()->text(0) + "/" + it.current()->text(0) ); + p = KMimeType::mimeType( it.current()->tqparent()->text(0) + "/" + it.current()->text(0) ); if ( p->name() != defMT ) l += p->patterns(); } diff --git a/kio/kio/kmimetypechooser.h b/kio/kio/kmimetypechooser.h index 0827d5b30..355eeb707 100644 --- a/kio/kio/kmimetypechooser.h +++ b/kio/kio/kmimetypechooser.h @@ -31,7 +31,7 @@ * * @author Anders Lund (anders at alweb dk), jan 23, 2002 */ -class KIO_EXPORT KMimeTypeChooser : public QVBox +class KIO_EXPORT KMimeTypeChooser : public TQVBox { Q_OBJECT diff --git a/kio/kio/kmimetyperesolver.h b/kio/kio/kmimetyperesolver.h index 4ac6347f2..fdbbb1e5b 100644 --- a/kio/kio/kmimetyperesolver.h +++ b/kio/kio/kmimetyperesolver.h @@ -46,7 +46,7 @@ protected: * itself. So an object of this class is used to handle signals, slots etc. * and forwards them to the KMimeTypeResolver instance. */ -class KIO_EXPORT KMimeTypeResolverHelper : public QObject +class KIO_EXPORT KMimeTypeResolverHelper : public TQObject { Q_OBJECT diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp index f0fdfce6d..faf7448ee 100644 --- a/kio/kio/knfsshare.cpp +++ b/kio/kio/knfsshare.cpp @@ -123,7 +123,7 @@ bool KNFSSharePrivate::readExportsFile() { // Handle quotation marks if ( completeLine[0] == '"' ) { - int i = completeLine.find('"',1); + int i = completeLine.tqfind('"',1); if (i == -1) { kdError() << "KNFSShare: Parse error: Missing quotation mark: " << completeLine << endl; continue; @@ -131,9 +131,9 @@ bool KNFSSharePrivate::readExportsFile() { path = completeLine.mid(1,i-1); } else { // no quotation marks - int i = completeLine.find(' '); + int i = completeLine.tqfind(' '); if (i == -1) - i = completeLine.find('\t'); + i = completeLine.tqfind('\t'); if (i == -1) path = completeLine; @@ -180,7 +180,7 @@ bool KNFSShare::isDirectoryShared( const TQString & path ) const { if ( path[path.length()-1] != '/' ) fixedPath += '/'; - return d->sharedPaths.find(fixedPath) != 0; + return d->sharedPaths.tqfind(fixedPath) != 0; } TQStringList KNFSShare::sharedDirectories() const { diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp index 8fb8b3227..8b333da07 100644 --- a/kio/kio/kprotocolmanager.cpp +++ b/kio/kio/kprotocolmanager.cpp @@ -267,7 +267,7 @@ TQString KProtocolManager::proxyForURL( const KURL &url ) } break; case EnvVarProxy: - proxy = TQString::fromLocal8Bit(getenv(proxyFor(url.protocol()).local8Bit())).stripWhiteSpace(); + proxy = TQString(TQString::fromLocal8Bit(getenv(proxyFor(url.protocol()).local8Bit()))).stripWhiteSpace(); break; case ManualProxy: proxy = proxyFor( url.protocol() ); @@ -277,7 +277,7 @@ TQString KProtocolManager::proxyForURL( const KURL &url ) break; } - return (proxy.isEmpty() ? TQString::fromLatin1("DIRECT") : proxy); + return (proxy.isEmpty() ? TQString::tqfromLatin1("DIRECT") : proxy); } void KProtocolManager::badProxy( const TQString &proxy ) @@ -462,7 +462,7 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) if( modifiers.contains('p') ) { // TODO: determine this value instead of hardcoding it... - supp += TQString::fromLatin1("; X11"); + supp += TQString::tqfromLatin1("; X11"); } if( modifiers.contains('m') ) { @@ -471,13 +471,13 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers ) if( modifiers.contains('l') ) { TQStringList languageList = KGlobal::locale()->languageList(); - TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) + if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::fromLatin1("en"); + (*it) = TQString::tqfromLatin1("en"); } if( languageList.count() ) supp += TQString("; %1").arg(languageList.join(", ")); diff --git a/kio/kio/kremoteencoding.cpp b/kio/kio/kremoteencoding.cpp index 632eeb8b2..23fd0563d 100644 --- a/kio/kio/kremoteencoding.cpp +++ b/kio/kio/kremoteencoding.cpp @@ -37,13 +37,13 @@ TQString KRemoteEncoding::decode(const TQCString& name) const { #ifdef CHECK_UTF8 if (codec->mibEnum() == 106 && !KStringHandler::isUtf8(name)) - return TQString::fromLatin1(name); + return TQString::tqfromLatin1(name); #endif TQString result = codec->toUnicode(name); if (codec->fromUnicode(result) != name) // fallback in case of decoding failure - return TQString::fromLatin1(name); + return TQString::tqfromLatin1(name); return result; } diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp index 9e51a2938..a8304427c 100644 --- a/kio/kio/krun.cpp +++ b/kio/kio/krun.cpp @@ -386,15 +386,15 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List /// compatibility hack -- KDE 4: remove TQRegExp re("^\\s*(?:/bin/)?sh\\s+-c\\s+(.*)$"); if (!re.search( exec )) { - exec = re.cap( 1 ).stripWhiteSpace(); + exec = TQString(re.cap( 1 )).stripWhiteSpace(); for (uint pos = 0; pos < exec.length(); ) { - TQChar c = exec.unicode()[pos]; + TQChar c = exec.tqunicode()[pos]; if (c != '\'' && c != '"') goto synerr; // what else can we do? after normal parsing the substs would be insecure - int pos2 = exec.find( c, pos + 1 ) - 1; + int pos2 = exec.tqfind( c, pos + 1 ) - 1; if (pos2 < 0) goto synerr; // quoting error - memcpy( (void *)(exec.unicode() + pos), exec.unicode() + pos + 1, (pos2 - pos) * sizeof(TQChar)); + memcpy( (void *)(exec.tqunicode() + pos), exec.tqunicode() + pos + 1, (pos2 - pos) * sizeof(TQChar)); pos = pos2; exec.remove( pos, 2 ); } @@ -545,8 +545,8 @@ TQString KRun::binaryName( const TQString & execLine, bool removePath ) for (TQStringList::ConstIterator it = args.begin(); it != args.end(); ++it) if (!(*it).contains('=')) // Remove path if wanted - return removePath ? (*it).mid((*it).findRev('/') + 1) : *it; - return TQString::null; + return removePath ? (*it).mid(TQString(*it).tqfindRev('/') + 1) : *it; + return TQString(); } static pid_t runCommandInternal( KProcess* proc, const KService* service, const TQString& binName, @@ -708,7 +708,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service { // compat mode: assume KIO if not set and it's a KDE app TQStringList categories = _service.property("Categories").toStringList(); - if ( categories.find("KDE") != categories.end() ) + if ( categories.tqfind("KDE") != categories.end() ) supportedProtocols.append( "KIO" ); else { // if no KDE app, be a bit over-generic supportedProtocols.append( "http"); @@ -719,10 +719,10 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl; KURL::List urls( _urls ); - if ( supportedProtocols.find( "KIO" ) == supportedProtocols.end() ) { + if ( supportedProtocols.tqfind( "KIO" ) == supportedProtocols.end() ) { for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) { const KURL url = *it; - bool supported = url.isLocalFile() || supportedProtocols.find( url.protocol().lower() ) != supportedProtocols.end(); + bool supported = url.isLocalFile() || supportedProtocols.tqfind( url.protocol().lower() ) != supportedProtocols.end(); kdDebug(7010) << "Looking at url=" << url << " supported=" << supported << endl; if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" ) { @@ -861,7 +861,7 @@ pid_t KRun::runCommand( const TQString& cmd, const TQString &execName, const TQS *proc << cmd; KService::Ptr service = KService::serviceByDesktopName( binaryName( execName, true ) ); TQString bin = binaryName( cmd, false ); - int pos = bin.findRev( '/' ); + int pos = bin.tqfindRev( '/' ); if (pos != -1) { proc->setWorkingDirectory( bin.mid(0, pos) ); } @@ -927,7 +927,7 @@ void KRun::init() if (m_strURL.url().startsWith("$(")) { // check for environment variables and make necessary translations TQString aValue = m_strURL.url(); - int nDollarPos = aValue.find( '$' ); + int nDollarPos = aValue.tqfind( '$' ); while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) { // there is at least one $ @@ -983,7 +983,7 @@ void KRun::init() aValue.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = aValue.find( '$', nDollarPos ); + nDollarPos = aValue.tqfind( '$', nDollarPos ); } m_strURL = KURL(aValue); bypassErrorMessage = true; @@ -1360,7 +1360,7 @@ void KRun::foundMimeType( const TQString& type ) return; } */ - KIO::TransferJob *job = ::qt_cast<KIO::TransferJob *>( m_job ); + KIO::TransferJob *job = ::tqqt_cast<KIO::TransferJob *>( m_job ); if ( job ) { job->putOnHold(); diff --git a/kio/kio/krun.h b/kio/kio/krun.h index 17fa434e3..5cf8189c9 100644 --- a/kio/kio/krun.h +++ b/kio/kio/krun.h @@ -55,7 +55,7 @@ namespace KIO { * * @short Opens files with their associated applications in KDE */ -class KIO_EXPORT KRun : public QObject +class KIO_EXPORT KRun : public TQObject { Q_OBJECT public: @@ -475,7 +475,7 @@ public: * It sends a notification when the process exits (for the taskbar) * and it will show an error message if necessary (e.g. "program not found"). */ -class KIO_EXPORT KProcessRunner : public QObject +class KIO_EXPORT KProcessRunner : public TQObject { Q_OBJECT diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp index defeae4a7..3eea9e145 100644 --- a/kio/kio/ksambashare.cpp +++ b/kio/kio/ksambashare.cpp @@ -62,7 +62,7 @@ bool KSambaSharePrivate::load() { * @return wether a smb.conf was found. **/ bool KSambaSharePrivate::findSmbConf() { - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true); smbConf = config.readEntry("SMBCONF"); if ( TQFile::exists(smbConf) ) @@ -144,7 +144,7 @@ bool KSambaSharePrivate::readSmbConf() { } // parameter - int i = completeLine.find('='); + int i = completeLine.tqfind('='); if (i>-1) { @@ -203,7 +203,7 @@ bool KSambaShare::isDirectoryShared( const TQString & path ) const { if ( path[path.length()-1] != '/' ) fixedPath += '/'; - return d->sharedPaths.find(fixedPath) != 0; + return d->sharedPaths.tqfind(fixedPath) != 0; } TQStringList KSambaShare::sharedDirectories() const { diff --git a/kio/kio/kscan.cpp b/kio/kio/kscan.cpp index 21e8086b8..49ae7c5ab 100644 --- a/kio/kio/kscan.cpp +++ b/kio/kio/kscan.cpp @@ -41,7 +41,7 @@ KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( parent, name, "KScanDialog", args ); + TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KScanDialog", args ); return dynamic_cast<KScanDialog *>( res ); } @@ -84,7 +84,7 @@ KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name, TQStringList args; args << TQString::number( (int)modal ); - TQObject *res = factory->create( parent, name, "KOCRDialog", args ); + TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KOCRDialog", args ); return dynamic_cast<KOCRDialog *>( res ); } @@ -133,7 +133,7 @@ TQObject *KScanDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return createDialog( static_cast<TQWidget *>( parent ), name, modal ); + return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); } @@ -166,7 +166,7 @@ TQObject *KOCRDialogFactory::createObject( TQObject *parent, const char *name, if ( args.count() == 1 ) modal = (bool)args[ 0 ].toInt(); - return createDialog( static_cast<TQWidget *>( parent ), name, modal ); + return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal )); } void KScanDialog::virtual_hook( int id, void* data ) diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp index 3af62f26f..36fb0f9fa 100644 --- a/kio/kio/kservice.cpp +++ b/kio/kio/kservice.cpp @@ -128,9 +128,9 @@ KService::init( KDesktopFile *config ) } // Try to make up a name. m_strName = entryPath(); - int i = m_strName.findRev('/'); + int i = m_strName.tqfindRev('/'); m_strName = m_strName.mid(i+1); - i = m_strName.findRev('.'); + i = m_strName.tqfindRev('.'); if (i != -1) m_strName = m_strName.left(i); } @@ -189,10 +189,10 @@ KService::init( KDesktopFile *config ) } TQString name = entryPath(); - int pos = name.findRev('/'); + int pos = name.tqfindRev('/'); if (pos != -1) name = name.mid(pos+1); - pos = name.find('.'); + pos = name.tqfind('.'); if (pos != -1) name = name.left(pos); @@ -200,7 +200,7 @@ KService::init( KDesktopFile *config ) if (kde4application && !m_strExec.startsWith("/")) { m_strExec = "KDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec; } else if (config->readBoolEntry("X-KDE-SubstituteUID")) { - int space = m_strExec.find(" "); + int space = m_strExec.tqfind(" "); if (space==-1) m_strExec = KStandardDirs::findExe(m_strExec); else { @@ -253,7 +253,7 @@ KService::init( KDesktopFile *config ) m_lstServiceTypes += config->readListEntry( "MimeType", ';' ); entryMap.remove("MimeType"); - if ( m_strType == "Application" && !m_lstServiceTypes.contains("Application") ) + if ( m_strType == "Application" && !m_lstServiceTypes.tqcontains("Application") ) // Applications implement the service type "Application" ;-) m_lstServiceTypes += "Application"; @@ -327,11 +327,11 @@ void KService::load( TQDataStream& s ) // dummies are here because of fields that were removed, to keep bin compat. // Feel free to re-use, but fields for Applications only (not generic services) // should rather be added to application.desktop - Q_INT8 def, term, dummy1, dummy2; - Q_INT8 dst, initpref; + TQ_INT8 def, term, dummy1, dummy2; + TQ_INT8 dst, initpref; TQString dummyStr1, dummyStr2; int dummyI1, dummyI2; - Q_UINT32 dummyUI32; + TQ_UINT32 dummyUI32; // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x! // !! This data structure should remain binary compatible at all times !! @@ -358,13 +358,13 @@ void KService::load( TQDataStream& s ) void KService::save( TQDataStream& s ) { KSycocaEntry::save( s ); - Q_INT8 def = m_bAllowAsDefault, initpref = m_initialPreference; - Q_INT8 term = m_bTerminal; - Q_INT8 dst = (Q_INT8) m_DCOPServiceType; - Q_INT8 dummy1 = 0, dummy2 = 0; // see ::load + TQ_INT8 def = m_bAllowAsDefault, initpref = m_initialPreference; + TQ_INT8 term = m_bTerminal; + TQ_INT8 dst = (TQ_INT8) m_DCOPServiceType; + TQ_INT8 dummy1 = 0, dummy2 = 0; // see ::load TQString dummyStr1, dummyStr2; int dummyI1 = 0, dummyI2 = 0; - Q_UINT32 dummyUI32 = 0; + TQ_UINT32 dummyUI32 = 0; // WARNING: IN KDE 3.x THIS NEEDS TO REMAIN COMPATIBLE WITH KDE 2.x! // !! This data structure should remain binary compatible at all times !! @@ -572,7 +572,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const // Then we use a homebuild class based on KConfigBase to convert the TQString. // For some often used property types we do the conversion ourselves. - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( _name ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { //kdDebug(7012) << "Property not found " << _name << endl; @@ -684,7 +684,7 @@ KService::Ptr KService::serviceByStorageId( const TQString& _storageId ) return new KService(_storageId); TQString tmp = _storageId; - tmp = tmp.mid(tmp.findRev('/')+1); // Strip dir + tmp = tmp.mid(tmp.tqfindRev('/')+1); // Strip dir if (tmp.endsWith(".desktop")) tmp.truncate(tmp.length()-8); @@ -720,7 +720,7 @@ TQString KService::username() const { } bool KService::noDisplay() const { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "NoDisplay" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "NoDisplay" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString().lower(); @@ -728,21 +728,21 @@ bool KService::noDisplay() const { return true; } - it = m_mapProps.find( "OnlyShowIn" ); + it = m_mapProps.tqfind( "OnlyShowIn" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString(); TQStringList aList = TQStringList::split(';', aValue); - if (!aList.contains("KDE")) + if (!aList.tqcontains("KDE")) return true; } - it = m_mapProps.find( "NotShowIn" ); + it = m_mapProps.tqfind( "NotShowIn" ); if ( (it != m_mapProps.end()) && (it.data().isValid())) { TQString aValue = it.data().toString(); TQStringList aList = TQStringList::split(';', aValue); - if (aList.contains("KDE")) + if (aList.tqcontains("KDE")) return true; } @@ -758,7 +758,7 @@ TQString KService::untranslatedGenericName() const { } bool KService::SuSEunimportant() const { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-SuSE-Unimportant" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "X-SuSE-Unimportant" ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { return false; @@ -772,7 +772,7 @@ bool KService::SuSEunimportant() const { } TQString KService::parentApp() const { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-KDE-ParentApp" ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( "X-KDE-ParentApp" ); if ( (it == m_mapProps.end()) || (!it.data().isValid())) { return TQString::null; @@ -783,8 +783,8 @@ TQString KService::parentApp() const { bool KService::allowMultipleFiles() const { // Can we pass multiple files on the command line or do we have to start the application for every single file ? - if ( m_strExec.find( "%F" ) != -1 || m_strExec.find( "%U" ) != -1 || - m_strExec.find( "%N" ) != -1 || m_strExec.find( "%D" ) != -1 ) + if ( m_strExec.tqfind( "%F" ) != -1 || m_strExec.tqfind( "%U" ) != -1 || + m_strExec.tqfind( "%N" ) != -1 || m_strExec.tqfind( "%D" ) != -1 ) return true; else return false; @@ -836,7 +836,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName else result = base + TQString("-%1.desktop").arg(i); - if (reservedMenuIds && reservedMenuIds->contains(result)) + if (reservedMenuIds && reservedMenuIds->tqcontains(result)) continue; // Lookup service by menu-id @@ -887,7 +887,7 @@ void KService::rebuildKSycoca(TQWidget *parent) DCOPClient *client = kapp->dcopClient(); int result = client->callAsync("kded", "kbuildsycoca", "recreate()", - data, &dlg, TQT_SLOT(slotFinished())); + data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished())); if (result) { diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp index 1f79deb19..d2d4a9623 100644 --- a/kio/kio/kservicefactory.cpp +++ b/kio/kio/kservicefactory.cpp @@ -40,7 +40,7 @@ KServiceFactory::KServiceFactory() if (m_str) { // Read Header - Q_INT32 i; + TQ_INT32 i; (*m_str) >> i; m_nameDictOffset = i; (*m_str) >> i; @@ -52,14 +52,14 @@ KServiceFactory::KServiceFactory() (*m_str) >> i; m_menuIdDictOffset = i; - int saveOffset = m_str->device()->at(); + int saveOffset = m_str->tqdevice()->at(); // Init index tables m_nameDict = new KSycocaDict(m_str, m_nameDictOffset); // Init index tables m_relNameDict = new KSycocaDict(m_str, m_relNameDictOffset); // Init index tables m_menuIdDict = new KSycocaDict(m_str, m_menuIdDictOffset); - saveOffset = m_str->device()->at(saveOffset); + saveOffset = m_str->tqdevice()->at(saveOffset); } else { @@ -191,7 +191,7 @@ KService* KServiceFactory::createEntry(int offset) break; default: - kdError(7011) << TQString("KServiceFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type) << endl; + kdError(7011) << TQString(TQString("KServiceFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type)) << endl; return 0; } if (!newEntry->isValid()) @@ -225,11 +225,11 @@ KService::List KServiceFactory::allInitServices() // Assume we're NOT building a database - m_str->device()->at(m_initListOffset); - Q_INT32 entryCount; + m_str->tqdevice()->at(m_initListOffset); + TQ_INT32 entryCount; (*m_str) >> entryCount; - Q_INT32 *offsetList = new Q_INT32[entryCount]; + TQ_INT32 *offsetList = new TQ_INT32[entryCount]; for(int i = 0; i < entryCount; i++) { (*m_str) >> offsetList[i]; @@ -253,10 +253,10 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) TQDataStream *str = m_str; // Jump to the offer list - str->device()->at( m_offerListOffset ); + str->tqdevice()->at( m_offerListOffset ); - Q_INT32 aServiceTypeOffset; - Q_INT32 aServiceOffset; + TQ_INT32 aServiceTypeOffset; + TQ_INT32 aServiceOffset; // We might want to do a binary search instead of a linear search // since servicetype offsets are sorted. Bah. while (true) @@ -268,14 +268,14 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) if ( aServiceTypeOffset == serviceTypeOffset ) { // Save stream position ! - int savedPos = str->device()->at(); + int savedPos = str->tqdevice()->at(); // Create Service KService * serv = createEntry( aServiceOffset ); if (serv) list.append( KService::Ptr( serv ) ); // Restore position - str->device()->at( savedPos ); - } else if ( aServiceTypeOffset > (Q_INT32)serviceTypeOffset ) + str->tqdevice()->at( savedPos ); + } else if ( aServiceTypeOffset > (TQ_INT32)serviceTypeOffset ) break; // too far } else diff --git a/kio/kio/kservicegroup.cpp b/kio/kio/kservicegroup.cpp index f5d2970a9..0560d033c 100644 --- a/kio/kio/kservicegroup.cpp +++ b/kio/kio/kservicegroup.cpp @@ -84,12 +84,12 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp TQStringList tmpList; if (config.hasKey("OnlyShowIn")) { - if (!config.readListEntry("OnlyShowIn", ';').contains("KDE")) + if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE")) d->m_bNoDisplay = true; } if (config.hasKey("NotShowIn")) { - if (config.readListEntry("NotShowIn", ';').contains("KDE")) + if (config.readListEntry("NotShowIn", ';').tqcontains("KDE")) d->m_bNoDisplay = true; } @@ -103,7 +103,7 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp m_strCaption = _relpath; if (m_strCaption.right(1) == "/") m_strCaption = m_strCaption.left(m_strCaption.length()-1); - int i = m_strCaption.findRev('/'); + int i = m_strCaption.tqfindRev('/'); if (i > 0) m_strCaption = m_strCaption.mid(i+1); } @@ -229,11 +229,11 @@ bool KServiceGroup::SuSEshortMenu() const void KServiceGroup::load( TQDataStream& s ) { TQStringList groupList; - Q_INT8 noDisplay; - Q_INT8 _showEmptyMenu; - Q_INT8 inlineHeader; - Q_INT8 _inlineAlias; - Q_INT8 _allowInline; + TQ_INT8 noDisplay; + TQ_INT8 _showEmptyMenu; + TQ_INT8 inlineHeader; + TQ_INT8 _inlineAlias; + TQ_INT8 _allowInline; s >> m_strCaption >> m_strIcon >> m_strComment >> groupList >> m_strBaseGroupName >> m_childCount >> noDisplay >> d->suppressGenericNames >> d->directoryEntryPath >> @@ -302,11 +302,11 @@ void KServiceGroup::save( TQDataStream& s ) (void) childCount(); - Q_INT8 noDisplay = d->m_bNoDisplay ? 1 : 0; - Q_INT8 _showEmptyMenu = d->m_bShowEmptyMenu ? 1 : 0; - Q_INT8 inlineHeader = d->m_bShowInlineHeader ? 1 : 0; - Q_INT8 _inlineAlias = d->m_bInlineAlias ? 1 : 0; - Q_INT8 _allowInline = d->m_bAllowInline ? 1 : 0; + TQ_INT8 noDisplay = d->m_bNoDisplay ? 1 : 0; + TQ_INT8 _showEmptyMenu = d->m_bShowEmptyMenu ? 1 : 0; + TQ_INT8 inlineHeader = d->m_bShowInlineHeader ? 1 : 0; + TQ_INT8 _inlineAlias = d->m_bInlineAlias ? 1 : 0; + TQ_INT8 _allowInline = d->m_bAllowInline ? 1 : 0; s << m_strCaption << m_strIcon << m_strComment << groupList << m_strBaseGroupName << m_childCount << noDisplay << d->suppressGenericNames << d->directoryEntryPath << @@ -707,7 +707,7 @@ KServiceGroup::childGroup(const TQString &parent) return KServiceGroupFactory::self()->findGroupByDesktopPath("#parent#"+parent, true); } -QString +TQString KServiceGroup::directoryEntryPath() const { return d->directoryEntryPath; diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp index 9bca4dc63..326c41173 100644 --- a/kio/kio/kservicegroupfactory.cpp +++ b/kio/kio/kservicegroupfactory.cpp @@ -36,14 +36,14 @@ KServiceGroupFactory::KServiceGroupFactory() if (m_str) { // Read Header - Q_INT32 i; + TQ_INT32 i; (*m_str) >> i; m_baseGroupDictOffset = i; - int saveOffset = m_str->device()->at(); + int saveOffset = m_str->tqdevice()->at(); // Init index tables m_baseGroupDict = new KSycocaDict(m_str, m_baseGroupDictOffset); - m_str->device()->at(saveOffset); + m_str->tqdevice()->at(saveOffset); } else { @@ -124,7 +124,7 @@ KServiceGroup* KServiceGroupFactory::createGroup(int offset, bool deep) break; default: - kdError(7011) << TQString("KServiceGroupFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type) << endl; + kdError(7011) << TQString(TQString("KServiceGroupFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type)) << endl; return 0; } if (!newEntry->isValid()) diff --git a/kio/kio/kservicetype.cpp b/kio/kio/kservicetype.cpp index 48693aceb..b8b4e4659 100644 --- a/kio/kio/kservicetype.cpp +++ b/kio/kio/kservicetype.cpp @@ -82,7 +82,7 @@ KServiceType::init( KDesktopFile *config) for( ; gIt != tmpList.end(); ++gIt ) { - if ( (*gIt).find( "Property::" ) == 0 ) + if ( (*gIt).tqfind( "Property::" ) == 0 ) { config->setGroup( *gIt ); TQVariant v = config->readPropertyEntry( "Value", @@ -95,7 +95,7 @@ KServiceType::init( KDesktopFile *config) gIt = tmpList.begin(); for( ; gIt != tmpList.end(); ++gIt ) { - if( (*gIt).find( "PropertyDef::" ) == 0 ) + if( (*gIt).tqfind( "PropertyDef::" ) == 0 ) { config->setGroup( *gIt ); m_mapPropDefs.insert( (*gIt).mid( 13 ), @@ -125,11 +125,11 @@ KServiceType::KServiceType( TQDataStream& _str, int offset ) void KServiceType::load( TQDataStream& _str ) { - Q_INT8 b; + TQ_INT8 b; _str >> m_strName >> m_strIcon >> m_strComment >> m_mapProps >> m_mapPropDefs >> b; m_bValid = b; - m_bDerived = m_mapProps.contains("X-KDE-Derived"); + m_bDerived = m_mapProps.tqcontains("X-KDE-Derived"); } void @@ -140,7 +140,7 @@ KServiceType::save( TQDataStream& _str ) // You may add new fields at the end. Make sure to update the version // number in ksycoca.h _str << m_strName << m_strIcon << m_strComment << m_mapProps << m_mapPropDefs - << (Q_INT8)m_bValid; + << (TQ_INT8)m_bValid; } KServiceType::~KServiceType() @@ -170,7 +170,7 @@ bool KServiceType::inherits( const TQString& servTypeName ) const return false; } -QVariant +TQVariant KServiceType::property( const TQString& _name ) const { TQVariant v; @@ -182,7 +182,7 @@ KServiceType::property( const TQString& _name ) const else if ( _name == "Comment" ) v = TQVariant( m_strComment ); else { - TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name ); + TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.tqfind( _name ); if ( it != m_mapProps.end() ) v = it.data(); } @@ -190,7 +190,7 @@ KServiceType::property( const TQString& _name ) const return v; } -QStringList +TQStringList KServiceType::propertyNames() const { TQStringList res; @@ -209,13 +209,13 @@ KServiceType::propertyNames() const TQVariant::Type KServiceType::propertyDef( const TQString& _name ) const { - TQMap<TQString,TQVariant::Type>::ConstIterator it = m_mapPropDefs.find( _name ); + TQMap<TQString,TQVariant::Type>::ConstIterator it = m_mapPropDefs.tqfind( _name ); if ( it == m_mapPropDefs.end() ) return TQVariant::Invalid; return it.data(); } -QStringList +TQStringList KServiceType::propertyDefNames() const { TQStringList l; @@ -239,7 +239,7 @@ static void addUnique(KService::List &lst, TQDict<KService> &dict, const KServic for( ; it != newLst.end(); ++it ) { KService *service = static_cast<KService*>(*it); - if (dict.find(service->desktopEntryPath())) + if (dict.tqfind(service->desktopEntryPath())) continue; dict.insert(service->desktopEntryPath(), service); lst.append(service); diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp index 8287bca44..99a0ee349 100644 --- a/kio/kio/kservicetypefactory.cpp +++ b/kio/kio/kservicetypefactory.cpp @@ -39,7 +39,7 @@ KServiceTypeFactory::KServiceTypeFactory() if (m_str) { // Read Header - Q_INT32 i,n; + TQ_INT32 i,n; (*m_str) >> i; m_fastPatternOffset = i; (*m_str) >> i; @@ -102,7 +102,7 @@ TQVariant::Type KServiceTypeFactory::findPropertyTypeByName(const TQString &_nam assert (!KSycoca::self()->isBuilding()); - TQMapConstIterator<TQString,int> it = m_propertyTypeDict.find(_name); + TQMapConstIterator<TQString,int> it = m_propertyTypeDict.tqfind(_name); if (it != m_propertyTypeDict.end()) { return (TQVariant::Type)it.data(); } @@ -118,23 +118,23 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt // Get stream to the header TQDataStream *str = m_str; - str->device()->at( m_fastPatternOffset ); + str->tqdevice()->at( m_fastPatternOffset ); - Q_INT32 nrOfEntries; + TQ_INT32 nrOfEntries; (*str) >> nrOfEntries; - Q_INT32 entrySize; + TQ_INT32 entrySize; (*str) >> entrySize; - Q_INT32 fastOffset = str->device()->at( ); + TQ_INT32 fastOffset = str->tqdevice()->at( ); - Q_INT32 matchingOffset = 0; + TQ_INT32 matchingOffset = 0; // Let's go for a binary search in the "fast" pattern index - Q_INT32 left = 0; - Q_INT32 right = nrOfEntries - 1; - Q_INT32 middle; + TQ_INT32 left = 0; + TQ_INT32 right = nrOfEntries - 1; + TQ_INT32 middle; // Extract extension - int lastDot = _filename.findRev('.'); + int lastDot = _filename.tqfindRev('.'); int ext_len = _filename.length() - lastDot - 1; if (lastDot != -1 && ext_len <= 4) // if no '.', skip the extension lookup { @@ -145,7 +145,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt while (left <= right) { middle = (left + right) / 2; // read pattern at position "middle" - str->device()->at( middle * entrySize + fastOffset ); + str->tqdevice()->at( middle * entrySize + fastOffset ); KSycocaEntry::read(*str, pattern); int cmp = pattern.compare( extension ); if (cmp < 0) @@ -166,10 +166,10 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt // Now try the "other" Pattern table if ( m_patterns.isEmpty() ) { - str->device()->at( m_otherPatternOffset ); + str->tqdevice()->at( m_otherPatternOffset ); TQString pattern; - Q_INT32 mimetypeOffset; + TQ_INT32 mimetypeOffset; while (true) { @@ -186,7 +186,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt TQStringList::const_iterator it = m_patterns.begin(); TQStringList::const_iterator end = m_patterns.end(); - TQValueVector<Q_INT32>::const_iterator it_offset = m_pattern_offsets.begin(); + TQValueVector<TQ_INT32>::const_iterator it_offset = m_pattern_offsets.begin(); for ( ; it != end; ++it, ++it_offset ) { @@ -280,7 +280,7 @@ KServiceType * KServiceTypeFactory::createEntry(int offset) break; default: - kdError(7011) << TQString("KServiceTypeFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type) << endl; + kdError(7011) << TQString(TQString("KServiceTypeFactory: unexpected object entry in KSycoca database (type = %1)").arg((int)type)) << endl; break; } if (newEntry && !newEntry->isValid()) diff --git a/kio/kio/kservicetypefactory.h b/kio/kio/kservicetypefactory.h index db64aa115..fd3c96a1a 100644 --- a/kio/kio/kservicetypefactory.h +++ b/kio/kio/kservicetypefactory.h @@ -113,7 +113,7 @@ protected: private: TQStringList m_patterns; - TQValueVector<Q_INT32> m_pattern_offsets; + TQValueVector<TQ_INT32> m_pattern_offsets; protected: virtual void virtual_hook( int id, void* data ); private: diff --git a/kio/kio/kshellcompletion.cpp b/kio/kio/kshellcompletion.cpp index 2fb67a31f..bd3c43be7 100644 --- a/kio/kio/kshellcompletion.cpp +++ b/kio/kio/kshellcompletion.cpp @@ -217,22 +217,22 @@ bool KShellCompletion::quoteText(TQString *text, bool force, bool skip_last) con int pos = 0; if ( !force ) { - pos = text->find( m_word_break_char ); + pos = text->tqfind( m_word_break_char ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->find( m_quote_char1 ); + pos = text->tqfind( m_quote_char1 ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->find( m_quote_char2 ); + pos = text->tqfind( m_quote_char2 ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } if ( !force && pos == -1 ) { - pos = text->find( m_escape_char ); + pos = text->tqfind( m_escape_char ); if ( skip_last && (pos == (int)(text->length())-1) ) pos = -1; } diff --git a/kio/kio/ktar.cpp b/kio/kio/ktar.cpp index 0b77fff52..6c8227d3e 100644 --- a/kio/kio/ktar.cpp +++ b/kio/kio/ktar.cpp @@ -129,7 +129,7 @@ void KTar::prepareDevice( const TQString & filename, const TQString & mimetype, bool /*forced*/ ) { if( "application/x-tar" == mimetype ) - setDevice( new TQFile( filename ) ); + setDevice( TQT_TQIODEVICE(new TQFile( filename )) ); else { // The compression filters are very slow with random access. @@ -149,7 +149,7 @@ void KTar::prepareDevice( const TQString & filename, // the device must be closed, however, for KArchive.setDevice() TQFile* file = d->tmpFile->file(); file->close(); - setDevice(file); + setDevice(TQT_TQIODEVICE(file)); } } @@ -185,9 +185,9 @@ void KTar::setOrigFileName( const TQCString & fileName ) d->origFileName = fileName; } -Q_LONG KTar::readRawHeader(char *buffer) { +TQ_LONG KTar::readRawHeader(char *buffer) { // Read header - Q_LONG n = device()->readBlock( buffer, 0x200 ); + TQ_LONG n = device()->readBlock( buffer, 0x200 ); if ( n == 0x200 && buffer[0] != 0 ) { // Make sure this is actually a tar header if (strncmp(buffer + 257, "ustar", 5)) { @@ -223,7 +223,7 @@ Q_LONG KTar::readRawHeader(char *buffer) { } bool KTar::readLonglink(char *buffer,TQCString &longlink) { - Q_LONG n = 0; + TQ_LONG n = 0; TQIODevice *dev = device(); // read size of longlink from size field in header // size is in bytes including the trailing null (which we ignore) @@ -252,11 +252,11 @@ bool KTar::readLonglink(char *buffer,TQCString &longlink) { return true; } -Q_LONG KTar::readHeader(char *buffer,TQString &name,TQString &symlink) { +TQ_LONG KTar::readHeader(char *buffer,TQString &name,TQString &symlink) { name.truncate(0); symlink.truncate(0); while (true) { - Q_LONG n = readRawHeader(buffer); + TQ_LONG n = readRawHeader(buffer); if (n != 0x200) return n; // is it a longlink? @@ -320,7 +320,7 @@ bool KTar::KTarPrivate::fillTempFile( const TQString & filename) { delete filterDev; return false; } - Q_LONG len = -1; + TQ_LONG len = -1; while ( !filterDev->atEnd() && len != 0) { len = filterDev->readBlock(buffer.data(),buffer.size()); if ( len < 0 ) { // corrupted archive @@ -372,7 +372,7 @@ bool KTar::openArchive( int mode ) TQString symlink; // Read header - Q_LONG n = readHeader(buffer,name,symlink); + TQ_LONG n = readHeader(buffer,name,symlink); if (n < 0) return false; if (n == 0x200) { @@ -385,7 +385,7 @@ bool KTar::openArchive( int mode ) name = name.left( name.length() - 1 ); } - int pos = name.findRev( '/' ); + int pos = name.tqfindRev( '/' ); if ( pos == -1 ) nm = name; else @@ -534,7 +534,7 @@ bool KTar::KTarPrivate::writeBackTempFile( const TQString & filename ) { if ( forced ) static_cast<KFilterDev *>(dev)->setOrigFileName( origFileName ); TQByteArray buffer(8*1024); - Q_LONG len; + TQ_LONG len; while ( ! file->atEnd()) { len = file->readBlock(buffer.data(),buffer.size()); dev->writeBlock(buffer.data(),len); @@ -633,7 +633,7 @@ bool KTar::prepareWriting( const TQString& name, const TQString& user, const TQS bool KTar::doneWriting( uint size ) { - // Write alignment + // Write tqalignment int rest = size % 0x200; if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at() + (rest ? 0x200 - rest : 0); // Record our new end of archive @@ -642,7 +642,7 @@ bool KTar::doneWriting( uint size ) char buffer[ 0x201 ]; for( uint i = 0; i < 0x200; ++i ) buffer[i] = 0; - Q_LONG nwritten = device()->writeBlock( buffer, 0x200 - rest ); + TQ_LONG nwritten = device()->writeBlock( buffer, 0x200 - rest ); return nwritten == 0x200 - rest; } return true; @@ -853,7 +853,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, if ( dirName.right(1) != "/" ) dirName += "/"; - if ( d->dirList.contains( dirName ) ) + if ( d->dirList.tqcontains( dirName ) ) return true; // already there char buffer[ 0x201 ]; diff --git a/kio/kio/ktar.h b/kio/kio/ktar.h index 95c52a32c..67f004a39 100644 --- a/kio/kio/ktar.h +++ b/kio/kio/ktar.h @@ -139,9 +139,9 @@ private: void writeLonglink(char *buffer, const TQCString &name, char typeflag, const char *uname, const char *gname); - Q_LONG readRawHeader(char *buffer); + TQ_LONG readRawHeader(char *buffer); bool readLonglink(char *buffer,TQCString &longlink); - Q_LONG readHeader(char *buffer,TQString &name,TQString &symlink); + TQ_LONG readHeader(char *buffer,TQString &name,TQString &symlink); TQString m_filename; protected: diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h index e5bb734e6..4b2690dc7 100644 --- a/kio/kio/ktrader.h +++ b/kio/kio/ktrader.h @@ -82,7 +82,7 @@ * applications or components. * @author Torben Weis <weis@kde.org> */ -class KIO_EXPORT KTrader : public QObject +class KIO_EXPORT KTrader : public TQObject { Q_OBJECT public: diff --git a/kio/kio/ktraderparsetree.cpp b/kio/kio/ktraderparsetree.cpp index 711ec5356..969599db6 100644 --- a/kio/kio/ktraderparsetree.cpp +++ b/kio/kio/ktraderparsetree.cpp @@ -415,7 +415,7 @@ bool ParseTreeMATCH::eval( ParseContext *_context ) const if ( c1.type != ParseContext::T_STRING || c2.type != ParseContext::T_STRING ) return false; - _context->b = ( c2.str.find( c1.str ) != -1 ); + _context->b = ( c2.str.tqfind( c1.str ) != -1 ); return true; } @@ -465,7 +465,7 @@ bool ParseTreeIN::eval( ParseContext *_context ) const if ( c1.type == ParseContext::T_STRING && c2.type == ParseContext::T_STR_SEQ ) { - _context->b = ( c2.strSeq.find( c1.str ) != c2.strSeq.end() ); + _context->b = ( c2.strSeq.tqfind( c1.str ) != c2.strSeq.end() ); return true; } @@ -535,7 +535,7 @@ bool ParseTreeMIN2::eval( ParseContext *_context ) const if ( !_context->initMaxima( m_strId ) ) return false; - TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.find( m_strId ); + TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.tqfind( m_strId ); if ( it == _context->maxima.end() ) return false; @@ -568,7 +568,7 @@ bool ParseTreeMAX2::eval( ParseContext *_context ) const return false; // Find extrema - TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.find( m_strId ); + TQMap<TQString,PreferencesMaxima>::Iterator it = _context->maxima.tqfind( m_strId ); if ( it == _context->maxima.end() ) return false; @@ -651,7 +651,7 @@ bool ParseContext::initMaxima( const TQString& _prop ) return false; // Did we cache the result ? - TQMap<TQString,PreferencesMaxima>::Iterator it = maxima.find( _prop ); + TQMap<TQString,PreferencesMaxima>::Iterator it = maxima.tqfind( _prop ); if ( it != maxima.end() ) return ( it.data().type == PreferencesMaxima::PM_DOUBLE || it.data().type == PreferencesMaxima::PM_INT ); diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp index 2c4c5b12e..e4b885ce5 100644 --- a/kio/kio/kurifilter.cpp +++ b/kio/kio/kurifilter.cpp @@ -35,7 +35,7 @@ template class TQPtrList<KURIFilterPlugin>; KURIFilterPlugin::KURIFilterPlugin( TQObject *parent, const char *name, double pri ) :TQObject( parent, name ) { - m_strName = TQString::fromLatin1( name ); + m_strName = TQString::tqfromLatin1( name ); m_dblPriority = pri; } @@ -171,32 +171,32 @@ TQString KURIFilterData::iconName() case KURIFilterData::EXECUTABLE: { TQString exeName = m_pURI.url(); - exeName = exeName.mid( exeName.findRev( '/' ) + 1 ); // strip path if given + exeName = exeName.mid( exeName.tqfindRev( '/' ) + 1 ); // strip path if given KService::Ptr service = KService::serviceByDesktopName( exeName ); - if (service && service->icon() != TQString::fromLatin1( "unknown" )) + if (service && service->icon() != TQString::tqfromLatin1( "unknown" )) m_strIconName = service->icon(); // Try to find an icon with the same name as the binary (useful for non-kde apps) else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) m_strIconName = exeName; else // not found, use default - m_strIconName = TQString::fromLatin1("exec"); + m_strIconName = TQString::tqfromLatin1("exec"); break; } case KURIFilterData::HELP: { - m_strIconName = TQString::fromLatin1("khelpcenter"); + m_strIconName = TQString::tqfromLatin1("khelpcenter"); break; } case KURIFilterData::SHELL: { - m_strIconName = TQString::fromLatin1("konsole"); + m_strIconName = TQString::tqfromLatin1("konsole"); break; } case KURIFilterData::ERROR: case KURIFilterData::BLOCKED: { - m_strIconName = TQString::fromLatin1("error"); + m_strIconName = TQString::tqfromLatin1("error"); break; } default: diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h index 0960c1419..2cd999582 100644 --- a/kio/kio/kurifilter.h +++ b/kio/kio/kurifilter.h @@ -347,9 +347,10 @@ private: * * @short Abstract class for URI filter plugins. */ -class KIO_EXPORT KURIFilterPlugin : public QObject +class KIO_EXPORT KURIFilterPlugin : public TQObject { Q_OBJECT + TQ_OBJECT public: diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 88a566b5f..339f6c351 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -80,7 +80,7 @@ class CompletionThread; * matches from an asyncrynous lookup. */ -class CompletionMatchEvent : public QCustomEvent +class CompletionMatchEvent : public TQCustomEvent { public: CompletionMatchEvent( CompletionThread *thread ) : @@ -95,7 +95,7 @@ private: CompletionThread *m_completionThread; }; -class CompletionThread : public QThread +class CompletionThread : public TQThread { protected: CompletionThread( KURLCompletion *receiver ) : @@ -786,7 +786,7 @@ bool KURLCompletion::envCompletion(const MyURL &url, TQString *match) while ( *env ) { TQString s = TQString::fromLocal8Bit( *env ); - int pos = s.find('='); + int pos = s.tqfind('='); if ( pos == -1 ) pos = s.length(); @@ -1407,7 +1407,7 @@ static bool expandEnv( TQString &text ) bool expanded = false; - while ( (pos = text.find('$', pos)) != -1 ) { + while ( (pos = text.tqfind('$', pos)) != -1 ) { // Skip escaped '$' // @@ -1419,8 +1419,8 @@ static bool expandEnv( TQString &text ) else { // Find the end of the variable = next '/' or ' ' // - int pos2 = text.find( ' ', pos+1 ); - int pos_tmp = text.find( '/', pos+1 ); + int pos2 = text.tqfind( ' ', pos+1 ); + int pos_tmp = text.tqfind( '/', pos+1 ); if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) pos2 = pos_tmp; @@ -1467,8 +1467,8 @@ static bool expandTilde(TQString &text) // Find the end of the user name = next '/' or ' ' // - int pos2 = text.find( ' ', 1 ); - int pos_tmp = text.find( '/', 1 ); + int pos2 = text.tqfind( ' ', 1 ); + int pos_tmp = text.tqfind( '/', 1 ); if ( pos2 == -1 || (pos_tmp != -1 && pos_tmp < pos2) ) pos2 = pos_tmp; diff --git a/kio/kio/kuserprofile.cpp b/kio/kio/kuserprofile.cpp index b7ef68c76..8fddf763d 100644 --- a/kio/kio/kuserprofile.cpp +++ b/kio/kio/kuserprofile.cpp @@ -165,7 +165,7 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers( const TQString& _ser if (_genericServiceType.isEmpty() /*no constraint*/ || (*it)->hasServiceType( _genericServiceType )) { // Check that we don't already have it ;) - if ( serviceList.find( (*it)->desktopEntryPath() ) == serviceList.end() ) + if ( serviceList.tqfind( (*it)->desktopEntryPath() ) == serviceList.end() ) { bool allow = (*it)->allowAsDefault(); KServiceOffer o( (*it), (*it)->initialPreferenceForMimeType(_servicetype), allow ); @@ -215,7 +215,7 @@ int KServiceTypeProfile::preference( const TQString& _service ) const KService::Ptr service = KService::serviceByName( _service ); if (!service) return 0; - TQMap<TQString,Service>::ConstIterator it = m_mapServices.find( service->storageId() ); + TQMap<TQString,Service>::ConstIterator it = m_mapServices.tqfind( service->storageId() ); if ( it == m_mapServices.end() ) return 0; @@ -233,7 +233,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const return false; // Look what the user says ... - TQMap<TQString,Service>::ConstIterator it = m_mapServices.find( service->storageId() ); + TQMap<TQString,Service>::ConstIterator it = m_mapServices.tqfind( service->storageId() ); if ( it == m_mapServices.end() ) return 0; @@ -270,7 +270,7 @@ KServiceTypeProfile::OfferList KServiceTypeProfile::offers() const if ( m_strGenericServiceType.isEmpty() || (*it)->hasServiceType( m_strGenericServiceType ) ) { // Now look into the profile, to find this service's preference. - TQMap<TQString,Service>::ConstIterator it2 = m_mapServices.find( (*it)->storageId() ); + TQMap<TQString,Service>::ConstIterator it2 = m_mapServices.tqfind( (*it)->storageId() ); if( it2 != m_mapServices.end() ) { diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp index 6f29bb264..1e1dd6241 100644 --- a/kio/kio/kzip.cpp +++ b/kio/kio/kzip.cpp @@ -60,7 +60,7 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer) { if ( dt.isValid() ) { - const Q_UINT16 time = + const TQ_UINT16 time = ( dt.time().hour() << 11 ) // 5 bit hour | ( dt.time().minute() << 5 ) // 6 bit minute | ( dt.time().second() >> 1 ); // 5 bit double seconds @@ -68,7 +68,7 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer) buffer[0] = char(time); buffer[1] = char(time >> 8); - const Q_UINT16 date = + const TQ_UINT16 date = ( ( dt.date().year() - 1980 ) << 9 ) // 7 bit year 1980-based | ( dt.date().month() << 5 ) // 4 bit month | ( dt.date().day() ); // 5 bit day @@ -87,13 +87,13 @@ static void transformToMsDos(const TQDateTime& dt, char* buffer) static time_t transformFromMsDos(const char* buffer) { - Q_UINT16 time = (uchar)buffer[0] | ( (uchar)buffer[1] << 8 ); + TQ_UINT16 time = (uchar)buffer[0] | ( (uchar)buffer[1] << 8 ); int h = time >> 11; int m = ( time & 0x7ff ) >> 5; int s = ( time & 0x1f ) * 2 ; TQTime qt(h, m, s); - Q_UINT16 date = (uchar)buffer[2] | ( (uchar)buffer[3] << 8 ); + TQ_UINT16 date = (uchar)buffer[2] | ( (uchar)buffer[3] << 8 ); int y = ( date >> 9 ) + 1980; int o = ( date & 0x1ff ) >> 5; int d = ( date & 0x1f ); @@ -385,7 +385,7 @@ bool KZip::openArchive( int mode ) return false; } Q_ASSERT( d->m_saveFile->file() ); - setDevice( d->m_saveFile->file() ); + setDevice( TQT_TQIODEVICE(d->m_saveFile->file()) ); } return true; case IO_ReadOnly: @@ -393,8 +393,8 @@ bool KZip::openArchive( int mode ) { // ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact. if ( !m_filename.isEmpty() ) { - setDevice( new TQFile( m_filename ) ); - if ( !device()->open( mode ) ) + setDevice( TQT_TQIODEVICE(new TQFile( m_filename )) ); + if ( !device()->tqopen( mode ) ) return false; } break; // continued below @@ -462,9 +462,9 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; int compression_mode = (uchar)buffer[2] | (uchar)buffer[3] << 8; time_t mtime = transformFromMsDos( buffer+4 ); - Q_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8 + TQ_LONG compr_size = (uchar)buffer[12] | (uchar)buffer[13] << 8 | (uchar)buffer[14] << 16 | (uchar)buffer[15] << 24; - Q_LONG uncomp_size = (uchar)buffer[16] | (uchar)buffer[17] << 8 + TQ_LONG uncomp_size = (uchar)buffer[16] | (uchar)buffer[17] << 8 | (uchar)buffer[18] << 16 | (uchar)buffer[19] << 24; int namelen = (uchar)buffer[20] | (uchar)buffer[21] << 8; int extralen = (uchar)buffer[22] | (uchar)buffer[23] << 8; @@ -578,7 +578,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; } } else { - if ( compr_size > (Q_LONG)dev->size() ) + if ( compr_size > (TQ_LONG)dev->size() ) { // here we cannot trust the compressed size, so scan through the compressed // data to find the next header @@ -736,7 +736,7 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl; else Q_ASSERT(access & S_IFDIR); } - int pos = name.findRev( '/' ); + int pos = name.tqfindRev( '/' ); if ( pos == -1 ) entryName = name; else @@ -871,9 +871,9 @@ bool KZip::closeArchive() char buffer[ 22 ]; // first used for 12, then for 22 at the end uLong crc = crc32(0L, Z_NULL, 0); - Q_LONG centraldiroffset = device()->at(); + TQ_LONG centraldiroffset = device()->at(); //kdDebug(7040) << "closearchive: centraldiroffset: " << centraldiroffset << endl; - Q_LONG atbackup = centraldiroffset; + TQ_LONG atbackup = centraldiroffset; TQPtrListIterator<KZipFileEntry> it( d->m_fileList ); for ( ; it.current() ; ++it ) @@ -994,7 +994,7 @@ bool KZip::closeArchive() if ( !ok ) return false; } - Q_LONG centraldirendoffset = device()->at(); + TQ_LONG centraldirendoffset = device()->at(); //kdDebug(7040) << "closearchive: centraldirendoffset: " << centraldirendoffset << endl; //kdDebug(7040) << "closearchive: device()->at(): " << device()->at() << endl; @@ -1133,7 +1133,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, // Find or create parent dir KArchiveDirectory* parentDir = rootDir(); TQString fileName( name ); - int i = name.findRev( '/' ); + int i = name.tqfindRev( '/' ); if ( i != -1 ) { TQString dir = name.left( i ); @@ -1383,9 +1383,9 @@ bool KZip::writeData_impl(const char * c, uint i) // and they didn't mention it in their docs... d->m_crc = crc32(d->m_crc, (const Bytef *) c , i); - Q_LONG written = d->m_currentDev->writeBlock( c, i ); + TQ_LONG written = d->m_currentDev->writeBlock( c, i ); //kdDebug(7040) << "KZip::writeData wrote " << i << " bytes." << endl; - bool ok = written == (Q_LONG)i; + bool ok = written == (TQ_LONG)i; if ( !ok ) abort(); return ok; diff --git a/kio/kio/kzip.h b/kio/kio/kzip.h index 291f827f8..26bfc71d3 100644 --- a/kio/kio/kzip.h +++ b/kio/kio/kzip.h @@ -230,8 +230,8 @@ public: {}*/ KZipFileEntry( KZip* zip, const TQString& name, int access, int date, const TQString& user, const TQString& group, const TQString& symlink, - const TQString& path, Q_LONG start, Q_LONG uncompressedSize, - int encoding, Q_LONG compressedSize) : + const TQString& path, TQ_LONG start, TQ_LONG uncompressedSize, + int encoding, TQ_LONG compressedSize) : KArchiveFile( zip, name, access, date, user, group, symlink, start, uncompressedSize ), m_crc(0), @@ -241,14 +241,14 @@ public: m_path( path ) {} int encoding() const { return m_encoding; } - Q_LONG compressedSize() const { return m_compressedSize; } + TQ_LONG compressedSize() const { return m_compressedSize; } /// Only used when writing - void setCompressedSize(Q_LONG compressedSize) { m_compressedSize = compressedSize; } + void setCompressedSize(TQ_LONG compressedSize) { m_compressedSize = compressedSize; } /// Header start: only used when writing - void setHeaderStart(Q_LONG headerstart) { m_headerStart = headerstart; } - Q_LONG headerStart() const {return m_headerStart; } + void setHeaderStart(TQ_LONG headerstart) { m_headerStart = headerstart; } + TQ_LONG headerStart() const {return m_headerStart; } /// CRC: only used when writing unsigned long crc32() const { return m_crc; } @@ -274,8 +274,8 @@ public: private: unsigned long m_crc; - Q_LONG m_compressedSize; - Q_LONG m_headerStart; + TQ_LONG m_compressedSize; + TQ_LONG m_headerStart; int m_encoding; TQString m_path; // KDE4: d pointer or at least some int for future extensions diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp index 3998584e3..28bc23633 100644 --- a/kio/kio/metainfojob.cpp +++ b/kio/kio/metainfojob.cpp @@ -86,7 +86,7 @@ void MetaInfoJob::removeItem(const KFileItem* item) determineNextFile(); } - d->items.remove(d->items.find(item)); + d->items.remove(d->items.tqfind(item)); } void MetaInfoJob::determineNextFile() diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp index 5189b93d6..975a42c10 100644 --- a/kio/kio/netaccess.cpp +++ b/kio/kio/netaccess.cpp @@ -293,7 +293,7 @@ void NetAccess::removeTempFile(const TQString& name) { if (!tmpfiles) return; - if (tmpfiles->contains(name)) + if (tmpfiles->tqcontains(name)) { unlink(TQFile::encodeName(name)); tmpfiles->remove(name); @@ -373,7 +373,7 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions, TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window ) { bJobOK = true; // success unless further error occurs - m_mimetype = TQString::fromLatin1("unknown"); + m_mimetype = TQString::tqfromLatin1("unknown"); KIO::Job * job = KIO::mimetype( url ); job->setWindow (window); connect( job, TQT_SIGNAL( result (KIO::Job *) ), @@ -403,7 +403,7 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman remoteTempFileName = tmpFile.name(); // only need the filename KTempFile adds some KDE specific dirs // that probably does not exist on the remote side - int pos = remoteTempFileName.findRev('/'); + int pos = remoteTempFileName.tqfindRev('/'); remoteTempFileName = "/tmp/fishexec_" + remoteTempFileName.mid(pos + 1); tempPathUrl.setPath( remoteTempFileName ); bJobOK = true; // success unless further error occurs @@ -462,16 +462,16 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* connect( job, TQT_SIGNAL( result (KIO::Job *) ), this, TQT_SLOT( slotResult (KIO::Job *) ) ); - TQMetaObject *meta = job->metaObject(); + TQMetaObject *meta = job->tqmetaObject(); static const char dataSignal[] = "data(KIO::Job*,const TQByteArray&)"; - if ( meta->findSignal( dataSignal ) != -1 ) { + if ( meta->tqfindSignal( dataSignal ) != -1 ) { connect( job, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)), this, TQT_SLOT(slotData(KIO::Job*,const TQByteArray&)) ); } static const char redirSignal[] = "redirection(KIO::Job*,const KURL&)"; - if ( meta->findSignal( redirSignal ) != -1 ) { + if ( meta->tqfindSignal( redirSignal ) != -1 ) { connect( job, TQT_SIGNAL(redirection(KIO::Job*,const KURL&)), this, TQT_SLOT(slotRedirection(KIO::Job*, const KURL&)) ); } @@ -492,10 +492,10 @@ void qt_leave_modal( TQWidget *widget ); void NetAccess::enter_loop() { - TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQWidget::NoFocus ); + TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); + dummy.setFocusPolicy( TQ_NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } @@ -515,7 +515,7 @@ void NetAccess::slotResult( KIO::Job * job ) if ( m_metaData ) *m_metaData = job->metaData(); - qApp->exit_loop(); + tqApp->exit_loop(); } void NetAccess::slotData( KIO::Job*, const TQByteArray& data ) diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h index caeb7b985..3fb9103af 100644 --- a/kio/kio/netaccess.h +++ b/kio/kio/netaccess.h @@ -56,7 +56,7 @@ namespace KIO { * * @short Provides an easy, synchronous interface to KIO file operations. */ -class KIO_EXPORT NetAccess : public QObject +class KIO_EXPORT NetAccess : public TQObject { Q_OBJECT @@ -92,7 +92,7 @@ public: * } * \endcode * - * Of course, your user interface will still process exposure/repaint + * Of course, your user interface will still process exposure/tqrepaint * events during the download. * * If the download fails, lastError() and lastErrorString() will be set. diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp index 83434906b..1670e83bb 100644 --- a/kio/kio/passdlg.cpp +++ b/kio/kio/passdlg.cpp @@ -87,12 +87,12 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, { lbl = new TQLabel( main ); lbl->setPixmap( pix ); - lbl->setAlignment( Qt::AlignLeft|Qt::AlignVCenter ); - lbl->setFixedSize( lbl->sizeHint() ); + lbl->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter ); + lbl->setFixedSize( lbl->tqsizeHint() ); d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft ); } d->prompt = new TQLabel( main ); - d->prompt->setAlignment( Qt::AlignLeft|Qt::AlignVCenter|Qt::WordBreak ); + d->prompt->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter|TQt::WordBreak ); d->layout->addWidget( d->prompt, 0, 2, Qt::AlignLeft ); if ( prompt.isEmpty() ) setPrompt( i18n( "You need to supply a username and a password" ) ); @@ -106,12 +106,12 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 4: Username field d->userNameLabel = new TQLabel( i18n("&Username:"), main ); - d->userNameLabel->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); - d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() ); + d->userNameLabel->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + d->userNameLabel->setFixedSize( d->userNameLabel->tqsizeHint() ); d->userNameHBox = new TQHBox( main ); d->userEdit = new KLineEdit( d->userNameHBox ); - TQSize s = d->userEdit->sizeHint(); + TQSize s = d->userEdit->tqsizeHint(); d->userEdit->setFixedHeight( s.height() ); d->userEdit->setMinimumWidth( s.width() ); d->userNameLabel->setBuddy( d->userEdit ); @@ -123,15 +123,15 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 6: Password field lbl = new TQLabel( i18n("&Password:"), main ); - lbl->setAlignment( Qt::AlignVCenter | Qt::AlignLeft ); - lbl->setFixedSize( lbl->sizeHint() ); + lbl->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); + lbl->setFixedSize( lbl->tqsizeHint() ); TQHBox* hbox = new TQHBox( main ); d->passEdit = new KLineEdit( hbox ); if ( cfg->readEntry("EchoMode", "OneStar") == "NoEcho" ) d->passEdit->setEchoMode( TQLineEdit::NoEcho ); else d->passEdit->setEchoMode( TQLineEdit::Password ); - s = d->passEdit->sizeHint(); + s = d->passEdit->tqsizeHint(); d->passEdit->setFixedHeight( s.height() ); d->passEdit->setMinimumWidth( s.width() ); lbl->setBuddy( d->passEdit ); @@ -145,7 +145,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, // Row 8: Keep Password hbox = new TQHBox( main ); d->keepCheckBox = new TQCheckBox( i18n("&Keep password"), hbox ); - d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() ); + d->keepCheckBox->setFixedSize( d->keepCheckBox->tqsizeHint() ); d->keep = cfg->readBoolEntry("Keep", false ); d->keepCheckBox->setChecked( d->keep ); connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); @@ -165,7 +165,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->userEdit->setFocus(); d->userEditCombo = 0; -// setFixedSize( sizeHint() ); +// setFixedSize( tqsizeHint() ); } TQString PasswordDialog::username() const @@ -198,7 +198,7 @@ static void calculateLabelSize(TQLabel *label) // Calculate a proper size for the text. { TQSimpleRichText rt(qt_text, label->font()); - TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget()); + TQRect d = KGlobalSettings::desktopGeometry(label->tqtopLevelWidget()); pref_width = d.width() / 4; rt.setWidth(pref_width-10); @@ -239,11 +239,11 @@ void PasswordDialog::addCommentLine( const TQString& label, TQWidget *main = mainWidget(); TQLabel* lbl = new TQLabel( label, main); - lbl->setAlignment( Qt::AlignVCenter|Qt::AlignRight ); - lbl->setFixedSize( lbl->sizeHint() ); + lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignRight ); + lbl->setFixedSize( lbl->tqsizeHint() ); d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); lbl = new TQLabel( comment, main); - lbl->setAlignment( Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak ); + lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak ); calculateLabelSize(lbl); d->layout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft ); d->layout->addRowSpacing( 3, 10 ); // Add a spacer @@ -304,7 +304,7 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin delete d->userEdit; d->userEditCombo = new KComboBox( true, d->userNameHBox ); d->userEdit = d->userEditCombo->lineEdit(); - TQSize s = d->userEditCombo->sizeHint(); + TQSize s = d->userEditCombo->tqsizeHint(); d->userEditCombo->setFixedHeight( s.height() ); d->userEditCombo->setMinimumWidth( s.width() ); d->userNameLabel->setBuddy( d->userEditCombo ); @@ -321,7 +321,7 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin void PasswordDialog::slotActivated( const TQString& userName ) { - TQMap<TQString, TQString>::ConstIterator it = d->knownLogins.find( userName ); + TQMap<TQString, TQString>::ConstIterator it = d->knownLogins.tqfind( userName ); if ( it != d->knownLogins.end() ) setPassword( it.data() ); } diff --git a/kio/kio/paste.cpp b/kio/kio/paste.cpp index 399350236..37ba406f6 100644 --- a/kio/kio/paste.cpp +++ b/kio/kio/paste.cpp @@ -105,7 +105,7 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, const TQCString& fmt = formats[i]; KMimeType::Ptr mime = KMimeType::mimeType( fmt ); if ( mime != KMimeType::defaultMimeTypePtr() ) - formatLabels.append( i18n( "%1 (%2)" ).arg( mime->comment() ).arg( fmt ) ); + formatLabels.append( i18n( "%1 (%2)" ).arg( mime->comment() ).arg( fmt.data() ) ); else formatLabels.append( fmt ); } @@ -135,9 +135,9 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, // if "data" came from QClipboard, then it was deleted already - by a nice 0-seconds timer // In that case, get it again. Let's hope the user didn't copy something else meanwhile :/ if ( clipboard ) { - data = TQApplication::clipboard()->data(); + data = TQApplication::tqclipboard()->data(); } - const TQByteArray ba = data->encodedData( chosenFormat ); + const TQByteArray ba = data->tqencodedData( chosenFormat ); return pasteDataAsyncTo( new_url, ba ); } #endif @@ -146,13 +146,13 @@ static KIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data, KIO_EXPORT bool KIO::isClipboardEmpty() { #ifndef QT_NO_MIMECLIPBOARD - TQMimeSource *data = TQApplication::clipboard()->data(); - if ( data->provides( "text/uri-list" ) && data->encodedData( "text/uri-list" ).size() > 0 ) + TQMimeSource *data = TQApplication::tqclipboard()->data(); + if ( data->provides( "text/uri-list" ) && data->tqencodedData( "text/uri-list" ).size() > 0 ) return false; #else // Happens with some versions of Qt Embedded... :/ // Guess. - TQString data = TQApplication::clipboard()->text(); + TQString data = TQApplication::tqclipboard()->text(); if(data.contains("://")) return false; #endif @@ -194,7 +194,7 @@ KIO::CopyJob* KIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url, if ( formats.size() > 1 ) { return chooseAndPaste( dest_url, data, formats, dialogText, widget, clipboard ); } - ba = data->encodedData( formats.first() ); + ba = data->tqencodedData( formats.first() ); } if ( ba.size() == 0 ) { @@ -215,7 +215,7 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move ) } #ifndef QT_NO_MIMECLIPBOARD - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); // First check for URLs. KURL::List urls; @@ -233,14 +233,14 @@ KIO_EXPORT KIO::Job *KIO::pasteClipboard( const KURL& dest_url, bool move ) // If moving, erase the clipboard contents, the original files don't exist anymore if ( move ) - TQApplication::clipboard()->clear(); + TQApplication::tqclipboard()->clear(); return res; } return pasteMimeSource( data, dest_url, TQString::null, 0 /*TODO parent widget*/, true /*clipboard*/ ); #else TQByteArray ba; TQTextStream txtStream( ba, IO_WriteOnly ); - TQStringList data = TQStringList::split("\n", TQApplication::clipboard()->text()); + TQStringList data = TQStringList::split("\n", TQApplication::tqclipboard()->text()); KURL::List urls; KURLDrag::decode(data, urls); TQStringList::Iterator end(data.end()); @@ -290,7 +290,7 @@ KIO_EXPORT KIO::CopyJob* KIO::pasteDataAsync( const KURL& u, const TQByteArray& KIO_EXPORT TQString KIO::pasteActionText() { - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); KURL::List urls; if ( KURLDrag::canDecode( data ) && KURLDrag::decode( data, urls ) ) { if ( urls.isEmpty() ) diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp index 3802093c1..34735c26d 100644 --- a/kio/kio/previewjob.cpp +++ b/kio/kio/previewjob.cpp @@ -96,7 +96,7 @@ struct KIO::PreviewJobPrivate // If the file to create a thumb for was a temp file, this is its name TQString tempName; // Over that, it's too much - unsigned long maximumSize; + unsigned long tqmaximumSize; // the size for the icon overlay int iconSize; // the transparency of the blended mimetype icon @@ -163,7 +163,7 @@ void PreviewJob::startPreview() TQMap<TQString, KService::Ptr> mimeMap; for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - if (!d->enabledPlugins || d->enabledPlugins->contains((*it)->desktopEntryName())) + if (!d->enabledPlugins || d->enabledPlugins->tqcontains((*it)->desktopEntryName())) { TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) @@ -176,7 +176,7 @@ void PreviewJob::startPreview() { PreviewItem item; item.item = it.current(); - TQMap<TQString, KService::Ptr>::ConstIterator plugin = mimeMap.find(it.current()->mimetype()); + TQMap<TQString, KService::Ptr>::ConstIterator plugin = mimeMap.tqfind(it.current()->mimetype()); if (plugin == mimeMap.end() && (it.current()->mimetype() != "application/x-desktop") && (it.current()->mimetype() != "media/builtin-mydocuments") @@ -187,7 +187,7 @@ void PreviewJob::startPreview() && (it.current()->mimetype() != "media/builtin-webbrowser")) { TQString mimeType = it.current()->mimetype(); - plugin = mimeMap.find(mimeType.replace(TQRegExp("/.*"), "/*")); + plugin = mimeMap.tqfind(mimeType.replace(TQRegExp("/.*"), "/*")); if (plugin == mimeMap.end()) { @@ -196,7 +196,7 @@ void PreviewJob::startPreview() TQString parentMimeType = mimeInfo->parentMimeType(); while (!parentMimeType.isEmpty()) { - plugin = mimeMap.find(parentMimeType); + plugin = mimeMap.tqfind(parentMimeType); if (plugin != mimeMap.end()) break; KMimeType::Ptr parentMimeInfo = KMimeType::mimeType(parentMimeType); @@ -215,10 +215,10 @@ void PreviewJob::startPreview() { if (textProperty.toBool()) { - plugin = mimeMap.find("text/plain"); + plugin = mimeMap.tqfind("text/plain"); if (plugin == mimeMap.end()) { - plugin = mimeMap.find( "text/*" ); + plugin = mimeMap.tqfind( "text/*" ); } } } @@ -246,7 +246,7 @@ void PreviewJob::startPreview() // Read configuration value for the maximum allowed size KConfig * config = KGlobal::config(); KConfigGroupSaver cgs( config, "PreviewSettings" ); - d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); + d->tqmaximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); if (bNeedCache) { @@ -339,7 +339,7 @@ void PreviewJob::slotResult( KIO::Job *job ) } else if ( (*it).m_uds == KIO::UDS_SIZE ) { - if ( filesize_t((*it).m_long) > d->maximumSize && + if ( filesize_t((*it).m_long) > d->tqmaximumSize && !d->ignoreMaximumSize && !d->currentItem.plugin->property("IgnoreMaximumSize").toBool() ) { @@ -405,7 +405,7 @@ bool PreviewJob::statResultThumbnail() else d->origName = url.url(); #endif - KMD5 md5( TQFile::encodeName( d->origName ) ); + KMD5 md5( TQFile::encodeName( d->origName ).data() ); d->thumbName = TQFile::encodeName( md5.hexDigest() ) + ".png"; TQImage thumb; @@ -533,9 +533,9 @@ void PreviewJob::emitPreview(const TQImage &thumb) double imgRatio = (double)thumb.height() / (double)thumb.width(); if (imgRatio > (double)d->height / (double)d->width) pix.convertFromImage( - thumb.smoothScale((int)QMAX((double)d->height / imgRatio, 1), d->height)); + thumb.smoothScale((int)TQMAX((double)d->height / imgRatio, 1), d->height)); else pix.convertFromImage( - thumb.smoothScale(d->width, (int)QMAX((double)d->width * imgRatio, 1))); + thumb.smoothScale(d->width, (int)TQMAX((double)d->width * imgRatio, 1))); } else pix.convertFromImage(thumb); emit gotPreview(d->currentItem.item, pix); @@ -553,7 +553,7 @@ TQStringList PreviewJob::availablePlugins() TQStringList result; KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - if (!result.contains((*it)->desktopEntryName())) + if (!result.tqcontains((*it)->desktopEntryName())) result.append((*it)->desktopEntryName()); return result; } diff --git a/kio/kio/renamedlg.cpp b/kio/kio/renamedlg.cpp index fe830b2e3..2cc928692 100644 --- a/kio/kio/renamedlg.cpp +++ b/kio/kio/renamedlg.cpp @@ -194,12 +194,12 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, lib->unload(); continue; } - TQObject *obj = factory->create( this, (*it)->name().latin1() ); + TQObject *obj = factory->create( TQT_TQOBJECT(this), (*it)->name().latin1() ); if(!obj) { lib->unload(); continue; } - RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(obj); + RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(TQT_TQWIDGET(obj)); if(!plugin ){ delete obj; continue; @@ -223,7 +223,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, // No plugin found, build default dialog TQGridLayout * gridLayout = new TQGridLayout( 0L, 9, 2, KDialog::marginHint(), KDialog::spacingHint() ); - pLayout->addLayout(gridLayout); + pLayout->addLayout(TQT_TQLAYOUT(gridLayout)); gridLayout->setColStretch(0,0); gridLayout->setColStretch(1,10); @@ -380,7 +380,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, d->bCancel->setDefault( true ); layout->addWidget( d->bCancel ); - resize( sizeHint() ); + resize( tqsizeHint() ); } RenameDlg::~RenameDlg() @@ -440,13 +440,13 @@ TQString RenameDlg::suggestName(const KURL& baseURL, const TQString& oldName) TQString dotSuffix, suggestedName; TQString basename = oldName; - int index = basename.find( '.' ); + int index = basename.tqfind( '.' ); if ( index != -1 ) { dotSuffix = basename.mid( index ); basename.truncate( index ); } - int pos = basename.findRev( '_' ); + int pos = basename.tqfindRev( '_' ); if(pos != -1 ){ TQString tmp = basename.mid( pos+1 ); bool ok; diff --git a/kio/kio/renamedlg.h b/kio/kio/renamedlg.h index a1b5d6bb2..373abf446 100644 --- a/kio/kio/renamedlg.h +++ b/kio/kio/renamedlg.h @@ -45,7 +45,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW * @short A dialog for renaming files. * @since 3.1 */ -class KIO_EXPORT RenameDlg : public QDialog +class KIO_EXPORT RenameDlg : public TQDialog { Q_OBJECT public: diff --git a/kio/kio/renamedlgplugin.h b/kio/kio/renamedlgplugin.h index 39319fdb8..b4dd8b9fb 100644 --- a/kio/kio/renamedlgplugin.h +++ b/kio/kio/renamedlgplugin.h @@ -31,7 +31,7 @@ * @short Base class for RenameDlg plugins. * @since 3.1 */ -class KIO_EXPORT RenameDlgPlugin : public QWidget +class KIO_EXPORT RenameDlgPlugin : public TQWidget { public: /** diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 8ab080486..830ebe93c 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -110,7 +110,7 @@ class KIO::Scheduler::ProtocolInfoDict : public TQDict<KIO::Scheduler::ProtocolI KIO::Scheduler::ProtocolInfo * KIO::Scheduler::ProtocolInfoDict::get(const TQString &protocol) { - ProtocolInfo *info = find(protocol); + ProtocolInfo *info = tqfind(protocol); if (!info) { info = new ProtocolInfo; @@ -206,7 +206,7 @@ void Scheduler::_doJob(SimpleJob *job) { jobData->checkOnHold = checkOnHold; checkOnHold = false; } - extraJobData->replace(job, jobData); + extraJobData->tqreplace(job, jobData); newJobs.append(job); slaveTimer.start(0, true); #ifndef NDEBUG @@ -217,7 +217,7 @@ void Scheduler::_doJob(SimpleJob *job) { void Scheduler::_scheduleJob(SimpleJob *job) { newJobs.removeRef(job); - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); if (!jobData) { kdFatal(7006) << "BUG! _ScheduleJob(): No extraJobData for job!" << endl; @@ -237,7 +237,7 @@ void Scheduler::_cancelJob(SimpleJob *job) { if ( !slave ) { // was not yet running (don't call this on a finished job!) - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); if (!jobData) return; // I said: "Don't call this on a finished job!" @@ -249,7 +249,7 @@ void Scheduler::_cancelJob(SimpleJob *job) { slave = slaveList->first(); for(; slave; slave = slaveList->next()) { - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); if (list && list->removeRef(job)) break; // Job was found and removed. // Fall through to kill the slave as well! @@ -402,7 +402,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) // kdDebug(7006) << "scheduler: job started " << job << endl; - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); setupSlave(slave, job->url(), jobData->protocol, jobData->proxy, newSlave); job->start(slave); @@ -414,7 +414,7 @@ bool Scheduler::startJobDirect() { debug_info(); SimpleJob *job = newJobs.take(0); - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); if (!jobData) { kdFatal(7006) << "BUG! startjobDirect(): No extraJobData for job!" @@ -481,7 +481,7 @@ static Slave *searchIdleList(SlaveList *idleSlaves, const KURL &url, const TQStr Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) { Slave *slave = 0; - JobData *jobData = extraJobData->find(job); + JobData *jobData = extraJobData->tqfind(job); if (!jobData) { kdFatal(7006) << "BUG! findIdleSlave(): No extraJobData for job!" << endl; @@ -504,7 +504,7 @@ Slave *Scheduler::findIdleSlave(ProtocolInfo *, SimpleJob *job, bool &exact) if ( bCanReuse ) { KIO::MetaData outgoing = tJob->outgoingMetaData(); - TQString resume = (!outgoing.contains("resume")) ? TQString::null : outgoing["resume"]; + TQString resume = (!outgoing.tqcontains("resume")) ? TQString() : outgoing["resume"]; kdDebug(7006) << "Resume metadata is '" << resume << "'" << endl; bCanReuse = (resume.isEmpty() || resume == "0"); } @@ -582,7 +582,7 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave) protInfo->activeSlaves.removeRef(slave); if (slave->isAlive()) { - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); if (list) { assert(slave->isConnected()); @@ -618,7 +618,7 @@ void Scheduler::slotSlaveDied(KIO::Slave *slave) urlOnHold = KURL(); } idleSlaves->removeRef(slave); - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); if (list) { // coSlave dies, kill jobs waiting in queue @@ -733,7 +733,7 @@ Scheduler::slotScheduleCoSlave() slave = nextSlave) { nextSlave = coIdleSlaves->next(); - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); assert(list); if (list && !list->isEmpty()) { @@ -784,7 +784,7 @@ void Scheduler::slotSlaveError(int errorNr, const TQString &errorMsg) { Slave *slave = (Slave *)sender(); - if (!slave->isConnected() || (coIdleSlaves->find(slave) != -1)) + if (!slave->isConnected() || (coIdleSlaves->tqfind(slave) != -1)) { // Only forward to application if slave is idle or still connecting. emit slaveError(slave, errorNr, errorMsg); @@ -805,7 +805,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job) return false; } - JobList *list = coSlaves.find(slave); + JobList *list = coSlaves.tqfind(slave); assert(list); if (!list) { @@ -865,15 +865,15 @@ Scheduler::_registerWindow(TQWidget *wid) if (!wid) return; - TQObject *obj = static_cast<TQObject *>(wid); - if (!m_windowList.contains(obj)) + TQObject *obj = TQT_TQOBJECT(wid); + if (!m_windowList.tqcontains(obj)) { // We must store the window Id because by the time // the destroyed signal is emitted we can no longer // access TQWidget::winId() (already destructed) WId windowId = wid->winId(); m_windowList.insert(obj, windowId); - connect(wid, TQT_SIGNAL(destroyed(TQObject *)), + connect(TQT_TQOBJECT(wid), TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotUnregisterWindow(TQObject*))); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); @@ -890,7 +890,7 @@ Scheduler::slotUnregisterWindow(TQObject *obj) if (!obj) return; - TQMap<TQObject *, WId>::Iterator it = m_windowList.find(obj); + TQMap<TQObject *, WId>::Iterator it = m_windowList.tqfind(obj); if (it == m_windowList.end()) return; WId windowId = it.data(); diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp index 258f03e2a..2381bde91 100644 --- a/kio/kio/sessiondata.cpp +++ b/kio/kio/sessiondata.cpp @@ -236,8 +236,8 @@ SessionData::~SessionData() void SessionData::configDataFor( MetaData &configData, const TQString &proto, const TQString & ) { - if ( (proto.find("http", 0, false) == 0 ) || - (proto.find("webdav", 0, false) == 0) ) + if ( (proto.tqfind("http", 0, false) == 0 ) || + (proto.tqfind("webdav", 0, false) == 0) ) { if (!d->initDone) reset(); @@ -273,20 +273,20 @@ void SessionData::reset() // Get language settings... TQStringList languageList = KGlobal::locale()->languagesTwoAlpha(); - TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); if ( it != languageList.end() ) { - if ( languageList.contains( english ) > 0 ) + if ( languageList.tqcontains( english ) > 0 ) languageList.remove( it ); else (*it) = english; } - if ( !languageList.contains( english ) ) + if ( !languageList.tqcontains( english ) ) languageList.append( english ); d->language = languageList.join( ", " ); - d->charsets = TQString::fromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower(); + d->charsets = TQString::tqfromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower(); KProtocolManager::reparseConfiguration(); } diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata.h index 408045260..80433679c 100644 --- a/kio/kio/sessiondata.h +++ b/kio/kio/sessiondata.h @@ -32,7 +32,7 @@ class SlaveConfig; /** * @internal */ -class KIO_EXPORT SessionData : public QObject +class KIO_EXPORT SessionData : public TQObject { Q_OBJECT diff --git a/kio/kio/skipdlg.cpp b/kio/kio/skipdlg.cpp index f014b10d9..fabc6f841 100644 --- a/kio/kio/skipdlg.cpp +++ b/kio/kio/skipdlg.cpp @@ -71,8 +71,8 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo // vlayout->addStrut( 360 ); makes dlg at least that wide TQLabel * lb = new TQLabel( _error_text, this ); - lb->setFixedHeight( lb->sizeHint().height() ); - lb->setMinimumWidth( lb->sizeHint().width() ); + lb->setFixedHeight( lb->tqsizeHint().height() ); + lb->setMinimumWidth( lb->tqsizeHint().width() ); vlayout->addWidget( lb ); vlayout->addSpacing( 10 ); @@ -82,26 +82,26 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo if ( b0 ) { b0->setDefault( true ); - b0->setFixedSize( b0->sizeHint() ); + b0->setFixedSize( b0->tqsizeHint() ); layout->addWidget( b0 ); layout->addSpacing( 5 ); } if ( b1 ) { - b1->setFixedSize( b1->sizeHint() ); + b1->setFixedSize( b1->tqsizeHint() ); layout->addWidget( b1 ); layout->addSpacing( 5 ); } if ( b2 ) { - b2->setFixedSize( b2->sizeHint() ); + b2->setFixedSize( b2->tqsizeHint() ); layout->addWidget( b2 ); layout->addSpacing( 5 ); } vlayout->addStretch( 10 ); vlayout->activate(); - resize( sizeHint() ); + resize( tqsizeHint() ); } SkipDlg::~SkipDlg() diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index c1a701711..b4f288d94 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -364,7 +364,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error client->attach(); TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); - KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); + KTempFile socketfile(prefix, TQString::tqfromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) { error_text = i18n("Unable to create io-slave: %1").arg(strerror(errno)); @@ -377,7 +377,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error #endif #ifndef Q_WS_WIN - KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name())); + KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); #else @@ -469,7 +469,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) client->attach(); TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName()); - KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket")); + KTempFile socketfile(prefix, TQString::tqfromLatin1(".slave-socket")); if ( socketfile.status() != 0 ) return 0; @@ -479,7 +479,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) #endif #ifndef Q_WS_WIN - KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name())); + KServerSocket *kss = new KServerSocket(TQFile::encodeName(socketfile.name()).data()); Slave *slave = new Slave(kss, protocol, socketfile.name()); #else diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index ad683a009..cecaf9ec3 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -340,7 +340,7 @@ void SlaveBase::dispatchLoop() void SlaveBase::connectSlave(const TQString& path) { #ifdef Q_OS_UNIX //TODO: KSocket not yet available on WIN32 - appconn->init(new KSocket(TQFile::encodeName(path))); + appconn->init(new KSocket(TQFile::encodeName(path).data())); if (!appconn->inited()) { kdDebug(7019) << "SlaveBase: failed to connect to " << path << endl; @@ -358,23 +358,23 @@ void SlaveBase::disconnectSlave() void SlaveBase::setMetaData(const TQString &key, const TQString &value) { - mOutgoingMetaData.replace(key, value); + mOutgoingMetaData.tqreplace(key, value); } TQString SlaveBase::metaData(const TQString &key) const { - if (mIncomingMetaData.contains(key)) + if (mIncomingMetaData.tqcontains(key)) return mIncomingMetaData[key]; - if (d->configData.contains(key)) + if (d->configData.tqcontains(key)) return d->configData[key]; return TQString::null; } bool SlaveBase::hasMetaData(const TQString &key) const { - if (mIncomingMetaData.contains(key)) + if (mIncomingMetaData.tqcontains(key)) return true; - if (d->configData.contains(key)) + if (d->configData.tqcontains(key)) return true; return false; } @@ -434,7 +434,7 @@ void SlaveBase::error( int _errid, const TQString &_text ) { mIncomingMetaData.clear(); // Clear meta data mOutgoingMetaData.clear(); - KIO_DATA << (Q_INT32) _errid << _text; + KIO_DATA << (TQ_INT32) _errid << _text; m_pConnection->send( MSG_ERROR, data ); //reset @@ -471,7 +471,7 @@ void SlaveBase::needSubURLData() void SlaveBase::slaveStatus( const TQString &host, bool connected ) { pid_t pid = getpid(); - Q_INT8 b = connected ? 1 : 0; + TQ_INT8 b = connected ? 1 : 0; KIO_DATA << pid << mProtocol << host << b; if (d->onHold) stream << d->onHoldUrl; @@ -543,7 +543,7 @@ void SlaveBase::processedPercent( float /* percent */ ) void SlaveBase::speed( unsigned long _bytes_per_second ) { - KIO_DATA << (Q_UINT32) _bytes_per_second; + KIO_DATA << (TQ_UINT32) _bytes_per_second; slaveWriteError = false; m_pConnection->send( INF_SPEED, data ); if (slaveWriteError) exit(); @@ -700,7 +700,7 @@ void SlaveBase::listEntry( const UDSEntry& entry, bool _ready ) void SlaveBase::listEntries( const UDSEntryList& list ) { - KIO_DATA << (Q_UINT32)list.count(); + KIO_DATA << (TQ_UINT32)list.count(); UDSEntryListConstIterator it = list.begin(); UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) @@ -898,7 +898,7 @@ int SlaveBase::messageBox( const TQString &text, MessageBoxType type, const TQSt const TQString &buttonYes, const TQString &buttonNo, const TQString &dontAskAgainName ) { kdDebug(7019) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl; - KIO_DATA << (Q_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName; + KIO_DATA << (TQ_INT32)type << text << caption << buttonYes << buttonNo << dontAskAgainName; m_pConnection->send( INF_MESSAGEBOX, data ); if ( waitForAnswer( CMD_MESSAGEBOXANSWER, 0, data ) != -1 ) { @@ -1048,7 +1048,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) case CMD_PUT: { int permissions; - Q_INT8 iOverwrite, iResume; + TQ_INT8 iOverwrite, iResume; stream >> url >> iOverwrite >> iResume >> permissions; bool overwrite = ( iOverwrite != 0 ); bool resume = ( iResume != 0 ); @@ -1078,7 +1078,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) break; case CMD_RENAME: { - Q_INT8 iOverwrite; + TQ_INT8 iOverwrite; KURL url2; stream >> url >> url2 >> iOverwrite; bool overwrite = (iOverwrite != 0); @@ -1086,7 +1086,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) } break; case CMD_SYMLINK: { - Q_INT8 iOverwrite; + TQ_INT8 iOverwrite; TQString target; stream >> target >> url >> iOverwrite; bool overwrite = (iOverwrite != 0); @@ -1095,7 +1095,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) case CMD_COPY: { int permissions; - Q_INT8 iOverwrite; + TQ_INT8 iOverwrite; KURL url2; stream >> url >> url2 >> permissions >> iOverwrite; bool overwrite = (iOverwrite != 0); @@ -1103,7 +1103,7 @@ void SlaveBase::dispatch( int command, const TQByteArray &data ) } break; case CMD_DEL: { - Q_INT8 isFile; + TQ_INT8 isFile; stream >> url >> isFile; del( url, isFile != 0); } break; diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h index 82370ce56..48fccd74e 100644 --- a/kio/kio/slavebase.h +++ b/kio/kio/slavebase.h @@ -618,10 +618,10 @@ public: * KIO::AuthInfo authInfo; * if ( openPassDlg( authInfo ) ) * { - * kdDebug() << TQString::fromLatin1("User: ") + * kdDebug() << TQString::tqfromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::fromLatin1("Password: ") - * << TQString::fromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::tqfromLatin1("Password: ") + * << TQString::tqfromLatin1("Not displayed here!") << endl; * } * \endcode * @@ -635,10 +635,10 @@ public: * TQString errorMsg = "You entered an incorrect password."; * if ( openPassDlg( authInfo, errorMsg ) ) * { - * kdDebug() << TQString::fromLatin1("User: ") + * kdDebug() << TQString::tqfromLatin1("User: ") * << authInfo.username << endl; - * kdDebug() << TQString::fromLatin1("Password: ") - * << TQString::fromLatin1("Not displayed here!") << endl; + * kdDebug() << TQString::tqfromLatin1("Password: ") + * << TQString::tqfromLatin1("Not displayed here!") << endl; * } * \endcode * diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp index fe888c99c..d9efdb6cc 100644 --- a/kio/kio/slaveconfig.cpp +++ b/kio/kio/slaveconfig.cpp @@ -79,7 +79,7 @@ void SlaveConfigPrivate::readGlobalConfig() SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_protocol) { - SlaveConfigProtocol *scp = protocol.find(_protocol); + SlaveConfigProtocol *scp = protocol.tqfind(_protocol); if (!scp) { TQString filename = KProtocolInfo::config(_protocol); @@ -94,7 +94,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::readProtocolConfig(const TQString &_pro SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_protocol) { - SlaveConfigProtocol *scp = protocol.find(_protocol); + SlaveConfigProtocol *scp = protocol.tqfind(_protocol); if (!scp) scp = readProtocolConfig(_protocol); return scp; @@ -103,7 +103,7 @@ SlaveConfigProtocol* SlaveConfigPrivate::findProtocolConfig(const TQString &_pro void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigProtocol *scp, const TQString &host) { MetaData *metaData = new MetaData; - scp->host.replace(host, metaData); + scp->host.tqreplace(host, metaData); // Read stuff // Break host into domains @@ -119,7 +119,7 @@ void SlaveConfigPrivate::readConfigProtocolHost(const TQString &, SlaveConfigPro int pos = 0; do { - pos = host.findRev('.', pos-1); + pos = host.tqfindRev('.', pos-1); if (pos < 0) domain = host; @@ -178,11 +178,11 @@ void SlaveConfig::setConfigData(const TQString &protocol, const TQString &host, } else { - MetaData *hostConfig = scp->host.find(host); + MetaData *hostConfig = scp->host.tqfind(host); if (!hostConfig) { d->readConfigProtocolHost(protocol, scp, host); - hostConfig = scp->host.find(host); + hostConfig = scp->host.tqfind(host); assert(hostConfig); } *hostConfig += config; @@ -197,12 +197,12 @@ MetaData SlaveConfig::configData(const TQString &protocol, const TQString &host) config += scp->global; if (host.isEmpty()) return config; - MetaData *hostConfig = scp->host.find(host); + MetaData *hostConfig = scp->host.tqfind(host); if (!hostConfig) { d->readConfigProtocolHost(protocol, scp, host); emit configNeeded(protocol, host); - hostConfig = scp->host.find(host); + hostConfig = scp->host.tqfind(host); assert(hostConfig); } config += *hostConfig; diff --git a/kio/kio/slaveconfig.h b/kio/kio/slaveconfig.h index 1eaaa55e4..a7ded457d 100644 --- a/kio/kio/slaveconfig.h +++ b/kio/kio/slaveconfig.h @@ -44,7 +44,7 @@ namespace KIO { * only applied when the slave is connecting with a host that matches with * the host and/or domain specified by the group. */ - class KIO_EXPORT SlaveConfig : public QObject + class KIO_EXPORT SlaveConfig : public TQObject { Q_OBJECT public: diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp index 563aad17e..62c64d566 100644 --- a/kio/kio/slaveinterface.cpp +++ b/kio/kio/slaveinterface.cpp @@ -43,7 +43,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e ) // We do the same on 64-bit platforms in case we run in a mixed 32/64bit // environment. - Q_UINT32 size = 0; + TQ_UINT32 size = 0; KIO::UDSEntry::ConstIterator it = e.begin(); for( ; it != e.end(); ++it ) { @@ -70,7 +70,7 @@ TQDataStream &operator <<(TQDataStream &s, const KIO::UDSEntry &e ) TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) { e.clear(); - Q_UINT32 size; + TQ_UINT32 size; s >> size; // On 32-bit platforms we send UDS_SIZE with UDS_SIZE_LARGE in front @@ -78,8 +78,8 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) // that would break the compatibility of the wire-protocol with KDE 2. // We do the same on 64-bit platforms in case we run in a mixed 32/64bit // environment. - Q_LLONG msb = 0; - for(Q_UINT32 i = 0; i < size; i++) + TQ_LLONG msb = 0; + for(TQ_UINT32 i = 0; i < size; i++) { KIO::UDSAtom a; s >> a; @@ -92,7 +92,7 @@ TQDataStream &operator >>(TQDataStream &s, KIO::UDSEntry &e ) if (a.m_uds == KIO::UDS_SIZE) { if (a.m_long < 0) - a.m_long += (Q_LLONG) 1 << 32; + a.m_long += (TQ_LLONG) 1 << 32; a.m_long += msb << 32; } e.append(a); @@ -225,9 +225,9 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) TQDataStream stream( rawdata, IO_ReadOnly ); TQString str1; - Q_INT32 i; - Q_INT8 b; - Q_UINT32 ul; + TQ_INT32 i; + TQ_INT8 b; + TQ_UINT32 ul; switch( _cmd ) { case MSG_DATA: @@ -251,7 +251,7 @@ bool SlaveInterface::dispatch( int _cmd, const TQByteArray &rawdata ) break; case MSG_LIST_ENTRIES: { - Q_UINT32 count; + TQ_UINT32 count; stream >> count; UDSEntryList list; diff --git a/kio/kio/slaveinterface.h b/kio/kio/slaveinterface.h index 5cca5dd77..d5b680f63 100644 --- a/kio/kio/slaveinterface.h +++ b/kio/kio/slaveinterface.h @@ -89,7 +89,7 @@ class SlaveInterfacePrivate; * * A call to foo() results in a call to slotFoo() on the other end. */ -class KIO_EXPORT SlaveInterface : public QObject +class KIO_EXPORT SlaveInterface : public TQObject { Q_OBJECT @@ -252,7 +252,7 @@ private: inline TQDataStream &operator >>(TQDataStream &s, KIO::UDSAtom &a ) { - Q_INT32 l; + TQ_INT32 l; s >> a.m_uds; if ( a.m_uds & KIO::UDS_LONG ) { @@ -273,7 +273,7 @@ inline TQDataStream &operator <<(TQDataStream &s, const KIO::UDSAtom &a ) s << a.m_uds; if ( a.m_uds & KIO::UDS_LONG ) - s << (Q_INT32) a.m_long; + s << (TQ_INT32) a.m_long; else if ( a.m_uds & KIO::UDS_STRING ) s << a.m_str; else {} // DIE! diff --git a/kio/kio/statusbarprogress.cpp b/kio/kio/statusbarprogress.cpp index 910155799..a3fdbf9c2 100644 --- a/kio/kio/statusbarprogress.cpp +++ b/kio/kio/statusbarprogress.cpp @@ -60,11 +60,11 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) stack->addWidget( m_pProgressBar, 1 ); m_pLabel = new TQLabel( "", this ); - m_pLabel->setAlignment( AlignHCenter | AlignVCenter ); + m_pLabel->tqsetAlignment( AlignHCenter | AlignVCenter ); m_pLabel->installEventFilter( this ); m_pLabel->setMinimumWidth( w ); stack->addWidget( m_pLabel, 2 ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); mode = None; setMode(); @@ -144,7 +144,7 @@ bool StatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) { if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *e = (TQMouseEvent*)ev; - if ( e->button() == LeftButton ) { // toggle view on left mouse button + if ( e->button() == Qt::LeftButton ) { // toggle view on left mouse button if ( mode == Label ) { mode = Progress; } else if ( mode == Progress ) { diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp index 78093577d..5547c4d23 100644 --- a/kio/kio/tcpslavebase.cpp +++ b/kio/kio/tcpslavebase.cpp @@ -774,7 +774,7 @@ int TCPSlaveBase::verifyCertificate() } #endif if (!_IPmatchesCN && !d->militantSSL) { // force this if the user wants it - if (d->cc->getHostList(pc).contains(ourHost)) { + if (d->cc->getHostList(pc).tqcontains(ourHost)) { _IPmatchesCN = true; } } diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index e444ebd46..88f7d3059 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -244,7 +244,7 @@ void KIOExec::slotRunApp() i18n( "The file\n%1\nhas been modified.\nDo you want to upload the changes?" ).arg(dest.prettyURL()), i18n( "File Changed" ), i18n("Upload"), i18n("Do Not Upload") ) == KMessageBox::Yes ) { - kdDebug() << TQString("src='%1' dest='%2'").arg(src).arg(dest.url()).ascii() << endl; + kdDebug() << TQString(TQString("src='%1' dest='%2'").arg(src).arg(dest.url())).ascii() << endl; // Do it the synchronous way. if ( !KIO::NetAccess::upload( src, dest, 0 ) ) { diff --git a/kio/kioexec/main.h b/kio/kioexec/main.h index 59f1cdac2..6a5dee65e 100644 --- a/kio/kioexec/main.h +++ b/kio/kioexec/main.h @@ -8,7 +8,7 @@ namespace KIO { class Job; } -class KIOExec : public QObject +class KIOExec : public TQObject { Q_OBJECT public: diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp index 42cbad3a4..858cad37b 100644 --- a/kio/kpasswdserver/kpasswdserver.cpp +++ b/kio/kpasswdserver/kpasswdserver.cpp @@ -94,7 +94,7 @@ static TQString makeWalletKey( const TQString& key, const TQString& realm ) // Helper for storeInWallet/readFromWallet static TQString makeMapKey( const char* key, int entryNumber ) { - TQString str = TQString::fromLatin1( key ); + TQString str = TQString::tqfromLatin1( key ); if ( entryNumber > 1 ) str += "-" + TQString::number( entryNumber ); return str; @@ -115,12 +115,12 @@ static bool storeInWallet( KWallet::Wallet* wallet, const TQString& key, const K kdDebug(130) << "storeInWallet: walletKey=" << walletKey << " reading existing map" << endl; if ( wallet->readMap( walletKey, map ) == 0 ) { Map::ConstIterator end = map.end(); - Map::ConstIterator it = map.find( "login" ); + Map::ConstIterator it = map.tqfind( "login" ); while ( it != end ) { if ( it.data() == info.username ) { break; // OK, overwrite this entry } - it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) ); + it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) ); } // If no entry was found, create a new entry - entryNumber is set already. } @@ -148,17 +148,17 @@ static bool readFromWallet( KWallet::Wallet* wallet, const TQString& key, const typedef TQMap<TQString,TQString> Map; int entryNumber = 1; Map::ConstIterator end = map.end(); - Map::ConstIterator it = map.find( "login" ); + Map::ConstIterator it = map.tqfind( "login" ); while ( it != end ) { //kdDebug(130) << "readFromWallet: found " << it.key() << "=" << it.data() << endl; - Map::ConstIterator pwdIter = map.find( makeMapKey( "password", entryNumber ) ); + Map::ConstIterator pwdIter = map.tqfind( makeMapKey( "password", entryNumber ) ); if ( pwdIter != end ) { if ( it.data() == username ) password = pwdIter.data(); knownLogins.insert( it.data(), pwdIter.data() ); } - it = map.find( TQString( "login-" ) + TQString::number( ++entryNumber ) ); + it = map.tqfind( TQString( "login-" ) + TQString::number( ++entryNumber ) ); } //kdDebug(130) << knownLogins.count() << " known logins" << endl; @@ -541,7 +541,7 @@ KPasswdServer::copyAuthInfo(const AuthInfo *i) const KPasswdServer::AuthInfo * KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) { - AuthInfoList *authList = m_authDict.find(key); + AuthInfoList *authList = m_authDict.tqfind(key); if (!authList) return 0; @@ -579,7 +579,7 @@ KPasswdServer::findAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) void KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info) { - AuthInfoList *authList = m_authDict.find(key); + AuthInfoList *authList = m_authDict.tqfind(key); if (!authList) return; @@ -606,7 +606,7 @@ KPasswdServer::removeAuthInfoItem(const TQString &key, const KIO::AuthInfo &info void KPasswdServer::addAuthInfoItem(const TQString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled) { - AuthInfoList *authList = m_authDict.find(key); + AuthInfoList *authList = m_authDict.tqfind(key); if (!authList) { authList = new AuthInfoList; @@ -659,7 +659,7 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long else if (windowId && (current->expire != AuthInfo::expNever)) { current->expire = AuthInfo::expWindowClose; - if (!current->windowList.contains(windowId)) + if (!current->windowList.tqcontains(windowId)) current->windowList.append(windowId); } else if (current->expire == AuthInfo::expTime) @@ -670,13 +670,13 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long // Update mWindowIdList if (windowId) { - TQStringList *keysChanged = mWindowIdList.find(windowId); + TQStringList *keysChanged = mWindowIdList.tqfind(windowId); if (!keysChanged) { keysChanged = new TQStringList; mWindowIdList.insert(windowId, keysChanged); } - if (!keysChanged->contains(key)) + if (!keysChanged->tqcontains(key)) keysChanged->append(key); } } @@ -684,14 +684,14 @@ KPasswdServer::updateAuthExpire(const TQString &key, const AuthInfo *auth, long void KPasswdServer::removeAuthForWindowId(long windowId) { - TQStringList *keysChanged = mWindowIdList.find(windowId); + TQStringList *keysChanged = mWindowIdList.tqfind(windowId); if (!keysChanged) return; for(TQStringList::ConstIterator it = keysChanged->begin(); it != keysChanged->end(); ++it) { TQString key = *it; - AuthInfoList *authList = m_authDict.find(key); + AuthInfoList *authList = m_authDict.tqfind(key); if (!authList) continue; diff --git a/kio/kssl/keygenwizard.ui b/kio/kssl/keygenwizard.ui index 1cecbd5fc..2130c767b 100644 --- a/kio/kssl/keygenwizard.ui +++ b/kio/kssl/keygenwizard.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KGWizardPage1</class> <author>George Staikos <staikos@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KGWizardPage1</cstring> </property> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -30,7 +30,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> diff --git a/kio/kssl/keygenwizard2.ui b/kio/kssl/keygenwizard2.ui index 9512e4ba9..a0d200428 100644 --- a/kio/kssl/keygenwizard2.ui +++ b/kio/kssl/keygenwizard2.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KGWizardPage2</class> <author>George Staikos <staikos@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KGWizardPage2</cstring> </property> @@ -17,20 +17,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel4</cstring> </property> <property name="text"> <string>You must now provide a password for the certificate request. Please choose a very secure password as this will be used to encrypt your private key.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -41,7 +41,7 @@ <cstring>_password2</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -52,7 +52,7 @@ <cstring>_password1</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>_password1</cstring> </property> @@ -60,7 +60,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>_password2</cstring> </property> diff --git a/kio/kssl/kopenssl.cc b/kio/kssl/kopenssl.cc index 70d36cd8e..79a36ba5f 100644 --- a/kio/kssl/kopenssl.cc +++ b/kio/kssl/kopenssl.cc @@ -245,7 +245,7 @@ static TQString findMostRecentLib(TQString dir, TQString name) uint s = filter.length()-1; for (TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { TQString numberpart = (*it).mid(s); - uint endmaj = numberpart.find('.'); + uint endmaj = numberpart.tqfind('.'); if (endmaj == -1) continue; bool ok; diff --git a/kio/kssl/kssl/caroot/ca-bundle.crt b/kio/kssl/kssl/caroot/ca-bundle.crt index ca5d292c9..c9bb22213 100644 --- a/kio/kssl/kssl/caroot/ca-bundle.crt +++ b/kio/kssl/kssl/caroot/ca-bundle.crt @@ -1442,7 +1442,7 @@ QTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRp b24xEjAQBgNVBAMTCUdQIFJvb3QgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC AQoCggEBALrsQ7g06qNn33cJHxoQoh6pTpVMdOcM3GzGmNCr+hckmmejSRRkiY+T Ei/vj9jOEASLhcDcL7wpmK+cQsXL0pbP9KXFLW5NjDiOsmoImdWRG6jtM5NJXcvn -FUNtUvHI6NfaMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW +FUNtUvHI6NfaTQMOCYKqlbo8PRAQOBXX62CZXo2zJu/TrDtZ6b/VkZILMjwOJq7kSW gO9oCUCUwrczSYPlya4tIDeQGD0gNtp5Oa+4V59672AqIYT4/6A5IdPYbVTHw2o8 yFwfLkdyFGxVSwkGzY7FawvnB0c6fZJffQ+wXDNXg4M/HoSoeZCfl04i3HUiyG4v 1tDLduEMV5fhJo8phFPy5Y6TykuKTDUCAwEAAaNCMEAwHQYDVR0OBBYEFKJcbg1l @@ -2931,7 +2931,7 @@ O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a 77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC -hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3 +hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmtqtKay20EIhid3 92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt diff --git a/kio/kssl/ksslcertdlg.cc b/kio/kssl/ksslcertdlg.cc index 21bff52b1..511bd4021 100644 --- a/kio/kssl/ksslcertdlg.cc +++ b/kio/kssl/ksslcertdlg.cc @@ -155,13 +155,13 @@ void KSSLCertDlg::slotDont() { TQDataStream& operator<<(TQDataStream& s, const KSSLCertDlgRet& r) { - s << Q_INT8(r.ok?1:0) << r.choice << Q_INT8(r.save?1:0) << Q_INT8(r.send?1:0); + s << TQ_INT8(r.ok?1:0) << r.choice << TQ_INT8(r.save?1:0) << TQ_INT8(r.send?1:0); return s; } TQDataStream& operator>>(TQDataStream& s, KSSLCertDlgRet& r) { -Q_INT8 tmp; +TQ_INT8 tmp; s >> tmp; r.ok = (tmp == 1); s >> r.choice; s >> tmp; r.save = (tmp == 1); diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index 285bb1d2d..d712c185c 100644 --- a/kio/kssl/ksslcertificate.cc +++ b/kio/kssl/ksslcertificate.cc @@ -243,7 +243,7 @@ TQString KSSLCertificate::getKDEKey() const { TQString KSSLCertificate::getMD5DigestFromKDEKey(const TQString &k) { TQString rc; - int pos = k.findRev('('); + int pos = k.tqfindRev('('); if (pos != -1) { unsigned int len = k.length(); if (k.at(len-1) == ')') { @@ -871,7 +871,7 @@ TQDateTime KSSLCertificate::getQDTNotBefore() const { #ifdef KSSL_HAVE_SSL return ASN1_UTCTIME_QDateTime(X509_get_notBefore(d->m_cert), NULL); #else -return TQDateTime::currentDateTime(); +return TQDateTime::tqcurrentDateTime(); #endif } @@ -880,7 +880,7 @@ TQDateTime KSSLCertificate::getQDTNotAfter() const { #ifdef KSSL_HAVE_SSL return ASN1_UTCTIME_QDateTime(X509_get_notAfter(d->m_cert), NULL); #else -return TQDateTime::currentDateTime(); +return TQDateTime::tqcurrentDateTime(); #endif } diff --git a/kio/kssl/ksslcertificatecache.cc b/kio/kssl/ksslcertificatecache.cc index eb4ff2d86..226e21c71 100644 --- a/kio/kssl/ksslcertificatecache.cc +++ b/kio/kssl/ksslcertificatecache.cc @@ -381,13 +381,13 @@ KSSLCertificate *KSSLCertificateCache::getCertByMD5Digest(const TQString &key) { TQDataStream& operator<<(TQDataStream& s, const KSSLCertificateCache::KSSLCertificatePolicy& p) { - s << (Q_UINT32)p; + s << (TQ_UINT32)p; return s; } TQDataStream& operator>>(TQDataStream& s, KSSLCertificateCache::KSSLCertificatePolicy& p) { - Q_UINT32 pd; + TQ_UINT32 pd; s >> pd; p = (KSSLCertificateCache::KSSLCertificatePolicy) pd; return s; diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index 70e8a094c..ea7dd1457 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -73,7 +73,7 @@ class KSSLInfoDlg::KSSLInfoDlgPrivate { KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *name, bool modal) - : KDialog(parent, name, modal, Qt::WDestructiveClose), d(new KSSLInfoDlgPrivate) { + : KDialog(parent, name, modal, (WFlags)TQt::WDestructiveClose), d(new KSSLInfoDlgPrivate) { TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); d->m_secCon = secureConnection; d->m_layout = new TQGridLayout(topLayout, 3, 3, KDialog::spacingHint()); @@ -273,14 +273,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { d->_serialNum->setText(x->getSerialNumber()); cspl = d->_validFrom->palette(); - if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC)) + if (x->getQDTNotBefore() > TQDateTime::tqcurrentDateTime(Qt::UTC)) cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); d->_validFrom->setPalette(cspl); d->_validFrom->setText(x->getNotBefore()); cspl = d->_validUntil->palette(); - if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC)) + if (x->getQDTNotAfter() < TQDateTime::tqcurrentDateTime(Qt::UTC)) cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); d->_validUntil->setPalette(cspl); @@ -305,8 +305,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { ksv = ksvl.first(); if (ksv == KSSLCertificate::SelfSigned) { - if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) && - x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) { + if (x->getQDTNotAfter() > TQDateTime::tqcurrentDateTime(Qt::UTC) && + x->getQDTNotBefore() < TQDateTime::tqcurrentDateTime(Qt::UTC)) { if (KSSLSigners().useForSSL(*x)) ksv = KSSLCertificate::Ok; } else { @@ -331,7 +331,7 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) { } d->_csl->setText(errorStr); - d->_csl->setMinimumSize(d->_csl->sizeHint()); + d->_csl->setMinimumSize(d->_csl->tqsizeHint()); d->_subject->setValues(x->getSubject()); d->_issuer->setValues(x->getIssuer()); @@ -399,37 +399,37 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) { TQLabel *label = 0L; if (!(tmp = cert.getValue("O")).isEmpty()) { label = new TQLabel(i18n("Organization:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("OU")).isEmpty()) { label = new TQLabel(i18n("Organizational unit:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("L")).isEmpty()) { label = new TQLabel(i18n("Locality:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("ST")).isEmpty()) { label = new TQLabel(i18n("Federal State","State:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("C")).isEmpty()) { label = new TQLabel(i18n("Country:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("CN")).isEmpty()) { label = new TQLabel(i18n("Common name:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); new TQLabel(tmp, _frame); } if (!(tmp = cert.getValue("Email")).isEmpty()) { label = new TQLabel(i18n("Email:"), _frame); - label->setAlignment(Qt::AlignLeft | Qt::AlignTop); + label->tqsetAlignment(Qt::AlignLeft | Qt::AlignTop); if (mailCatcher) { KURLLabel *mail = new KURLLabel(tmp, tmp, _frame); connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &))); diff --git a/kio/kssl/ksslpeerinfo.cc b/kio/kssl/ksslpeerinfo.cc index d1c2d00fc..8d960ceb7 100644 --- a/kio/kssl/ksslpeerinfo.cc +++ b/kio/kssl/ksslpeerinfo.cc @@ -65,7 +65,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) { #ifdef Q_WS_WIN //TODO kresolver not ported d->peerHost = d->peerHost.lower(); #else - d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); + d->peerHost = TQString::tqfromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost)); #endif } diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index 5a77b12bf..40b3493cd 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -169,7 +169,7 @@ TQString KSSLSettings::getCipherList() { int bits = d->kossl->SSL_CIPHER_get_bits(sc, NULL); if (m_cfg->readBoolEntry(tcipher, bits >= 56)) { CipherNode *xx = new CipherNode(sc->name,bits); - if (!cipherList.contains(xx)) + if (!cipherList.tqcontains(xx)) cipherList.prepend(xx); else delete xx; diff --git a/kio/kssl/ksslx509map.cc b/kio/kssl/ksslx509map.cc index 7896fdfcf..222d187cb 100644 --- a/kio/kssl/ksslx509map.cc +++ b/kio/kssl/ksslx509map.cc @@ -33,12 +33,12 @@ KSSLX509Map::~KSSLX509Map() { void KSSLX509Map::setValue(const TQString& key, const TQString& value) { - m_pairs.replace(key, value); + m_pairs.tqreplace(key, value); } TQString KSSLX509Map::getValue(const TQString& key) const { - if (!m_pairs.contains(key)) { + if (!m_pairs.tqcontains(key)) { return TQString::null; } @@ -63,7 +63,7 @@ unsigned int length = str.length(); for(head = 0, tail = 0; tail < length-1; head = tail+1) { TQString thisline; - tail = str.find(tok, head); + tail = str.tqfind(tok, head); if (tail > length) // last token - none at end tail = length; @@ -85,11 +85,11 @@ TQStringList vl = tokenizeBy(name, TQRegExp("/[A-Za-z]+="), false); for (TQStringList::Iterator j = vl.begin(); j != vl.end(); ++j) { TQStringList apair = tokenizeBy(*j, TQRegExp("="), false); - if (m_pairs.contains(apair[0])) { + if (m_pairs.tqcontains(apair[0])) { TQString oldValue = m_pairs[apair[0]]; oldValue += "\n"; oldValue += apair[1]; - m_pairs.replace(apair[0], oldValue); + m_pairs.tqreplace(apair[0], oldValue); } else { m_pairs.insert(apair[0], apair[1]); } diff --git a/kio/misc/kdesasl/kdesasl.cpp b/kio/misc/kdesasl/kdesasl.cpp index b547f7e6b..e9bc75dc1 100644 --- a/kio/misc/kdesasl/kdesasl.cpp +++ b/kio/misc/kdesasl/kdesasl.cpp @@ -49,10 +49,10 @@ KDESasl::~KDESasl() { TQCString KDESasl::chooseMethod(const TQStrIList aMethods) { - if (aMethods.contains("DIGEST-MD5")) mMethod = "DIGEST-MD5"; - else if (aMethods.contains("CRAM-MD5")) mMethod = "CRAM-MD5"; - else if (aMethods.contains("PLAIN")) mMethod = "PLAIN"; - else if (aMethods.contains("LOGIN")) mMethod = "LOGIN"; + if (aMethods.tqcontains("DIGEST-MD5")) mMethod = "DIGEST-MD5"; + else if (aMethods.tqcontains("CRAM-MD5")) mMethod = "CRAM-MD5"; + else if (aMethods.tqcontains("PLAIN")) mMethod = "PLAIN"; + else if (aMethods.tqcontains("LOGIN")) mMethod = "LOGIN"; else mMethod = TQCString(); return mMethod; } diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp index 096fc1f03..0dacc662f 100644 --- a/kio/misc/kfile/fileprops.cpp +++ b/kio/misc/kfile/fileprops.cpp @@ -267,16 +267,16 @@ static void printSupportedMimeTypes() if ( allMimeTypes.isEmpty() ) { cout << - i18n("No support for metadata extraction found.").local8Bit() + i18n("No support for metadata extraction found.").local8Bit().data() << endl; return; } - cout << i18n("Supported MimeTypes:").local8Bit() << endl; + cout << i18n("Supported MimeTypes:").local8Bit().data() << endl; TQStringList::ConstIterator it = allMimeTypes.begin(); for ( ; it != allMimeTypes.end(); it++ ) - cout << (*it).local8Bit() << endl; + cout << (*it).local8Bit().data() << endl; } // caller needs to delete the returned list! @@ -304,8 +304,8 @@ static void printMimeTypes( const KCmdLineArgs *args ) { KURL url = args->url( i ); KMimeType::Ptr mt = KMimeType::findByURL( url ); - cout << args->arg(i) << ": " << mt->comment().local8Bit() << " (" - << mt->name().local8Bit() << ")" << endl; + cout << args->arg(i) << ": " << mt->comment().local8Bit().data() << " (" + << mt->name().local8Bit().data() << ")" << endl; } } @@ -313,7 +313,7 @@ static void printList( const TQStringList& list ) { TQStringList::ConstIterator it = list.begin(); for ( ; it != list.end(); ++it ) - cout << (*it).local8Bit() << endl; + cout << (*it).local8Bit().data() << endl; cout << endl; } @@ -330,7 +330,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList, { TQString file = props->fileName() + " "; TQString fileString = line.replace( 3, file.length(), file ); - cout << TQFile::encodeName( fileString ) << endl; + cout << TQFile::encodeName( fileString ).data() << endl; if ( args->isSet( "listsupported" ) ) { @@ -349,7 +349,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList, TQStringList::ConstIterator git = groups.begin(); for ( ; git != groups.end(); ++git ) { - cout << "Group: " << (*git).local8Bit() << endl; + cout << "Group: " << (*git).local8Bit().data() << endl; printList( props->availableKeys( *git ) ); } } @@ -363,7 +363,7 @@ static void processMetaDataOptions( const TQPtrList<FileProps> propList, TQString key = TQString::fromLocal8Bit( args->getOption("getValue")); TQStringList::ConstIterator git = props->groupsToUse().begin(); for ( ; git != props->groupsToUse().end(); ++git ) - cout << props->getValue( *git, key ).local8Bit() << endl; + cout << props->getValue( *git, key ).local8Bit().data() << endl; } if ( args->isSet( "setValue" ) ) @@ -464,7 +464,7 @@ int main( int argc, char **argv ) if ( !quiet ) { cerr << args->arg(i) << ": " << - i18n("Cannot determine metadata").local8Bit() << endl; + i18n("Cannot determine metadata").local8Bit().data() << endl; } delete props; } diff --git a/kio/misc/kntlm/des.cpp b/kio/misc/kntlm/des.cpp index b6683ac34..bb4fab88b 100644 --- a/kio/misc/kntlm/des.cpp +++ b/kio/misc/kntlm/des.cpp @@ -25,7 +25,7 @@ static void permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *ou static void perminit_ip (DES_KEY * key); static void spinit (DES_KEY * key); static void perminit_fp (DES_KEY * key); -static Q_UINT32 f (DES_KEY * key, Q_UINT32 r, char *subkey); +static TQ_UINT32 f (DES_KEY * key, TQ_UINT32 r, char *subkey); /* Tables defined in the Data Encryption Standard documents */ @@ -240,9 +240,9 @@ ntlm_des_set_key (DES_KEY * dkey, char *user_key, int /*len*/) static void ntlm_des_encrypt (DES_KEY * key, unsigned char *block) { - Q_UINT32 left, right; + TQ_UINT32 left, right; char *knp; - Q_UINT32 work[2]; /* Working data storage */ + TQ_UINT32 work[2]; /* Working data storage */ permute_ip (block, key, (unsigned char *) work); /* Initial Permutation */ left = KFromToBigEndian(work[0]); @@ -352,11 +352,11 @@ permute_fp (unsigned char *inblock, DES_KEY * key, unsigned char *outblock) } /* The nonlinear function f(r,k), the heart of DES */ -static Q_UINT32 -f (DES_KEY * key, Q_UINT32 r, char *subkey) +static TQ_UINT32 +f (DES_KEY * key, TQ_UINT32 r, char *subkey) { - Q_UINT32 *spp; - Q_UINT32 rval, rt; + TQ_UINT32 *spp; + TQ_UINT32 rval, rt; int er; #ifdef TRACE @@ -377,7 +377,7 @@ f (DES_KEY * key, Q_UINT32 r, char *subkey) spp = &key->sp[7][0]; rval = spp[(er ^ *subkey--) & 0x3f]; spp -= 64; - rt = (Q_UINT32) r >> 3; + rt = (TQ_UINT32) r >> 3; rval |= spp[((int) rt ^ *subkey--) & 0x3f]; spp -= 64; rt >>= 4; @@ -457,7 +457,7 @@ spinit (DES_KEY * key) { char pbox[32]; int p, i, s, j, rowcol; - Q_UINT32 val; + TQ_UINT32 val; /* Compute pbox, the inverse of p32i. * This is easier to work with diff --git a/kio/misc/kntlm/des.h b/kio/misc/kntlm/des.h index 1cb2f27e5..0f6f59dc9 100644 --- a/kio/misc/kntlm/des.h +++ b/kio/misc/kntlm/des.h @@ -6,7 +6,7 @@ typedef struct des_key { char kn[16][8]; - Q_UINT32 sp[8][64]; + TQ_UINT32 sp[8][64]; char iperm[16][16][8]; char fperm[16][16][8]; } DES_KEY; diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp index a3eca3bdd..db2b45b6c 100644 --- a/kio/misc/kntlm/kntlm.cpp +++ b/kio/misc/kntlm/kntlm.cpp @@ -32,12 +32,12 @@ #include "des.h" #include "kntlm.h" -TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode ) +TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode ) { //watch for buffer overflows - Q_UINT32 offset; - Q_UINT16 len; - offset = KFromToLittleEndian((Q_UINT32)secbuf.offset); + TQ_UINT32 offset; + TQ_UINT16 len; + offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset); len = KFromToLittleEndian(secbuf.len); if ( offset > buf.size() || offset + len > buf.size() ) return TQString::null; @@ -45,10 +45,10 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool un TQString str; const char *c = buf.data() + offset; - if ( unicode ) { + if ( tqunicode ) { str = UnicodeLE2TQString( (TQChar*) c, len >> 1 ); } else { - str = TQString::fromLatin1( c, len ); + str = TQString::tqfromLatin1( c, len ); } return str; } @@ -56,9 +56,9 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool un TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf ) { TQByteArray ret; - Q_UINT32 offset; - Q_UINT16 len; - offset = KFromToLittleEndian((Q_UINT32)secbuf.offset); + TQ_UINT32 offset; + TQ_UINT16 len; + offset = KFromToLittleEndian((TQ_UINT32)secbuf.offset); len = KFromToLittleEndian(secbuf.len); //watch for buffer overflows if ( offset > buf.size() || @@ -67,11 +67,11 @@ TQByteArray KNTLM::getBuf( const TQByteArray &buf, const SecBuf &secbuf ) return ret; } -void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode ) +void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode ) { TQByteArray tmp; - if ( unicode ) { + if ( tqunicode ) { tmp = QString2UnicodeLE( str ); addBuf( buf, secbuf, tmp ); } else { @@ -85,26 +85,26 @@ void KNTLM::addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bo void KNTLM::addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data ) { - Q_UINT32 offset; - Q_UINT16 len, maxlen; + TQ_UINT32 offset; + TQ_UINT16 len, maxlen; offset = (buf.size() + 1) & 0xfffffffe; len = data.size(); maxlen = data.size(); - secbuf.offset = KFromToLittleEndian((Q_UINT32)offset); + secbuf.offset = KFromToLittleEndian((TQ_UINT32)offset); secbuf.len = KFromToLittleEndian(len); secbuf.maxlen = KFromToLittleEndian(maxlen); buf.resize( offset + len ); memcpy( buf.data() + offset, data.data(), data.size() ); } -bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, Q_UINT32 flags ) +bool KNTLM::getNegotiate( TQByteArray &negotiate, const TQString &domain, const TQString &workstation, TQ_UINT32 flags ) { TQByteArray rbuf( sizeof(Negotiate) ); rbuf.fill( 0 ); memcpy( rbuf.data(), "NTLMSSP", 8 ); - ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)1 ); + ((Negotiate*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)1 ); if ( !domain.isEmpty() ) { flags |= Negotiate_Domain_Supplied; addString( rbuf, ((Negotiate*) rbuf.data())->domain, domain ); @@ -126,21 +126,21 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt Challenge *ch = (Challenge *) challenge.data(); TQByteArray response; uint chsize = challenge.size(); - bool unicode = false; + bool tqunicode = false; TQString dom; //challenge structure too small if ( chsize < 32 ) return false; - unicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode; + tqunicode = KFromToLittleEndian(ch->flags) & Negotiate_Unicode; if ( domain.isEmpty() ) - dom = getString( challenge, ch->targetName, unicode ); + dom = getString( challenge, ch->targetName, tqunicode ); else dom = domain; rbuf.fill( 0 ); memcpy( rbuf.data(), "NTLMSSP", 8 ); - ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (Q_UINT32)3 ); + ((Auth*) rbuf.data())->msgType = KFromToLittleEndian( (TQ_UINT32)3 ); ((Auth*) rbuf.data())->flags = ch->flags; TQByteArray targetInfo = getBuf( challenge, ch->targetInfo ); @@ -164,10 +164,10 @@ bool KNTLM::getAuth( TQByteArray &auth, const TQByteArray &challenge, const TQSt addBuf( rbuf, ((Auth*) rbuf.data())->lmResponse, response ); // } if ( !dom.isEmpty() ) - addString( rbuf, ((Auth*) rbuf.data())->domain, dom, unicode ); - addString( rbuf, ((Auth*) rbuf.data())->user, user, unicode ); + addString( rbuf, ((Auth*) rbuf.data())->domain, dom, tqunicode ); + addString( rbuf, ((Auth*) rbuf.data())->user, user, tqunicode ); if ( !workstation.isEmpty() ) - addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, unicode ); + addString( rbuf, ((Auth*) rbuf.data())->workstation, workstation, tqunicode ); auth = rbuf; @@ -241,10 +241,10 @@ TQByteArray KNTLM::getNTLMResponse( const TQString &password, const unsigned cha TQByteArray KNTLM::ntlmHash( const TQString &password ) { KMD4::Digest digest; - TQByteArray ret, unicode; - unicode = QString2UnicodeLE( password ); + TQByteArray ret, tqunicode; + tqunicode = QString2UnicodeLE( password ); - KMD4 md4( unicode ); + KMD4 md4( tqunicode ); md4.rawDigest( digest ); ret.duplicate( (const char*) digest, sizeof( digest ) ); return ret; @@ -298,10 +298,10 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo ) blob.fill( 0 ); Blob *bl = (Blob *) blob.data(); - bl->signature = KFromToBigEndian( (Q_UINT32) 0x01010000 ); - Q_UINT64 now = TQDateTime::currentDateTime().toTime_t(); - now += (Q_UINT64)3600*(Q_UINT64)24*(Q_UINT64)134774; - now *= (Q_UINT64)10000000; + bl->signature = KFromToBigEndian( (TQ_UINT32) 0x01010000 ); + TQ_UINT64 now = TQDateTime::tqcurrentDateTime().toTime_t(); + now += (TQ_UINT64)3600*(TQ_UINT64)24*(TQ_UINT64)134774; + now *= (TQ_UINT64)10000000; bl->timestamp = KFromToLittleEndian( now ); for ( uint i = 0; i<8; i++ ) { bl->challenge[i] = KApplication::random() % 0xff; @@ -312,7 +312,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo ) TQByteArray KNTLM::hmacMD5( const TQByteArray &data, const TQByteArray &key ) { - Q_UINT8 ipad[64], opad[64]; + TQ_UINT8 ipad[64], opad[64]; KMD5::Digest digest; TQByteArray ret; @@ -372,18 +372,18 @@ void KNTLM::convertKey( unsigned char *key_56, void* ks ) TQByteArray KNTLM::QString2UnicodeLE( const TQString &target ) { - TQByteArray unicode( target.length() * 2 ); + TQByteArray tqunicode( target.length() * 2 ); for ( uint i = 0; i < target.length(); i++ ) { - ((Q_UINT16*)unicode.data())[ i ] = KFromToLittleEndian( target[i].unicode() ); + ((TQ_UINT16*)tqunicode.data())[ i ] = KFromToLittleEndian( target[i].tqunicode() ); } - return unicode; + return tqunicode; } TQString KNTLM::UnicodeLE2TQString( const TQChar* data, uint len ) { TQString ret; for ( uint i = 0; i < len; i++ ) { - ret += KFromToLittleEndian( data[ i ].unicode() ); + ret += KFromToLittleEndian( data[ i ].tqunicode() ); } return ret; } diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h index 9be4ea357..8a89001ab 100644 --- a/kio/misc/kntlm/kntlm.h +++ b/kio/misc/kntlm/kntlm.h @@ -70,9 +70,9 @@ public: typedef struct { - Q_UINT16 len; - Q_UINT16 maxlen; - Q_UINT32 offset; + TQ_UINT16 len; + TQ_UINT16 maxlen; + TQ_UINT32 offset; } SecBuf; /** @@ -81,8 +81,8 @@ public: typedef struct { char signature[8]; /* "NTLMSSP\0" */ - Q_UINT32 msgType; /* 1 */ - Q_UINT32 flags; + TQ_UINT32 msgType; /* 1 */ + TQ_UINT32 flags; SecBuf domain; SecBuf workstation; } Negotiate; @@ -93,11 +93,11 @@ public: typedef struct { char signature[8]; - Q_UINT32 msgType; /* 2 */ + TQ_UINT32 msgType; /* 2 */ SecBuf targetName; - Q_UINT32 flags; - Q_UINT8 challengeData[8]; - Q_UINT32 context[2]; + TQ_UINT32 flags; + TQ_UINT8 challengeData[8]; + TQ_UINT32 context[2]; SecBuf targetInfo; } Challenge; @@ -107,23 +107,23 @@ public: typedef struct { char signature[8]; - Q_UINT32 msgType; /* 3 */ + TQ_UINT32 msgType; /* 3 */ SecBuf lmResponse; SecBuf ntResponse; SecBuf domain; SecBuf user; SecBuf workstation; SecBuf sessionKey; - Q_UINT32 flags; + TQ_UINT32 flags; } Auth; typedef struct { - Q_UINT32 signature; - Q_UINT32 reserved; - Q_UINT64 timestamp; - Q_UINT8 challenge[8]; - Q_UINT8 unknown[4]; + TQ_UINT32 signature; + TQ_UINT32 reserved; + TQ_UINT64 timestamp; + TQ_UINT8 challenge[8]; + TQ_UINT8 unknown[4]; //Target info block - variable length } Blob; @@ -139,7 +139,7 @@ public: */ static bool getNegotiate( TQByteArray &negotiate, const TQString &domain = TQString::null, const TQString &workstation = TQString::null, - Q_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM ); + TQ_UINT32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM ); /** * Creates the type 3 message which should be sent to the server after * the challenge (type 2) received. @@ -212,7 +212,7 @@ public: /** * Extracts a string field from an NTLM structure. */ - static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool unicode ); + static TQString getString( const TQByteArray &buf, const SecBuf &secbuf, bool tqunicode ); /** * Extracts a byte array from an NTLM structure. */ @@ -226,7 +226,7 @@ private: static TQString UnicodeLE2TQString( const TQChar* data, uint len ); static void addBuf( TQByteArray &buf, SecBuf &secbuf, TQByteArray &data ); - static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool unicode = false ); + static void addString( TQByteArray &buf, SecBuf &secbuf, const TQString &str, bool tqunicode = false ); static void convertKey( unsigned char *key_56, void* ks ); }; diff --git a/kio/misc/kntlm/kswap.h b/kio/misc/kntlm/kswap.h index 336321fd4..9eca243de 100644 --- a/kio/misc/kntlm/kswap.h +++ b/kio/misc/kntlm/kswap.h @@ -47,52 +47,52 @@ #ifdef HAVE_BYTESWAP_H #include <byteswap.h> - inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return bswap_16( b ); } - inline Q_INT16 KSWAP_16( Q_INT16 b ) { return bswap_16( (Q_UINT16)b ); } - inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return bswap_32( b ); } - inline Q_INT32 KSWAP_32( Q_INT32 b ) { return bswap_32( (Q_UINT32)b ); } - inline Q_UINT64 KSWAP_64( Q_UINT64 b ) { return bswap_64( b ); } - inline Q_INT64 KSWAP_64( Q_INT64 b ) { return bswap_64( (Q_UINT64)b ); } + inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return bswap_16( b ); } + inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return bswap_16( (TQ_UINT16)b ); } + inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return bswap_32( b ); } + inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return bswap_32( (TQ_UINT32)b ); } + inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) { return bswap_64( b ); } + inline TQ_INT64 KSWAP_64( TQ_INT64 b ) { return bswap_64( (TQ_UINT64)b ); } #else /* HAVE_BYTESWAP_H */ #ifdef WORDS_BIGENDIAN - inline Q_UINT16 KSWAP_16( Q_UINT16 b ) + inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return (((b) & 0x00ff) << 8 | ((b) & 0xff00) >> 8); } - inline Q_INT16 KSWAP_16( Q_INT16 b ) + inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { - return ((((Q_UINT16)b) & 0x00ff) << 8 | (((Q_UINT16)b) & 0xff00) >> 8); + return ((((TQ_UINT16)b) & 0x00ff) << 8 | (((TQ_UINT16)b) & 0xff00) >> 8); } - inline Q_UINT32 KSWAP_32( Q_UINT32 b ) + inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return ((((b) & 0xff000000) >> 24) | (((b) & 0x00ff0000) >> 8) | \ (((b) & 0x0000ff00) << 8) | (((b) & 0x000000ff) << 24)); } - inline Q_INT32 KSWAP_32( Q_INT32 b ) + inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return - (((((Q_UINT32)b) & 0xff000000) >> 24) | ((((Q_UINT32)b) & 0x00ff0000) >> 8) | \ - ((((Q_UINT32)b) & 0x0000ff00) << 8) | ((((Q_UINT32)b) & 0x000000ff) << 24)); + (((((TQ_UINT32)b) & 0xff000000) >> 24) | ((((TQ_UINT32)b) & 0x00ff0000) >> 8) | \ + ((((TQ_UINT32)b) & 0x0000ff00) << 8) | ((((TQ_UINT32)b) & 0x000000ff) << 24)); } #else /* WORDS_BIGENDIAN */ #include <sys/types.h> #include <netinet/in.h> - inline Q_UINT16 KSWAP_16( Q_UINT16 b ) { return htons(b); } - inline Q_INT16 KSWAP_16( Q_INT16 b ) { return htons((Q_UINT16)b); } - inline Q_UINT32 KSWAP_32( Q_UINT32 b ) { return htonl(b); } - inline Q_INT32 KSWAP_32( Q_INT32 b ) { return htonl((Q_UINT32)b); } + inline TQ_UINT16 KSWAP_16( TQ_UINT16 b ) { return htons(b); } + inline TQ_INT16 KSWAP_16( TQ_INT16 b ) { return htons((TQ_UINT16)b); } + inline TQ_UINT32 KSWAP_32( TQ_UINT32 b ) { return htonl(b); } + inline TQ_INT32 KSWAP_32( TQ_INT32 b ) { return htonl((TQ_UINT32)b); } #endif - inline Q_UINT64 KSWAP_64( Q_UINT64 b ) + inline TQ_UINT64 KSWAP_64( TQ_UINT64 b ) { union { - Q_UINT64 ll; - Q_UINT32 l[2]; + TQ_UINT64 ll; + TQ_UINT32 l[2]; } w, r; w.ll = b; r.l[0] = KSWAP_32( w.l[1] ); @@ -100,13 +100,13 @@ return r.ll; } - inline Q_INT64 KSWAP_64( Q_INT64 b ) + inline TQ_INT64 KSWAP_64( TQ_INT64 b ) { union { - Q_UINT64 ll; - Q_UINT32 l[2]; + TQ_UINT64 ll; + TQ_UINT32 l[2]; } w, r; - w.ll = (Q_UINT64) b; + w.ll = (TQ_UINT64) b; r.l[0] = KSWAP_32( w.l[1] ); r.l[1] = KSWAP_32( w.l[0] ); return r.ll; @@ -117,7 +117,7 @@ * \ingroup KSWAP * Converts a 16 bit unsigned value from/to big-endian byte order to/from the machine order. */ -inline Q_UINT16 KFromToBigEndian( Q_UINT16 b ) +inline TQ_UINT16 KFromToBigEndian( TQ_UINT16 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -130,7 +130,7 @@ inline Q_UINT16 KFromToBigEndian( Q_UINT16 b ) * \ingroup KSWAP * Converts a 16 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) +inline void KFromToBigEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -143,7 +143,7 @@ inline void KFromToBigEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit unsigned value from/to big-endian byte order to/from the machine order. */ -inline Q_UINT32 KFromToBigEndian( Q_UINT32 b ) +inline TQ_UINT32 KFromToBigEndian( TQ_UINT32 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -156,7 +156,7 @@ inline Q_UINT32 KFromToBigEndian( Q_UINT32 b ) * \ingroup KSWAP * Converts a 32 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) +inline void KFromToBigEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -169,7 +169,7 @@ inline void KFromToBigEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit unsigned value from/to big-endian byte order to/from the machine order. */ -inline Q_UINT64 KFromToBigEndian( Q_UINT64 b ) +inline TQ_UINT64 KFromToBigEndian( TQ_UINT64 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -182,7 +182,7 @@ inline Q_UINT64 KFromToBigEndian( Q_UINT64 b ) * \ingroup KSWAP * Converts a 64 bit unsigned array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) +inline void KFromToBigEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -195,7 +195,7 @@ inline void KFromToBigEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit signed value from/to big-endian byte order to/from the machine order. */ -inline Q_INT16 KFromToBigEndian( Q_INT16 b ) +inline TQ_INT16 KFromToBigEndian( TQ_INT16 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -208,7 +208,7 @@ inline Q_INT16 KFromToBigEndian( Q_INT16 b ) * \ingroup KSWAP * Converts a 16 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len ) +inline void KFromToBigEndian( TQ_INT16 *out, TQ_INT16 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -221,7 +221,7 @@ inline void KFromToBigEndian( Q_INT16 *out, Q_INT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit signed value from/to big-endian byte order to/from the machine order. */ -inline Q_INT32 KFromToBigEndian( Q_INT32 b ) +inline TQ_INT32 KFromToBigEndian( TQ_INT32 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -234,7 +234,7 @@ inline Q_INT32 KFromToBigEndian( Q_INT32 b ) * \ingroup KSWAP * Converts a 32 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len ) +inline void KFromToBigEndian( TQ_INT32 *out, TQ_INT32 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -247,7 +247,7 @@ inline void KFromToBigEndian( Q_INT32 *out, Q_INT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit signed value from/to big-endian byte order to/from the machine order. */ -inline Q_INT64 KFromToBigEndian( Q_INT64 b ) +inline TQ_INT64 KFromToBigEndian( TQ_INT64 b ) { #ifdef WORDS_BIGENDIAN return b; @@ -260,7 +260,7 @@ inline Q_INT64 KFromToBigEndian( Q_INT64 b ) * \ingroup KSWAP * Converts a 64 bit signed array from/to big-endian byte order to/from the machine order. */ -inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len ) +inline void KFromToBigEndian( TQ_INT64 *out, TQ_INT64 *in, uint len ) { #ifdef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -273,7 +273,7 @@ inline void KFromToBigEndian( Q_INT64 *out, Q_INT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b ) +inline TQ_UINT16 KFromToLittleEndian( TQ_UINT16 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -286,7 +286,7 @@ inline Q_UINT16 KFromToLittleEndian( Q_UINT16 b ) * \ingroup KSWAP * Converts a 16 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) +inline void KFromToLittleEndian( TQ_UINT16 *out, TQ_UINT16 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -299,7 +299,7 @@ inline void KFromToLittleEndian( Q_UINT16 *out, Q_UINT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b ) +inline TQ_UINT32 KFromToLittleEndian( TQ_UINT32 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -312,7 +312,7 @@ inline Q_UINT32 KFromToLittleEndian( Q_UINT32 b ) * \ingroup KSWAP * Converts a 32 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) +inline void KFromToLittleEndian( TQ_UINT32 *out, TQ_UINT32 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -325,7 +325,7 @@ inline void KFromToLittleEndian( Q_UINT32 *out, Q_UINT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit unsigned value from/to little-endian byte order to/from the machine order. */ -inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b ) +inline TQ_UINT64 KFromToLittleEndian( TQ_UINT64 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -338,7 +338,7 @@ inline Q_UINT64 KFromToLittleEndian( Q_UINT64 b ) * \ingroup KSWAP * Converts a 64 bit unsigned array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) +inline void KFromToLittleEndian( TQ_UINT64 *out, TQ_UINT64 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; @@ -351,7 +351,7 @@ inline void KFromToLittleEndian( Q_UINT64 *out, Q_UINT64 *in, uint len ) * \ingroup KSWAP * Converts a 16 bit signed value from/to little-endian byte order to/from the machine order. */ -inline Q_INT16 KFromToLittleEndian( Q_INT16 b ) +inline TQ_INT16 KFromToLittleEndian( TQ_INT16 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -364,7 +364,7 @@ inline Q_INT16 KFromToLittleEndian( Q_INT16 b ) * \ingroup KSWAP * Converts a 16 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len ) +inline void KFromToLittleEndian( TQ_INT16 *out, TQ_INT16 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<1 ) ; @@ -377,7 +377,7 @@ inline void KFromToLittleEndian( Q_INT16 *out, Q_INT16 *in, uint len ) * \ingroup KSWAP * Converts a 32 bit signed value from/to little-endian byte order to/from the machine order. */ -inline Q_INT32 KFromToLittleEndian( Q_INT32 b ) +inline TQ_INT32 KFromToLittleEndian( TQ_INT32 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -390,7 +390,7 @@ inline Q_INT32 KFromToLittleEndian( Q_INT32 b ) * \ingroup KSWAP * Converts a 32 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len ) +inline void KFromToLittleEndian( TQ_INT32 *out, TQ_INT32 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<2 ) ; @@ -403,7 +403,7 @@ inline void KFromToLittleEndian( Q_INT32 *out, Q_INT32 *in, uint len ) * \ingroup KSWAP * Converts a 64 bit signed value from/to little-endian byte order to/from the machine order. */ -inline Q_INT64 KFromToLittleEndian( Q_INT64 b ) +inline TQ_INT64 KFromToLittleEndian( TQ_INT64 b ) { #ifndef WORDS_BIGENDIAN return b; @@ -416,7 +416,7 @@ inline Q_INT64 KFromToLittleEndian( Q_INT64 b ) * \ingroup KSWAP * Converts a 64 bit signed array from/to little-endian byte order to/from the machine order. */ -inline void KFromToLittleEndian( Q_INT64 *out, Q_INT64 *in, uint len ) +inline void KFromToLittleEndian( TQ_INT64 *out, TQ_INT64 *in, uint len ) { #ifndef WORDS_BIGENDIAN if ( out != in ) memcpy( out, in, len<<3 ) ; diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp index 7a84958f7..671c2a941 100644 --- a/kio/misc/kpac/discovery.cpp +++ b/kio/misc/kpac/discovery.cpp @@ -126,7 +126,7 @@ namespace KPAC return; } - int dot = m_hostname.find( '.' ); + int dot = m_hostname.tqfind( '.' ); if ( dot >= 0 ) { m_hostname.remove( 0, dot + 1 ); // remove one domain level diff --git a/kio/misc/kpac/downloader.h b/kio/misc/kpac/downloader.h index 05d8569cc..82418882f 100644 --- a/kio/misc/kpac/downloader.h +++ b/kio/misc/kpac/downloader.h @@ -29,7 +29,7 @@ namespace KIO { class Job; } namespace KPAC { - class Downloader : public QObject + class Downloader : public TQObject { Q_OBJECT public: diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp index 6cba79db6..f843dc045 100644 --- a/kio/misc/kpac/proxyscout.cpp +++ b/kio/misc/kpac/proxyscout.cpp @@ -162,9 +162,9 @@ namespace KPAC // this particular case, simply calling setProtocol() on // it trashes the whole URL. int len = proxyURL.protocol().length(); - if ( !proxyURL.isValid() || proxy.find( ":/", len ) != len ) + if ( !proxyURL.isValid() || proxy.tqfind( ":/", len ) != len ) proxy.prepend("http://"); - BlackList::Iterator it = m_blackList.find( proxy ); + BlackList::Iterator it = m_blackList.tqfind( proxy ); if ( it == m_blackList.end() ) return proxy; else if ( std::time( 0 ) - *it > 1800 ) // 30 minutes { diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp index 55faef8a1..243f5f9c2 100644 --- a/kio/misc/kpac/script.cpp +++ b/kio/misc/kpac/script.cpp @@ -49,7 +49,7 @@ TQString UString::qstring() const UString::UString( const TQString &s ) { UChar* data = new UChar[ s.length() ]; - std::memcpy( data, s.unicode(), s.length() * sizeof( UChar ) ); + std::memcpy( data, s.tqunicode(), s.length() * sizeof( UChar ) ); rep = Rep::create( data, s.length() ); } diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp index d84e4c297..b80a23d1b 100644 --- a/kio/misc/ksendbugmail/main.cpp +++ b/kio/misc/ksendbugmail/main.cpp @@ -101,11 +101,11 @@ int main(int argc, char **argv) { if (!fromaddr.isEmpty()) { TQString name = emailConfig.getSetting(KEMailSettings::RealName); if (!name.isEmpty()) - fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">"); + fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">"); } else { struct passwd *p; p = getpwuid(getuid()); - fromaddr = TQString::fromLatin1(p->pw_name); + fromaddr = TQString::tqfromLatin1(p->pw_name); fromaddr += "@"; char buffer[256]; buffer[0] = '\0'; @@ -117,7 +117,7 @@ int main(int argc, char **argv) { TQString server = emailConfig.getSetting(KEMailSettings::OutServer); if (server.isEmpty()) - server=TQString::fromLatin1("bugs.kde.org"); + server=TQString::tqfromLatin1("bugs.kde.org"); SMTP *sm = new SMTP; BugMailer bm(sm); @@ -129,7 +129,7 @@ int main(int argc, char **argv) { sm->setSenderAddress(fromaddr); sm->setRecipientAddress(recipient); sm->setMessageSubject(subject); - sm->setMessageHeader(TQString::fromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient)); + sm->setMessageHeader(TQString::tqfromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient.data())); sm->setMessageBody(text); sm->sendMessage(); diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp index 36a417b88..ac3e7b74f 100644 --- a/kio/misc/ksendbugmail/smtp.cpp +++ b/kio/misc/ksendbugmail/smtp.cpp @@ -74,22 +74,22 @@ void SMTP::setTimeOut(int timeout) void SMTP::setSenderAddress(const TQString& sender) { senderAddress = sender; - int index = senderAddress.find('<'); + int index = senderAddress.tqfind('<'); if (index == -1) return; senderAddress = senderAddress.mid(index + 1); - index = senderAddress.find('>'); + index = senderAddress.tqfind('>'); if (index != -1) senderAddress = senderAddress.left(index); senderAddress = senderAddress.simplifyWhiteSpace(); while (1) { - index = senderAddress.find(' '); + index = senderAddress.tqfind(' '); if (index != -1) senderAddress = senderAddress.mid(index + 1); // take one side else break; } - index = senderAddress.find('@'); + index = senderAddress.tqfind('@'); if (index == -1) senderAddress.append("@localhost"); // won't go through without a local mail system @@ -134,7 +134,7 @@ void SMTP::sendMessage(void) kdDebug() << "state was == FINISHED\n" << endl; finished = false; state = IN; - writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName); + writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName); write(sock->socket(), writeString.ascii(), writeString.length()); } if(connected){ @@ -218,7 +218,7 @@ void SMTP::socketRead(KSocket *socket) readBuffer[n] = '\0'; lineBuffer += readBuffer; - nl = lineBuffer.find('\n'); + nl = lineBuffer.tqfind('\n'); if(nl == -1) return; lastLine = lineBuffer.left(nl); @@ -249,7 +249,7 @@ void SMTP::processLine(TQString *line) int i, stat; TQString tmpstr; - i = line->find(' '); + i = line->tqfind(' '); tmpstr = line->left(i); if(i > 3) kdDebug() << "warning: SMTP status code longer then 3 digits: " << tmpstr << endl; @@ -262,7 +262,7 @@ void SMTP::processLine(TQString *line) switch(stat){ case GREET: //220 state = IN; - writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName); + writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName); kdDebug() << "out: " << writeString << endl; write(sock->socket(), writeString.ascii(), writeString.length()); break; @@ -273,19 +273,19 @@ void SMTP::processLine(TQString *line) switch(state){ case IN: state = READY; - writeString = TQString::fromLatin1("mail from: %1\r\n").arg(senderAddress); + writeString = TQString::tqfromLatin1("mail from: %1\r\n").arg(senderAddress); kdDebug() << "out: " << writeString << endl; write(sock->socket(), writeString.ascii(), writeString.length()); break; case READY: state = SENTFROM; - writeString = TQString::fromLatin1("rcpt to: %1\r\n").arg(recipientAddress); + writeString = TQString::tqfromLatin1("rcpt to: %1\r\n").arg(recipientAddress); kdDebug() << "out: " << writeString << endl; write(sock->socket(), writeString.ascii(), writeString.length()); break; case SENTFROM: state = SENTTO; - writeString = TQString::fromLatin1("data\r\n"); + writeString = TQString::tqfromLatin1("data\r\n"); kdDebug() << "out: " << writeString << endl; write(sock->socket(), writeString.ascii(), writeString.length()); break; @@ -305,11 +305,11 @@ void SMTP::processLine(TQString *line) break; case READYDATA: //354 state = DATA; - writeString = TQString::fromLatin1("Subject: %1\r\n").arg(messageSubject); + writeString = TQString::tqfromLatin1("Subject: %1\r\n").arg(messageSubject); writeString += messageHeader; writeString += "\r\n"; writeString += messageBody; - writeString += TQString::fromLatin1(".\r\n"); + writeString += TQString::tqfromLatin1(".\r\n"); kdDebug() << "out: " << writeString; write(sock->socket(), writeString.ascii(), writeString.length()); break; diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index 9e8b85574..1a7cc1edf 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -72,7 +72,7 @@ static void updatePoliciesConfig(KConfig *cfg) { cfg->setGroup(*i); // remove it if it has expired - if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::currentDateTime()) { + if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::tqcurrentDateTime()) { cfg->deleteGroup(*i); continue; } @@ -164,7 +164,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (node->permanent || - node->expires > TQDateTime::currentDateTime()) { + node->expires > TQDateTime::tqcurrentDateTime()) { // First convert to a binary format and then write the // kconfig entry write the (CN, policy, cert) to // KSimpleConfig @@ -239,7 +239,7 @@ TQStringList groups = cfg->groupList(); // remove it if it has expired if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { cfg->deleteGroup(*i); continue; } @@ -278,9 +278,9 @@ KSSLCNode *node; node->permanent = permanent; if (!permanent) { - node->expires = TQDateTime::currentDateTime(); + node->expires = TQDateTime::tqcurrentDateTime(); // FIXME: make this configurable - node->expires = node->expires.addSecs(3600); + node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(3600)); } cacheSaveToDisk(); @@ -297,8 +297,8 @@ KSSLCNode *node; certList.prepend(n); if (!permanent) { - n->expires = TQDateTime::currentDateTime(); - n->expires = n->expires.addSecs(3600); + n->expires = TQDateTime::tqcurrentDateTime(); + n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(3600)); } searchAddCert(n->cert); @@ -312,7 +312,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) { if (!node->permanent && - node->expires < TQDateTime::currentDateTime()) { + node->expires < TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -338,7 +338,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && - node->expires < TQDateTime::currentDateTime()) { + node->expires < TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -362,7 +362,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) { if (!node->permanent && - node->expires < TQDateTime::currentDateTime()) { + node->expires < TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -386,7 +386,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && - node->expires < TQDateTime::currentDateTime()) { + node->expires < TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -410,7 +410,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && node->expires < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); delete node; @@ -535,7 +535,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && node->expires < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); searchRemoveCert(node->cert); @@ -563,7 +563,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && node->expires < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); searchRemoveCert(node->cert); @@ -572,7 +572,7 @@ KSSLCNode *node; return false; } - if (!node->hosts.contains(host)) { + if (!node->hosts.tqcontains(host)) { node->hosts << host; } @@ -593,7 +593,7 @@ KSSLCNode *node; for (node = certList.first(); node; node = certList.next()) { if (cert == *(node->cert)) { if (!node->permanent && node->expires < - TQDateTime::currentDateTime()) { + TQDateTime::tqcurrentDateTime()) { certList.remove(node); cfg->deleteGroup(node->cert->getMD5Digest()); searchRemoveCert(node->cert); @@ -623,8 +623,8 @@ void KSSLD::caVerifyUpdate() { return; cfg->setGroup(TQString::null); - Q_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); - Q_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); + TQ_UINT32 newStamp = KGlobal::dirs()->calcResourceHash("config", "ksslcalist", true); + TQ_UINT32 oldStamp = cfg->readUnsignedNumEntry("ksslcalistStamp"); if (oldStamp != newStamp) { caRegenerate(); @@ -857,14 +857,14 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) { cert->getEmails(mails); for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) { TQString email = static_cast<const TQString &>(*iter).lower(); - TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email); if (it == skEmail.end()) it = skEmail.insert(email, TQPtrVector<KSSLCertificate>()); TQPtrVector<KSSLCertificate> &elem = *it; - if (elem.findRef(cert) == -1) { + if (elem.tqfindRef(cert) == -1) { unsigned int n = 0; for(; n < elem.size(); n++) { if (!elem.at(n)) { @@ -887,14 +887,14 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) { TQStringList mails; cert->getEmails(mails); for(TQStringList::const_iterator iter = mails.begin(); iter != mails.end(); ++iter) { - TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(static_cast<const TQString &>(*iter).lower()); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(static_cast<const TQString &>(*iter).lower()); if (it == skEmail.end()) break; TQPtrVector<KSSLCertificate> &elem = *it; - int n = elem.findRef(cert); + int n = elem.tqfindRef(cert); if (n != -1) elem.remove(n); } @@ -903,7 +903,7 @@ void KSSLD::searchRemoveCert(KSSLCertificate *cert) { TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) { TQStringList rc; - TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.find(email.lower()); + TQMap<TQString, TQPtrVector<KSSLCertificate> >::iterator it = skEmail.tqfind(email.lower()); kdDebug() << "GETKDEKey " << email.latin1() << endl; @@ -924,7 +924,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) { KSSLCertificate KSSLD::getCertByMD5Digest(const TQString &key) { - TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.find(key); + TQMap<TQString, KSSLCertificate *>::iterator iter = skMD5Digest.tqfind(key); kdDebug() << "Searching cert for " << key.latin1() << endl; diff --git a/kio/misc/kwalletd/kbetterthankdialogbase.ui b/kio/misc/kwalletd/kbetterthankdialogbase.ui index ecf2d236f..60b75da28 100644 --- a/kio/misc/kwalletd/kbetterthankdialogbase.ui +++ b/kio/misc/kwalletd/kbetterthankdialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KBetterThanKDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KBetterThanKDialogBase</cstring> </property> @@ -37,14 +37,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>21</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layout1</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_allowOnce</cstring> </property> @@ -63,7 +63,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_allowAlways</cstring> </property> @@ -71,7 +71,7 @@ <string>Allow &Always</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_deny</cstring> </property> @@ -79,7 +79,7 @@ <string>&Deny</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_denyForever</cstring> </property> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -140,13 +140,13 @@ <include location="global" impldecl="in declaration">kactivelabel.h</include> <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">clicked()</slot> - <slot>setLabel( const QString & label )</slot> + <slot>setLabel( const TQString & label )</slot> <slot access="private">init()</slot> <slot access="protected">accept()</slot> <slot access="protected">reject()</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> diff --git a/kio/misc/kwalletd/ktimeout.cpp b/kio/misc/kwalletd/ktimeout.cpp index c431ecf69..d4c87bd28 100644 --- a/kio/misc/kwalletd/ktimeout.cpp +++ b/kio/misc/kwalletd/ktimeout.cpp @@ -39,7 +39,7 @@ void KTimeout::clear() { void KTimeout::removeTimer(int id) { - TQTimer *t = _timers.find(id); + TQTimer *t = _timers.tqfind(id); if (t != 0L) { _timers.remove(id); // autodeletes } @@ -47,7 +47,7 @@ void KTimeout::removeTimer(int id) { void KTimeout::addTimer(int id, int timeout) { - if (_timers.find(id) != 0L) { + if (_timers.tqfind(id) != 0L) { return; } @@ -59,7 +59,7 @@ void KTimeout::addTimer(int id, int timeout) { void KTimeout::resetTimer(int id, int timeout) { - TQTimer *t = _timers.find(id); + TQTimer *t = _timers.tqfind(id); if (t) { t->changeInterval(timeout); } diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 069575710..2cd8cd406 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -121,7 +121,7 @@ int KWalletD::generateHandle() { // ASSUMPTION: RAND_MAX is fairly large. do { rc = rand(); - } while (_wallets.find(rc) || rc == 0); + } while (_wallets.tqfind(rc) || rc == 0); return rc; } @@ -308,7 +308,7 @@ void KWalletD::checkActiveDialog() { } int KWalletD::doTransactionOpen(const TQCString& appid, const TQString& wallet, uint wId, bool modal) { - if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet())) { + if (_firstUse && !wallets().tqcontains(KWallet::Wallet::LocalWallet())) { // First use wizard KWalletWizard *wiz = new KWalletWizard(0); setupDialog( wiz, wId, appid, modal ); @@ -529,11 +529,11 @@ int KWalletD::internalOpen(const TQCString& appid, const TQString& wallet, bool KApplication::startServiceByDesktopName("kwalletmanager-kwalletd"); } } else { - if (!_handles[appid].contains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { + if (!_handles[appid].tqcontains(rc) && _openPrompt && !isAuthorizedApp(appid, wallet, w)) { return -1; } _handles[appid].append(rc); - _wallets.find(rc)->ref(); + _wallets.tqfind(rc)->ref(); } return rc; @@ -567,7 +567,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W KConfig cfg("kwalletrc"); cfg.setGroup("Auto Allow"); TQStringList apps = cfg.readListEntry(wallet); - if (!apps.contains(thisApp)) { + if (!apps.tqcontains(thisApp)) { apps += thisApp; _implicitAllowMap[wallet] += thisApp; cfg.writeEntry(wallet, apps); @@ -578,7 +578,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W KConfig cfg("kwalletrc"); cfg.setGroup("Auto Deny"); TQStringList apps = cfg.readListEntry(wallet); - if (!apps.contains(thisApp)) { + if (!apps.tqcontains(thisApp)) { apps += thisApp; _implicitDenyMap[wallet] += thisApp; cfg.writeEntry(wallet, apps); @@ -646,7 +646,7 @@ void KWalletD::doTransactionChangePassword(const TQCString& appid, const TQStrin return; } - w = _wallets.find(handle); + w = _wallets.tqfind(handle); reclose = true; } else { handle = it.currentKey(); @@ -712,12 +712,12 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { const TQString& wallet = w->walletName(); assert(_passwords.contains(wallet)); if (w->refCount() == 0 || force) { - invalidateHandle(handle); + tqinvalidateHandle(handle); if (_closeIdle && _timeouts) { _timeouts->removeTimer(handle); } _wallets.remove(handle); - if (_passwords.contains(wallet)) { + if (_passwords.tqcontains(wallet)) { w->close(TQByteArray().duplicate(_passwords[wallet].data(), _passwords[wallet].length())); _passwords[wallet].fill(0); _passwords.remove(wallet); @@ -735,14 +735,14 @@ int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { int KWalletD::close(int handle, bool force) { TQCString appid = friendlyDCOPPeerName(); - KWallet::Backend *w = _wallets.find(handle); + KWallet::Backend *w = _wallets.tqfind(handle); bool contains = false; if (w) { // the handle is valid - if (_handles.contains(appid)) { // we know this app - if (_handles[appid].contains(handle)) { + if (_handles.tqcontains(appid)) { // we know this app + if (_handles[appid].tqcontains(handle)) { // the app owns this handle - _handles[appid].remove(_handles[appid].find(handle)); + _handles[appid].remove(_handles[appid].tqfind(handle)); contains = true; if (_handles[appid].isEmpty()) { _handles.remove(appid); @@ -757,9 +757,9 @@ int KWalletD::close(int handle, bool force) { } _wallets.remove(handle); if (force) { - invalidateHandle(handle); + tqinvalidateHandle(handle); } - if (_passwords.contains(w->walletName())) { + if (_passwords.tqcontains(w->walletName())) { w->close(TQByteArray().duplicate(_passwords[w->walletName()].data(), _passwords[w->walletName()].length())); _passwords[w->walletName()].fill(0); _passwords.remove(w->walletName()); @@ -792,7 +792,7 @@ bool KWalletD::isOpen(int handle) { return false; } - KWallet::Backend *rc = _wallets.find(handle); + KWallet::Backend *rc = _wallets.tqfind(handle); if (rc == 0 && ++_failed > 5) { _failed = 0; @@ -812,8 +812,8 @@ TQStringList KWalletD::wallets() const { dir.setFilter(TQDir::Files | TQDir::NoSymLinks); - const QFileInfoList *list = dir.entryInfoList(); - QFileInfoListIterator it(*list); + const TQFileInfoList *list = dir.entryInfoList(); + TQFileInfoListIterator it(*list); TQFileInfo *fi; while ((fi = it.current()) != 0L) { TQString fn = fi->fileName(); @@ -1179,11 +1179,11 @@ int KWalletD::removeEntry(int handle, const TQString& folder, const TQString& ke void KWalletD::slotAppUnregistered(const TQCString& app) { - if (_handles.contains(app)) { + if (_handles.tqcontains(app)) { TQValueList<int> l = _handles[app]; for (TQValueList<int>::Iterator i = l.begin(); i != l.end(); ++i) { _handles[app].remove(*i); - KWallet::Backend *w = _wallets.find(*i); + KWallet::Backend *w = _wallets.tqfind(*i); if (w && !_leaveOpen && 0 == w->deref()) { close(w->walletName(), true); } @@ -1193,7 +1193,7 @@ void KWalletD::slotAppUnregistered(const TQCString& app) { } -void KWalletD::invalidateHandle(int handle) { +void KWalletD::tqinvalidateHandle(int handle) { for (TQMap<TQCString,TQValueList<int> >::Iterator i = _handles.begin(); i != _handles.end(); ++i) { @@ -1207,11 +1207,11 @@ KWallet::Backend *KWalletD::getWallet(const TQCString& appid, int handle) { return 0L; } - KWallet::Backend *w = _wallets.find(handle); + KWallet::Backend *w = _wallets.tqfind(handle); if (w) { // the handle is valid - if (_handles.contains(appid)) { // we know this app - if (_handles[appid].contains(handle)) { + if (_handles.tqcontains(appid)) { // we know this app + if (_handles[appid].tqcontains(handle)) { // the app owns this handle _failed = 0; if (_closeIdle && _timeouts) { @@ -1285,7 +1285,7 @@ TQStringList KWalletD::users(const TQString& wallet) const { ++it) { if (it.current()->walletName() == wallet) { for (TQMap<TQCString,TQValueList<int> >::ConstIterator hit = _handles.begin(); hit != _handles.end(); ++hit) { - if (hit.data().contains(it.currentKey())) { + if (hit.data().tqcontains(it.currentKey())) { rc += hit.key(); } } @@ -1302,7 +1302,7 @@ bool KWalletD::disconnectApplication(const TQString& wallet, const TQCString& ap it.current(); ++it) { if (it.current()->walletName() == wallet) { - if (_handles[application].contains(it.currentKey())) { + if (_handles[application].tqcontains(it.currentKey())) { _handles[application].remove(it.currentKey()); if (_handles[application].isEmpty()) { @@ -1416,7 +1416,7 @@ bool KWalletD::isEnabled() const { bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder) { - if (!wallets().contains(wallet)) { + if (!wallets().tqcontains(wallet)) { return true; } @@ -1435,7 +1435,7 @@ bool KWalletD::folderDoesNotExist(const TQString& wallet, const TQString& folder bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, const TQString& key) { - if (!wallets().contains(wallet)) { + if (!wallets().tqcontains(wallet)) { return true; } @@ -1454,12 +1454,12 @@ bool KWalletD::keyDoesNotExist(const TQString& wallet, const TQString& folder, c bool KWalletD::implicitAllow(const TQString& wallet, const TQCString& app) { - return _implicitAllowMap[wallet].contains(TQString::fromLocal8Bit(app)); + return _implicitAllowMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); } bool KWalletD::implicitDeny(const TQString& wallet, const TQCString& app) { - return _implicitDenyMap[wallet].contains(TQString::fromLocal8Bit(app)); + return _implicitDenyMap[wallet].tqcontains(TQString::fromLocal8Bit(app)); } @@ -1468,12 +1468,12 @@ TQCString KWalletD::friendlyDCOPPeerName() { if (!dc) { return ""; } - return dc->senderId().replace(TQRegExp("-[0-9]+$"), ""); + return dc->senderId().tqreplace(TQRegExp("-[0-9]+$"), ""); } void KWalletD::timedOut(int id) { - KWallet::Backend *w = _wallets.find(id); + KWallet::Backend *w = _wallets.tqfind(id); if (w) { closeWallet(w, id, true); } diff --git a/kio/misc/kwalletd/kwalletd.h b/kio/misc/kwalletd/kwalletd.h index 2aea371ba..ba83b4efc 100644 --- a/kio/misc/kwalletd/kwalletd.h +++ b/kio/misc/kwalletd/kwalletd.h @@ -161,7 +161,7 @@ class KWalletD : public KDEDModule { // Generate a new unique handle. int generateHandle(); // Invalidate a handle (remove it from the TQMap) - void invalidateHandle(int handle); + void tqinvalidateHandle(int handle); // Emit signals about closing wallets void doCloseSignals(int,const TQString&); void emitFolderUpdated(const TQString&, const TQString&); diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui index 609508e11..809993077 100644 --- a/kio/misc/kwalletd/kwalletwizard.ui +++ b/kio/misc/kwalletd/kwalletwizard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KWalletWizard</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>KWalletWizard</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>KDE Wallet Wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page1</cstring> </property> @@ -36,14 +36,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -58,11 +58,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -83,11 +83,11 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QButtonGroup" row="2" column="1"> + <widget class="TQButtonGroup" row="2" column="1"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -104,7 +104,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>_basic</cstring> </property> @@ -115,7 +115,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>_advanced</cstring> </property> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>21</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>31</height> @@ -161,7 +161,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page4</cstring> </property> @@ -172,7 +172,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -185,7 +185,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page2</cstring> </property> @@ -196,7 +196,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -207,7 +207,7 @@ <enum>RichText</enum> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> <cstring>layout7</cstring> </property> @@ -215,7 +215,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -223,7 +223,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -233,14 +233,14 @@ <property name="text"> <string>Enter a new password:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>_pass1</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -250,7 +250,7 @@ <property name="text"> <string>Verify password:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -259,7 +259,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -267,7 +267,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>_pass1</cstring> </property> @@ -278,7 +278,7 @@ <enum>Password</enum> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>_pass2</cstring> </property> @@ -293,7 +293,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>_useWallet</cstring> </property> @@ -311,7 +311,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -328,7 +328,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>21</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>31</height> @@ -362,27 +362,27 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>70</height> </size> </property> </spacer> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>_matchLabel</cstring> </property> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page3</cstring> </property> @@ -393,7 +393,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -403,7 +403,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -417,14 +417,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>121</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_networkWallet</cstring> </property> @@ -432,7 +432,7 @@ <string>Store network passwords and local passwords in separate wallet files</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>_closeIdle</cstring> </property> @@ -450,7 +450,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -530,16 +530,16 @@ <tabstop>_pass2</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">qcheckbox.h</include> + <include location="global" impldecl="in declaration">tqcheckbox.h</include> <include location="global" impldecl="in implementation">klocale.h</include> <include location="local" impldecl="in implementation">kwalletwizard.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">passwordPageUpdate()</slot> <slot access="private">init()</slot> <slot>setAdvanced()</slot> <slot>setBasic()</slot> <slot access="private">destroy()</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index b1d060f21..0524d60b3 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -99,7 +99,7 @@ class UIServerSystemTray:public KSystemTray pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); setPixmap(loadIcon("filesave")); //actionCollection()->action("file_quit")->setEnabled(true); - KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection()); } }; @@ -272,8 +272,8 @@ void ProgressItem::setPercent( unsigned long percent ) { void ProgressItem::setInfoMessage( const TQString & msg ) { TQString plainTextMsg(msg); - plainTextMsg.replace( TQRegExp( "</?b>" ), TQString::null ); - plainTextMsg.replace( TQRegExp( "<img.*>" ), TQString::null ); + plainTextMsg.tqreplace( TQRegExp( "</?b>" ), TQString() ); + plainTextMsg.tqreplace( TQRegExp( "<img.*>" ), TQString() ); setText( ListProgress::TB_PROGRESS, plainTextMsg ); defaultProgress->slotInfoMessage( 0, msg ); @@ -596,10 +596,10 @@ UIServer::UIServer() // setup toolbar toolBar()->insertButton("editdelete", TOOL_CANCEL, - TQT_SIGNAL(clicked()), this, + TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); toolBar()->insertButton("configure", TOOL_CONFIGURE, - TQT_SIGNAL(clicked()), this, + TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), true, i18n("Settings...")); toolBar()->setBarPos( KToolBar::Left ); @@ -1195,7 +1195,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const KIO::MetaData &meta, kdDebug(7024) << "ssl_cert_errors=" << meta["ssl_cert_errors"] << endl; kid->setCertState(meta["ssl_cert_errors"]); - TQString ip = meta.contains("ssl_proxied") ? "" : meta["ssl_peer_ip"]; + TQString ip = meta.tqcontains("ssl_proxied") ? "" : meta["ssl_peer_ip"]; kid->setup( x, ip, url, // the URL @@ -1291,7 +1291,7 @@ TQByteArray UIServer::open_RenameDlg64( int id, kdDebug(7024) << "KIO::open_RenameDlg done" << endl; TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); - stream << Q_UINT8(result) << newDest; + stream << TQ_UINT8(result) << newDest; if ( item && result != KIO::R_CANCEL ) setItemVisible( item, true ); return data; diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp index 0c8470a61..64167d9ea 100644 --- a/kio/tests/dataprotocoltest.cpp +++ b/kio/tests/dataprotocoltest.cpp @@ -47,7 +47,7 @@ public: // meta_data[key] = value; // cout << "§ " << key << " = " << value << endl; TQString prefix = "Metadata[\""+key+"\"]: "; - KIO::MetaData::Iterator it = attributes_expected.find(key); + KIO::MetaData::Iterator it = attributes_expected.tqfind(key); if (it != attributes_expected.end()) { testStrings(prefix,it.data(),value); // remove key from map diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index 9fe4b4c49..93b250075 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -532,7 +532,7 @@ void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst ) void JobTest::copyFileToSystem() { - if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) { + if ( !KProtocolInfo::isKnownProtocol( TQString::tqfromLatin1( "system" ) ) ) { kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl; return; } diff --git a/kio/tests/jobtest.h b/kio/tests/jobtest.h index 533ffba8c..83ec2da7c 100644 --- a/kio/tests/jobtest.h +++ b/kio/tests/jobtest.h @@ -24,7 +24,7 @@ #include <tqobject.h> #include <kio/job.h> -class JobTest : public QObject +class JobTest : public TQObject { Q_OBJECT diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp index 58ae319b2..372589dd9 100644 --- a/kio/tests/kacltest.cpp +++ b/kio/tests/kacltest.cpp @@ -80,22 +80,22 @@ int main(int argc, char *argv[]) } #ifdef Q_OS_FREEBSD -static const TQString s_group1 = TQString::fromLatin1("staff"); -static const TQString s_group2 = TQString::fromLatin1("guest"); +static const TQString s_group1 = TQString::tqfromLatin1("staff"); +static const TQString s_group2 = TQString::tqfromLatin1("guest"); #else -static const TQString s_group1 = TQString::fromLatin1("audio"); -static const TQString s_group2 = TQString::fromLatin1("users"); +static const TQString s_group1 = TQString::tqfromLatin1("audio"); +static const TQString s_group2 = TQString::tqfromLatin1("users"); #endif -static const TQString s_testACL = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::rwx\nother::r--\n" ); -static const TQString s_testACL2 = TQString::fromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") + - TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) + - TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) + - TQString::fromLatin1( "mask::r-x\nother::r--\n" ); -static const TQString s_testACLEffective = TQString::fromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) + - TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) + - TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) + - TQString::fromLatin1( "mask::r-x\nother::r--\n" ); +static const TQString s_testACL = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::rwx\nother::r--\n" ); +static const TQString s_testACL2 = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") + + TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) + + TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) + + TQString::tqfromLatin1( "mask::r-x\nother::r--\n" ); +static const TQString s_testACLEffective = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) + + TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) + + TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) + + TQString::tqfromLatin1( "mask::r-x\nother::r--\n" ); KACLTest::KACLTest() :m_acl( s_testACL ) @@ -265,8 +265,8 @@ void KACLTest::testSettingExtended() // groups, all and named - const TQString expected2 = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 + - TQString::fromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::fromLatin1(":r--\nmask::rwx\nother::r--\n" ); + const TQString expected2 = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 + + TQString::tqfromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::tqfromLatin1(":r--\nmask::rwx\nother::r--\n" ); CharlesII.setACL( s_testACL ); // reset ACLGroupPermissionsList groups; ACLGroupPermissions group = qMakePair( s_group1, ( unsigned short )3 ); diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h index c3572d929..9a76e6246 100644 --- a/kio/tests/kdcopcheck.h +++ b/kio/tests/kdcopcheck.h @@ -5,7 +5,7 @@ #include <tqstring.h> #include <tqobject.h> -class TestService : public QObject +class TestService : public TQObject { Q_OBJECT public: diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp index a831041e1..c2a642c1f 100644 --- a/kio/tests/kdefaultprogresstest.cpp +++ b/kio/tests/kdefaultprogresstest.cpp @@ -18,7 +18,7 @@ int main(int argc, char **argv) dlg->slotTotalDirs( 0L, 1 ); dlg->slotSpeed( 0L, 55 ); - dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Starting..." ) ); + dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Starting..." ) ); int files = 0; for ( int size = 0 ; size < 12000 ; size += 1 ) @@ -31,7 +31,7 @@ int main(int argc, char **argv) } kapp->processEvents(); } - dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) ); + dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Done." ) ); delete dlg; return 0; diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp index 6137f5e71..8acef5b24 100644 --- a/kio/tests/kdirlistertest.cpp +++ b/kio/tests/kdirlistertest.cpp @@ -47,7 +47,7 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) layout->addWidget( startR ); layout->addWidget( startT ); layout->addWidget( test ); - resize( layout->sizeHint() ); + resize( layout->tqsizeHint() ); connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); diff --git a/kio/tests/kdirlistertest.h b/kio/tests/kdirlistertest.h index 6b1e831f5..12e72c911 100644 --- a/kio/tests/kdirlistertest.h +++ b/kio/tests/kdirlistertest.h @@ -31,7 +31,7 @@ using namespace std; -class PrintSignals : public QObject +class PrintSignals : public TQObject { Q_OBJECT public: @@ -98,7 +98,7 @@ public slots: { cout << "*** speed: " << bytes_per_second << endl; } }; -class KDirListerTest : public QWidget +class KDirListerTest : public TQWidget { Q_OBJECT public: diff --git a/kio/tests/kdirwatchunittest.cpp b/kio/tests/kdirwatchunittest.cpp index 1bd17edd6..870b85de9 100644 --- a/kio/tests/kdirwatchunittest.cpp +++ b/kio/tests/kdirwatchunittest.cpp @@ -26,7 +26,7 @@ void KDirWatchTest::VERIFY_NOTHING() for (int i = 0; i < 20; ++i) { usleep(100*1000); - qApp->processEvents(); + tqApp->processEvents(); } bool nothing_failed = true; @@ -47,7 +47,7 @@ void KDirWatchTest::VERIFY_DIRTY(const TQString& alert) for (int i = 0; i < 20; ++i) { usleep(100*1000); - qApp->processEvents(); + tqApp->processEvents(); } VERIFY (m_s[sigCreated] == m_signals[sigCreated] && @@ -64,7 +64,7 @@ void KDirWatchTest::VERIFY_CREATED(const TQString& alert) for (int i = 0; i < 20; ++i) { usleep(100*1000); - qApp->processEvents(); + tqApp->processEvents(); } VERIFY (m_s[sigDirty] == m_signals[sigDirty] && @@ -81,7 +81,7 @@ void KDirWatchTest::VERIFY_DELETED(const TQString& alert) for (int i = 0; i < 20; ++i) { usleep(100*1000); - qApp->processEvents(); + tqApp->processEvents(); } VERIFY (m_s[sigDirty] == m_signals[sigDirty] && diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index 0db23457d..5689aaae9 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -144,24 +144,24 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) hbLayout = new TQHBoxLayout( topLayout, 15 ); pbStart = new TQPushButton( "&Start", main_widget ); - pbStart->setFixedSize( pbStart->sizeHint() ); + pbStart->setFixedSize( pbStart->tqsizeHint() ); connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); - pbStop->setFixedSize( pbStop->sizeHint() ); + pbStop->setFixedSize( pbStop->tqsizeHint() ); pbStop->setEnabled( false ); connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); hbLayout->addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); - close->setFixedSize( close->sizeHint() ); + close->setFixedSize( close->tqsizeHint() ); connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); - main_widget->setMinimumSize( main_widget->sizeHint() ); + main_widget->setMinimumSize( main_widget->tqsizeHint() ); setCentralWidget( main_widget ); slave = 0; @@ -545,7 +545,7 @@ int main(int argc, char **argv) { KioslaveTest test( src, dest, op, pr ); test.show(); // Bug in KTMW / Qt / layouts ? - test.resize( test.sizeHint() ); + test.resize( test.tqsizeHint() ); app.setMainWidget(&test); app.exec(); diff --git a/kio/tests/kruntest.h b/kio/tests/kruntest.h index 8cbc7af53..68e7a7280 100644 --- a/kio/tests/kruntest.h +++ b/kio/tests/kruntest.h @@ -40,7 +40,7 @@ public: class TQPushButton; -class Receiver : public QWidget +class Receiver : public TQWidget { Q_OBJECT public: diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp index 4a4fcabb0..a9fa8198a 100644 --- a/kio/tests/ksycocatest.cpp +++ b/kio/tests/ksycocatest.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption TQCString instname = "kword"; - TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname ); + TQString desktopPath = TQString::tqfromLatin1( "Office/%1.desktop" ).arg( instname ); qDebug( "Looking for %s", desktopPath.latin1() ); KService::Ptr service = KService::serviceByDesktopPath( desktopPath ); if ( service ) diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp index 8e4b023cb..dca72c234 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -45,7 +45,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType if( abs_path ) { - m_filterData->setAbsolutePath( TQString::fromLatin1( abs_path ) ); + m_filterData->setAbsolutePath( TQString::tqfromLatin1( abs_path ) ); kdDebug() << "Filtering: " << a << " with abs_path=" << abs_path << endl; } else @@ -98,7 +98,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType { // Hack for other locales than english, normalize google hosts to google.com cmd = cmd.replace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" ); - if ( cmd != TQString::fromLatin1( expectedResult ) ) + if ( cmd != TQString::tqfromLatin1( expectedResult ) ) { kdError() << " Got " << cmd << " expected " << expectedResult << endl; ::exit(1); diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp index 612dab558..4750636b8 100644 --- a/kio/tests/kurlcompletiontest.cpp +++ b/kio/tests/kurlcompletiontest.cpp @@ -96,8 +96,8 @@ void KURLCompletionTest::testLocalRelativePath() waitForCompletion(); TQStringList comp1all = m_completion->allMatches(); assert( comp1all.count() == 2 ); - assert( comp1all.find( "file1" ) != comp1all.end() ); - assert( comp1all.find( "file#a" ) != comp1all.end() ); + assert( comp1all.tqfind( "file1" ) != comp1all.end() ); + assert( comp1all.tqfind( "file#a" ) != comp1all.end() ); TQString comp1 = m_completion->replacedPath( "file1" ); // like KURLRequester does assert( comp1 == "file1" ); @@ -138,9 +138,9 @@ void KURLCompletionTest::testLocalURL() TQStringList comp1all = m_completion->allMatches(); kdDebug() << comp1all << endl; assert( comp1all.count() == 2 ); - assert( comp1all.find( m_dirURL.url() + "file1" ) != comp1all.end() ); + assert( comp1all.tqfind( m_dirURL.url() + "file1" ) != comp1all.end() ); TQString filehash = m_dirURL.url() + "file%23a"; - assert( comp1all.find( filehash ) != comp1all.end() ); + assert( comp1all.tqfind( filehash ) != comp1all.end() ); TQString filehashPath = m_completion->replacedPath( filehash ); // note that it returns a path!! kdDebug() << filehashPath << endl; assert( filehashPath == m_dirURL.path() + "file#a" ); diff --git a/kio/tests/previewtest.h b/kio/tests/previewtest.h index a7e1727d6..27d797403 100644 --- a/kio/tests/previewtest.h +++ b/kio/tests/previewtest.h @@ -6,7 +6,7 @@ class KLineEdit; class TQLabel; class KFileItem; -class PreviewTest : public QWidget +class PreviewTest : public TQWidget { Q_OBJECT public: diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc index 441d03b98..88ba3b94d 100644 --- a/kioslave/file/file.cc +++ b/kioslave/file/file.cc @@ -379,7 +379,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum kdDebug(7101) << "put(): " << dest_orig << ", mode=" << _mode << endl; TQString dest_part( dest_orig ); - dest_part += TQString::fromLatin1(".part"); + dest_part += TQString::tqfromLatin1(".part"); TQCString _dest_part( TQFile::encodeName(dest_part)); KDE_struct_stat buff_orig; @@ -569,7 +569,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum // set modification time const TQString mtimeStr = metaData( "modified" ); if ( !mtimeStr.isEmpty() ) { - TQDateTime dt = TQDateTime::fromString( mtimeStr, Qt::ISODate ); + TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( mtimeStr, Qt::ISODate )); if ( dt.isValid() ) { KDE_struct_stat dest_statbuf; if (KDE_stat( _dest_orig.data(), &dest_statbuf ) == 0) { @@ -809,7 +809,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, ut.modtime = buff_src.st_mtime; if ( ::utime( _dest.data(), &ut ) != 0 ) { - kdWarning() << TQString::fromLatin1("Couldn't preserve access and modification time for\n%1").arg( dest.path() ) << endl; + kdWarning() << TQString(TQString::tqfromLatin1("Couldn't preserve access and modification time for\n%1").arg( dest.path() )) << endl; } processedSize( buff_src.st_size ); @@ -859,7 +859,7 @@ void FileProtocol::rename( const KURL &src, const KURL &dest, error( KIO::ERR_ACCESS_DENIED, dest.path() ); } else if (errno == EXDEV) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename")); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename")); } else if (errno == EROFS) { // The file is on a read-only filesystem error( KIO::ERR_CANNOT_DELETE, src.path() ); @@ -960,12 +960,12 @@ void FileProtocol::del( const KURL& url, bool isfile) TQString FileProtocol::getUserName( uid_t uid ) { TQString *temp; - temp = usercache.find( uid ); + temp = usercache.tqfind( uid ); if ( !temp ) { struct passwd *user = getpwuid( uid ); if ( user ) { - usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) ); - return TQString::fromLatin1( user->pw_name ); + usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) ); + return TQString::tqfromLatin1( user->pw_name ); } else return TQString::number( uid ); @@ -977,12 +977,12 @@ TQString FileProtocol::getUserName( uid_t uid ) TQString FileProtocol::getGroupName( gid_t gid ) { TQString *temp; - temp = groupcache.find( gid ); + temp = groupcache.tqfind( gid ); if ( !temp ) { struct group *grp = getgrgid( gid ); if ( grp ) { - groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) ); - return TQString::fromLatin1( grp->gr_name ); + groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) ); + return TQString::tqfromLatin1( grp->gr_name ); } else return TQString::number( gid ); @@ -1116,7 +1116,7 @@ void FileProtocol::stat( const KURL & url ) */ TQCString _path( TQFile::encodeName(url.path(-1))); - TQString sDetails = metaData(TQString::fromLatin1("details")); + TQString sDetails = metaData(TQString::tqfromLatin1("details")); int details = sDetails.isEmpty() ? 2 : sDetails.toInt(); kdDebug(7101) << "FileProtocol::stat details=" << details << endl; @@ -1303,7 +1303,7 @@ void FileProtocol::special( const TQByteArray &data) case 1: { TQString fstype, dev, point; - Q_INT8 iRo; + TQ_INT8 iRo; stream >> iRo >> fstype >> dev >> point; @@ -1419,10 +1419,10 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c bool fstype_empty = !_fstype || !*_fstype; TQCString fstype = KProcess::quote(_fstype).latin1(); // good guess TQCString readonly = _ro ? "-r" : ""; - TQString epath = TQString::fromLatin1(getenv("PATH")); - TQString path = TQString::fromLatin1("/sbin:/bin"); + TQString epath = TQString::tqfromLatin1(getenv("PATH")); + TQString path = TQString::tqfromLatin1("/sbin:/bin"); if(!epath.isEmpty()) - path += TQString::fromLatin1(":") + epath; + path += TQString::tqfromLatin1(":") + epath; TQString mountProg = KGlobal::dirs()->findExe("mount", path); if (mountProg.isEmpty()){ error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\"")); @@ -1604,7 +1604,7 @@ void FileProtocol::unmount( const TQString& _point ) } #else TQString epath = getenv("PATH"); - TQString path = TQString::fromLatin1("/sbin:/bin"); + TQString path = TQString::tqfromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; TQString umountProg = KGlobal::dirs()->findExe("umount", path); @@ -1658,7 +1658,7 @@ void FileProtocol::unmount( const TQString& _point ) bool FileProtocol::pmount(const TQString &dev) { TQString epath = getenv("PATH"); - TQString path = TQString::fromLatin1("/sbin:/bin"); + TQString path = TQString::tqfromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; TQString pmountProg = KGlobal::dirs()->findExe("pmount", path); @@ -1700,7 +1700,7 @@ bool FileProtocol::pumount(const TQString &point) if (dev.endsWith("/")) dev.truncate(dev.length()-1); TQString epath = getenv("PATH"); - TQString path = TQString::fromLatin1("/sbin:/bin"); + TQString path = TQString::tqfromLatin1("/sbin:/bin"); if (!epath.isEmpty()) path += ":" + epath; TQString pumountProg = KGlobal::dirs()->findExe("pumount", path); @@ -1774,7 +1774,7 @@ static bool isExtendedACL( acl_t acl ) static TQString aclAsString( acl_t acl ) { char *aclString = acl_to_text( acl, 0 ); - TQString ret = TQString::fromLatin1( aclString ); + TQString ret = TQString::tqfromLatin1( aclString ); acl_free( (void*)aclString ); return ret; } diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc index 9e4fc21d9..68bcf2064 100644 --- a/kioslave/ftp/ftp.cc +++ b/kioslave/ftp/ftp.cc @@ -71,9 +71,9 @@ #endif // JPF: a remark on coding style (2004-03-06): -// Some calls to TQString::fromLatin1() were removed from the code. In most places +// Some calls to TQString::tqfromLatin1() were removed from the code. In most places // the KDE code relies on implicit creation of QStrings. Also Qt has a lot of -// const char* overloads, so that using TQString::fromLatin1() can be ineffectient! +// const char* overloads, so that using TQString::tqfromLatin1() can be ineffectient! #define FTP_LOGIN "anonymous" #define FTP_PASSWD "anonymous@" @@ -249,7 +249,7 @@ int FtpSocket::connectSocket(int iTimeOutSec, bool bControl) ? ERR_UNKNOWN_HOST : ERR_COULD_NOT_CONNECT; TQString strMsg = KExtendedSocket::strError(status(), systemError()); strMsg.prepend("connect failed (code %1): "); - return errorMessage(iErrorCode, strMsg.arg(iCon).latin1()); + return errorMessage(iErrorCode, TQString(strMsg.arg(iCon)).latin1()); } if( !setAddressReusable(true) ) return errorMessage(ERR_COULD_NOT_CREATE_SOCKET, "setAddressReusable failed"); @@ -693,8 +693,8 @@ bool Ftp::ftpLogin() } TQString sTmp = remoteEncoding()->decode( ftpResponse(3) ); - int iBeg = sTmp.find('"'); - int iEnd = sTmp.findRev('"'); + int iBeg = sTmp.tqfind('"'); + int iEnd = sTmp.tqfindRev('"'); if(iBeg > 0 && iBeg < iEnd) { m_initialPath = sTmp.mid(iBeg+1, iEnd-iBeg-1); @@ -749,7 +749,7 @@ bool Ftp::ftpSendCmd( const TQCString& cmd, int maxretries ) { assert(m_control != NULL); // must have control connection socket - if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1) + if ( cmd.tqfind( '\r' ) != -1 || cmd.tqfind( '\n' ) != -1) { kdWarning(7102) << "Invalid command received (contains CR or LF):" << cmd.data() << endl; @@ -968,7 +968,7 @@ int Ftp::ftpOpenEPRTDataConnection() if (sin == NULL) return ERR_INTERNAL; - // TQString command = TQString::fromLatin1("eprt |%1|%2|%3|").arg(sin->ianaFamily()) + // TQString command = TQString::tqfromLatin1("eprt |%1|%2|%3|").arg(sin->ianaFamily()) // .arg(sin->nodeName()) // .arg(sin->port()); TQCString command; @@ -1285,7 +1285,7 @@ bool Ftp::ftpRename( const TQString & src, const TQString & dst, bool overwrite return false; } - int pos = src.findRev("/"); + int pos = src.tqfindRev("/"); if( !ftpFolder(src.left(pos+1), false) ) return false; @@ -1838,7 +1838,7 @@ bool Ftp::ftpReadDir(FtpEntry& de) TQCString tmp( p_name ); if ( p_access[0] == 'l' ) { - int i = tmp.findRev( " -> " ); + int i = tmp.tqfindRev( " -> " ); if ( i != -1 ) { de.link = remoteEncoding()->decode(p_name + i + 4); tmp.truncate( i ); @@ -1852,7 +1852,7 @@ bool Ftp::ftpReadDir(FtpEntry& de) if ( tmp[0] == '/' ) // listing on ftp://ftp.gnupg.org/ starts with '/' tmp.remove( 0, 1 ); - if (tmp.find('/') != -1) + if (tmp.tqfind('/') != -1) continue; // Don't trick us! // Some sites put more than one space between the date and the name // e.g. ftp://ftp.uni-marburg.de/mirror/ diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index f59de0db0..f6ab75195 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -171,7 +171,7 @@ static TQString sanitizeCustomHTTPHeader(const TQString& _header) TQString header = (*it).lower(); // Do not allow Request line to be specified and ignore // the other HTTP headers. - if (header.find(':') == -1 || + if (header.tqfind(':') == -1 || header.startsWith("host") || header.startsWith("via")) continue; @@ -431,7 +431,7 @@ void HTTPProtocol::setHost( const TQString& host, int port, m_davHostOk = m_davHostUnsupported = false; // is it an IPv6 address? - if (host.find(':') == -1) + if (host.tqfind(':') == -1) { m_request.hostname = host; m_request.encoded_hostname = KIDNA::toAscii(host); @@ -439,7 +439,7 @@ void HTTPProtocol::setHost( const TQString& host, int port, else { m_request.hostname = host; - int pos = host.find('%'); + int pos = host.tqfind('%'); if (pos == -1) m_request.encoded_hostname = '[' + host + ']'; else @@ -607,7 +607,7 @@ void HTTPProtocol::stat(const KURL& url) if ( m_protocol != "webdav" && m_protocol != "webdavs" ) { - TQString statSide = metaData(TQString::fromLatin1("statSide")); + TQString statSide = metaData(TQString::tqfromLatin1("statSide")); if ( statSide != "source" ) { // When uploading we assume the file doesn't exit @@ -828,8 +828,8 @@ void HTTPProtocol::davGeneric( const KURL& url, KIO::HTTP_METHOD method ) int HTTPProtocol::codeFromResponse( const TQString& response ) { - int firstSpace = response.find( ' ' ); - int secondSpace = response.find( ' ', firstSpace + 1 ); + int firstSpace = response.tqfind( ' ' ); + int secondSpace = response.tqfind( ' ', firstSpace + 1 ); return response.mid( firstSpace + 1, secondSpace - firstSpace - 1 ).toInt(); } @@ -1805,7 +1805,7 @@ bool HTTPProtocol::isOffline(const KURL &url) TQDataStream stream(params, IO_WriteOnly); - if ( url.host() == TQString::fromLatin1("localhost") || url.host() == TQString::fromLatin1("127.0.0.1") || url.host() == TQString::fromLatin1("::") ) { + if ( url.host() == TQString::tqfromLatin1("localhost") || url.host() == TQString::tqfromLatin1("127.0.0.1") || url.host() == TQString::tqfromLatin1("::") ) { return false; } if ( dcopClient()->call( "kded", "networkstatus", "status()", @@ -1824,7 +1824,7 @@ bool HTTPProtocol::isOffline(const KURL &url) void HTTPProtocol::multiGet(const TQByteArray &data) { TQDataStream stream(data, IO_ReadOnly); - Q_UINT32 n; + TQ_UINT32 n; stream >> n; kdDebug(7113) << "(" << m_pid << ") HTTPProtcool::multiGet n = " << n << endl; @@ -2686,7 +2686,7 @@ try_again: return false; } - m_strMimeType = TQString::fromUtf8( buffer).stripWhiteSpace(); + m_strMimeType = TQString(TQString::fromUtf8( buffer)).stripWhiteSpace(); kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::readHeader: cached " << "data mimetype: " << m_strMimeType << endl; @@ -2700,7 +2700,7 @@ try_again: return false; } - m_request.strCharset = TQString::fromUtf8( buffer).stripWhiteSpace().lower(); + m_request.strCharset = TQString(TQString::fromUtf8( buffer)).stripWhiteSpace().lower(); setMetaData("charset", m_request.strCharset); if (!m_request.lastModified.isEmpty()) setMetaData("modified", m_request.lastModified); @@ -2786,7 +2786,7 @@ try_again: // by assuming that they will be sending html. kdDebug(7113) << "(" << m_pid << ") HTTPPreadHeader: HEAD -> returned " << "mimetype: " << DEFAULT_MIME_TYPE << endl; - mimeType(TQString::fromLatin1(DEFAULT_MIME_TYPE)); + mimeType(TQString::tqfromLatin1(DEFAULT_MIME_TYPE)); return true; } @@ -2847,7 +2847,7 @@ try_again: // Store the the headers so they can be passed to the // calling application later - m_responseHeader << TQString::fromLatin1(buf); + m_responseHeader << TQString::tqfromLatin1(buf); if ((strncasecmp(buf, "HTTP/", 5) == 0) || (strncasecmp(buf, "ICY ", 4) == 0)) // Shoutcast support @@ -3030,7 +3030,7 @@ try_again: // Keep Alive else if (strncasecmp(buf, "Keep-Alive:", 11) == 0) { TQStringList options = TQStringList::split(',', - TQString::fromLatin1(trimLead(buf+11))); + TQString::tqfromLatin1(trimLead(buf+11))); for(TQStringList::ConstIterator it = options.begin(); it != options.end(); it++) @@ -3046,7 +3046,7 @@ try_again: // Cache control else if (strncasecmp(buf, "Cache-Control:", 14) == 0) { TQStringList cacheControls = TQStringList::split(',', - TQString::fromLatin1(trimLead(buf+14))); + TQString::tqfromLatin1(trimLead(buf+14))); for(TQStringList::ConstIterator it = cacheControls.begin(); it != cacheControls.end(); it++) @@ -3081,7 +3081,7 @@ try_again: else if (strncasecmp(buf, "Content-location:", 17) == 0) { setMetaData ("content-location", - TQString::fromLatin1(trimLead(buf+17)).stripWhiteSpace()); + TQString::tqfromLatin1(trimLead(buf+17)).stripWhiteSpace()); } // what type of data do we have? @@ -3093,7 +3093,7 @@ try_again: while ( *pos && *pos != ';' ) pos++; // Assign the mime-type. - m_strMimeType = TQString::fromLatin1(start, pos-start).stripWhiteSpace().lower(); + m_strMimeType = TQString::tqfromLatin1(start, pos-start).stripWhiteSpace().lower(); kdDebug(7113) << "(" << m_pid << ") Content-type: " << m_strMimeType << endl; // If we still have text, then it means we have a mime-type with a @@ -3108,8 +3108,8 @@ try_again: if (*pos) { - mediaAttribute = TQString::fromLatin1(start, pos-start).stripWhiteSpace().lower(); - mediaValue = TQString::fromLatin1(pos+1, end-pos-1).stripWhiteSpace(); + mediaAttribute = TQString::tqfromLatin1(start, pos-start).stripWhiteSpace().lower(); + mediaValue = TQString::tqfromLatin1(pos+1, end-pos-1).stripWhiteSpace(); pos = end; if (mediaValue.length() && (mediaValue[0] == '"') && @@ -3153,7 +3153,7 @@ try_again: // Cache management else if (strncasecmp(buf, "Last-Modified:", 14) == 0) { - m_request.lastModified = (TQString::fromLatin1(trimLead(buf+14))).stripWhiteSpace(); + m_request.lastModified = (TQString::tqfromLatin1(trimLead(buf+14))).stripWhiteSpace(); } // whoops.. we received a warning @@ -3177,7 +3177,7 @@ try_again: // The deprecated Refresh Response else if (strncasecmp(buf,"Refresh:", 8) == 0) { mayCache = false; // Do not cache page as it defeats purpose of Refresh tag! - setMetaData( "http-refresh", TQString::fromLatin1(trimLead(buf+8)).stripWhiteSpace() ); + setMetaData( "http-refresh", TQString::tqfromLatin1(trimLead(buf+8)).stripWhiteSpace() ); } // In fact we should do redirection only if we got redirection code @@ -3254,7 +3254,7 @@ try_again: dispositionBuf--; if ( dispositionBuf > bufStart ) - dispositionFilename = TQString::fromLatin1( bufStart, dispositionBuf-bufStart ); + dispositionFilename = TQString::tqfromLatin1( bufStart, dispositionBuf-bufStart ); break; } @@ -3267,7 +3267,7 @@ try_again: dispositionBuf++; if ( dispositionBuf > bufStart ) - dispositionType = TQString::fromLatin1( bufStart, dispositionBuf-bufStart ).stripWhiteSpace(); + dispositionType = TQString::tqfromLatin1( bufStart, dispositionBuf-bufStart ).stripWhiteSpace(); while ( *dispositionBuf == ';' || *dispositionBuf == ' ' ) dispositionBuf++; @@ -3278,7 +3278,7 @@ try_again: // path, thus we extract the filename only. if ( !dispositionFilename.isEmpty() ) { - int pos = dispositionFilename.findRev( '/' ); + int pos = dispositionFilename.tqfindRev( '/' ); if( pos > -1 ) dispositionFilename = dispositionFilename.mid(pos+1); @@ -3288,7 +3288,7 @@ try_again: } } else if(strncasecmp(buf, "Content-Language:", 17) == 0) { - TQString language = TQString::fromLatin1(trimLead(buf+17)).stripWhiteSpace(); + TQString language = TQString::tqfromLatin1(trimLead(buf+17)).stripWhiteSpace(); if (!language.isEmpty()) setMetaData("content-language", language); } @@ -3309,7 +3309,7 @@ try_again: if (rel.startsWith("rel=\"")) { rel = rel.mid(5, rel.length() - 6); if (rel.lower() == "pageservices") { - TQString url = link[0].replace(TQRegExp("[<>]"),"").stripWhiteSpace(); + TQString url = TQString(link[0].replace(TQRegExp("[<>]"),"")).stripWhiteSpace(); setMetaData("PageServices", url); } } @@ -3327,14 +3327,14 @@ try_again: if (policy.count() == 2) { if (policy[0].lower() == "policyref") { - policyrefs << policy[1].replace(TQRegExp("[\"\']"), "") + policyrefs << TQString(policy[1].replace(TQRegExp("[\"\']"), "")) .stripWhiteSpace(); } else if (policy[0].lower() == "cp") { // We convert to cp\ncp\ncp\n[...]\ncp to be consistent with // other metadata sent in strings. This could be a bit more // efficient but I'm going for correctness right now. TQStringList cps = TQStringList::split(" ", - policy[1].replace(TQRegExp("[\"\']"), "") + TQString(policy[1].replace(TQRegExp("[\"\']"), "")) .simplifyWhiteSpace()); for (TQStringList::Iterator j = cps.begin(); j != cps.end(); ++j) @@ -3381,17 +3381,17 @@ try_again: // md5 signature else if (strncasecmp(buf, "Content-MD5:", 12) == 0) { - m_sContentMD5 = TQString::fromLatin1(trimLead(buf + 12)); + m_sContentMD5 = TQString::tqfromLatin1(trimLead(buf + 12)); } // *** Responses to the HTTP OPTIONS method follow // WebDAV capabilities else if (strncasecmp(buf, "DAV:", 4) == 0) { if (m_davCapabilities.isEmpty()) { - m_davCapabilities << TQString::fromLatin1(trimLead(buf + 4)); + m_davCapabilities << TQString::tqfromLatin1(trimLead(buf + 4)); } else { - m_davCapabilities << TQString::fromLatin1(trimLead(buf + 4)); + m_davCapabilities << TQString::tqfromLatin1(trimLead(buf + 4)); } } // *** Responses to the HTTP OPTIONS method finished @@ -3667,14 +3667,14 @@ try_again: if (m_strMimeType == "application/x-tar") { m_qContentEncodings.remove(m_qContentEncodings.fromLast()); - m_strMimeType = TQString::fromLatin1("application/x-tgz"); + m_strMimeType = TQString::tqfromLatin1("application/x-tgz"); } else if (m_strMimeType == "application/postscript") { // LEONB: Adding another exception for psgz files. // Could we use the mimelnk files instead of hardcoding all this? m_qContentEncodings.remove(m_qContentEncodings.fromLast()); - m_strMimeType = TQString::fromLatin1("application/x-gzpostscript"); + m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript"); } else if ( m_request.allowCompressedPage && m_strMimeType != "application/x-tgz" && @@ -3683,7 +3683,7 @@ try_again: m_request.url.path().right(6) == ".ps.gz" ) { m_qContentEncodings.remove(m_qContentEncodings.fromLast()); - m_strMimeType = TQString::fromLatin1("application/x-gzpostscript"); + m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript"); } else if ( (m_request.allowCompressedPage && m_strMimeType == "text/html") @@ -3700,7 +3700,7 @@ try_again: else { m_qContentEncodings.remove(m_qContentEncodings.fromLast()); - m_strMimeType = TQString::fromLatin1("application/x-gzip"); + m_strMimeType = TQString::tqfromLatin1("application/x-gzip"); } } @@ -3713,34 +3713,34 @@ try_again: if (m_qContentEncodings.last() == "bzip2") { m_qContentEncodings.remove(m_qContentEncodings.fromLast()); - m_strMimeType = TQString::fromLatin1("application/x-bzip2"); + m_strMimeType = TQString::tqfromLatin1("application/x-bzip2"); } // Convert some common mimetypes to standard KDE mimetypes if (m_strMimeType == "application/x-targz") - m_strMimeType = TQString::fromLatin1("application/x-tgz"); + m_strMimeType = TQString::tqfromLatin1("application/x-tgz"); else if (m_strMimeType == "application/zip") - m_strMimeType = TQString::fromLatin1("application/x-zip"); + m_strMimeType = TQString::tqfromLatin1("application/x-zip"); else if (m_strMimeType == "image/x-png") - m_strMimeType = TQString::fromLatin1("image/png"); + m_strMimeType = TQString::tqfromLatin1("image/png"); else if (m_strMimeType == "image/bmp") - m_strMimeType = TQString::fromLatin1("image/x-bmp"); + m_strMimeType = TQString::tqfromLatin1("image/x-bmp"); else if (m_strMimeType == "audio/mpeg" || m_strMimeType == "audio/x-mpeg" || m_strMimeType == "audio/mp3") - m_strMimeType = TQString::fromLatin1("audio/x-mp3"); + m_strMimeType = TQString::tqfromLatin1("audio/x-mp3"); else if (m_strMimeType == "audio/microsoft-wave") - m_strMimeType = TQString::fromLatin1("audio/x-wav"); + m_strMimeType = TQString::tqfromLatin1("audio/x-wav"); else if (m_strMimeType == "audio/midi") - m_strMimeType = TQString::fromLatin1("audio/x-midi"); + m_strMimeType = TQString::tqfromLatin1("audio/x-midi"); else if (m_strMimeType == "image/x-xpixmap") - m_strMimeType = TQString::fromLatin1("image/x-xpm"); + m_strMimeType = TQString::tqfromLatin1("image/x-xpm"); else if (m_strMimeType == "application/rtf") - m_strMimeType = TQString::fromLatin1("text/rtf"); + m_strMimeType = TQString::tqfromLatin1("text/rtf"); // Crypto ones.... else if (m_strMimeType == "application/pkix-cert" || m_strMimeType == "application/binary-certificate") { - m_strMimeType = TQString::fromLatin1("application/x-x509-ca-cert"); + m_strMimeType = TQString::tqfromLatin1("application/x-x509-ca-cert"); } // Prefer application/x-tgz or x-gzpostscript over application/x-gzip. @@ -3748,9 +3748,9 @@ try_again: { if ((m_request.url.path().right(7) == ".tar.gz") || (m_request.url.path().right(4) == ".tar")) - m_strMimeType = TQString::fromLatin1("application/x-tgz"); + m_strMimeType = TQString::tqfromLatin1("application/x-tgz"); if ((m_request.url.path().right(6) == ".ps.gz")) - m_strMimeType = TQString::fromLatin1("application/x-gzpostscript"); + m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript"); } // Some webservers say "text/plain" when they mean "application/x-bzip2" @@ -3758,15 +3758,15 @@ try_again: { TQString ext = m_request.url.path().right(4).upper(); if (ext == ".BZ2") - m_strMimeType = TQString::fromLatin1("application/x-bzip2"); + m_strMimeType = TQString::tqfromLatin1("application/x-bzip2"); else if (ext == ".PEM") - m_strMimeType = TQString::fromLatin1("application/x-x509-ca-cert"); + m_strMimeType = TQString::tqfromLatin1("application/x-x509-ca-cert"); else if (ext == ".SWF") - m_strMimeType = TQString::fromLatin1("application/x-shockwave-flash"); + m_strMimeType = TQString::tqfromLatin1("application/x-shockwave-flash"); else if (ext == ".PLS") - m_strMimeType = TQString::fromLatin1("audio/x-scpls"); + m_strMimeType = TQString::tqfromLatin1("audio/x-scpls"); else if (ext == ".WMV") - m_strMimeType = TQString::fromLatin1("video/x-ms-wmv"); + m_strMimeType = TQString::tqfromLatin1("video/x-ms-wmv"); } #if 0 @@ -3871,11 +3871,11 @@ void HTTPProtocol::addEncoding(TQString encoding, TQStringList &encs) //if ( m_cmd != CMD_COPY ) m_iSize = NO_SIZE; } else if ((encoding == "x-gzip") || (encoding == "gzip")) { - encs.append(TQString::fromLatin1("gzip")); + encs.append(TQString::tqfromLatin1("gzip")); } else if ((encoding == "x-bzip2") || (encoding == "bzip2")) { - encs.append(TQString::fromLatin1("bzip2")); // Not yet supported! + encs.append(TQString::tqfromLatin1("bzip2")); // Not yet supported! } else if ((encoding == "x-deflate") || (encoding == "deflate")) { - encs.append(TQString::fromLatin1("deflate")); + encs.append(TQString::tqfromLatin1("deflate")); } else { kdDebug(7113) << "(" << m_pid << ") Unknown encoding encountered. " << "Please write code. Encoding = \"" << encoding @@ -4270,7 +4270,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d) if ( m_strMimeType.isEmpty() ) { - m_strMimeType = TQString::fromLatin1( DEFAULT_MIME_TYPE ); + m_strMimeType = TQString::tqfromLatin1( DEFAULT_MIME_TYPE ); kdDebug(7113) << "(" << m_pid << ") Using default mimetype: " << m_strMimeType << endl; } @@ -4680,12 +4680,12 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite) TQString CEF = m_request.path; - int p = CEF.find('/'); + int p = CEF.tqfind('/'); while(p != -1) { CEF[p] = separator; - p = CEF.find('/', p); + p = CEF.tqfind('/', p); } TQString host = m_request.hostname.lower(); @@ -4711,7 +4711,7 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite) TQCString u = m_request.url.url().latin1(); for(int i = u.length(); i--;) { - hash = (hash * 12211 + u[i]) % 2147483563; + hash = (hash * 12211 + u.at(i)) % 2147483563; } TQString hashString; @@ -4739,7 +4739,7 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite) ok = false; time_t date; - time_t currentDate = time(0); + time_t tqcurrentDate = time(0); // URL if (ok && (!fgets(buffer, 400, fs))) @@ -4762,10 +4762,10 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite) { date = (time_t) strtoul(buffer, 0, 10); m_request.creationDate = date; - if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge)) + if (m_maxCacheAge && (difftime(tqcurrentDate, date) > m_maxCacheAge)) { m_request.bMustRevalidate = true; - m_request.expireDate = currentDate; + m_request.expireDate = tqcurrentDate; } } @@ -4779,14 +4779,14 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite) { date = (time_t) strtoul(buffer, 0, 10); // After the expire date we need to revalidate. - if (!date || difftime(currentDate, date) >= 0) + if (!date || difftime(tqcurrentDate, date) >= 0) m_request.bMustRevalidate = true; m_request.expireDate = date; } else if (m_request.cache == CC_Refresh) { m_request.bMustRevalidate = true; - m_request.expireDate = currentDate; + m_request.expireDate = tqcurrentDate; } } @@ -4875,7 +4875,7 @@ void HTTPProtocol::updateExpireDate(time_t expireDate, bool updateCreationDate) void HTTPProtocol::createCacheEntry( const TQString &mimetype, time_t expireDate) { TQString dir = m_request.cef; - int p = dir.findRev('/'); + int p = dir.tqfindRev('/'); if (p == -1) return; // Error. dir.truncate(p); @@ -5135,12 +5135,12 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy ) if( isForProxy ) { ProxyAuthentication = f; - m_strProxyAuthorization = TQString::fromLatin1( strAuth ); + m_strProxyAuthorization = TQString::tqfromLatin1( strAuth ); } else { Authentication = f; - m_strAuthorization = TQString::fromLatin1( strAuth ); + m_strAuthorization = TQString::tqfromLatin1( strAuth ); } } @@ -5233,13 +5233,13 @@ bool HTTPProtocol::getAuthorization() { bool isStaleNonce = false; TQString auth = ( m_responseCode == 401 ) ? m_strAuthorization : m_strProxyAuthorization; - int pos = auth.find("stale", 0, false); + int pos = auth.tqfind("stale", 0, false); if ( pos != -1 ) { pos += 5; int len = auth.length(); while( pos < len && (auth[pos] == ' ' || auth[pos] == '=') ) pos++; - if ( pos < len && auth.find("true", pos, false) != -1 ) + if ( pos < len && auth.tqfind("true", pos, false) != -1 ) { isStaleNonce = true; kdDebug(7113) << "(" << m_pid << ") Stale nonce value. " @@ -5358,13 +5358,13 @@ bool HTTPProtocol::getAuthorization() else auth = m_strProxyAuthorization; - int pos = auth.find("stale", 0, false); + int pos = auth.tqfind("stale", 0, false); if ( pos != -1 ) { pos += 5; int len = auth.length(); while( pos < len && (auth[pos] == ' ' || auth[pos] == '=') ) pos++; - if ( pos < len && auth.find("true", pos, false) != -1 ) + if ( pos < len && auth.tqfind("true", pos, false) != -1 ) { info.digestInfo = (m_responseCode == 401) ? m_strAuthorization : m_strProxyAuthorization; kdDebug(7113) << "(" << m_pid << ") Just a stale nonce value! " @@ -5880,7 +5880,7 @@ TQString HTTPProtocol::createDigestAuth ( bool isForProxy ) TQCString uri = TQCString(p,i+1); do { - pos = uri.find( ' ', idx ); + pos = uri.tqfind( ' ', idx ); if ( pos != -1 ) { KURL u (m_request.url, uri.mid(idx, pos-idx)); diff --git a/kioslave/http/http.h b/kioslave/http/http.h index 2985eb938..c5de923d0 100644 --- a/kioslave/http/http.h +++ b/kioslave/http/http.h @@ -403,7 +403,7 @@ protected: /** * Resets any per connection settings. These are different from - * per-session settings in that they must be invalidates every time + * per-session settings in that they must be tqinvalidates every time * a request is made, e.g. a retry to re-send the header to the * server, as compared to only when a new request arrives. */ diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp index 74b0b8102..8c10d0d16 100644 --- a/kioslave/http/http_cache_cleaner.cpp +++ b/kioslave/http/http_cache_cleaner.cpp @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> -time_t currentDate; +time_t tqcurrentDate; int m_maxCacheAge; int m_maxCacheSize; @@ -109,7 +109,7 @@ FileInfo *readEntry( const TQString &filename) if (ok) { creationDate = (time_t) strtoul(buffer, 0, 10); - age = (int) difftime(currentDate, creationDate); + age = (int) difftime(tqcurrentDate, creationDate); if ( m_maxCacheAge && ( age > m_maxCacheAge)) { ok = false; // Expired @@ -125,7 +125,7 @@ FileInfo *readEntry( const TQString &filename) #if 0 time_t expireDate; expireDate = (time_t) strtoul(buffer, 0, 10); - if (expireDate && (expireDate < currentDate)) + if (expireDate && (expireDate < tqcurrentDate)) ok = false; // Expired #endif } @@ -166,7 +166,7 @@ void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQStri TQDir dir(strDir); if (!dir.exists()) return; - QFileInfoList *newEntries = (QFileInfoList *) dir.entryInfoList(); + TQFileInfoList *newEntries = (TQFileInfoList *) dir.entryInfoList(); if (!newEntries) return; // Directory not accessible ?? @@ -213,7 +213,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) } } - currentDate = time(0); + tqcurrentDate = time(0); m_maxCacheAge = KProtocolManager::maxCacheAge(); m_maxCacheSize = KProtocolManager::maxCacheSize(); diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp index 909f92dcb..83c2bd0e7 100644 --- a/kioslave/http/kcookiejar/kcookiejar.cpp +++ b/kioslave/http/kcookiejar/kcookiejar.cpp @@ -84,12 +84,12 @@ #define READ_BUFFER_SIZE 8192 #define IP_ADDRESS_EXPRESSION "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)" -// Note with respect to TQString::fromLatin1( ) +// Note with respect to TQString::tqfromLatin1( ) // Cookies are stored as 8 bit data and passed to kio_http as // latin1 regardless of their actual encoding. // L1 is used to indicate latin1 constants -#define L1(x) TQString::fromLatin1(x) +#define L1(x) TQString::tqfromLatin1(x) template class TQPtrList<KHttpCookie>; template class TQPtrDict<KHttpCookieList>; @@ -154,9 +154,9 @@ KHttpCookie::KHttpCookie(const TQString &_host, // // Checks if a cookie has been expired // -bool KHttpCookie::isExpired(time_t currentDate) +bool KHttpCookie::isExpired(time_t tqcurrentDate) { - return (mExpireDate != 0) && (mExpireDate < currentDate); + return (mExpireDate != 0) && (mExpireDate < tqcurrentDate); } // @@ -194,14 +194,14 @@ bool KHttpCookie::match(const TQString &fqdn, const TQStringList &domains, if (fqdn != mHost) return false; } - else if (!domains.contains(mDomain)) + else if (!domains.tqcontains(mDomain)) { if (mDomain[0] == '.') return false; // Maybe the domain needs an extra dot. TQString domain = '.' + mDomain; - if ( !domains.contains( domain ) ) + if ( !domains.tqcontains( domain ) ) if ( fqdn != mDomain ) return false; } @@ -261,7 +261,7 @@ KCookieJar::KCookieJar() for(TQStringList::ConstIterator it = countries.begin(); it != countries.end(); ++it) { - m_twoLevelTLD.replace(*it, (int *) 1); + m_twoLevelTLD.tqreplace(*it, (int *) 1); } } @@ -301,7 +301,7 @@ static void removeDuplicateFromList(KHttpCookieList *list, KHttpCookie *cookiePt it != cookie->windowIds().end(); ++it) { long windowId = *it; - if (windowId && (cookiePtr->windowIds().find(windowId) == cookiePtr->windowIds().end())) + if (windowId && (cookiePtr->windowIds().tqfind(windowId) == cookiePtr->windowIds().end())) { cookiePtr->windowIds().append(windowId); } @@ -337,8 +337,8 @@ TQString KCookieJar::findCookies(const TQString &_url, bool useDOMFormat, long w if (!parseURL(_url, fqdn, path)) return cookieStr; - bool secureRequest = (_url.find( L1("https://"), 0, false) == 0 || - _url.find( L1("webdavs://"), 0, false) == 0); + bool secureRequest = (_url.tqfind( L1("https://"), 0, false) == 0 || + _url.tqfind( L1("webdavs://"), 0, false) == 0); // kdDebug(7104) << "findCookies: URL= " << _url << ", secure = " << secureRequest << endl; @@ -399,7 +399,7 @@ TQString KCookieJar::findCookies(const TQString &_url, bool useDOMFormat, long w continue; } - if (windowId && (cookie->windowIds().find(windowId) == cookie->windowIds().end())) + if (windowId && (cookie->windowIds().tqfind(windowId) == cookie->windowIds().end())) { cookie->windowIds().append(windowId); } @@ -479,7 +479,7 @@ static const char * parseNameValue(const char *header, // No '=' sign -> use string as the value, name is empty // (behavior found in Mozilla and IE) Name = ""; - Value = TQString::fromLatin1(header); + Value = TQString::tqfromLatin1(header); Value.truncate( s - header ); Value = Value.stripWhiteSpace(); return (s); @@ -516,12 +516,12 @@ static const char * parseNameValue(const char *header, if ((*s=='\0') || (*s=='\n')) { // End of Name - Value = TQString::fromLatin1(header); + Value = TQString::tqfromLatin1(header); Value.truncate(s - header); return (s); } } - Value = TQString::fromLatin1(header); + Value = TQString::tqfromLatin1(header); // *s == '\"'; if (keepQuotes) Value.truncate( ++s - header ); @@ -542,7 +542,7 @@ static const char * parseNameValue(const char *header, while ((*s != '\0') && (*s != ';') && (*s != '\n')) s++; // End of Name - Value = TQString::fromLatin1(header); + Value = TQString::tqfromLatin1(header); Value.truncate( s - header ); Value = Value.stripWhiteSpace(); } @@ -591,7 +591,7 @@ bool KCookieJar::parseURL(const TQString &_url, // Cookie spoofing protection. Since there is no way a path separator // or escape encoded character is allowed in the hostname according // to RFC 2396, reject attempts to include such things there! - if(_fqdn.find('/') > -1 || _fqdn.find('%') > -1) + if(_fqdn.tqfind('/') > -1 || _fqdn.tqfind('%') > -1) { return false; // deny everything!! } @@ -618,9 +618,9 @@ void KCookieJar::extractDomains(const TQString &_fqdn, return; } // Return numeric IPv4 addresses as is... - if ((_fqdn[0] >= '0') && (_fqdn[0] <= '9')) + if ((_fqdn.at(0) >= '0') && (_fqdn.at(0) <= '9')) { - if (_fqdn.find(TQRegExp(IP_ADDRESS_EXPRESSION)) > -1) + if (_fqdn.tqfind(TQRegExp(IP_ADDRESS_EXPRESSION)) > -1) { _domains.append( _fqdn ); return; @@ -683,7 +683,7 @@ void KCookieJar::extractDomains(const TQString &_fqdn, */ static TQString fixupDateTime(const TQString& dt) { - const int index = dt.find(TQRegExp("[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}")); + const int index = dt.tqfind(TQRegExp("[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}")); if (index > -1) { @@ -729,7 +729,7 @@ KHttpCookieList KCookieJar::makeCookies(const TQString &_url, return KHttpCookieList(); } TQString defaultPath; - int i = path.findRev('/'); + int i = path.tqfindRev('/'); if (i > 0) defaultPath = path.left(i); @@ -811,7 +811,7 @@ KHttpCookieList KCookieJar::makeCookies(const TQString &_url, if(dom.length() > 2 && dom[dom.length()-1] == '.') dom = dom.left(dom.length()-1); - if(dom.contains('.') > 1 || dom == ".local") + if(dom.tqcontains('.') > 1 || dom == ".local") lastCookie->mDomain = dom; } else if (cName == "max-age") @@ -1020,7 +1020,7 @@ KCookieAdvice KCookieJar::cookieAdvice(KHttpCookiePtr cookiePtr) // cross-site cookie injection. if (!cookiePtr->domain().isEmpty()) { - if (!domains.contains(cookiePtr->domain()) && + if (!domains.tqcontains(cookiePtr->domain()) && !cookiePtr->domain().endsWith("."+cookiePtr->host())) cookiePtr->fixDomain(TQString::null); } @@ -1457,11 +1457,11 @@ bool KCookieJar::loadCookies(const TQString &_filename) if ((expDate == 0) || (expDate < curTime)) continue; - KHttpCookie *cookie = new KHttpCookie(TQString::fromLatin1(host), - TQString::fromLatin1(domain), - TQString::fromLatin1(path), - TQString::fromLatin1(name), - TQString::fromLatin1(value), + KHttpCookie *cookie = new KHttpCookie(TQString::tqfromLatin1(host), + TQString::tqfromLatin1(domain), + TQString::tqfromLatin1(path), + TQString::tqfromLatin1(name), + TQString::tqfromLatin1(value), expDate, protVer, secure, httpOnly, explicitPath); addCookie(cookie); @@ -1546,7 +1546,7 @@ void KCookieJar::loadConfig(KConfig *_config, bool reparse ) { const TQString &value = *it++; - int sepPos = value.findRev(':'); + int sepPos = value.tqfindRev(':'); if (sepPos <= 0) continue; diff --git a/kioslave/http/kcookiejar/kcookiejar.h b/kioslave/http/kcookiejar/kcookiejar.h index eb64485ea..6d5d9f2e5 100644 --- a/kioslave/http/kcookiejar/kcookiejar.h +++ b/kioslave/http/kcookiejar/kcookiejar.h @@ -89,7 +89,7 @@ public: time_t expireDate(void) { return mExpireDate; } int protocolVersion(void) { return mProtocolVersion; } bool isSecure(void) { return mSecure; } - bool isExpired(time_t currentDate); + bool isExpired(time_t tqcurrentDate); bool isCrossDomain(void) { return mCrossDomain; } bool isHttpOnly(void) { return mHttpOnly; } bool hasExplicitPath(void) { return mExplicitPath; } diff --git a/kioslave/http/kcookiejar/kcookieserver.cpp b/kioslave/http/kcookiejar/kcookieserver.cpp index e6469f127..afd5664d8 100644 --- a/kioslave/http/kcookiejar/kcookieserver.cpp +++ b/kioslave/http/kcookiejar/kcookieserver.cpp @@ -368,14 +368,14 @@ bool KCookieServer::cookieMatches( KHttpCookiePtr c, } // DCOP function -QString +TQString KCookieServer::findCookies(TQString url) { return findCookies(url, 0); } // DCOP function -QString +TQString KCookieServer::findCookies(TQString url, long windowId) { if (cookiesPending(url)) @@ -399,7 +399,7 @@ KCookieServer::findCookies(TQString url, long windowId) } // DCOP function -QStringList +TQStringList KCookieServer::findDomains() { TQStringList result; @@ -417,7 +417,7 @@ KCookieServer::findDomains() } // DCOP function -QStringList +TQStringList KCookieServer::findCookies(TQValueList<int> fields, TQString domain, TQString fqdn, @@ -449,14 +449,14 @@ KCookieServer::findCookies(TQValueList<int> fields, } // DCOP function -QString +TQString KCookieServer::findDOMCookies(TQString url) { return findDOMCookies(url, 0); } // DCOP function -QString +TQString KCookieServer::findDOMCookies(TQString url, long windowId) { // We don't wait for pending cookies because it locks up konqueror @@ -561,7 +561,7 @@ KCookieServer::setDomainAdvice(TQString url, TQString advice) } // DCOP function -QString +TQString KCookieServer::getDomainAdvice(TQString url) { KCookieAdvice advice = KCookieDunno; diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp index 2c11c33cb..ca8560bf0 100644 --- a/kioslave/http/kcookiejar/kcookiewin.cpp +++ b/kioslave/http/kcookiejar/kcookiewin.cpp @@ -102,8 +102,8 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, hBox->setSpacing( KDialog::spacingHint() ); TQLabel* icon = new TQLabel( hBox ); icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) ); - icon->setAlignment( Qt::AlignCenter ); - icon->setFixedSize( 2*icon->sizeHint() ); + icon->tqsetAlignment( Qt::AlignCenter ); + icon->setFixedSize( 2*icon->tqsizeHint() ); int count = cookieList.count(); @@ -111,11 +111,11 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, TQString txt = i18n("You received a cookie from", "You received %n cookies from", count); TQLabel* lbl = new TQLabel( txt, vBox ); - lbl->setAlignment( Qt::AlignCenter ); + lbl->tqsetAlignment( Qt::AlignCenter ); KHttpCookiePtr cookie = cookieList.first(); TQString host (cookie->host()); - int pos = host.find(':'); + int pos = host.tqfind(':'); if ( pos > 0 ) { TQString portNum = host.left(pos); @@ -128,9 +128,9 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, if (cookie->isCrossDomain()) txt += i18n(" <b>[Cross Domain!]</b>"); lbl = new TQLabel( txt, vBox ); - lbl->setAlignment( Qt::AlignCenter ); + lbl->tqsetAlignment( Qt::AlignCenter ); lbl = new TQLabel( i18n("Do you want to accept or reject?"), vBox ); - lbl->setAlignment( Qt::AlignCenter ); + lbl->tqsetAlignment( Qt::AlignCenter ); vlayout->addWidget( hBox, 0, Qt::AlignLeft ); // Cookie Details dialog... @@ -203,7 +203,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, vlayout->addWidget( bbox ); - setFixedSize( sizeHint() ); + setFixedSize( tqsizeHint() ); } KCookieWin::~KCookieWin() @@ -313,7 +313,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount, if ( cookieCount > 1 ) { TQPushButton* btnNext = new TQPushButton( i18n("Next cookie","&Next >>"), this ); - btnNext->setFixedSize( btnNext->sizeHint() ); + btnNext->setFixedSize( btnNext->tqsizeHint() ); grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 ); connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) ); #ifndef QT_NO_TOOLTIP diff --git a/kioslave/http/kcookiejar/kcookiewin.h b/kioslave/http/kcookiejar/kcookiewin.h index 369ba69b1..d739732dc 100644 --- a/kioslave/http/kcookiejar/kcookiewin.h +++ b/kioslave/http/kcookiejar/kcookiewin.h @@ -37,7 +37,7 @@ class TQPushButton; class TQVButtonGroup; class KURLLabel; -class KCookieDetail : public QGroupBox +class KCookieDetail : public TQGroupBox { Q_OBJECT diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp index 0ad238ab7..aa51b2f91 100644 --- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp +++ b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp @@ -53,7 +53,7 @@ static void FAIL(const TQString &msg) static void popArg(TQCString &command, TQCString & line) { - int i = line.find(' '); + int i = line.tqfind(' '); if (i != -1) { command = line.left(i); @@ -69,15 +69,15 @@ static void popArg(TQCString &command, TQCString & line) static void popArg(TQString &command, TQCString & line) { - int i = line.find(' '); + int i = line.tqfind(' '); if (i != -1) { - command = TQString::fromLatin1(line.left(i)); + command = TQString::tqfromLatin1(line.left(i)); line = line.mid(i+1); } else { - command = TQString::fromLatin1(line); + command = TQString::tqfromLatin1(line); line = 0; } } @@ -158,7 +158,7 @@ static void processCheck(TQCString &line) if (url.isEmpty()) FAIL(TQString("Missing URL")); - TQString expectedCookies = TQString::fromLatin1(line); + TQString expectedCookies = TQString::tqfromLatin1(line); TQString cookies = jar->findCookies(urlStr, false, 0, 0).stripWhiteSpace(); if (cookies != expectedCookies) @@ -246,8 +246,8 @@ int main(int argc, char *argv[]) TQCString arg2; TQString result; - lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()-1).utf8()); - nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8()); + lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::tqcurrentDate().year()-1).utf8()); + nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::tqcurrentDate().year()+1).utf8()); KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian"); KCmdLineArgs::init( argc, argv, &about); diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp index 268805770..310e222c7 100644 --- a/kioslave/iso/iso.cpp +++ b/kioslave/iso/iso.cpp @@ -130,7 +130,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star fullPath += '/'; kdDebug() << "the full path is " << fullPath << endl; - while ( (pos=fullPath.find( '/', pos+1 )) != -1 ) + while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 ) { TQString tryPath = fullPath.left( pos ); kdDebug() << fullPath << " trying " << tryPath << endl; @@ -150,7 +150,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star path.truncate( len - 1 ); } else - path = TQString::fromLatin1("/"); + path = TQString::tqfromLatin1("/"); kdDebug() << "Found. isoFile=" << isoFile << " path=" << path << endl; break; } @@ -259,10 +259,10 @@ void kio_isoProtocol::listDir( const KURL & url ) if ( path.isEmpty() ) { - KURL redir( TQString::fromLatin1( "iso:/") ); + KURL redir( TQString::tqfromLatin1( "iso:/") ); kdDebug() << "url.path()==" << url.path() << endl; if (url.hasRef()) redir.setRef(url.htmlRef()); - redir.setPath( url.path() + TQString::fromLatin1("/") ); + redir.setPath( url.path() + TQString::tqfromLatin1("/") ); kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); @@ -274,7 +274,7 @@ void kio_isoProtocol::listDir( const KURL & url ) const KArchiveDirectory* dir; if (!path.isEmpty() && path != "/") { - kdDebug() << TQString("Looking for entry %1").arg(path) << endl; + kdDebug() << TQString(TQString("Looking for entry %1").arg(path)) << endl; const KArchiveEntry* e = root->entry( path ); if ( !e ) { @@ -356,7 +356,7 @@ void kio_isoProtocol::stat( const KURL & url ) const KArchiveEntry* isoEntry; if ( path.isEmpty() ) { - path = TQString::fromLatin1( "/" ); + path = TQString::tqfromLatin1( "/" ); isoEntry = root; } else { isoEntry = root->entry( path ); @@ -407,8 +407,8 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat ptrblock_bytes = (nblocks+1) * 4; pointer_block=isoFileEntry->data( hdr->header_size << 2, ptrblock_bytes ); if (pointer_block.size() == ptrblock_bytes && - inbuf.resize(block_size2) && - outbuf.resize(block_size)) { + inbuf.tqresize(block_size2) && + outbuf.tqresize(block_size)) { pptr = pointer_block.data(); } else { diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp index dff111bff..f487ad2f5 100644 --- a/kioslave/iso/kiso.cpp +++ b/kioslave/iso/kiso.cpp @@ -157,7 +157,7 @@ void KIso::prepareDevice( const TQString & filename, { /* 'hack' for Qt's false assumption that only S_ISREG is seekable */ if( "inode/blockdevice" == mimetype ) - setDevice( new QFileHack( filename ) ); + setDevice( TQT_TQIODEVICE(new QFileHack( filename )) ); else { if( "application/x-gzip" == mimetype diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp index afac16b74..9be5dfad1 100644 --- a/kioslave/iso/kisofile.cpp +++ b/kioslave/iso/kisofile.cpp @@ -43,7 +43,7 @@ TQByteArray KIsoFile::data(long long pos, int count) const { int rlen; if ( archive()->device()->at(position()+pos) && - r.resize( ((pos+count) < size()) ? count : size()-pos) ) { + r.tqresize( ((pos+count) < size()) ? count : size()-pos) ) { rlen=archive()->device()->readBlock( r.data(), r.size() ); if (rlen ==- 1) r.resize(0); else if (rlen != (int)r.size()) r.resize(rlen); diff --git a/kjs/internal.cpp b/kjs/internal.cpp index 25f7b6e31..c796cddd5 100644 --- a/kjs/internal.cpp +++ b/kjs/internal.cpp @@ -52,7 +52,7 @@ extern int kjsyyparse(); using namespace KJS; namespace KJS { - /* work around some strict alignment requirements + /* work around some strict tqalignment requirements for double variables on some architectures (e.g. PA-RISC) */ typedef union { unsigned char b[8]; double d; } kjs_double_t; diff --git a/kjs/lexer.cpp b/kjs/lexer.cpp index 054defb88..55a6d8fa5 100644 --- a/kjs/lexer.cpp +++ b/kjs/lexer.cpp @@ -604,7 +604,7 @@ bool Lexer::isIdentLetter(unsigned short c) // Uppercase letter (Lu), Lowercase letter (Ll), // Titlecase letter (Lt)", Modifier letter (Lm), // Other letter (Lo), or Letter number (Nl). - // Also see: http://www.unicode.org/Public/UNIDATA/UnicodeData.txt */ + // Also see: http://www.tqunicode.org/Public/UNIDATA/UnicodeData.txt */ return (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || // A with grave - O with diaeresis diff --git a/kjs/lexer.h b/kjs/lexer.h index c6cb6aa88..da7c5ac7e 100644 --- a/kjs/lexer.h +++ b/kjs/lexer.h @@ -144,7 +144,7 @@ namespace KJS { int bol; // begin of line #endif - // current and following unicode characters (int to allow for -1 for end-of-file marker) + // current and following tqunicode characters (int to allow for -1 for end-of-file marker) int current, next1, next2, next3; UString **strings; diff --git a/kjs/regexp.cpp b/kjs/regexp.cpp index 06defcc53..c10911693 100644 --- a/kjs/regexp.cpp +++ b/kjs/regexp.cpp @@ -38,7 +38,7 @@ RegExp::UTF8SupportState RegExp::utf8Support = RegExp::Unknown; RegExp::RegExp(const UString &p, int f) : pat(p), flgs(f), m_notEmpty(false), valid(true), buffer(0), originalPos(0) { - // Determine whether libpcre has unicode support if need be.. + // Determine whether libpcre has tqunicode support if need be.. #ifdef PCRE_CONFIG_UTF8 if (utf8Support == Unknown) { int supported; @@ -64,13 +64,13 @@ RegExp::RegExp(const UString &p, int f) escape = false; // we only care about \u if (c == 'u') { - // standard unicode escape sequence looks like \uxxxx but + // standard tqunicode escape sequence looks like \uxxxx but // other browsers also accept less then 4 hex digits unsigned short u = 0; int j = 0; for (j = 0; j < 4; ++j) { - if (i + 1 < p.size() && Lexer::isHexDigit(p[i + 1].unicode())) { - u = (u << 4) + Lexer::convertHex(p[i + 1].unicode()); + if (i + 1 < p.size() && Lexer::isHexDigit(p[i + 1].tqunicode())) { + u = (u << 4) + Lexer::convertHex(p[i + 1].tqunicode()); ++i; } else { // sequence incomplete. restore index. @@ -222,7 +222,7 @@ void RegExp::prepareUtf8(const UString& s) int *posOut = originalPos; const UChar *d = s.data(); for (int i = 0; i != length; ++i) { - unsigned short c = d[i].unicode(); + unsigned short c = d[i].tqunicode(); int sequenceLen; if (c < 0x80) { diff --git a/kjs/regexp_object.cpp b/kjs/regexp_object.cpp index edd2bbeca..7ab223d73 100644 --- a/kjs/regexp_object.cpp +++ b/kjs/regexp_object.cpp @@ -292,7 +292,7 @@ RegExp* RegExpObjectImp::makeEngine(ExecState *exec, const UString &p, const Val // Check for validity of flags for (int pos = 0; pos < flags.size(); ++pos) { - switch (flags[pos].unicode()) { + switch (flags[pos].tqunicode()) { case 'g': case 'i': case 'm': diff --git a/kjs/ustring.cpp b/kjs/ustring.cpp index 36f201863..85eadc29c 100644 --- a/kjs/ustring.cpp +++ b/kjs/ustring.cpp @@ -134,7 +134,7 @@ static int statBufferSize = 0; UChar UChar::toLower() const { - // ### properly support unicode tolower + // ### properly support tqunicode tolower if (uc >= 256) return *this; @@ -746,7 +746,7 @@ unsigned int UString::toStrictUInt32(bool *ok) const if (len == 0) return 0; const UChar *p = rep->dat; - unsigned short c = p->unicode(); + unsigned short c = p->tqunicode(); // If the first digit is 0, only 0 itself is OK. if (c == '0') { @@ -782,7 +782,7 @@ unsigned int UString::toStrictUInt32(bool *ok) const } // Get next character. - c = (++p)->unicode(); + c = (++p)->tqunicode(); } } diff --git a/kjs/ustring.h b/kjs/ustring.h index 0cdfa3f0f..70dd3d7d7 100644 --- a/kjs/ustring.h +++ b/kjs/ustring.h @@ -79,7 +79,7 @@ namespace KJS { /** * @return the 16 bit Unicode value of the character */ - unsigned short unicode() const { return uc; } + unsigned short tqunicode() const { return uc; } public: /** * @return The character converted to lower case. @@ -132,7 +132,7 @@ namespace KJS { /** * @return Unicode value. */ - unsigned short unicode() const { return ref().uc; } + unsigned short tqunicode() const { return ref().uc; } /** * @return Lower byte. */ @@ -158,7 +158,7 @@ namespace KJS { int offset; }; - inline UChar::UChar(const UCharReference &c) : uc(c.unicode()) { } + inline UChar::UChar(const UCharReference &c) : uc(c.tqunicode()) { } /** * @short 8 bit char based string class diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 3455fe1e8..7e09ae100 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -90,7 +90,7 @@ DockContainer::DockContainer(TQWidget *parent, TQWidget *win, int position, int m_ws=new TQWidgetStack(this); - m_ws->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); + m_ws->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); if ( (position==KDockWidget::DockLeft) || (position==KDockWidget::DockTop)) { @@ -119,7 +119,7 @@ DockContainer::~DockContainer() it = m_map.begin(); KDockWidget *w=it.key(); if (m_overlapButtons.contains(w)) { - (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); + (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } m_map.remove(w); @@ -149,7 +149,7 @@ void DockContainer::init() if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + parent()->tqqt_cast("KDockSplitter")); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -181,15 +181,15 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt m_revMap.insert(tab,w); - if (((KDockWidget*)parentWidget())->mayBeShow()) - ((KDockWidget*)parentWidget())->dockBack(); + if (((KDockWidget*)tqparentWidget())->mayBeShow()) + ((KDockWidget*)tqparentWidget())->dockBack(); - if (w->getHeader()->qt_cast("KDockWidgetHeader")) + if (w->getHeader()->tqqt_cast("KDockWidgetHeader")) { kdDebug(760)<<"*** KDockWidgetHeader has been found"<<endl; KDockWidgetHeader *hdr=static_cast<KDockWidgetHeader*>(w->getHeader()-> - qt_cast("KDockWidgetHeader")); + tqqt_cast("KDockWidgetHeader")); KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); @@ -257,7 +257,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) break; } KDockWidgetHeader *hdr=static_cast<KDockWidgetHeader*>(w->getHeader()-> - qt_cast("KDockWidgetHeader")); + tqqt_cast("KDockWidgetHeader")); if (!hdr) { kdDebug()<<"Wrong header type in DockContainer::eventFilter"<<endl; break; @@ -337,7 +337,7 @@ void DockContainer::changeOverlapMode() void DockContainer::hideIfNeeded() { kdDebug(760)<<"************************* hideIfNeeded *************************"<<endl; if (!itemNames.count()) - ((KDockWidget*)parentWidget())->undock(); + ((KDockWidget*)tqparentWidget())->undock(); } void DockContainer::removeWidget(KDockWidget* dwdg) @@ -357,7 +357,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg) m_map.remove(w); m_revMap.remove(id); if (m_overlapButtons.contains(w)) { - (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); + (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } KDockContainer::removeWidget(w); @@ -365,7 +365,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg) tabCaptions.remove(w->name()); tabTooltips.remove(w->name()); if (!itemNames.count()) - ((KDockWidget*)parentWidget())->undock(); + ((KDockWidget*)tqparentWidget())->undock(); } void DockContainer::undockWidget(KDockWidget *dwdg) @@ -405,7 +405,7 @@ void DockContainer::tabClicked(int t) } m_ws->raiseWidget(t); if (m_ws->widget(t)) { - KDockWidget *tmpDw=static_cast<KDockWidget*>(m_ws->widget(t)->qt_cast("KDockWidget")); + KDockWidget *tmpDw=static_cast<KDockWidget*>(m_ws->widget(t)->tqqt_cast("KDockWidget")); if (tmpDw) { if (tmpDw->getWidget()) tmpDw->getWidget()->setFocus(); } else kdDebug(760)<<"Something really weird is going on"<<endl; @@ -423,7 +423,7 @@ void DockContainer::tabClicked(int t) if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + parent()->tqqt_cast("KDockSplitter")); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -476,7 +476,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix) if ( parentDockWidget() && parentDockWidget()->parent() ) { KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + parent()->tqqt_cast("KDockSplitter")); if ( sp ) cfg->writeEntry( "separatorPosition", m_separatorPos ); } diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index 882916f30..0522d78a1 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -68,7 +68,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ).arg( actionListName ); + TQString completeDescription = TQString::tqfromLatin1( guiDescription ).arg( actionListName ); setXML( completeDescription, false /*merge*/ ); } @@ -202,7 +202,7 @@ void ToggleToolViewAction::anDWChanged() setChecked(true); else if (isChecked() && (m_dw->parentDockTabGroup() && ((static_cast<KDockWidget*>(m_dw->parentDockTabGroup()-> - parent()->qt_cast("KDockWidget")))->mayBeShow()))) + parent()->tqqt_cast("KDockWidget")))->mayBeShow()))) setChecked(false); } diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index d6e332780..912ad3a1d 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -97,8 +97,8 @@ namespace KMDI { //============ constructor ============// -MainWindow::MainWindow(TQWidget* parentWidget, const char* name) - : KParts::DockMainWindow( parentWidget, name) +MainWindow::MainWindow(TQWidget* tqparentWidget, const char* name) + : KParts::DockMainWindow( tqparentWidget, name) , m_toolViews (new TQMap<TQWidget*,KMDI::ToolViewAccessor*>) , d(new KMDIPrivate::MainWindowPrivate()) { @@ -156,19 +156,19 @@ void MainWindow::setupToolViews () w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } - TQPtrList<KDockWidget> leftReparentWidgets; - TQPtrList<KDockWidget> rightReparentWidgets; - TQPtrList<KDockWidget> bottomReparentWidgets; - TQPtrList<KDockWidget> topReparentWidgets; + TQPtrList<KDockWidget> leftRetqparentWidgets; + TQPtrList<KDockWidget> rightRetqparentWidgets; + TQPtrList<KDockWidget> bottomRetqparentWidgets; + TQPtrList<KDockWidget> topRetqparentWidgets; if (mainDock->parentDockTabGroup()) { mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } - findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft); - findToolViewsDockedToMain(&rightReparentWidgets,KDockWidget::DockRight); - findToolViewsDockedToMain(&bottomReparentWidgets,KDockWidget::DockBottom); - findToolViewsDockedToMain(&topReparentWidgets,KDockWidget::DockTop); + findToolViewsDockedToMain(&leftRetqparentWidgets,KDockWidget::DockLeft); + findToolViewsDockedToMain(&rightRetqparentWidgets,KDockWidget::DockRight); + findToolViewsDockedToMain(&bottomRetqparentWidgets,KDockWidget::DockBottom); + findToolViewsDockedToMain(&topRetqparentWidgets,KDockWidget::DockTop); mainDock->setEnableDocking(KDockWidget::DockNone); //::DockCorner); mainDock->setDockSite(KDockWidget::DockCorner); @@ -220,10 +220,10 @@ void MainWindow::setupToolViews () m_topContainer->setDockSite( KDockWidget::DockCenter ); m_bottomContainer->setDockSite( KDockWidget::DockCenter ); - dockToolViewsIntoContainers(leftReparentWidgets,m_leftContainer); - dockToolViewsIntoContainers(rightReparentWidgets,m_rightContainer); - dockToolViewsIntoContainers(bottomReparentWidgets,m_bottomContainer); - dockToolViewsIntoContainers(topReparentWidgets,m_topContainer); + dockToolViewsIntoContainers(leftRetqparentWidgets,m_leftContainer); + dockToolViewsIntoContainers(rightRetqparentWidgets,m_rightContainer); + dockToolViewsIntoContainers(bottomRetqparentWidgets,m_bottomContainer); + dockToolViewsIntoContainers(topRetqparentWidgets,m_topContainer); dockManager->setSpecialLeftDockContainer(m_leftContainer); dockManager->setSpecialRightDockContainer(m_rightContainer); @@ -311,16 +311,16 @@ void MainWindow::setToolViewStyle(int flag) { d->m_styleIDEAlMode = flag; // see KMultiTabBar for the first 3 bits - DockContainer *tmpL=(DockContainer*) (m_leftContainer->getWidget()->qt_cast("KMDI::DockContainer")); + DockContainer *tmpL=(DockContainer*) (m_leftContainer->getWidget()->tqqt_cast("KMDI::DockContainer")); if (tmpL) tmpL->setStyle(flag); - DockContainer *tmpR=(DockContainer*) (m_rightContainer->getWidget()->qt_cast("KMDI::DockContainer")); + DockContainer *tmpR=(DockContainer*) (m_rightContainer->getWidget()->tqqt_cast("KMDI::DockContainer")); if (tmpR) tmpR->setStyle(flag); - DockContainer *tmpT=(DockContainer*) (m_topContainer->getWidget()->qt_cast("KMDI::DockContainer")); + DockContainer *tmpT=(DockContainer*) (m_topContainer->getWidget()->tqqt_cast("KMDI::DockContainer")); if (tmpT) tmpT->setStyle(flag); - DockContainer *tmpB=(DockContainer*) (m_bottomContainer->getWidget()->qt_cast("KMDI::DockContainer")); + DockContainer *tmpB=(DockContainer*) (m_bottomContainer->getWidget()->tqqt_cast("KMDI::DockContainer")); if (tmpB) tmpB->setStyle(flag); d->m_toolviewStyle = flag; diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h index d7351a330..597bc15f5 100644 --- a/kmdi/kmdi/mainwindow.h +++ b/kmdi/kmdi/mainwindow.h @@ -79,7 +79,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow /** * Constructor. */ - MainWindow ( TQWidget* parentWidget, const char* name = ""); + MainWindow ( TQWidget* tqparentWidget, const char* name = ""); /** * Destructor. diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp index 0d21bd2ea..d4a369b47 100644 --- a/kmdi/kmdi/tabwidget.cpp +++ b/kmdi/kmdi/tabwidget.cpp @@ -182,7 +182,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQString & label, int index) KTabWidget::insertTab(child,label,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -190,7 +190,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const T KTabWidget::insertTab(child,iconset,label,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) @@ -198,7 +198,7 @@ void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) KTabWidget::insertTab(child,tab,index); showPage(child); maybeShow(); - tabBar()->repaint(); + tabBar()->tqrepaint(); } void TabWidget::removePage ( TQWidget * w ) diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp index 21f621ec5..e2707941b 100644 --- a/kmdi/kmdi/toolviewaccessor.cpp +++ b/kmdi/kmdi/toolviewaccessor.cpp @@ -186,8 +186,8 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd if (!DockToOurself) if(pTargetWnd != 0L) { pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd); if (!pTargetDock) { - if (pTargetWnd->parentWidget()) { - pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget()); + if (pTargetWnd->tqparentWidget()) { + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget()); } } } diff --git a/kmdi/kmdi/toolviewaccessor.h b/kmdi/kmdi/toolviewaccessor.h index 180ba56a3..75d9a863e 100644 --- a/kmdi/kmdi/toolviewaccessor.h +++ b/kmdi/kmdi/toolviewaccessor.h @@ -37,7 +37,7 @@ namespace KMDI { class MainWindow; -class ToolViewAccessor : public QObject +class ToolViewAccessor : public TQObject { Q_OBJECT diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp index 923b55372..c4a94597b 100644 --- a/kmdi/kmdichildarea.cpp +++ b/kmdi/kmdichildarea.cpp @@ -420,10 +420,10 @@ void KMdiChildArea::cascadeMaximized() childFrm->move( pnt ); TQSize curSize( width() - pnt.x(), height() - pnt.y() ); - if ( ( childFrm->minimumSize().width() > curSize.width() ) || - ( childFrm->minimumSize().height() > curSize.height() ) ) + if ( ( childFrm->tqminimumSize().width() > curSize.width() ) || + ( childFrm->tqminimumSize().height() > curSize.height() ) ) { - childFrm->resize( childFrm->minimumSize() ); + childFrm->resize( childFrm->tqminimumSize() ); } else childFrm->resize( curSize ); diff --git a/kmdi/kmdichildarea.h b/kmdi/kmdichildarea.h index 37ce3336f..2e4faf6ec 100644 --- a/kmdi/kmdichildarea.h +++ b/kmdi/kmdichildarea.h @@ -49,7 +49,7 @@ class KMdiChildAreaPrivate; * and manages the frame widgets of attached MDI views. * All actions and stuff concerning only to childframes are handled here. */ -class KMDI_EXPORT KMdiChildArea : public QFrame +class KMDI_EXPORT KMdiChildArea : public TQFrame { friend class KMdiChildFrmCaption; friend class KMdiChildFrm; diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index f471cf6c3..162837b2b 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/kmdichildfrm.cpp @@ -278,7 +278,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( !m_pClient ) return; - if ( m_pClient->minimumSize() == m_pClient->maximumSize() ) + if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() ) return; if ( m_bResizing ) @@ -286,7 +286,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( !( e->state() & RightButton ) && !( e->state() & MidButton ) ) { // same as: if no button or left button pressed - TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() ); + TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() ); resizeWindow( m_iResizeCorner, p.x(), p.y() ); } else @@ -329,11 +329,11 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos ) // it could be the client forces the childframe to enlarge its minimum size if ( m_pClient ) { - minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; - minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; + minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR; - maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; - maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; + maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR; } @@ -524,7 +524,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) // client min / max size / layout behavior don't change // set frame max size indirectly by setting the clients max size to // it's current value (calls setMaxSize() of frame) - m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() ); + m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); setGeometry( m_restoredRect ); break; @@ -608,8 +608,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) m_pClient->m_stateChanged = true; m_state = state; // save client min / max size / layout behavior - m_oldClientMinSize = m_pClient->minimumSize(); - m_oldClientMaxSize = m_pClient->maximumSize(); + m_oldClientMinSize = m_pClient->tqminimumSize(); + m_oldClientMaxSize = m_pClient->tqmaximumSize(); if ( m_pClient->layout() != 0L ) { m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); @@ -627,8 +627,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) m_pClient->m_stateChanged = true; m_state = state; // save client min / max size / layout behavior - m_oldClientMinSize = m_pClient->minimumSize(); - m_oldClientMaxSize = m_pClient->maximumSize(); + m_oldClientMinSize = m_pClient->tqminimumSize(); + m_oldClientMaxSize = m_pClient->tqmaximumSize(); if ( m_pClient->layout() != 0L ) { m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); @@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text ) void KMdiChildFrm::enableClose( bool bEnable ) { m_pClose->setEnabled( bEnable ); - m_pClose->repaint( false ); + m_pClose->tqrepaint( false ); } //============ setIcon ==================// @@ -779,8 +779,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) { //reparent to this widget , no flags , point , show it TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos ); - TQSize mincs = w->minimumSize(); - TQSize maxcs = w->maximumSize(); + TQSize mincs = w->tqminimumSize(); + TQSize maxcs = w->tqmaximumSize(); w->setMinimumSize( 0, 0 ); w->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); @@ -798,11 +798,11 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() ) - setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); + setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() ) { - setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR ); } } @@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) if ( focusedChildWidget != 0 ) nameOfFocusedWidget = focusedChildWidget->name(); - TQSize mins = m_pClient->minimumSize(); - TQSize maxs = m_pClient->maximumSize(); + TQSize mins = m_pClient->tqminimumSize(); + TQSize maxs = m_pClient->tqmaximumSize(); m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() ); m_pClient->setMinimumSize( mins.width(), mins.height() ); m_pClient->setMaximumSize( maxs.width(), maxs.height() ); @@ -1105,7 +1105,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // in case we didn't click on the icon button TQFocusEvent focusEvent( TQFocusEvent::FocusIn ); - TQApplication::sendEvent( qApp->mainWidget(), &focusEvent ); + TQApplication::sendEvent( tqApp->mainWidget(), &focusEvent ); if ( m_pClient ) { m_pClient->updateTimeStamp(); @@ -1177,7 +1177,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) // child and its children (as we did when we got our client). // XXX see linkChildren() and focus policy stuff TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child(); - if ( ( pNewChild != 0L ) && ::qt_cast<TQWidget*>( pNewChild ) ) + if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) ) { TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild ); TQObjectList *list = pNewWidget->queryList( "TQWidget" ); @@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - if ( !::qt_cast<TQPopupMenu*>( widg ) ) + if ( !::tqqt_cast<TQPopupMenu*>( widg ) ) { widg->installEventFilter( this ); } @@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons() TQRect KMdiChildFrm::mdiAreaContentsRect() const { - TQFrame * p = ( TQFrame* ) parentWidget(); + TQFrame * p = ( TQFrame* ) tqparentWidget(); if ( p ) { return p->contentsRect(); diff --git a/kmdi/kmdichildfrm.h b/kmdi/kmdichildfrm.h index 23435479e..d9e3ed922 100644 --- a/kmdi/kmdichildfrm.h +++ b/kmdi/kmdichildfrm.h @@ -49,7 +49,7 @@ class TQToolButton; * @short Internal class, only used on Win32. * This class provides a label widget that can process mouse click events. */ -class KMDI_EXPORT KMdiWin32IconButton : public QLabel +class KMDI_EXPORT KMdiWin32IconButton : public TQLabel { Q_OBJECT public: @@ -68,7 +68,7 @@ signals: * @short a TQCustomEvent for move * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmMoveEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmMoveEvent : public TQCustomEvent { public: KMdiChildFrmMoveEvent( TQMoveEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_Move ) ), e ) {} @@ -80,7 +80,7 @@ public: * @short a TQCustomEvent for begin of dragging * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmDragBeginEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmDragBeginEvent : public TQCustomEvent { public: KMdiChildFrmDragBeginEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_DragBegin ) ), e ) {} @@ -91,7 +91,7 @@ public: * @short a TQCustomEvent for end of dragging * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmDragEndEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmDragEndEvent : public TQCustomEvent { public: KMdiChildFrmDragEndEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_DragEnd ) ), e ) {} @@ -102,7 +102,7 @@ public: * @short a TQCustomEvent for begin of resizing * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmResizeBeginEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmResizeBeginEvent : public TQCustomEvent { public: KMdiChildFrmResizeBeginEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_ResizeBegin ) ), e ) {} @@ -113,7 +113,7 @@ public: * @short a TQCustomEvent for end of resizing * This special event will be useful, to inform view about child frame event. */ -class KMDI_EXPORT KMdiChildFrmResizeEndEvent : public QCustomEvent +class KMDI_EXPORT KMdiChildFrmResizeEndEvent : public TQCustomEvent { public: KMdiChildFrmResizeEndEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_ResizeEnd ) ), e ) {} @@ -127,7 +127,7 @@ class KMdiChildFrmPrivate; * It's an MDI child frame widget. It contains a view widget and a frame caption. Usually you derive from its view. */ //------------------------------------------------------------------------------ -class KMDI_EXPORT KMdiChildFrm : public QFrame +class KMDI_EXPORT KMdiChildFrm : public TQFrame { friend class KMdiChildArea; friend class KMdiChildFrmCaption; diff --git a/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp index 65d348f30..b92eda26e 100644 --- a/kmdi/kmdichildfrmcaption.cpp +++ b/kmdi/kmdichildfrmcaption.cpp @@ -163,7 +163,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e ) TQPoint mousePosInChildArea = relMousePosInChildArea - m_offset; // set new child frame position - parentWidget() ->move( mousePosInChildArea ); + tqparentWidget() ->move( mousePosInChildArea ); } //=============== setActive ===============// @@ -182,7 +182,7 @@ void KMdiChildFrmCaption::setActive( bool bActive ) m_pParent->m_pManager->m_captionInactiveBackColor ); m_bActive = bActive; - repaint( false ); + tqrepaint( false ); } //=============== setCaption ===============// @@ -190,7 +190,7 @@ void KMdiChildFrmCaption::setActive( bool bActive ) void KMdiChildFrmCaption::setCaption( const TQString& text ) { m_szCaption = text; - repaint( false ); + tqrepaint( false ); } //============== heightHint ===============// diff --git a/kmdi/kmdichildfrmcaption.h b/kmdi/kmdichildfrmcaption.h index 1bc47ac1f..1c5ec0c86 100644 --- a/kmdi/kmdichildfrmcaption.h +++ b/kmdi/kmdichildfrmcaption.h @@ -41,7 +41,7 @@ class KMdiChildFrmCaptionPrivate; * * It's the caption bar of a child frame widget. */ -class KMDI_EXPORT KMdiChildFrmCaption : public QWidget +class KMDI_EXPORT KMdiChildFrmCaption : public TQWidget { Q_OBJECT public: diff --git a/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp index 37414fe0a..1aad3c36f 100644 --- a/kmdi/kmdichildview.cpp +++ b/kmdi/kmdichildview.cpp @@ -44,8 +44,8 @@ //============ KMdiChildView ============// -KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, const char* name, WFlags f ) - : TQWidget( parentWidget, name, f ) +KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, const char* name, WFlags f ) + : TQWidget( tqparentWidget, name, f ) , m_focusedChildWidget( 0L ) , m_firstFocusableChildWidget( 0L ) , m_lastFocusableChildWidget( 0L ) @@ -73,8 +73,8 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c //============ KMdiChildView ============// -KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f ) - : TQWidget( parentWidget, name, f ) +KMdiChildView::KMdiChildView( TQWidget* tqparentWidget, const char* name, WFlags f ) + : TQWidget( tqparentWidget, name, f ) , m_focusedChildWidget( 0L ) , m_firstFocusableChildWidget( 0L ) , m_lastFocusableChildWidget( 0L ) diff --git a/kmdi/kmdichildview.h b/kmdi/kmdichildview.h index 656c17fd7..75b05bb74 100644 --- a/kmdi/kmdichildview.h +++ b/kmdi/kmdichildview.h @@ -105,7 +105,7 @@ class KMdiChildViewPrivate; * */ -class KMDI_EXPORT KMdiChildView : public QWidget +class KMDI_EXPORT KMdiChildView : public TQWidget { friend class KMdiMainFrm; friend class KMdiChildFrm; @@ -182,13 +182,13 @@ public: /** * Constructor */ - KMdiChildView( const TQString& caption, TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 ); + KMdiChildView( const TQString& caption, TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 ); /** * Constructor * sets "Unnamed" as default caption */ - KMdiChildView( TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 ); + KMdiChildView( TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 ); /** * Destructor @@ -358,7 +358,7 @@ public: */ inline void updateTimeStamp() { - m_time.setDate( TQDate::currentDate() ); + m_time.setDate( TQDate::tqcurrentDate() ); m_time.setTime( TQTime::currentTime() ); } @@ -603,7 +603,7 @@ private: inline KMdiChildFrm *KMdiChildView::mdiParent() const { - TQWidget * pw = parentWidget(); + TQWidget * pw = tqparentWidget(); if ( pw != 0L ) if ( pw->inherits( "KMdiChildFrm" ) ) return ( KMdiChildFrm * ) pw; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index df82a4e6c..8304aa168 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -104,7 +104,7 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit m_ws = new TQWidgetStack( this ); - m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + m_ws->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); //layout the tabbar if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop ) @@ -140,7 +140,7 @@ KMdiDockContainer::~KMdiDockContainer() KDockWidget *w = it.key(); if ( m_overlapButtons.contains( w ) ) { - ( static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); + ( static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); m_overlapButtons.remove( w ); } m_map.remove( w ); @@ -172,7 +172,7 @@ void KMdiDockContainer::init() // try to restore splitter size if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->tqqt_cast( "KDockSplitter" ) ); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -204,15 +204,15 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const m_map.insert( w, tab ); m_revMap.insert( tab, w ); - if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() ) - ( ( KDockWidget* ) parentWidget() ) ->dockBack(); + if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() ) + ( ( KDockWidget* ) tqparentWidget() ) ->dockBack(); - if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) + if ( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ) { kdDebug( 760 ) << k_funcinfo << "The dockwidget we're adding has a header" << endl; kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl; - KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ); + KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ); KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) ); @@ -272,7 +272,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) break; } - KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ); + KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ); if ( !hdr ) { kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl; @@ -362,7 +362,7 @@ void KMdiDockContainer::hideIfNeeded() if ( itemNames.count() == 0 ) { kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl; - ( ( KDockWidget* ) parentWidget() )->undock(); + ( ( KDockWidget* ) tqparentWidget() )->undock(); } } @@ -387,7 +387,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg ) m_revMap.remove( id ); if ( m_overlapButtons.contains( w ) ) { - ( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); + ( static_cast<KDockWidgetHeader*>( w->getHeader() ->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); m_overlapButtons.remove( w ); } KDockContainer::removeWidget( w ); @@ -442,7 +442,7 @@ void KMdiDockContainer::tabClicked( int t ) if ( m_ws->widget( t ) ) { m_ws->raiseWidget( t ); - KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->qt_cast( "KDockWidget" ) ); + KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->tqqt_cast( "KDockWidget" ) ); if ( tmpDw ) { if ( tmpDw->getWidget() ) @@ -467,7 +467,7 @@ void KMdiDockContainer::tabClicked( int t ) // try save splitter position if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->tqqt_cast( "KDockSplitter" ) ); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -639,7 +639,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) if ( parentDockWidget() && parentDockWidget() ->parent() ) { KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() -> - parent() ->qt_cast( "KDockSplitter" ) ); + parent() ->tqqt_cast( "KDockSplitter" ) ); if ( sp ) cfg->writeEntry( "separatorPosition", m_separatorPos ); } diff --git a/kmdi/kmdidocumentviewtabwidget.cpp b/kmdi/kmdidocumentviewtabwidget.cpp index 90b618e47..7656bb358 100644 --- a/kmdi/kmdidocumentviewtabwidget.cpp +++ b/kmdi/kmdidocumentviewtabwidget.cpp @@ -54,7 +54,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l KTabWidget::insertTab( child, label, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -62,7 +62,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & KTabWidget::insertTab( child, iconset, label, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index ) @@ -70,7 +70,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i KTabWidget::insertTab( child, tab, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->repaint(); + tabBar() ->tqrepaint(); } void KMdiDocumentViewTabWidget::removePage ( TQWidget * w ) @@ -140,7 +140,7 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( ) } -#ifndef NO_INCLUDE_MOCFILES +#ifndef NO_INCLUDE_TQMOCFILES #include "kmdidocumentviewtabwidget.moc" #endif diff --git a/kmdi/kmdifocuslist.h b/kmdi/kmdifocuslist.h index 71e2f05cb..37c98e8db 100644 --- a/kmdi/kmdifocuslist.h +++ b/kmdi/kmdifocuslist.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <kdelibs_export.h> -class KMDI_EXPORT KMdiFocusList: public QObject +class KMDI_EXPORT KMdiFocusList: public TQObject { Q_OBJECT public: diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp index 6279253bc..c94f2488f 100644 --- a/kmdi/kmdiguiclient.cpp +++ b/kmdi/kmdiguiclient.cpp @@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged() setChecked( true ); else if ( isChecked() && ( m_dw->parentDockTabGroup() && ( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() -> - parent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) + parent() ->tqqt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) setChecked( false ); } @@ -128,7 +128,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::fromLatin1( guiDescription ) + TQString completeDescription = TQString::tqfromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index e62b61cb2..942919230 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -136,8 +136,8 @@ public: }; //============ constructor ============// -KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags ) - : KParts::DockMainWindow( parentWidget, name, flags ) +KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags ) + : KParts::DockMainWindow( tqparentWidget, name, flags ) , m_mdiMode( KMdi::UndefinedMode ) , m_pMdi( 0L ) , m_pTaskBar( 0L ) @@ -294,7 +294,7 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) //============ ~KMdiMainFrm ============// KMdiMainFrm::~KMdiMainFrm() { - //save the children first to a list, as removing invalidates our iterator + //save the children first to a list, as removing tqinvalidates our iterator TQValueList<KMdiChildView*> children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) children.append( w ); @@ -391,7 +391,7 @@ void KMdiMainFrm::slot_toggleTaskBar() void KMdiMainFrm::resizeEvent( TQResizeEvent *e ) { - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) { if ( e->oldSize().height() != e->size().height() ) return ; @@ -406,7 +406,7 @@ void KMdiMainFrm::resizeEvent( TQResizeEvent *e ) void KMdiMainFrm::setMinimumSize( int minw, int minh ) { - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) return ; DockMainWindow::setMinimumSize( minw, minh ); } @@ -627,7 +627,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic lpC->setClient( pWnd, bAutomaticResize ); lpC->setFocus(); pWnd->youAreAttached( lpC ); - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -701,7 +701,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef Q_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); + XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() ); } #endif @@ -711,7 +711,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef Q_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); + XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() ); } #endif @@ -772,12 +772,12 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) m_pDockbaseOfTabPage = m_pDockbaseAreaOfDocumentViews; m_pClose->hide(); } - KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget(); + KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget(); pWnd->reparent( 0L, TQPoint( 0, 0 ) ); pDockW->setWidget( 0L ); if ( pDockW == m_pDockbaseOfTabPage ) { - TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget(); + TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget(); int cnt = pTab->count(); m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 ); if ( pDockW == m_pDockbaseOfTabPage ) @@ -874,12 +874,12 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar ) m_pClose->hide(); } #if 0 - KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget(); + KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget(); pWnd->reparent( 0L, TQPoint( 0, 0 ) ); pDockW->setWidget( 0L ); if ( pDockW == m_pDockbaseOfTabPage ) { - TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget(); + TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget(); int cnt = pTab->count(); m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 ); if ( pDockW == m_pDockbaseOfTabPage ) @@ -1234,7 +1234,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e ) */ void KMdiMainFrm::closeAllViews() { - //save the children first to a list, as removing invalidates our iterator + //save the children first to a list, as removing tqinvalidates our iterator TQValueList<KMdiChildView*> children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) { @@ -1296,13 +1296,13 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis // find the oldest ancestor of the current dockwidget that can be undocked while ( !pW->isTopLevel() ) { - if ( ::qt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) + if ( ::tqqt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) { undockCandidate = static_cast<KDockWidget*>( pW ); if ( undockCandidate->enableDocking() != KDockWidget::DockNone ) rootDockWindow = undockCandidate; } - pW = pW->parentWidget(); + pW = pW->tqparentWidget(); } if ( rootDockWindow ) @@ -1395,7 +1395,7 @@ void KMdiMainFrm::switchToToplevelMode() setMainDockWidget( m_pDockbaseAreaOfDocumentViews ); } // TQApplication::sendPostedEvents(); //why do we need to empty the event queue? - if ( !parentWidget() ) + if ( !tqparentWidget() ) { //if we don't have a parent widget ( which i expect we wouldn't ) //make sure we take into account the size of the docks provided by @@ -1556,7 +1556,7 @@ void KMdiMainFrm::switchToChildframeMode() if ( !pView->isToolView() ) pView->show(); } - if ( ( oldMdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( oldMdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -1659,10 +1659,10 @@ void KMdiMainFrm::finishTabPageMode() if ( pView->isToolView() ) continue; kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl; - TQSize mins = pView->minimumSize(); - TQSize maxs = pView->maximumSize(); + TQSize mins = pView->tqminimumSize(); + TQSize maxs = pView->tqmaximumSize(); TQSize sz = pView->size(); - TQWidget* pParent = pView->parentWidget(); + TQWidget* pParent = pView->tqparentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); m_documentTabWidget->removePage( pView ); pView->reparent( 0, 0, p ); @@ -1688,7 +1688,7 @@ void KMdiMainFrm::finishTabPageMode() void KMdiMainFrm::setupTabbedDocumentViewSpace() { // resize to childframe mode size of the mainwindow if we were in toplevel mode - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -1739,28 +1739,28 @@ void KMdiMainFrm::setIDEAlModeStyle( int flags ) d->m_styleIDEAlMode = flags; // see KMultiTabBar for the first 3 bits if ( m_leftContainer ) { - KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) ); if ( tmpL ) tmpL->setStyle( flags ); } if ( m_rightContainer ) { - KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) ); if ( tmpR ) tmpR->setStyle( flags ); } if ( m_topContainer ) { - KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) ); if ( tmpT ) tmpT->setStyle( flags ); } if ( m_bottomContainer ) { - KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->tqqt_cast( "KMdiDockContainer" ) ); if ( tmpB ) tmpB->setStyle( flags ); } @@ -1933,18 +1933,18 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() if ( mainDock->parentDockTabGroup() ) w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); - TQPtrList<KDockWidget> leftReparentWidgets; - TQPtrList<KDockWidget> rightReparentWidgets; - TQPtrList<KDockWidget> bottomReparentWidgets; - TQPtrList<KDockWidget> topReparentWidgets; + TQPtrList<KDockWidget> leftRetqparentWidgets; + TQPtrList<KDockWidget> rightRetqparentWidgets; + TQPtrList<KDockWidget> bottomRetqparentWidgets; + TQPtrList<KDockWidget> topRetqparentWidgets; if ( mainDock->parentDockTabGroup() ) mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); - findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); - findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); - findToolViewsDockedToMain( &bottomReparentWidgets, KDockWidget::DockBottom ); - findToolViewsDockedToMain( &topReparentWidgets, KDockWidget::DockTop ); + findToolViewsDockedToMain( &leftRetqparentWidgets, KDockWidget::DockLeft ); + findToolViewsDockedToMain( &rightRetqparentWidgets, KDockWidget::DockRight ); + findToolViewsDockedToMain( &bottomRetqparentWidgets, KDockWidget::DockBottom ); + findToolViewsDockedToMain( &topRetqparentWidgets, KDockWidget::DockTop ); mainDock->setEnableDocking( KDockWidget::DockNone ); //::DockCorner); mainDock->setDockSite( KDockWidget::DockCorner ); @@ -1996,10 +1996,10 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() m_topContainer->setDockSite( KDockWidget::DockCenter ); m_bottomContainer->setDockSite( KDockWidget::DockCenter ); - dockToolViewsIntoContainers( leftReparentWidgets, m_leftContainer ); - dockToolViewsIntoContainers( rightReparentWidgets, m_rightContainer ); - dockToolViewsIntoContainers( bottomReparentWidgets, m_bottomContainer ); - dockToolViewsIntoContainers( topReparentWidgets, m_topContainer ); + dockToolViewsIntoContainers( leftRetqparentWidgets, m_leftContainer ); + dockToolViewsIntoContainers( rightRetqparentWidgets, m_rightContainer ); + dockToolViewsIntoContainers( bottomRetqparentWidgets, m_bottomContainer ); + dockToolViewsIntoContainers( topRetqparentWidgets, m_topContainer ); dockManager->setSpecialLeftDockContainer( m_leftContainer ); @@ -2075,10 +2075,10 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) KMdiChildView* pView = it.current(); if ( pView->isToolView() ) continue; - TQSize mins = pView->minimumSize(); - TQSize maxs = pView->maximumSize(); + TQSize mins = pView->tqminimumSize(); + TQSize maxs = pView->tqmaximumSize(); TQSize sz = pView->size(); - TQWidget* pParent = pView->parentWidget(); + TQWidget* pParent = pView->tqparentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); pView->reparent( 0, 0, p ); pView->reparent( 0, 0, p ); @@ -2101,7 +2101,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) } else { - pParent = pParent->parentWidget(); + pParent = pParent->tqparentWidget(); } } while ( pParent && !pDockW ); @@ -2262,10 +2262,10 @@ void KMdiMainFrm::setSysButtonsAtMenuPosition() { if ( m_pMainMenuBar == 0L ) return ; - if ( m_pMainMenuBar->parentWidget() == 0L ) + if ( m_pMainMenuBar->tqparentWidget() == 0L ) return ; - int menuW = m_pMainMenuBar->parentWidget() ->width(); + int menuW = m_pMainMenuBar->tqparentWidget() ->width(); int h; int y; if ( frameDecorOfAttachedViews() == KMdi::Win95Look ) @@ -2357,7 +2357,7 @@ void KMdiMainFrm::activateFirstWin() return ; TQDateTime current = activeWindow() ->getTimeStamp(); - TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) ); + TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) ); TQMap<TQDateTime, KMdiChildView*>::iterator newPos = pos; if ( pos != m.end() ) { @@ -2390,7 +2390,7 @@ void KMdiMainFrm::activateLastWin() return ; TQDateTime current = activeWindow() ->getTimeStamp(); - TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) ); + TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) ); if ( pos != m.begin() ) { --pos; diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h index 47ca34b9f..772ecc779 100644 --- a/kmdi/kmdimainfrm.h +++ b/kmdi/kmdimainfrm.h @@ -69,7 +69,7 @@ class KMdiMainFrmPrivate; * * This special event is needed because the view has to inform the main frame that it`s being closed. */ -class KMDI_EXPORT KMdiViewCloseEvent : public QCustomEvent +class KMDI_EXPORT KMdiViewCloseEvent : public TQCustomEvent { public: KMdiViewCloseEvent( KMdiChildView* pWnd ) : TQCustomEvent( TQEvent::User, pWnd ) {} @@ -98,7 +98,7 @@ public: * * \code * MyMainWindow mainframe; - * qApp->setMainWidget(&mainframe); + * tqApp->setMainWidget(&mainframe); * mainframe->addWindow(view1); // put it under MDI control * mainframe->addWindow(view2); * \endcode @@ -142,7 +142,7 @@ public: * use fakeSDIApplication() to fake it and isFakingSDIApplication() to query whether or not an SDI * interface is being faked. * - * You can dynamically change the shape of the attached MDI views using setFrameDecorOfAttachedViews(). + * You can dynamically change the tqshape of the attached MDI views using setFrameDecorOfAttachedViews(). * * Additionally, here's a hint how to restore the mainframe's settings from config file: * \code @@ -296,7 +296,7 @@ private: // methods public: - KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose ); + KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose ); virtual ~KMdiMainFrm(); /** diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp index 71c3de454..ae8ae0a09 100644 --- a/kmdi/kmditaskbar.cpp +++ b/kmdi/kmditaskbar.cpp @@ -102,7 +102,7 @@ void KMdiTaskBarButton::fitText( const TQString& origStr, int newWidth ) { TQButton::setText( m_actualText ); - int actualWidth = sizeHint().width(); + int actualWidth = tqsizeHint().width(); int realLetterCount = origStr.length(); int newLetterCount = ( newWidth * realLetterCount ) / actualWidth; int w = newWidth + 1; @@ -337,16 +337,16 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) // if there's enough space, use actual width int buttonCount = m_pButtonList->count(); int tbHandlePixel; - tbHandlePixel = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); - int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; - if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) ) + tbHandlePixel = style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; + if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) ) { for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) { b->setText( b->actualText() ); - if ( b->width() != b->sizeHint().width() ) + if ( b->width() != b->tqsizeHint().width() ) { - b->setFixedWidth( b->sizeHint().width() ); + b->setFixedWidth( b->tqsizeHint().width() ); b->show(); } } diff --git a/kmdi/kmditaskbar.h b/kmdi/kmditaskbar.h index 39c4efa2e..de6f0f51d 100644 --- a/kmdi/kmditaskbar.h +++ b/kmdi/kmditaskbar.h @@ -48,7 +48,7 @@ class KMdiTaskBarButtonPrivate; * It's a special kind of TQPushButton catching mouse clicks. * And you have the ability to abbreviate the text that it fits in the button. */ -class KMDI_EXPORT KMdiTaskBarButton : public QPushButton +class KMDI_EXPORT KMdiTaskBarButton : public TQPushButton { Q_OBJECT // methods diff --git a/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp index 1d2cce946..3de517d6c 100644 --- a/kmdi/kmditoolviewaccessor.cpp +++ b/kmdi/kmditoolviewaccessor.cpp @@ -222,9 +222,9 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd ); if ( !pTargetDock ) { - if ( pTargetWnd->parentWidget() ) + if ( pTargetWnd->tqparentWidget() ) { - pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget() ); + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget() ); } } } @@ -262,7 +262,7 @@ void KMdiToolViewAccessor::show() } -#ifndef NO_INCLUDE_MOCFILES +#ifndef NO_INCLUDE_TQMOCFILES #include "kmditoolviewaccessor.moc" #endif // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/kmdi/kmditoolviewaccessor.h b/kmdi/kmditoolviewaccessor.h index 28241ea3b..a58375ec8 100644 --- a/kmdi/kmditoolviewaccessor.h +++ b/kmdi/kmditoolviewaccessor.h @@ -35,7 +35,7 @@ class KMDIGUIClient; } -class KMDI_EXPORT KMdiToolViewAccessor : public QObject +class KMDI_EXPORT KMdiToolViewAccessor : public TQObject { Q_OBJECT diff --git a/kmdi/test/hello.cpp b/kmdi/test/hello.cpp index d92233ea6..a560a8902 100644 --- a/kmdi/test/hello.cpp +++ b/kmdi/test/hello.cpp @@ -18,8 +18,8 @@ Constructs a Hello widget. Starts a 40 ms animation timer. */ -Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) - : KMdiChildView(title, parentWidget), t(text), b(0) +Hello::Hello( const char *title, const char *text, TQWidget *tqparentWidget ) + : KMdiChildView(title, tqparentWidget), t(text), b(0) { TQTimer *timer = new TQTimer(this); TQObject::connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) ); @@ -36,7 +36,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) void Hello::animate() { b = (b + 1) & 15; - repaint( false ); + tqrepaint( false ); } diff --git a/kmdi/test/hello.h b/kmdi/test/hello.h index 808d25b90..762318d87 100644 --- a/kmdi/test/hello.h +++ b/kmdi/test/hello.h @@ -22,7 +22,7 @@ class Hello : public KMdiChildView { Q_OBJECT public: - Hello( const char *title, const char *text, TQWidget* parentWidget = 0 ); + Hello( const char *title, const char *text, TQWidget* tqparentWidget = 0 ); signals: void clicked(); protected: diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index 4e1d298c8..521d13f24 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -225,7 +225,7 @@ void DownloadDialog::addProvider(Provider *p) if(m_map.count() == 0) { - frame = addPage(i18n("Welcome"), i18n("Welcome"), TQPixmap("")); + frame = addPage(i18n("Welcome"), i18n("Welcome"), TQPixmap(TQString(""))); delete frame; } @@ -399,7 +399,7 @@ int DownloadDialog::installStatus(Entry *entry) if(datestring.isNull()) installed = 0; else { - date = TQDate::fromString(datestring, Qt::ISODate); + date = TQT_TQDATE_OBJECT(TQDate::fromString(datestring, Qt::ISODate)); if(!date.isValid()) installed = 0; else if(date < entry->releaseDate()) installed = -1; else installed = 1; @@ -421,19 +421,19 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) TQString lang = KGlobal::locale()->language(); - if(variants.contains("score")) + if(variants.tqcontains("score")) { KListViewItem *tmp_r = new NumSortListViewItem(lv_r, entry->name(lang), entry->version(), TQString("%1").arg(entry->rating())); tmp_r->setPixmap(0, pix); } - if(variants.contains("downloads")) + if(variants.tqcontains("downloads")) { KListViewItem *tmp_d = new NumSortListViewItem(lv_d, entry->name(lang), entry->version(), TQString("%1").arg(entry->downloads())); tmp_d->setPixmap(0, pix); } - if(variants.contains("latest")) + if(variants.tqcontains("latest")) { KListViewItem *tmp_l = new DateSortListViewItem(lv_l, entry->name(lang), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate())); @@ -547,7 +547,7 @@ void DownloadDialog::slotInstall() void DownloadDialog::install(Entry *e) { kapp->config()->setGroup("KNewStuffStatus"); - kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate)); + kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate))); kapp->config()->sync(); TQPixmap pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); @@ -559,11 +559,11 @@ void DownloadDialog::install(Entry *e) m_entryitem->setPixmap(0, pix); TQListViewItem *item; - item = lv_r->findItem(e->name(lang), 0); + item = lv_r->tqfindItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); - item = lv_d->findItem(e->name(lang), 0); + item = lv_d->tqfindItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); - item = lv_l->findItem(e->name(lang), 0); + item = lv_l->tqfindItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); } @@ -585,7 +585,7 @@ void DownloadDialog::slotInstalled(KIO::Job *job) bool ret = job && (job->error() == 0); if(ret) { - KIO::FileCopyJob *cjob = ::qt_cast<KIO::FileCopyJob*>(job); + KIO::FileCopyJob *cjob = ::tqqt_cast<KIO::FileCopyJob*>(job); if(cjob) { ret = m_s->install(cjob->destURL().path()); @@ -651,19 +651,19 @@ void DownloadDialog::slotSelected() if(m_curtab != 0) { lv_r->clearSelection(); - item = lv_r->findItem(e->name(lang), 0); + item = lv_r->tqfindItem(e->name(lang), 0); if(item) lv_r->setSelected(item, true); } if(m_curtab != 1) { lv_d->clearSelection(); - item = lv_d->findItem(e->name(lang), 0); + item = lv_d->tqfindItem(e->name(lang), 0); if(item) lv_d->setSelected(item, true); } if(m_curtab != 2) { lv_l->clearSelection(); - item = lv_l->findItem(e->name(lang), 0); + item = lv_l->tqfindItem(e->name(lang), 0); if(item) lv_l->setSelected(item, true); } @@ -743,7 +743,7 @@ void DownloadDialog::slotPage(TQWidget *w) kdDebug() << "changed widget!!!" << endl; - if(m_map.find(w) == m_map.end()) return; + if(m_map.tqfind(w) == m_map.end()) return; d->m_page = w; @@ -794,7 +794,7 @@ void DownloadDialog::loadProvider(Provider *p) for(TQStringList::Iterator it = variants.begin(); it != variants.end(); it++) { TQString url = p->downloadUrlVariant((*it)).url(); - if(!urls.contains(url)) + if(!urls.tqcontains(url)) { urls[url] = TQStringList(); } diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp index 799ce9898..bfb1135dd 100644 --- a/knewstuff/engine.cpp +++ b/knewstuff/engine.cpp @@ -46,8 +46,8 @@ struct Engine::Private }; Engine::Engine( KNewStuff *newStuff, const TQString &type, - TQWidget *parentWidget ) : - mParentWidget( parentWidget ), mDownloadDialog( 0 ), + TQWidget *tqparentWidget ) : + mParentWidget( tqparentWidget ), mDownloadDialog( 0 ), mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ), d(new Private), mType( type ) { @@ -57,8 +57,8 @@ Engine::Engine( KNewStuff *newStuff, const TQString &type, } Engine::Engine( KNewStuff *newStuff, const TQString &type, - const TQString &providerList, TQWidget *parentWidget ) : - mParentWidget( parentWidget ), + const TQString &providerList, TQWidget *tqparentWidget ) : + mParentWidget( tqparentWidget ), mDownloadDialog( 0 ), mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ), mProviderList( providerList ), d(new Private), @@ -164,7 +164,7 @@ void Engine::slotNewStuffJobResult( KIO::Job *job ) kdDebug() << " SUMMARY: " << entry->summary() << endl; kdDebug() << " VERSION: " << entry->version() << endl; - kdDebug() << " RELEASEDATE: " << entry->releaseDate().toString() << endl; + kdDebug() << " RELEASEDATE: " << TQString(entry->releaseDate().toString()) << endl; kdDebug() << " RATING: " << entry->rating() << endl; kdDebug() << " LANGS: " << entry->langs().join(", ") << endl; diff --git a/knewstuff/engine.h b/knewstuff/engine.h index d3834566f..14c7e2b3d 100644 --- a/knewstuff/engine.h +++ b/knewstuff/engine.h @@ -48,7 +48,7 @@ class ProviderDialog; * \par Maintainer: * Josef Spillner (spillner@kde.org) */ -class KDE_EXPORT Engine : public QObject +class KDE_EXPORT Engine : public TQObject { Q_OBJECT struct Private; @@ -58,18 +58,18 @@ class KDE_EXPORT Engine : public QObject @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" - @param parentWidget the parent window + @param tqparentWidget the parent window */ - Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 ); + Engine( KNewStuff *newStuff, const TQString &type, TQWidget *tqparentWidget = 0 ); /** Constructor. @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" @param providerList the URL of the provider list - @param parentWidget the parent window + @param tqparentWidget the parent window */ - Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); + Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 ); /** Destructor. @@ -88,7 +88,7 @@ class KDE_EXPORT Engine : public QObject @return parent widget */ - TQWidget *parentWidget() const { return mParentWidget; } + TQWidget *tqparentWidget() const { return mParentWidget; } /** Initiates the download process, retrieving provider lists and invoking diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp index cdbf4dbe7..e224bb0a3 100644 --- a/knewstuff/entry.cpp +++ b/knewstuff/entry.cpp @@ -47,11 +47,11 @@ static EntryPrivate *d(const Entry *e) d_ptr = new TQPtrDict<EntryPrivate>(); d_ptr->setAutoDelete(true); } - EntryPrivate *ret = d_ptr->find((void*)e); + EntryPrivate *ret = d_ptr->tqfind((void*)e); if(!ret) { ret = new EntryPrivate(); - d_ptr->replace((void*)e, ret); + d_ptr->tqreplace((void*)e, ret); } return ret; } @@ -84,7 +84,7 @@ void Entry::setName( const TQString &name, const TQString &lang ) { d(this)->mNameMap.insert( lang, name ); - if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); } // BCI part ends here @@ -105,7 +105,7 @@ Entry::~Entry() { if (d_ptr) { - EntryPrivate *p = d_ptr->find(this); + EntryPrivate *p = d_ptr->tqfind(this); if (p) d_ptr->remove(p); @@ -166,7 +166,7 @@ void Entry::setSummary( const TQString &text, const TQString &lang ) { mSummaryMap.insert( lang, text ); - if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); } TQString Entry::summary( const TQString &lang ) const @@ -221,7 +221,7 @@ void Entry::setPayload( const KURL &url, const TQString &lang ) { mPayloadMap.insert( lang, url ); - if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); } KURL Entry::payload( const TQString &lang ) const @@ -244,7 +244,7 @@ void Entry::setPreview( const KURL &url, const TQString &lang ) { mPreviewMap.insert( lang, url ); - if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); } KURL Entry::preview( const TQString &lang ) const @@ -325,7 +325,7 @@ void Entry::parseDomElement( const TQDomElement &element ) if ( e.tagName() == "version" ) setVersion( e.text().stripWhiteSpace() ); if ( e.tagName() == "release" ) setRelease( e.text().toInt() ); if ( e.tagName() == "releasedate" ) { - TQDate date = TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate ); + TQDate date = TQT_TQDATE_OBJECT(TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate )); setReleaseDate( date ); } if ( e.tagName() == "preview" ) { diff --git a/knewstuff/ghns.h b/knewstuff/ghns.h index 0263c8f26..727dc6a0f 100644 --- a/knewstuff/ghns.h +++ b/knewstuff/ghns.h @@ -30,7 +30,7 @@ #include "knewstuff.h" -class GhnsWidget : public QWidget +class GhnsWidget : public TQWidget { Q_OBJECT public: diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp index 6a37aa61d..84fef0ac1 100644 --- a/knewstuff/knewstuff.cpp +++ b/knewstuff/knewstuff.cpp @@ -39,14 +39,14 @@ KAction* KNS::standardAction(const TQString& what, 0, recvr, slot, parent, name); } -KNewStuff::KNewStuff( const TQString &type, TQWidget *parentWidget ) +KNewStuff::KNewStuff( const TQString &type, TQWidget *tqparentWidget ) { - mEngine = new Engine( this, type, parentWidget ); + mEngine = new Engine( this, type, tqparentWidget ); } -KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget ) +KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget ) { - mEngine = new Engine( this, type, providerList, parentWidget ); + mEngine = new Engine( this, type, providerList, tqparentWidget ); } TQString KNewStuff::type() const @@ -54,9 +54,9 @@ TQString KNewStuff::type() const return mEngine->type(); } -TQWidget *KNewStuff::parentWidget() const +TQWidget *KNewStuff::tqparentWidget() const { - return mEngine->parentWidget(); + return mEngine->tqparentWidget(); } KNewStuff::~KNewStuff() diff --git a/knewstuff/knewstuff.h b/knewstuff/knewstuff.h index 5d2319aec..0891aa4de 100644 --- a/knewstuff/knewstuff.h +++ b/knewstuff/knewstuff.h @@ -74,10 +74,10 @@ class KDE_EXPORT KNewStuff @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper - @param parentWidget parent widget of dialogs opened by the KNewStuff + @param tqparentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuff( const TQString &type, TQWidget *parentWidget = 0 ); + KNewStuff( const TQString &type, TQWidget *tqparentWidget = 0 ); /** Constructor. @@ -85,10 +85,10 @@ class KDE_EXPORT KNewStuff @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper @param providerList the URL of the provider list - @param parentWidget parent widget of dialogs opened by the KNewStuff + @param tqparentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); + KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 ); virtual ~KNewStuff(); /** @@ -99,7 +99,7 @@ class KDE_EXPORT KNewStuff /** Return parent widget. */ - TQWidget *parentWidget() const; + TQWidget *tqparentWidget() const; /** Start download process. diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp index 8438e25ea..6dfccf202 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/knewstuff/knewstuffgeneric.cpp @@ -135,7 +135,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry ) TQString file = destinationPath(entry); if ( KStandardDirs::exists( file ) ) { - int result = KMessageBox::warningContinueCancel( parentWidget(), + int result = KMessageBox::warningContinueCancel( tqparentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .arg( file ), TQString::null, i18n("Overwrite") ); diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp index f68be7ae3..ed68fcf8a 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -33,8 +33,8 @@ using namespace KNS; -KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *parentWidget) - : KNewStuff(type, parentWidget) +KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget) + : KNewStuff(type, tqparentWidget) { m_tempDir = 0L; connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool))); @@ -80,7 +80,7 @@ bool KNewStuffSecure::install(const TQString &fileName) } else ok = false; if (!ok) - KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error")); + KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error")); return ok; } @@ -134,10 +134,10 @@ void KNewStuffSecure::slotValidated(int result) if (!valid) { signatureStr.prepend( "<br>"); - if (KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) valid = true; } else - KMessageBox::information(parentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); + KMessageBox::information(tqparentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); if (valid) { installResource(); @@ -187,12 +187,12 @@ void KNewStuffSecure::slotFileSigned(int result) { if (result == 0) { - KMessageBox::error(parentWidget(), i18n("The signing failed for unknown reason.")); + KMessageBox::error(tqparentWidget(), i18n("The signing failed for unknown reason.")); } else { if (result & Security::BAD_PASSPHRASE) { - if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel) { disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); removeTempDirectory(); @@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory() { if (m_tempDir) { - KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); + KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), tqparentWidget()); delete m_tempDir; m_tempDir = 0L; } diff --git a/knewstuff/knewstuffsecure.h b/knewstuff/knewstuffsecure.h index 1a6bc44a1..52a8d856b 100644 --- a/knewstuff/knewstuffsecure.h +++ b/knewstuff/knewstuffsecure.h @@ -46,10 +46,10 @@ public: @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper - @param parentWidget parent widget of dialogs opened by the KNewStuff + @param tqparentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuffSecure(const TQString &type, TQWidget *parentWidget=0); + KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget=0); virtual ~KNewStuffSecure(); /** Installs the downloaded resource. Do not call or reimplement directly. diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index c1d12853c..1d059d34f 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -53,11 +53,11 @@ static ProviderPrivate *d_prov(const Provider *p) d_ptr_prov = new TQPtrDict<ProviderPrivate>(); d_ptr_prov->setAutoDelete(true); } - ProviderPrivate *ret = d_ptr_prov->find((void*)p); + ProviderPrivate *ret = d_ptr_prov->tqfind((void*)p); if(!ret) { ret = new ProviderPrivate(); - d_ptr_prov->replace((void*)p, ret); + d_ptr_prov->tqreplace((void*)p, ret); } return ret; } @@ -89,7 +89,7 @@ Provider::~Provider() { if (d_ptr_prov) { - ProviderPrivate *p = d_ptr_prov->find(this); + ProviderPrivate *p = d_ptr_prov->tqfind(this); if (p) d_ptr_prov->remove(p); @@ -206,8 +206,8 @@ TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &paren } -ProviderLoader::ProviderLoader( TQWidget *parentWidget ) : - TQObject( parentWidget ) +ProviderLoader::ProviderLoader( TQWidget *tqparentWidget ) : + TQObject( tqparentWidget ) { mProviders.setAutoDelete( true ); } diff --git a/knewstuff/provider.h b/knewstuff/provider.h index 6a0972319..98b5b7def 100644 --- a/knewstuff/provider.h +++ b/knewstuff/provider.h @@ -169,16 +169,16 @@ class KDE_EXPORT Provider * the main provider database for this specific application. * It should probably not be used directly by the application. */ -class KDE_EXPORT ProviderLoader : public QObject +class KDE_EXPORT ProviderLoader : public TQObject { Q_OBJECT public: /** * Constructor. * - * @param parentWidget the parent widget + * @param tqparentWidget the parent widget */ - ProviderLoader( TQWidget *parentWidget ); + ProviderLoader( TQWidget *tqparentWidget ); /** * Starts asynchronously loading the list of providers of the diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp index 8ef377b78..7db2ccfe7 100644 --- a/knewstuff/security.cpp +++ b/knewstuff/security.cpp @@ -125,19 +125,19 @@ void Security::slotDataArrived(KProcIO *procIO) key.mail=data.section('<', -1, -1); key.mail.truncate(key.mail.length() - 1); key.name=data.section('<',0,0); - if (key.name.find("(")!=-1) + if (key.name.tqfind("(")!=-1) key.name=key.name.section('(',0,0); m_keys[shortId] = key; } break; case Verify: - data = data.section("]",1,-1).stripWhiteSpace(); + data = TQString(data.section("]",1,-1)).stripWhiteSpace(); if (data.startsWith("GOODSIG")) { m_result &= SIGNED_BAD_CLEAR; m_result |= SIGNED_OK; TQString id = data.section(" ", 1 , 1).right(8); - if (!m_keys.contains(id)) + if (!m_keys.tqcontains(id)) { m_result |= UNKNOWN; } else @@ -154,7 +154,7 @@ void Security::slotDataArrived(KProcIO *procIO) { m_result |= SIGNED_BAD; TQString id = data.section(" ", 1 , 1).right(8); - if (!m_keys.contains(id)) + if (!m_keys.tqcontains(id)) { m_result |= UNKNOWN; } else @@ -170,7 +170,7 @@ void Security::slotDataArrived(KProcIO *procIO) break; case Sign: - if (data.find("passphrase.enter") != -1) + if (data.tqfind("passphrase.enter") != -1) { TQCString password; KeyStruct key = m_keys[m_secretKey]; @@ -187,7 +187,7 @@ void Security::slotDataArrived(KProcIO *procIO) return; } } else - if (data.find("BAD_PASSPHRASE") != -1) + if (data.tqfind("BAD_PASSPHRASE") != -1) { m_result |= BAD_PASSPHRASE; } @@ -226,7 +226,7 @@ void Security::slotCheckValidity() if (file.open(IO_ReadOnly)) { context.reset(); - context.update(file); + context.update(TQT_TQIODEVICE_OBJECT(file)); md5sum = context.hexDigest(); file.close(); } @@ -298,7 +298,7 @@ void Security::slotSignFile() if (file.open(IO_ReadOnly)) { context.reset(); - context.update(file); + context.update(TQT_TQIODEVICE_OBJECT(file)); md5sum = context.hexDigest(); file.close(); } diff --git a/knewstuff/security.h b/knewstuff/security.h index 2a4eca536..2831770e0 100644 --- a/knewstuff/security.h +++ b/knewstuff/security.h @@ -41,7 +41,7 @@ It is a private class, not meant to be used by third party applications. namespace KNS { -class Security : public QObject +class Security : public TQObject { Q_OBJECT public: diff --git a/knewstuff/testnewstuff.h b/knewstuff/testnewstuff.h index da0149fda..3af0d68cc 100644 --- a/knewstuff/testnewstuff.h +++ b/knewstuff/testnewstuff.h @@ -40,7 +40,7 @@ class TestNewStuff : public KNewStuff bool createUploadFile( const TQString &fileName ); }; -class MyWidget : public QWidget +class MyWidget : public TQWidget { Q_OBJECT public: diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp index 060d9220e..81aa4fb52 100644 --- a/kparts/browserextension.cpp +++ b/kparts/browserextension.cpp @@ -370,11 +370,11 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent, // they're supported or not ActionSlotMap::ConstIterator it = s_actionSlotMap->begin(); ActionSlotMap::ConstIterator itEnd = s_actionSlotMap->end(); - TQStrList slotNames = metaObject()->slotNames(); + TQStrList slotNames = tqmetaObject()->slotNames(); for ( int i=0 ; it != itEnd ; ++it, ++i ) { // Does the extension have a slot with the name of this action ? - d->m_actionStatus.setBit( i, slotNames.contains( it.key()+"()" ) ); + d->m_actionStatus.setBit( i, slotNames.tqcontains( it.key()+"()" ) ); } connect( m_part, TQT_SIGNAL( completed() ), @@ -415,13 +415,13 @@ int BrowserExtension::yOffset() void BrowserExtension::saveState( TQDataStream &stream ) { - stream << m_part->url() << (Q_INT32)xOffset() << (Q_INT32)yOffset(); + stream << m_part->url() << (TQ_INT32)xOffset() << (TQ_INT32)yOffset(); } void BrowserExtension::restoreState( TQDataStream &stream ) { KURL u; - Q_INT32 xOfs, yOfs; + TQ_INT32 xOfs, yOfs; stream >> u >> xOfs >> yOfs; URLArgs args( urlArgs() ); @@ -452,7 +452,7 @@ void BrowserExtension::slotCompleted() void BrowserExtension::pasteRequest() { TQCString plain( "plain" ); - TQString url = TQApplication::clipboard()->text(plain, QClipboard::Selection).stripWhiteSpace(); + TQString url = TQApplication::tqclipboard()->tqtext(plain, TQClipboard::Selection).stripWhiteSpace(); // Remove linefeeds and any whitespace surrounding it. url.remove(TQRegExp("[\\ ]*\\n+[\\ ]*")); @@ -552,7 +552,7 @@ void BrowserExtension::slotSetActionText( const char * name, const TQString& tex TQString BrowserExtension::actionText( const char * name ) const { int actionNumber = (*s_actionNumberMap)[ name ]; - TQMap<int, TQString>::ConstIterator it = d->m_actionText.find( actionNumber ); + TQMap<int, TQString>::ConstIterator it = d->m_actionText.tqfind( actionNumber ); if ( it != d->m_actionText.end() ) return *it; return TQString::null; @@ -605,13 +605,13 @@ void BrowserExtension::createActionSlotMap() BrowserExtension *BrowserExtension::childObject( TQObject *obj ) { - if ( !obj || !obj->children() ) + if ( !obj || obj->childrenListObject().isEmpty() ) return 0L; // we try to do it on our own, in hope that we are faster than // queryList, which looks kind of big :-) - const TQObjectList *children = obj->children(); - TQObjectListIt it( *children ); + const TQObjectList children = obj->childrenListObject(); + TQObjectListIt it( children ); for (; it.current(); ++it ) if ( it.current()->inherits( "KParts::BrowserExtension" ) ) return static_cast<KParts::BrowserExtension *>( it.current() ); @@ -666,13 +666,13 @@ bool BrowserHostExtension::openURLInFrame( const KURL &, const KParts::URLArgs & BrowserHostExtension *BrowserHostExtension::childObject( TQObject *obj ) { - if ( !obj || !obj->children() ) + if ( !obj || obj->childrenListObject().isEmpty() ) return 0L; // we try to do it on our own, in hope that we are faster than // queryList, which looks kind of big :-) - const TQObjectList *children = obj->children(); - TQObjectListIt it( *children ); + const TQObjectList children = obj->childrenListObject(); + TQObjectListIt it( children ); for (; it.current(); ++it ) if ( it.current()->inherits( "KParts::BrowserHostExtension" ) ) return static_cast<KParts::BrowserHostExtension *>( it.current() ); @@ -715,13 +715,13 @@ void LiveConnectExtension::unregister( const unsigned long ) {} LiveConnectExtension *LiveConnectExtension::childObject( TQObject *obj ) { - if ( !obj || !obj->children() ) + if ( !obj || obj->childrenListObject().isEmpty() ) return 0L; // we try to do it on our own, in hope that we are faster than // queryList, which looks kind of big :-) - const TQObjectList *children = obj->children(); - TQObjectListIt it( *children ); + const TQObjectList children = obj->childrenListObject(); + TQObjectListIt it( children ); for (; it.current(); ++it ) if ( it.current()->inherits( "KParts::LiveConnectExtension" ) ) return static_cast<KParts::LiveConnectExtension *>( it.current() ); diff --git a/kparts/browserextension.h b/kparts/browserextension.h index edb376d27..364e300c4 100644 --- a/kparts/browserextension.h +++ b/kparts/browserextension.h @@ -305,7 +305,7 @@ class BrowserExtensionPrivate; * otherwise, they are saved globally. * @li @p disableScrolling: no scrollbars */ -class KPARTS_EXPORT BrowserExtension : public QObject +class KPARTS_EXPORT BrowserExtension : public TQObject { Q_OBJECT Q_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled ) @@ -446,7 +446,7 @@ public: * Checking if the extension implements a certain slot can be done like this: * * \code - * extension->metaObject()->slotNames().contains( actionName + "()" ) + * extension->tqmetaObject()->slotNames().contains( actionName + "()" ) * \endcode * * (note that @p actionName is the iterator's key value if already @@ -721,7 +721,7 @@ private: * other parts. * For instance a KHTMLPart hosts one part per frame. */ -class KPARTS_EXPORT BrowserHostExtension : public QObject +class KPARTS_EXPORT BrowserHostExtension : public TQObject { Q_OBJECT public: @@ -789,7 +789,7 @@ private: * A part can have an object hierarchie by using objid as a reference * to an object. */ -class KPARTS_EXPORT LiveConnectExtension : public QObject +class KPARTS_EXPORT LiveConnectExtension : public TQObject { Q_OBJECT public: diff --git a/kparts/browserinterface.cpp b/kparts/browserinterface.cpp index fc9909a9f..52200a20b 100644 --- a/kparts/browserinterface.cpp +++ b/kparts/browserinterface.cpp @@ -4,7 +4,7 @@ #include <tqmetaobject.h> #include <config.h> -#include <private/qucomextra_p.h> +#include <tqucomextra_p.h> using namespace KParts; @@ -19,12 +19,12 @@ BrowserInterface::~BrowserInterface() void BrowserInterface::callMethod( const char *name, const TQVariant &argument ) { - int slot = metaObject()->findSlot( name ); + int slot = tqmetaObject()->tqfindSlot( name ); if ( slot == -1 ) return; - QUObject o[ 2 ]; + TQUObject o[ 2 ]; TQStringList strLst; uint i; @@ -33,21 +33,21 @@ void BrowserInterface::callMethod( const char *name, const TQVariant &argument ) case TQVariant::Invalid: break; case TQVariant::String: - static_QUType_QString.set( o + 1, argument.toString() ); + static_TQUType_TQString.set( o + 1, argument.toString() ); break; case TQVariant::StringList: strLst = argument.toStringList(); - static_QUType_ptr.set( o + 1, &strLst ); + static_TQUType_ptr.set( o + 1, &strLst ); break; case TQVariant::Int: - static_QUType_int.set( o + 1, argument.toInt() ); + static_TQUType_int.set( o + 1, argument.toInt() ); break; case TQVariant::UInt: i = argument.toUInt(); - static_QUType_ptr.set( o + 1, &i ); + static_TQUType_ptr.set( o + 1, &i ); break; case TQVariant::Bool: - static_QUType_bool.set( o + 1, argument.toBool() ); + static_TQUType_bool.set( o + 1, argument.toBool() ); break; default: return; } diff --git a/kparts/browserinterface.h b/kparts/browserinterface.h index 8d3f0ad98..37e6cef41 100644 --- a/kparts/browserinterface.h +++ b/kparts/browserinterface.h @@ -35,7 +35,7 @@ namespace KParts * </code> * */ -class KPARTS_EXPORT BrowserInterface : public QObject +class KPARTS_EXPORT BrowserInterface : public TQObject { Q_OBJECT public: diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index 4d23d6300..a0d7aee80 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -128,7 +128,7 @@ void BrowserRun::scanFile() } // Set the PropagateHttpHeader meta-data if it has not already been set... - if (!m_args.metaData().contains("PropagateHttpHeader")) + if (!m_args.metaData().tqcontains("PropagateHttpHeader")) m_args.metaData().insert("PropagateHttpHeader", "TRUE"); } @@ -209,7 +209,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString& !m_strURL.isLocalFile() ) { if ( isTextExecutable(mimeType) ) - mimeType = TQString::fromLatin1("text/plain"); // view, don't execute + mimeType = TQString::tqfromLatin1("text/plain"); // view, don't execute kdDebug(1000) << "BrowserRun: ask for saving" << endl; KService::Ptr offer = KServiceTypeProfile::preferredService(mimeType, "Application"); // ... -> ask whether to save @@ -236,7 +236,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString& m_sMimeType = mimeType; TQString extension; TQString fileName = m_suggestedFilename.isEmpty() ? m_strURL.fileName() : m_suggestedFilename; - int extensionPos = fileName.findRev( '.' ); + int extensionPos = fileName.tqfindRev( '.' ); if ( extensionPos != -1 ) extension = fileName.mid( extensionPos ); // keep the '.' KTempFile tempFile( TQString::null, extension ); @@ -313,7 +313,7 @@ BrowserRun::AskSaveResult BrowserRun::askSave( const KURL & url, KService::Ptr o int choice = KMessageBox::questionYesNoCancel( 0L, question, url.host(), KStdGuiItem::saveAs(), openText, - TQString::fromLatin1("askSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!! + TQString::tqfromLatin1("askSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!! return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel ); // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC @@ -351,7 +351,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ int choice = KMessageBox::questionYesNoCancel( 0L, question, url.host(), KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "fileopen"), - TQString::fromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!! + TQString::tqfromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!! return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel ); // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC } diff --git a/kparts/browserrun.h b/kparts/browserrun.h index 79a7386c6..0a0ec1be4 100644 --- a/kparts/browserrun.h +++ b/kparts/browserrun.h @@ -98,7 +98,7 @@ namespace KParts { */ TQString contentDisposition() const; - bool serverSuggestsSave() const { return contentDisposition() == TQString::fromLatin1("attachment"); } + bool serverSuggestsSave() const { return contentDisposition() == TQString::tqfromLatin1("attachment"); } enum AskSaveResult { Save, Open, Cancel }; /** diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h index 7e9de4280..3e6578781 100644 --- a/kparts/componentfactory.h +++ b/kparts/componentfactory.h @@ -63,7 +63,7 @@ namespace KParts const TQStringList &args = TQStringList() ) { TQObject *object = factory->create( parent, name, - T::staticMetaObject()->className(), + T::tqstaticMetaObject()->className(), args ); T *result = dynamic_cast<T *>( object ); @@ -82,7 +82,7 @@ namespace KParts * \endcode * * @param factory The factory to ask for the creation of the component - * @param parentWidget the parent widget for the part + * @param tqparentWidget the parent widget for the part * @param widgetName the name of the part's widget * @param parent The parent object (see TQObject constructor) * @param name The name of the object to create (see TQObject constructor) @@ -93,13 +93,13 @@ namespace KParts */ template <class T> static T *createPartInstanceFromFactory( KParts::Factory *factory, - TQWidget *parentWidget = 0, + TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() ) { - KParts::Part *object = factory->createPart( parentWidget, widgetName, + KParts::Part *object = factory->createPart( tqparentWidget, widgetName, parent, name, T::staticMetaObject()->className(), args ); @@ -156,7 +156,7 @@ namespace KParts template <class T> static T *createPartInstanceFromLibrary( const char *libraryName, - TQWidget *parentWidget = 0, + TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, @@ -186,7 +186,7 @@ namespace KParts *error = ErrNoFactory; return 0; } - T *res = createPartInstanceFromFactory<T>( partFactory, parentWidget, + T *res = createPartInstanceFromFactory<T>( partFactory, tqparentWidget, widgetName, parent, name, args ); if ( !res ) { @@ -218,7 +218,7 @@ namespace KParts template <class T> static T *createPartInstanceFromService( const KService::Ptr &service, - TQWidget *parentWidget = 0, + TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, @@ -233,7 +233,7 @@ namespace KParts return 0; } - return createPartInstanceFromLibrary<T>( library.local8Bit().data(), parentWidget, + return createPartInstanceFromLibrary<T>( library.local8Bit().data(), tqparentWidget, widgetName, parent, name, args, error ); } @@ -267,7 +267,7 @@ namespace KParts template <class T, class ServiceIterator> static T *createPartInstanceFromServices( ServiceIterator begin, ServiceIterator end, - TQWidget *parentWidget = 0, + TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, @@ -281,7 +281,7 @@ namespace KParts if ( error ) *error = 0; - T *component = createPartInstanceFromService<T>( service, parentWidget, + T *component = createPartInstanceFromService<T>( service, tqparentWidget, widgetName, parent, name, args, error ); if ( component ) @@ -344,18 +344,18 @@ namespace KParts * You can use this method to create a generic viewer - that can display any * kind of file, provided that there is a ReadOnlyPart installed for it - in 5 lines: * \code - * // Given the following: KURL url, TQWidget* parentWidget and TQObject* parentObject. + * // Given the following: KURL url, TQWidget* tqparentWidget and TQObject* parentObject. * TQString mimetype = KMimeType::findByURL( url )->name(); - * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, parentWidget, 0, parentObject, 0 ); + * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString::null, tqparentWidget, 0, parentObject, 0 ); * if ( part ) { * part->openURL( url ); - * part->widget()->show(); // also insert the widget into a layout, or simply use a TQVBox as parentWidget + * part->widget()->show(); // also insert the widget into a layout, or simply use a TQVBox as tqparentWidget * } * \endcode * * @param serviceType the type of service for which to find a part, e.g. a mimetype * @param constraint an optional constraint to pass to the trader (see KTrader) - * @param parentWidget the parent widget, will be set as the parent of the part's widget + * @param tqparentWidget the parent widget, will be set as the parent of the part's widget * @param widgetName the name that will be given to the part's widget * @param parent the parent object for the part itself * @param name the name that will be given to the part @@ -369,14 +369,14 @@ namespace KParts template <class T> static T *createPartInstanceFromQuery( const TQString &serviceType, const TQString &constraint, - TQWidget *parentWidget = 0, + TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const TQStringList &args = TQStringList(), int *error = 0 ) { - KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null ); + KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::tqfromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null ); if ( offers.isEmpty() ) { if ( error ) @@ -385,7 +385,7 @@ namespace KParts } return createPartInstanceFromServices<T>( offers.begin(), offers.end(), - parentWidget, widgetName, + tqparentWidget, widgetName, parent, name, args, error ); } diff --git a/kparts/dockmainwindow.cpp b/kparts/dockmainwindow.cpp index b5370e2c0..9f7703ab6 100644 --- a/kparts/dockmainwindow.cpp +++ b/kparts/dockmainwindow.cpp @@ -62,7 +62,7 @@ DockMainWindow::DockMainWindow( TQWidget* parent, const char *name, WFlags f ) : KDockMainWindow( parent, name, f ) { d = new DockMainWindowPrivate(); - PartBase::setPartObject( this ); + PartBase::setPartObject( TQT_TQOBJECT(this) ); } DockMainWindow::~DockMainWindow() @@ -72,7 +72,7 @@ DockMainWindow::~DockMainWindow() void DockMainWindow::createGUI( Part * part ) { - kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L") << endl; + kdDebug(1000) << TQString(TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L")) << endl; KXMLGUIFactory *factory = guiFactory(); @@ -82,7 +82,7 @@ void DockMainWindow::createGUI( Part * part ) if ( d->m_activePart ) { - kdDebug(1000) << TQString("deactivating GUI for %1").arg(d->m_activePart->name()) << endl; + kdDebug(1000) << TQString(TQString("deactivating GUI for %1").arg(d->m_activePart->name())) << endl; GUIActivateEvent ev( false ); TQApplication::sendEvent( d->m_activePart, &ev ); @@ -97,7 +97,7 @@ void DockMainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( this, this, KGlobal::instance() ); + loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } diff --git a/kparts/dockmainwindow.h b/kparts/dockmainwindow.h index c81dda47c..32b1df1d4 100644 --- a/kparts/dockmainwindow.h +++ b/kparts/dockmainwindow.h @@ -51,7 +51,7 @@ class KPARTS_EXPORT DockMainWindow : public KDockMainWindow, virtual public Part /** * Constructor, same signature as KDockMainWindow. */ - DockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WDestructiveClose ); + DockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = (WFlags)WDestructiveClose ); /** * Destructor. */ diff --git a/kparts/event.h b/kparts/event.h index 2a3421617..001cc0a1b 100644 --- a/kparts/event.h +++ b/kparts/event.h @@ -33,7 +33,7 @@ class Part; /** * Base class for all KParts events. */ -class KPARTS_EXPORT Event : public QCustomEvent +class KPARTS_EXPORT Event : public TQCustomEvent { public: Event( const char *eventName ); diff --git a/kparts/factory.cpp b/kparts/factory.cpp index 9be2f4f92..fc33feccf 100644 --- a/kparts/factory.cpp +++ b/kparts/factory.cpp @@ -39,9 +39,9 @@ Factory::~Factory() { } -Part *Factory::createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) +Part *Factory::createPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { - Part* part = createPartObject( parentWidget, widgetName, parent, name, classname, args ); + Part* part = createPartObject( tqparentWidget, widgetName, parent, name, classname, args ); if ( part ) emit objectCreated( part ); return part; @@ -77,6 +77,6 @@ Part *Factory::createPartObject( TQWidget *, const char *, TQObject *, const cha TQObject *Factory::createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { assert( !parent || parent->isWidgetType() ); - return createPart( static_cast<TQWidget *>( parent ), name, parent, name, classname, args ); + return createPart( TQT_TQWIDGET( parent ), name, parent, name, classname, args ); } #include "factory.moc" diff --git a/kparts/factory.h b/kparts/factory.h index c1b98eca1..2ac834ba4 100644 --- a/kparts/factory.h +++ b/kparts/factory.h @@ -60,7 +60,7 @@ public: * \endcode * This could result in a call to * \code - * createPart( parentWidget, name, parentObject, parentName, "KParts::Part", + * createPart( tqparentWidget, name, parentObject, parentName, "KParts::Part", * TQStringList("name1="value1"", "name2="value2") ); * \endcode * @@ -71,7 +71,7 @@ public: * important for reference counting, and allows unloading the * library automatically once all its objects have been destroyed. */ - Part *createPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ); + Part *createPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ); /** * If you have a part contained in a shared library you might want to query @@ -108,13 +108,13 @@ protected: * \endcode * This could result in a call to * \code - * createPart( parentWidget, name, parentObject, parentName, "Kparts::Part", + * createPart( tqparentWidget, name, parentObject, parentName, "Kparts::Part", * TQStringList("name1="value1"", "name2="value2") ); * \endcode * * @returns the newly created part. */ - virtual Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ) = 0; + virtual Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ) = 0; /** * Reimplemented from KLibFactory. Calls createPart() diff --git a/kparts/genericfactory.h b/kparts/genericfactory.h index 950214ee5..99ce7c3be 100644 --- a/kparts/genericfactory.h +++ b/kparts/genericfactory.h @@ -66,7 +66,7 @@ namespace KParts * * The template argument has to inherit from KParts::Part and has to implement two methods: * 1) There needs to be a public constructor with the following signature: - * MyPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args ) + * MyPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args ) * * 2) It needs to provide one static method to create a KAboutData object per * request, holding information about the component's name, its authors, license, etc. @@ -97,12 +97,12 @@ namespace KParts public: GenericFactory() { } - virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ) { - T *part = KDEPrivate::ConcreteFactory<T>::create( parentWidget, + T *part = KDEPrivate::ConcreteFactory<T>::create( tqparentWidget, widgetName, parent, name, @@ -125,12 +125,12 @@ namespace KParts public: GenericFactory() { } - virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ) { - TQObject *object = KDEPrivate::MultiFactory< KTypeList<T1, T2> >::create( parentWidget, + TQObject *object = KDEPrivate::MultiFactory< KTypeList<T1, T2> >::create( tqparentWidget, widgetName, parent, name, className, diff --git a/kparts/historyprovider.cpp b/kparts/historyprovider.cpp index 416a109f6..d62d94b3a 100644 --- a/kparts/historyprovider.cpp +++ b/kparts/historyprovider.cpp @@ -40,7 +40,7 @@ public: HistoryProvider * HistoryProvider::self() { if ( !s_self ) - s_self = new HistoryProvider( kapp, "history provider" ); + s_self = new HistoryProvider( TQT_TQOBJECT(kapp), "history provider" ); return s_self; } @@ -63,13 +63,13 @@ HistoryProvider::~HistoryProvider() bool HistoryProvider::contains( const TQString& item ) const { - return (bool) d->dict.find( item ); + return (bool) d->dict.tqfind( item ); } void HistoryProvider::insert( const TQString& item ) { // no need to allocate memory, we only want to have fast lookup, no mapping - d->dict.replace( item, (void*) 1 ); + d->dict.tqreplace( item, (void*) 1 ); emit inserted( item ); } diff --git a/kparts/historyprovider.h b/kparts/historyprovider.h index 40bf36aa7..91fefd67f 100644 --- a/kparts/historyprovider.h +++ b/kparts/historyprovider.h @@ -38,7 +38,7 @@ namespace KParts { * * @author Carsten Pfeiffer <pfeiffer@kde.org> */ -class KPARTS_EXPORT HistoryProvider : public QObject +class KPARTS_EXPORT HistoryProvider : public TQObject { Q_OBJECT diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp index ee286fd15..c0c4cd086 100644 --- a/kparts/mainwindow.cpp +++ b/kparts/mainwindow.cpp @@ -61,21 +61,21 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) : KMainWindow( parent, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( this ); + PartBase::setPartObject( TQT_TQOBJECT(this) ); } MainWindow::MainWindow( const char *name, WFlags f ) : KMainWindow( 0L, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( this ); + PartBase::setPartObject( TQT_TQOBJECT(this) ); } MainWindow::MainWindow( int cflags, TQWidget* parent, const char *name, WFlags f ) : KMainWindow( cflags, parent, name, f ) { d = new MainWindowPrivate(); - PartBase::setPartObject( this ); + PartBase::setPartObject( TQT_TQOBJECT(this) ); } MainWindow::~MainWindow() @@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( this, this, KGlobal::instance() ); + loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } diff --git a/kparts/mainwindow.h b/kparts/mainwindow.h index 1dbc43975..08262c19a 100644 --- a/kparts/mainwindow.h +++ b/kparts/mainwindow.h @@ -51,16 +51,16 @@ class KPARTS_EXPORT MainWindow : public KMainWindow, virtual public PartBase /** * Constructor, same signature as KMainWindow. */ - MainWindow( TQWidget* parent, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); + MainWindow( TQWidget* parent, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); /** * Compatibility Constructor */ - MainWindow( const char *name = 0L, WFlags f = WDestructiveClose ); + MainWindow( const char *name = 0L, WFlags f = (WFlags)WDestructiveClose ); /** * Constructor with creation flags, see KMainWindow. * @since 3.2 */ - MainWindow( int cflags, TQWidget* parent, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); + MainWindow( int cflags, TQWidget* parent, const char *name = 0L, WFlags f = (WFlags)(WType_TopLevel | WDestructiveClose) ); /** * Destructor. */ diff --git a/kparts/part.cpp b/kparts/part.cpp index fcd426abf..201a774a7 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -114,7 +114,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins ) // install 'instancename'data resource type KGlobal::dirs()->addResourceType( inst->instanceName() + "data", KStandardDirs::kde_default( "data" ) - + TQString::fromLatin1( inst->instanceName() ) + '/' ); + + TQString::tqfromLatin1( inst->instanceName() ) + '/' ); if ( bLoadPlugins ) loadPlugins( m_obj, this, instance() ); } @@ -162,10 +162,10 @@ Part::~Part() delete d; } -void Part::embed( TQWidget * parentWidget ) +void Part::embed( TQWidget * tqparentWidget ) { if ( widget() ) - widget()->reparent( parentWidget, 0, TQPoint( 0, 0 ), true ); + widget()->reparent( tqparentWidget, 0, TQPoint( 0, 0 ), true ); } TQWidget *Part::widget() @@ -365,7 +365,7 @@ bool ReadOnlyPart::openURL( const KURL &url ) KURL destURL; destURL.setPath( m_file ); d->m_job = KIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo ); - d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 ); + d->m_job->setWindow( widget() ? widget()->tqtopLevelWidget() : 0 ); emit started( d->m_job ); connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) ); return true; @@ -638,7 +638,7 @@ bool ReadWritePart::saveToURL() return false; } d->m_uploadJob = KIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ ); - d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 ); + d->m_uploadJob->setWindow( widget() ? widget()->tqtopLevelWidget() : 0 ); connect( d->m_uploadJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) ); return true; } @@ -674,7 +674,7 @@ void ReadWritePart::slotUploadFinished( KIO::Job * ) d->m_originalFilePath = TQString::null; if (d->m_waitForSave) { - qApp->exit_loop(); + tqApp->exit_loop(); } } @@ -689,10 +689,10 @@ bool ReadWritePart::waitSaveComplete() d->m_waitForSave = true; - TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQWidget::NoFocus ); + TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); + dummy.setFocusPolicy( TQ_NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); d->m_waitForSave = false; diff --git a/kparts/part.h b/kparts/part.h index 0c4023f6c..7913710c7 100644 --- a/kparts/part.h +++ b/kparts/part.h @@ -208,7 +208,7 @@ public: * This method is not recommended since creating the widget with the correct * parent is simpler anyway. */ - virtual void embed( TQWidget * parentWidget ); + virtual void embed( TQWidget * tqparentWidget ); /** * @return The widget defined by this part, set by setWidget(). diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index 0ff139532..bc2afd2a1 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -56,7 +56,7 @@ public: switch( ev->type() ) { case TQEvent::MouseButtonPress: case TQEvent::MouseButtonDblClick: { - TQMouseEvent* mev = static_cast<TQMouseEvent *>( ev ); + TQMouseEvent* mev = TQT_TQMOUSEEVENT( ev ); m_reason = mev->button() == Qt::LeftButton ? PartManager::ReasonLeftClick : ( mev->button() == Qt::MidButton @@ -65,7 +65,7 @@ public: break; } case TQEvent::FocusIn: - m_reason = static_cast<TQFocusEvent *>( ev )->reason(); + m_reason = TQT_TQFOCUSEVENT( ev )->reason(); break; default: kdWarning(1000) << "PartManagerPrivate::setReason got unexpected ev type " << ev->type() << endl; @@ -97,7 +97,7 @@ PartManager::PartManager( TQWidget * parent, const char * name ) { d = new PartManagerPrivate; - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); d->m_policy = Direct; @@ -109,7 +109,7 @@ PartManager::PartManager( TQWidget *topLevel, TQObject *parent, const char *name { d = new PartManagerPrivate; - qApp->installEventFilter( this ); + tqApp->installEventFilter( this ); d->m_policy = Direct; @@ -129,7 +129,7 @@ PartManager::~PartManager() } // core dumps ... setActivePart( 0L ); - qApp->removeEventFilter( this ); + tqApp->removeEventFilter( this ); delete d; } @@ -184,7 +184,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) if ( !obj->isWidgetType() ) return false; - TQWidget *w = static_cast<TQWidget *>( obj ); + TQWidget *w = TQT_TQWIDGET( obj ); if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) || w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) @@ -193,7 +193,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) TQMouseEvent* mev = 0L; if ( ev->type() == TQEvent::MouseButtonPress || ev->type() == TQEvent::MouseButtonDblClick ) { - mev = static_cast<TQMouseEvent *>( ev ); + mev = TQT_TQMOUSEEVENT( ev ); #ifdef DEBUG_PARTMANAGER kdDebug(1000) << "PartManager::eventFilter button: " << mev->button() << " " << "d->m_activationButtonMask=" << d->m_activationButtonMask << endl; #endif @@ -206,7 +206,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) { TQPoint pos; - if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) ) + if ( !d->m_managedTopLevelWidgets.tqcontainsRef( w->tqtopLevelWidget() ) ) return false; if ( d->m_bIgnoreScrollBars && w->inherits( "QScrollBar" ) ) @@ -288,7 +288,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) return false; } - w = w->parentWidget(); + w = w->tqparentWidget(); if ( w && ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) || w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) ) @@ -313,7 +313,7 @@ Part * PartManager::findPartFromWidget( TQWidget * widget, const TQPoint &pos ) for ( ; it.current() ; ++it ) { Part *part = it.current()->hitTest( widget, pos ); - if ( part && d->m_parts.findRef( part ) != -1 ) + if ( part && d->m_parts.tqfindRef( part ) != -1 ) return part; } return 0L; @@ -332,7 +332,7 @@ Part * PartManager::findPartFromWidget( TQWidget * widget ) void PartManager::addPart( Part *part, bool setActive ) { - if ( d->m_parts.findRef( part ) != -1 ) // don't add parts more than once :) + if ( d->m_parts.tqfindRef( part ) != -1 ) // don't add parts more than once :) { #ifdef DEBUG_PARTMANAGER kdWarning(1000) << k_funcinfo << part << " already added" << kdBacktrace(5) << endl; @@ -352,11 +352,11 @@ void PartManager::addPart( Part *part, bool setActive ) } // Prevent focus problems - if ( part->widget() && part->widget()->focusPolicy() == TQWidget::NoFocus ) + if ( part->widget() && part->widget()->focusPolicy() == TQ_NoFocus ) { kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of NoFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl; } - if ( part->widget() && part->widget()->focusPolicy() == TQWidget::TabFocus ) + if ( part->widget() && part->widget()->focusPolicy() == TQ_TabFocus ) { kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of TabFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl; } @@ -368,9 +368,9 @@ void PartManager::addPart( Part *part, bool setActive ) void PartManager::removePart( Part *part ) { - if ( d->m_parts.findRef( part ) == -1 ) + if ( d->m_parts.tqfindRef( part ) == -1 ) { - kdFatal(1000) << TQString("Can't remove part %1, not in KPartManager's list.").arg(part->name()) << endl; + kdFatal(1000) << TQString(TQString("Can't remove part %1, not in KPartManager's list.").arg(part->name())) << endl; return; } @@ -394,9 +394,9 @@ void PartManager::replacePart( Part * oldPart, Part * newPart, bool setActive ) { //kdDebug(1000) << "replacePart " << oldPart->name() << "-> " << newPart->name() << " setActive=" << setActive << endl; // This methods does exactly removePart + addPart but without calling setActivePart(0) in between - if ( d->m_parts.findRef( oldPart ) == -1 ) + if ( d->m_parts.tqfindRef( oldPart ) == -1 ) { - kdFatal(1000) << TQString("Can't remove part %1, not in KPartManager's list.").arg(oldPart->name()) << endl; + kdFatal(1000) << TQString(TQString("Can't remove part %1, not in KPartManager's list.").arg(oldPart->name())) << endl; return; } @@ -410,7 +410,7 @@ void PartManager::replacePart( Part * oldPart, Part * newPart, bool setActive ) void PartManager::setActivePart( Part *part, TQWidget *widget ) { - if ( part && d->m_parts.findRef( part ) == -1 ) + if ( part && d->m_parts.tqfindRef( part ) == -1 ) { kdWarning( 1000 ) << "PartManager::setActivePart : trying to activate a non-registered part! " << part->name() << endl; return; // don't allow someone call setActivePart with a part we don't know about @@ -420,7 +420,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) //tree recursively (Simon) if ( part && !d->m_bAllowNestedParts ) { - TQObject *parentPart = part->parent(); // ### this relies on people using KParts::Factory! + TQObject *parentPart = TQT_TQOBJECT(part->parent()); // ### this relies on people using KParts::Factory! if ( parentPart && parentPart->inherits( "KParts::Part" ) ) { KParts::Part *parPart = static_cast<KParts::Part *>( parentPart ); @@ -565,7 +565,7 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel ) if ( !topLevel->isTopLevel() ) return; - if ( d->m_managedTopLevelWidgets.containsRef( topLevel ) ) + if ( d->m_managedTopLevelWidgets.tqcontainsRef( topLevel ) ) return; d->m_managedTopLevelWidgets.append( topLevel ); @@ -578,7 +578,7 @@ void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel ) if ( !topLevel->isTopLevel() ) return; - if ( d->m_managedTopLevelWidgets.findRef( topLevel ) == -1 ) + if ( d->m_managedTopLevelWidgets.tqfindRef( topLevel ) == -1 ) return; d->m_managedTopLevelWidgets.remove(); diff --git a/kparts/partmanager.h b/kparts/partmanager.h index a9b150a67..83bd975b2 100644 --- a/kparts/partmanager.h +++ b/kparts/partmanager.h @@ -47,7 +47,7 @@ class PartManagerPrivate; * Parts know about the part manager to add nested parts to it. * See also KParts::Part::manager() and KParts::Part::setManager(). */ -class KPARTS_EXPORT PartManager : public QObject +class KPARTS_EXPORT PartManager : public TQObject { Q_OBJECT Q_ENUMS( SelectionPolicy ) diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp index c9b0d2e36..b9b60fc0b 100644 --- a/kparts/plugin.cpp +++ b/kparts/plugin.cpp @@ -68,7 +68,7 @@ TQString Plugin::xmlFile() const if ( !d->m_parentInstance || ( path.length() > 0 && path[ 0 ] == '/' ) ) return path; - TQString absPath = locate( "data", TQString::fromLatin1( d->m_parentInstance->instanceName() ) + '/' + path ); + TQString absPath = locate( "data", TQString::tqfromLatin1( d->m_parentInstance->instanceName() ) + '/' + path ); assert( !absPath.isEmpty() ); return absPath; } @@ -80,7 +80,7 @@ TQString Plugin::localXMLFile() const if ( !d->m_parentInstance || ( path.length() > 0 && path[ 0 ] == '/' ) ) return path; - TQString absPath = locateLocal( "data", TQString::fromLatin1( d->m_parentInstance->instanceName() ) + '/' + path ); + TQString absPath = locateLocal( "data", TQString::tqfromLatin1( d->m_parentInstance->instanceName() ) + '/' + path ); assert( !absPath.isEmpty() ); return absPath; } @@ -104,10 +104,10 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance for (; pIt != pEnd; ++pIt ) { TQFileInfo fInfo( *pIt ); - if ( fInfo.extension() == TQString::fromLatin1( "desktop" ) ) + if ( fInfo.extension() == TQString::tqfromLatin1( "desktop" ) ) continue; - TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.find( fInfo.fileName() ); + TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.tqfind( fInfo.fileName() ); if ( mapIt == sortedPlugins.end() ) mapIt = sortedPlugins.insert( fInfo.fileName(), TQStringList() ); @@ -249,7 +249,7 @@ void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KIns else { // no user-setting, load plugin default setting TQString relPath = TQString( instance->instanceName() ) + "/" + (*pIt).m_relXMLFileName; - relPath.truncate( relPath.findRev( '.' ) ); // remove extension + relPath.truncate( relPath.tqfindRev( '.' ) ); // remove extension relPath += ".desktop"; //kdDebug(1000) << "looking for " << relPath << endl; const TQString desktopfile = instance->dirs()->findResource( "data", relPath ); diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp index 6b0ee3cb2..c3277752d 100644 --- a/kparts/statusbarextension.cpp +++ b/kparts/statusbarextension.cpp @@ -88,13 +88,13 @@ StatusBarExtension::~StatusBarExtension() StatusBarExtension *StatusBarExtension::childObject( TQObject *obj ) { - if ( !obj || !obj->children() ) + if ( !obj || obj->childrenListObject().isEmpty() ) return 0L; // we try to do it on our own, in hope that we are faster than // queryList, which looks kind of big :-) - const TQObjectList *children = obj->children(); - TQObjectListIt it( *children ); + const TQObjectList children = obj->childrenListObject(); + TQObjectListIt it( children ); for (; it.current(); ++it ) if ( it.current()->inherits( "KParts::StatusBarExtension" ) ) return static_cast<KParts::StatusBarExtension *>( it.current() ); @@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const { if ( !m_statusBar ) { TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget(); - KMainWindow* mw = dynamic_cast<KMainWindow *>( w->topLevelWidget() ); + KMainWindow* mw = dynamic_cast<KMainWindow *>( w->tqtopLevelWidget() ); if ( mw ) m_statusBar = mw->statusBar(); } diff --git a/kparts/statusbarextension.h b/kparts/statusbarextension.h index 79d449a98..81bf6854b 100644 --- a/kparts/statusbarextension.h +++ b/kparts/statusbarextension.h @@ -50,7 +50,7 @@ namespace KParts * * @since 3.2 */ - class KPARTS_EXPORT StatusBarExtension : public QObject + class KPARTS_EXPORT StatusBarExtension : public TQObject { Q_OBJECT diff --git a/kparts/tests/notepad.cpp b/kparts/tests/notepad.cpp index e0857a51e..4472bfe55 100644 --- a/kparts/tests/notepad.cpp +++ b/kparts/tests/notepad.cpp @@ -16,14 +16,14 @@ #include <kstatusbar.h> #include <kstandarddirs.h> -NotepadPart::NotepadPart( TQWidget* parentWidget, const char*, +NotepadPart::NotepadPart( TQWidget* tqparentWidget, const char*, TQObject* parent, const char* name, const TQStringList& ) : KParts::ReadWritePart( parent, name ) { setInstance( NotepadFactory::instance() ); - m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" ); + m_edit = new TQMultiLineEdit( tqparentWidget, "NotepadPart's multiline edit" ); setWidget( m_edit ); (void)new KAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); diff --git a/kparts/tests/parts.cpp b/kparts/tests/parts.cpp index d932a168f..f11f0194f 100644 --- a/kparts/tests/parts.cpp +++ b/kparts/tests/parts.cpp @@ -18,12 +18,12 @@ #include <kaction.h> #include <klocale.h> -Part1::Part1( TQObject *parent, TQWidget * parentWidget ) +Part1::Part1( TQObject *parent, TQWidget * tqparentWidget ) : KParts::ReadOnlyPart( parent, "Part1" ) { m_instance = new KInstance( "kpartstestpart" ); setInstance( m_instance ); - m_edit = new TQMultiLineEdit( parentWidget ); + m_edit = new TQMultiLineEdit( tqparentWidget ); setWidget( m_edit ); setXMLFile( "kpartstest_part1.rc" ); @@ -56,12 +56,12 @@ bool Part1::openFile() return true; } -Part2::Part2( TQObject *parent, TQWidget * parentWidget ) +Part2::Part2( TQObject *parent, TQWidget * tqparentWidget ) : KParts::Part( parent, "Part2" ) { m_instance = new KInstance( "part2" ); setInstance( m_instance ); - TQWidget * w = new TQWidget( parentWidget, "Part2Widget" ); + TQWidget * w = new TQWidget( tqparentWidget, "Part2Widget" ); setWidget( w ); TQCheckBox * cb = new TQCheckBox( "something", w ); diff --git a/kparts/tests/parts.h b/kparts/tests/parts.h index 6f373a85c..873a6fea4 100644 --- a/kparts/tests/parts.h +++ b/kparts/tests/parts.h @@ -13,7 +13,7 @@ class Part1 : public KParts::ReadOnlyPart { Q_OBJECT public: - Part1( TQObject *parent, TQWidget * parentWidget ); + Part1( TQObject *parent, TQWidget * tqparentWidget ); virtual ~Part1(); protected: @@ -28,7 +28,7 @@ class Part2 : public KParts::Part { Q_OBJECT public: - Part2( TQObject *parent, TQWidget * parentWidget ); + Part2( TQObject *parent, TQWidget * tqparentWidget ); virtual ~Part2(); protected: diff --git a/krandr/ktimerdialog.cpp b/krandr/ktimerdialog.cpp index 55302b407..3885ca438 100644 --- a/krandr/ktimerdialog.cpp +++ b/krandr/ktimerdialog.cpp @@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( TQWidget *widget ) // yuck, here goes. TQVBox *newWidget = new TQVBox( this ); - if ( widget->parentWidget() != mainWidget ) { + if ( widget->tqparentWidget() != mainWidget ) { widget->reparent( newWidget, 0, TQPoint(0,0) ); } else { newWidget->insertChild( widget ); diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc index cbb023e4f..492afa94b 100644 --- a/krandr/libkrandr.cc +++ b/krandr/libkrandr.cc @@ -32,7 +32,7 @@ TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenNa TQString retval; if (profileName != NULL) { - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); } else { t_systemconfig = new KSimpleConfig( kde_confdir + TQString("/kicc/kiccconfigrc") ); @@ -216,7 +216,7 @@ TQString KRandrSimpleAPI::applyIccConfiguration(TQString profileName, TQString k int screenNumber = 0; TQString errorstr = ""; - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); // Find all screens if (isValid() == true) { @@ -248,7 +248,7 @@ TQString KRandrSimpleAPI::getCurrentProfile () { TQString profileName; KSimpleConfig *t_config; - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); profileName = t_config->readEntry("CurrentProfile"); delete t_config; return profileName; diff --git a/krandr/randr.h b/krandr/randr.h index 355f3d866..54d9d2f44 100644 --- a/krandr/randr.h +++ b/krandr/randr.h @@ -29,7 +29,7 @@ class KTimerDialog; class RandRScreenPrivate; -class RandRScreen : public QObject +class RandRScreen : public TQObject { Q_OBJECT diff --git a/kresources/configdialog.cpp b/kresources/configdialog.cpp index bbebc47a3..a705fda3a 100644 --- a/kresources/configdialog.cpp +++ b/kresources/configdialog.cpp @@ -82,7 +82,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, TQT_SLOT( slotNameChanged(const TQString &))); slotNameChanged( mName->text() ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } void ConfigDialog::setInEditMode( bool value ) diff --git a/kresources/configpage.cpp b/kresources/configpage.cpp index 5e5e61198..46f7bfa79 100644 --- a/kresources/configpage.cpp +++ b/kresources/configpage.cpp @@ -58,7 +58,7 @@ ResourcePageInfo::~ResourcePageInfo() { } -class ConfigViewItem : public QCheckListItem +class ConfigViewItem : public TQCheckListItem { public: ConfigViewItem( TQListView *parent, Resource* resource ) : @@ -122,13 +122,13 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) groupBoxLayout->addWidget( mListView, 1, 0 ); connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) ); - KButtonBox *buttonBox = new KButtonBox( groupBox, Vertical ); - mAddButton = buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT(slotAdd()) ); - mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT(slotRemove()) ); + KButtonBox *buttonBox = new KButtonBox( groupBox, Qt::Vertical ); + mAddButton = buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()) ); + mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT(slotRemove()) ); mRemoveButton->setEnabled( false ); - mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT(slotEdit()) ); + mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT(slotEdit()) ); mEditButton->setEnabled( false ); - mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQT_SLOT(slotStandard()) ); + mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), TQT_TQOBJECT(this), TQT_SLOT(slotStandard()) ); mStandardButton->setEnabled( false ); buttonBox->layout(); @@ -179,7 +179,7 @@ void ConfigPage::load() KTrader::OfferList::ConstIterator end = plugins.end(); for ( ; it != end; ++it ) { const TQString family = (*it)->property( "X-KDE-ResourceFamily" ).toString(); - if ( compatFamilyNames.find( family ) == compatFamilyNames.end() ) + if ( compatFamilyNames.tqfind( family ) == compatFamilyNames.end() ) compatFamilyNames.append( family ); } @@ -300,7 +300,7 @@ void ConfigPage::slotAdd() if ( !ok ) return; - TQString type = types[ descs.findIndex( desc ) ]; + TQString type = types[ descs.tqfindIndex( desc ) ]; // Create new resource Resource *resource = mCurrentManager->createResource( type ); diff --git a/kresources/configwidget.h b/kresources/configwidget.h index 47917edd3..3a2fe3f55 100644 --- a/kresources/configwidget.h +++ b/kresources/configwidget.h @@ -30,7 +30,7 @@ namespace KRES { -class KRESOURCES_EXPORT ConfigWidget : public QWidget +class KRESOURCES_EXPORT ConfigWidget : public TQWidget { Q_OBJECT public: diff --git a/kresources/factory.cpp b/kresources/factory.cpp index 462d6be9c..14f905603 100644 --- a/kresources/factory.cpp +++ b/kresources/factory.cpp @@ -45,7 +45,7 @@ Factory *Factory::self( const TQString& resourceFamily ) if ( !mSelves ) staticDeleter.setObject( mSelves, new TQDict<Factory> ); - factory = mSelves->find( resourceFamily ); + factory = mSelves->tqfind( resourceFamily ); if ( !factory ) { factory = new Factory( resourceFamily ); @@ -79,7 +79,7 @@ TQStringList Factory::typeNames() const ConfigWidget *Factory::configWidget( const TQString& type, TQWidget *parent ) { - if ( type.isEmpty() || !mTypeMap.contains( type ) ) + if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) return 0; KService::Ptr ptr = mTypeMap[ type ]; @@ -109,7 +109,7 @@ ConfigWidget *Factory::configWidget( const TQString& type, TQWidget *parent ) TQString Factory::typeName( const TQString &type ) const { - if ( type.isEmpty() || !mTypeMap.contains( type ) ) + if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) return TQString(); KService::Ptr ptr = mTypeMap[ type ]; @@ -118,7 +118,7 @@ TQString Factory::typeName( const TQString &type ) const TQString Factory::typeDescription( const TQString &type ) const { - if ( type.isEmpty() || !mTypeMap.contains( type ) ) + if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) return TQString(); KService::Ptr ptr = mTypeMap[ type ]; @@ -129,7 +129,7 @@ Resource *Factory::resource( const TQString& type, const KConfig *config ) { kdDebug(5650) << "Factory::resource( " << type << ", config )" << endl; - if ( type.isEmpty() || !mTypeMap.contains( type ) ) { + if ( type.isEmpty() || !mTypeMap.tqcontains( type ) ) { kdDebug(5650) << "Factory::resource() no such type " << type << endl; return 0; } diff --git a/kresources/manager.h b/kresources/manager.h index ab1562716..c11ecaab5 100644 --- a/kresources/manager.h +++ b/kresources/manager.h @@ -335,7 +335,7 @@ class Manager : private ManagerNotifier ++it ) { TQString desc = mFactory->typeName( *it ); if ( !mFactory->typeDescription( *it ).isEmpty() ) - desc += TQString::fromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::fromLatin1(")"); + desc += TQString::tqfromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::tqfromLatin1(")"); typeDescs.append( desc ); } diff --git a/kresources/managerimpl.cpp b/kresources/managerimpl.cpp index b5d9ec32f..15dd33428 100644 --- a/kresources/managerimpl.cpp +++ b/kresources/managerimpl.cpp @@ -353,7 +353,7 @@ Resource *ManagerImpl::readResourceConfig( const TQString &identifier, if ( checkActive ) { TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); - resource->setActive( activeKeys.contains( identifier ) ); + resource->setActive( activeKeys.tqcontains( identifier ) ); } mResources.append( resource ); @@ -383,20 +383,20 @@ void ManagerImpl::writeResourceConfig( Resource *resource, bool checkActive ) TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); TQStringList passiveKeys = mConfig->readListEntry( "PassiveResourceKeys" ); if ( resource->isActive() ) { - if ( passiveKeys.contains( key ) ) { // remove it from passive list + if ( passiveKeys.tqcontains( key ) ) { // remove it from passive list passiveKeys.remove( key ); mConfig->writeEntry( "PassiveResourceKeys", passiveKeys ); } - if ( !activeKeys.contains( key ) ) { // add it to active list + if ( !activeKeys.tqcontains( key ) ) { // add it to active list activeKeys.append( key ); mConfig->writeEntry( "ResourceKeys", activeKeys ); } } else if ( !resource->isActive() ) { - if ( activeKeys.contains( key ) ) { // remove it from active list + if ( activeKeys.tqcontains( key ) ) { // remove it from active list activeKeys.remove( key ); mConfig->writeEntry( "ResourceKeys", activeKeys ); } - if ( !passiveKeys.contains( key ) ) { // add it to passive list + if ( !passiveKeys.tqcontains( key ) ) { // add it to passive list passiveKeys.append( key ); mConfig->writeEntry( "PassiveResourceKeys", passiveKeys ); } @@ -414,7 +414,7 @@ void ManagerImpl::removeResource( Resource *resource ) mConfig->setGroup( "General" ); TQStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); - if ( activeKeys.contains( key ) ) { + if ( activeKeys.tqcontains( key ) ) { activeKeys.remove( key ); mConfig->writeEntry( "ResourceKeys", activeKeys ); } else { diff --git a/kresources/resource.h b/kresources/resource.h index 63190378d..eec790bbe 100644 --- a/kresources/resource.h +++ b/kresources/resource.h @@ -252,7 +252,7 @@ service_DATA = resourceexample.desktop data. Subclasses of ResourceCalendar would implement this API for local files, remote files, specific calendar servers etc. */ -class KRESOURCES_EXPORT Resource : public QObject +class KRESOURCES_EXPORT Resource : public TQObject { friend class Factory; friend class ManagerImpl; diff --git a/kresources/selectdialog.cpp b/kresources/selectdialog.cpp index cc1c7e593..3eb8ad332 100644 --- a/kresources/selectdialog.cpp +++ b/kresources/selectdialog.cpp @@ -57,8 +57,8 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent, KButtonBox *buttonBox = new KButtonBox( this ); buttonBox->addStretch(); - buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) ); - buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) ); + buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) ); + buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) ); buttonBox->layout(); mainLayout->addWidget( buttonBox ); diff --git a/kspell2/backgroundchecker.h b/kspell2/backgroundchecker.h index e5418d7ec..9346b0c89 100644 --- a/kspell2/backgroundchecker.h +++ b/kspell2/backgroundchecker.h @@ -46,7 +46,7 @@ namespace KSpell2 * @author Zack Rusin <zack@kde.org> * @short class used for spell checking in the background */ - class KDE_EXPORT BackgroundChecker : public QObject + class KDE_EXPORT BackgroundChecker : public TQObject { Q_OBJECT public: diff --git a/kspell2/backgroundengine.h b/kspell2/backgroundengine.h index 9534e970c..d5bee8ca5 100644 --- a/kspell2/backgroundengine.h +++ b/kspell2/backgroundengine.h @@ -31,7 +31,7 @@ namespace KSpell2 class Filter; class Broker; class Dictionary; - class BackgroundEngine : public QObject + class BackgroundEngine : public TQObject { Q_OBJECT public: diff --git a/kspell2/backgroundthread.h b/kspell2/backgroundthread.h index 90432a1b8..12c631c2b 100644 --- a/kspell2/backgroundthread.h +++ b/kspell2/backgroundthread.h @@ -33,7 +33,7 @@ namespace KSpell2 class Filter; class Broker; class Dictionary; - class BackgroundThread : public QThread + class BackgroundThread : public TQThread { public: BackgroundThread(); diff --git a/kspell2/broker.cpp b/kspell2/broker.cpp index 7f572bb01..0149dace1 100644 --- a/kspell2/broker.cpp +++ b/kspell2/broker.cpp @@ -189,8 +189,8 @@ void Broker::loadPlugin( const TQString& pluginId ) kdDebug()<<"Loading plugin " << pluginId << endl; Client *client = KParts::ComponentFactory::createInstanceFromQuery<Client>( - TQString::fromLatin1( "KSpell/Client" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), + TQString::tqfromLatin1( "KSpell/Client" ), + TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); if ( client ) diff --git a/kspell2/client.h b/kspell2/client.h index 86046e204..f06b760bf 100644 --- a/kspell2/client.h +++ b/kspell2/client.h @@ -38,7 +38,7 @@ namespace KSpell2 * I don't really feel like writting my own KLibFactory * that would load anything else then TQObject derivatives. */ - class KDE_EXPORT Client : public QObject + class KDE_EXPORT Client : public TQObject { Q_OBJECT public: diff --git a/kspell2/plugins/ispell/ispell_checker.h b/kspell2/plugins/ispell/ispell_checker.h index 08783922a..df72fe7b4 100644 --- a/kspell2/plugins/ispell/ispell_checker.h +++ b/kspell2/plugins/ispell/ispell_checker.h @@ -112,7 +112,7 @@ private: /* HACK: macros replaced with function implementations - so we could do a side-effect-free check for unicode + so we could do a side-effect-free check for tqunicode characters which aren't in hashheader */ char myupper(ichar_t c); diff --git a/kspell2/plugins/ispell/makedent.cpp b/kspell2/plugins/ispell/makedent.cpp index 9c168dc17..0aeba8a1c 100644 --- a/kspell2/plugins/ispell/makedent.cpp +++ b/kspell2/plugins/ispell/makedent.cpp @@ -903,7 +903,7 @@ ISpellChecker::findfiletype (const char *name, int searchnames, int *deformatter /* HACK: macros replaced with function implementations - so we could do a side-effect-free check for unicode + so we could do a side-effect-free check for tqunicode characters which aren't in hashheader TODO: this is just a workaround to keep us from crashing. diff --git a/kspell2/settings.cpp b/kspell2/settings.cpp index 664ae24e0..9e10913bf 100644 --- a/kspell2/settings.cpp +++ b/kspell2/settings.cpp @@ -75,7 +75,7 @@ KSharedConfig *Settings::sharedConfig() const void Settings::setDefaultLanguage( const TQString& lang ) { TQStringList cs = d->broker->languages(); - if ( cs.find( lang ) != cs.end() && + if ( cs.tqfind( lang ) != cs.end() && d->defaultLanguage != lang ) { d->defaultLanguage = lang; readIgnoreList(); diff --git a/kspell2/tests/backgroundtest.h b/kspell2/tests/backgroundtest.h index fcdf9db55..2f08e9ce0 100644 --- a/kspell2/tests/backgroundtest.h +++ b/kspell2/tests/backgroundtest.h @@ -26,7 +26,7 @@ #include "backgroundchecker.h" -class BackgroundTest : public QObject +class BackgroundTest : public TQObject { Q_OBJECT public: diff --git a/kspell2/tests/test_dialog.cpp b/kspell2/tests/test_dialog.cpp index f0ee1ab3b..bc5d808a8 100644 --- a/kspell2/tests/test_dialog.cpp +++ b/kspell2/tests/test_dialog.cpp @@ -49,7 +49,7 @@ void TestDialog::check( const TQString& buffer ) void TestDialog::doneChecking( const TQString& buf ) { kdDebug()<<"Done with :"<<buf<<endl; - qApp->quit(); + tqApp->quit(); } int main( int argc, char** argv ) diff --git a/kspell2/tests/test_dialog.h b/kspell2/tests/test_dialog.h index 5ef2dd189..e8a6cf970 100644 --- a/kspell2/tests/test_dialog.h +++ b/kspell2/tests/test_dialog.h @@ -26,7 +26,7 @@ #include <tqobject.h> -class TestDialog : public QObject +class TestDialog : public TQObject { Q_OBJECT public: diff --git a/kspell2/threadevents.h b/kspell2/threadevents.h index e6b52293e..87a516148 100644 --- a/kspell2/threadevents.h +++ b/kspell2/threadevents.h @@ -30,7 +30,7 @@ namespace KSpell2 FoundMisspelling = 2003, FinishedChecking = 2004 }; - class MisspellingEvent : public QCustomEvent + class MisspellingEvent : public TQCustomEvent { public: MisspellingEvent( const TQString& word, @@ -49,7 +49,7 @@ namespace KSpell2 TQString m_word; int m_position; }; - class FinishedCheckingEvent : public QCustomEvent + class FinishedCheckingEvent : public TQCustomEvent { public: FinishedCheckingEvent() diff --git a/kspell2/ui/configwidget.h b/kspell2/ui/configwidget.h index ed49ca20e..e51be6b89 100644 --- a/kspell2/ui/configwidget.h +++ b/kspell2/ui/configwidget.h @@ -27,7 +27,7 @@ namespace KSpell2 { class Broker; - class KDE_EXPORT ConfigWidget : public QWidget + class KDE_EXPORT ConfigWidget : public TQWidget { Q_OBJECT public: diff --git a/kspell2/ui/highlighter.cpp b/kspell2/ui/highlighter.cpp index 2d185462d..a3c33d7ae 100644 --- a/kspell2/ui/highlighter.cpp +++ b/kspell2/ui/highlighter.cpp @@ -110,7 +110,7 @@ TQString Highlighter::currentLanguage() const void Highlighter::setCurrentLanguage( const TQString& lang ) { - if ( !d->dictCache.find( lang ) ) { + if ( !d->dictCache.tqfind( lang ) ) { Dictionary *dict = d->broker->dictionary( lang ); if ( dict ) { d->dictCache.insert( lang, dict ); diff --git a/kspell2/ui/highlighter.h b/kspell2/ui/highlighter.h index 543bbe01f..2309c3a64 100644 --- a/kspell2/ui/highlighter.h +++ b/kspell2/ui/highlighter.h @@ -29,7 +29,7 @@ class TQTextEdit; namespace KSpell2 { - class Highlighter : public QSyntaxHighlighter + class Highlighter : public TQSyntaxHighlighter { public: Highlighter( TQTextEdit *textEdit, diff --git a/kspell2/ui/kspell2ui.ui b/kspell2/ui/kspell2ui.ui index b8870f2f5..b8a5d662b 100644 --- a/kspell2/ui/kspell2ui.ui +++ b/kspell2/ui/kspell2ui.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>430</width> <height>300</height> @@ -87,7 +87,7 @@ <property name="text"> <string>... the <b>misspelled</b> word shown in context ...</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> <property name="toolTip" stdset="0"> @@ -123,7 +123,7 @@ Click here if you consider that the unknown word is not misspelled and you want <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>74</width> <height>20</height> @@ -204,7 +204,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt></string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="5" rowspan="3" colspan="1"> + <widget class="TQLayoutWidget" row="2" column="5" rowspan="3" colspan="1"> <property name="name"> <cstring>layout1</cstring> </property> @@ -298,7 +298,7 @@ Click here if you consider that the unknown word is not misspelled and you want <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kstyles/highcolor/bitmaps.h b/kstyles/highcolor/bitmaps.h index 43e96bd8e..f63301818 100644 --- a/kstyles/highcolor/bitmaps.h +++ b/kstyles/highcolor/bitmaps.h @@ -31,19 +31,19 @@ static const unsigned char radiomask_bits[] = { static const unsigned char x_bits[] = {0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63}; // Arrow bitmaps -static const QCOORD u_arrow[]={-1,-3, 0,-3, -2,-2, 1,-2, -3,-1, 2,-1, -4,0, 3,0, -4,1, 3,1}; -static const QCOORD d_arrow[]={-4,-2, 3,-2, -4,-1, 3,-1, -3,0, 2,0, -2,1, 1,1, -1,2, 0,2}; -static const QCOORD l_arrow[]={-3,-1, -3,0, -2,-2, -2,1, -1,-3, -1,2, 0,-4, 0,3, 1,-4, 1,3}; -static const QCOORD r_arrow[]={-2,-4, -2,3, -1,-4, -1,3, 0,-3, 0,2, 1,-2, 1,1, 2,-1, 2,0}; +static const TQCOORD u_arrow[]={-1,-3, 0,-3, -2,-2, 1,-2, -3,-1, 2,-1, -4,0, 3,0, -4,1, 3,1}; +static const TQCOORD d_arrow[]={-4,-2, 3,-2, -4,-1, 3,-1, -3,0, 2,0, -2,1, 1,1, -1,2, 0,2}; +static const TQCOORD l_arrow[]={-3,-1, -3,0, -2,-2, -2,1, -1,-3, -1,2, 0,-4, 0,3, 1,-4, 1,3}; +static const TQCOORD r_arrow[]={-2,-4, -2,3, -1,-4, -1,3, 0,-3, 0,2, 1,-2, 1,1, 2,-1, 2,0}; namespace B3 { - const QCOORD u_arrow[]={ 0,-2, 0,-2, -1,-1, 1,-1, -2,0, 2,0, -3,1, 3,1 }; - const QCOORD d_arrow[]={ -3,-2, 3,-2, -2,-1, 2,-1, -1,0, 1,0, 0,1, 0,1 }; - const QCOORD l_arrow[]={ 1,-3, 1,-3, 0,-2, 1,-2, -1,-1, 1,-1, -2,0, 1,0, -1,1, 1,1, 0,2, 1,2, 1,3, 1,3 }; - const QCOORD r_arrow[]={ -2,-3, -2,-3, -2,-2, -1,-2, -2,-1, 0,-1, -2,0, 1,0, -2,1, 0,1, -2,2, -1,2, -2,3, -2,3 }; + const TQCOORD u_arrow[]={ 0,-2, 0,-2, -1,-1, 1,-1, -2,0, 2,0, -3,1, 3,1 }; + const TQCOORD d_arrow[]={ -3,-2, 3,-2, -2,-1, 2,-1, -1,0, 1,0, 0,1, 0,1 }; + const TQCOORD l_arrow[]={ 1,-3, 1,-3, 0,-2, 1,-2, -1,-1, 1,-1, -2,0, 1,0, -1,1, 1,1, 0,2, 1,2, 1,3, 1,3 }; + const TQCOORD r_arrow[]={ -2,-3, -2,-3, -2,-2, -1,-2, -2,-1, 0,-1, -2,0, 1,0, -2,1, 0,1, -2,2, -1,2, -2,3, -2,3 }; } -#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +#define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) // Fix Qt's wacky image positions diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp index a3a520f84..bd3d25822 100644 --- a/kstyles/highcolor/highcolor.cpp +++ b/kstyles/highcolor/highcolor.cpp @@ -41,6 +41,9 @@ #include <tqtoolbar.h> #include <tqpopupmenu.h> +#include <tqimage.h> +#include <tqapplication.h> + #include <kdrawutil.h> #include <kpixmapeffect.h> @@ -50,7 +53,7 @@ // -- Style Plugin Interface ------------------------- -class HighColorStylePlugin : public QStylePlugin +class HighColorStylePlugin : public TQStylePlugin { public: HighColorStylePlugin() {} @@ -314,7 +317,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, if ( sunken ) kDrawBeButton( p, x, y, w, h, cg, true, - &cg.brush(TQColorGroup::Mid) ); + &cg.tqbrush(TQColorGroup::Mid) ); else if ( flags & Style_MouseOver && !flat ) { TQBrush brush(cg.button().light(110)); @@ -364,7 +367,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, cg.button(), false); } else kDrawBeButton(p, x, y, w, h, cg, false, - &cg.brush(TQColorGroup::Button)); + &cg.tqbrush(TQColorGroup::Button)); break; } @@ -417,7 +420,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, if (p && p->device()->devType() == TQInternal::Widget) { TQHeader* hdr = dynamic_cast<TQHeader*>(p->device()); if (hdr) - horizontal = hdr->orientation() == Horizontal; + horizontal = hdr->orientation() == Qt::Horizontal; } int x,y,w,h; @@ -760,7 +763,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, case PE_WindowFrame: case PE_PanelLineEdit: { bool sunken = flags & Style_Sunken; - int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth) + int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) : opt.lineWidth(); if (lw == 2) { @@ -783,7 +786,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, p->drawLine(x+1, y+1, x+1, y2-1); p->setPen(oldPen); } else - KStyle::drawPrimitive(pe, p, r, cg, flags, opt); + KStyle::tqdrawPrimitive(pe, p, r, cg, flags, opt); break; } @@ -795,7 +798,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, case PE_PanelDockWindow: { // Toolbar int x2 = r.x()+r.width()-1; int y2 = r.y()+r.height()-1; - int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth) + int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) : opt.lineWidth(); if (lw) @@ -853,44 +856,44 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, // HighColor & Default arrows switch(pe) { case PE_ArrowUp: - a.setPoints(QCOORDARRLEN(u_arrow), u_arrow); + a.setPoints(TQCOORDARRLEN(u_arrow), u_arrow); break; case PE_ArrowDown: - a.setPoints(QCOORDARRLEN(d_arrow), d_arrow); + a.setPoints(TQCOORDARRLEN(d_arrow), d_arrow); break; case PE_ArrowLeft: - a.setPoints(QCOORDARRLEN(l_arrow), l_arrow); + a.setPoints(TQCOORDARRLEN(l_arrow), l_arrow); break; default: - a.setPoints(QCOORDARRLEN(r_arrow), r_arrow); + a.setPoints(TQCOORDARRLEN(r_arrow), r_arrow); } } else { // B3 arrows switch(pe) { case PE_ArrowUp: - a.setPoints(QCOORDARRLEN(B3::u_arrow), B3::u_arrow); + a.setPoints(TQCOORDARRLEN(B3::u_arrow), B3::u_arrow); break; case PE_ArrowDown: - a.setPoints(QCOORDARRLEN(B3::d_arrow), B3::d_arrow); + a.setPoints(TQCOORDARRLEN(B3::d_arrow), B3::d_arrow); break; case PE_ArrowLeft: - a.setPoints(QCOORDARRLEN(B3::l_arrow), B3::l_arrow); + a.setPoints(TQCOORDARRLEN(B3::l_arrow), B3::l_arrow); break; default: - a.setPoints(QCOORDARRLEN(B3::r_arrow), B3::r_arrow); + a.setPoints(TQCOORDARRLEN(B3::r_arrow), B3::r_arrow); } } p->save(); if ( flags & Style_Down ) - p->translate( pixelMetric( PM_ButtonShiftHorizontal ), - pixelMetric( PM_ButtonShiftVertical ) ); + p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ), + tqpixelMetric( PM_ButtonShiftVertical ) ); if ( flags & Style_Enabled ) { a.translate( r.x() + r.width() / 2, r.y() + r.height() / 2 ); @@ -907,7 +910,7 @@ void HighColorStyle::drawPrimitive( PrimitiveElement pe, p->restore(); } else - KStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + KStyle::tqdrawPrimitive( pe, p, r, cg, flags, opt ); } } } @@ -1001,7 +1004,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe, // ------------------------------------------------------------------- case KPE_SliderGroove: { const TQSlider* slider = (const TQSlider*)widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; int gcenter = (horizontal ? r.height() : r.width()) / 2; TQRect gr; @@ -1035,7 +1038,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe, // ------------------------------------------------------------------- case KPE_SliderHandle: { const TQSlider* slider = (const TQSlider*)widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; int x,y,w,h; r.rect(&x, &y, &w, &h); int x2 = x+w-1; @@ -1092,7 +1095,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe, } -void HighColorStyle::drawControl( ControlElement element, +void HighColorStyle::tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1115,7 +1118,7 @@ void HighColorStyle::drawControl( ControlElement element, if ( btnDefault || button->autoDefault() ) { // Compensate for default indicator - static int di = pixelMetric( PM_ButtonDefaultIndicator ); + static int di = tqpixelMetric( PM_ButtonDefaultIndicator ); br.addCoords( di, di, -di, -di ); } @@ -1141,14 +1144,14 @@ void HighColorStyle::drawControl( ControlElement element, // Shift button contents if pushed. if ( active ) { - x += pixelMetric(PM_ButtonShiftHorizontal, widget); - y += pixelMetric(PM_ButtonShiftVertical, widget); + x += tqpixelMetric(PM_ButtonShiftHorizontal, widget); + y += tqpixelMetric(PM_ButtonShiftVertical, widget); flags |= Style_Sunken; } // Does the button have a popup menu? if ( button->isMenuButton() ) { - int dx = pixelMetric( PM_MenuButtonIndicator, widget ); + int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ); drawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4), cg, flags, opt ); w -= dx; @@ -1181,7 +1184,7 @@ void HighColorStyle::drawControl( ControlElement element, // Make the label indicate if the button is a default button or not if ( active || button->isDefault() ) { // Draw "fake" bold text - this enables the font metrics to remain - // the same as computed in TQPushButton::sizeHint(), but gives + // the same as computed in TQPushButton::tqsizeHint(), but gives // a reasonable bold effect. int i; @@ -1189,25 +1192,25 @@ void HighColorStyle::drawControl( ControlElement element, if (button->isEnabled()) // Don't draw double-shadow when disabled for(i=0; i<2; i++) drawItem( p, TQRect(x+i+1, y+1, w, h), AlignCenter | ShowPrefix, - button->colorGroup(), button->isEnabled(), NULL, + button->tqcolorGroup(), button->isEnabled(), NULL, button->text(), -1, - active ? &button->colorGroup().dark() : &button->colorGroup().mid() ); + active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() ); // Normal Text for(i=0; i<2; i++) drawItem( p, TQRect(x+i, y, w, h), AlignCenter | ShowPrefix, - button->colorGroup(), button->isEnabled(), i == 0 ? button->pixmap() : NULL, + button->tqcolorGroup(), button->isEnabled(), i == 0 ? button->pixmap() : NULL, button->text(), -1, - active ? &button->colorGroup().light() : &button->colorGroup().buttonText() ); + active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() ); } else - drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(), + drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, - active ? &button->colorGroup().light() : &button->colorGroup().buttonText() ); + active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() ); // Draw a focus rect if the button has focus if ( flags & Style_HasFocus ) drawPrimitive( PE_FocusRect, p, - TQStyle::visualRect(subRect(SR_PushButtonFocusRect, widget), widget), + TQStyle::tqvisualRect(subRect(SR_PushButtonFocusRect, widget), widget), cg, flags ); break; } @@ -1293,7 +1296,7 @@ void HighColorStyle::drawControl( ControlElement element, bool enabled = mi->isEnabled(); bool checkable = popupmenu->isCheckable(); bool active = flags & Style_Active; - bool etchtext = styleHint( SH_EtchDisabledText ); + bool etchtext = tqstyleHint( SH_EtchDisabledText ); bool reverse = TQApplication::reverseLayout(); int x, y, w, h; r.rect( &x, &y, &w, &h ); @@ -1324,7 +1327,7 @@ void HighColorStyle::drawControl( ControlElement element, // Do we have an icon? if ( mi->iconSet() ) { TQIconSet::Mode mode; - TQRect cr = visualRect( TQRect(x, y, checkcol, h), r ); + TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r ); // Select the correct icon from the iconset if ( active ) @@ -1404,7 +1407,7 @@ void HighColorStyle::drawControl( ControlElement element, // Does the menu item have a text label? if ( !s.isNull() ) { - int t = s.find( '\t' ); + int t = s.tqfind( '\t' ); int m = itemVMargin; int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; text_flags |= reverse ? AlignRight : AlignLeft; @@ -1445,22 +1448,22 @@ void HighColorStyle::drawControl( ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( OpaqueMode ); + p->setBackgroundMode( Qt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( TransparentMode ); + p->setBackgroundMode( Qt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; - int dim = pixelMetric(PM_MenuButtonIndicator); - TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, + int dim = tqpixelMetric(PM_MenuButtonIndicator); + TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); // Draw an arrow at the far end of the menu item @@ -1480,12 +1483,12 @@ void HighColorStyle::drawControl( ControlElement element, } default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void HighColorStyle::drawControlMask( ControlElement element, +void HighColorStyle::tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1498,7 +1501,7 @@ void HighColorStyle::drawControlMask( ControlElement element, case CE_PushButton: { int x1, y1, x2, y2; r.coords( &x1, &y1, &x2, &y2 ); - QCOORD corners[] = { x1,y1, x2,y1, x1,y2, x2,y2 }; + TQCOORD corners[] = { x1,y1, x2,y1, x1,y2, x2,y2 }; p->fillRect( r, color1 ); p->setPen( color0 ); p->drawPoints( TQPointArray(4, corners) ); @@ -1506,12 +1509,12 @@ void HighColorStyle::drawControlMask( ControlElement element, } default: - KStyle::drawControlMask(element, p, widget, r, opt); + KStyle::tqdrawControlMask(element, p, widget, r, opt); } } -void HighColorStyle::drawComplexControl( ComplexControl control, +void HighColorStyle::tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1562,7 +1565,7 @@ void HighColorStyle::drawComplexControl( ComplexControl control, p->drawLine(x+1, y+2, x+1, y2-2); // Get the button bounding box - TQRect ar = TQStyle::visualRect( + TQRect ar = TQStyle::tqvisualRect( querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow), widget ); @@ -1581,7 +1584,7 @@ void HighColorStyle::drawComplexControl( ComplexControl control, if ( controls & SC_ComboBoxEditField ) { const TQComboBox * cb = (const TQComboBox *) widget; - TQRect re = TQStyle::visualRect( + TQRect re = TQStyle::tqvisualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField), widget ); @@ -1605,7 +1608,7 @@ void HighColorStyle::drawComplexControl( ComplexControl control, p->fillRect( re.x(), re.y(), re.width(), re.height(), cg.brush( TQColorGroup::Highlight ) ); - TQRect re = TQStyle::visualRect( + TQRect re = TQStyle::tqvisualRect( subRect(SR_ComboBoxFocusRect, cb), widget); drawPrimitive( PE_FocusRect, p, re, cg, @@ -1639,11 +1642,11 @@ void HighColorStyle::drawComplexControl( ComplexControl control, drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); // Check whether to draw a background pixmap - else if ( toolbutton->parentWidget() && - toolbutton->parentWidget()->backgroundPixmap() && - !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->tqparentWidget() && + toolbutton->tqparentWidget()->backgroundPixmap() && + !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } else if (widget->parent()) @@ -1693,14 +1696,14 @@ void HighColorStyle::drawComplexControl( ComplexControl control, default: - KStyle::drawComplexControl(control, p, widget, + KStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); break; } } -void HighColorStyle::drawComplexControlMask( ComplexControl control, +void HighColorStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1714,7 +1717,7 @@ void HighColorStyle::drawComplexControlMask( ComplexControl control, case CC_ToolButton: { int x1, y1, x2, y2; r.coords( &x1, &y1, &x2, &y2 ); - QCOORD corners[] = { x1,y1, x2,y1, x1,y2, x2,y2 }; + TQCOORD corners[] = { x1,y1, x2,y1, x1,y2, x2,y2 }; p->fillRect( r, color1 ); p->setPen( color0 ); p->drawPoints( TQPointArray(4, corners) ); @@ -1722,7 +1725,7 @@ void HighColorStyle::drawComplexControlMask( ComplexControl control, } default: - KStyle::drawComplexControlMask(control, p, widget, r, opt); + KStyle::tqdrawComplexControlMask(control, p, widget, r, opt); } } @@ -1765,11 +1768,11 @@ TQRect HighColorStyle::subRect(SubRect r, const TQWidget *widget) const int dbw1 = 0, dbw2 = 0; if (button->isDefault() || button->autoDefault()) { - dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget); + dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget); dbw2 = dbw1 * 2; } - int dfw1 = pixelMetric(PM_DefaultFrameWidth, widget) * 2, + int dfw1 = tqpixelMetric(PM_DefaultFrameWidth, widget) * 2, dfw2 = dfw1 * 2; return TQRect(wrect.x() + dfw1 + dbw1 + 1, @@ -1781,7 +1784,7 @@ TQRect HighColorStyle::subRect(SubRect r, const TQWidget *widget) const } -int HighColorStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int HighColorStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { @@ -1814,7 +1817,7 @@ int HighColorStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } @@ -1832,8 +1835,8 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents, const TQPushButton* button = (const TQPushButton*) widget; int w = contentSize.width(); int h = contentSize.height(); - int bm = pixelMetric( PM_ButtonMargin, widget ); - int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2; + int bm = tqpixelMetric( PM_ButtonMargin, widget ); + int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2; w += bm + fw + 6; // ### Add 6 to make way for bold font. h += bm + fw; @@ -1845,7 +1848,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents, if ( type != HighColor ) { // Compensate for default indicator - int di = pixelMetric( PM_ButtonDefaultIndicator ); + int di = tqpixelMetric( PM_ButtonDefaultIndicator ); w += di * 2; h += di * 2; } @@ -1871,8 +1874,8 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents, int w = contentSize.width(), h = contentSize.height(); if ( mi->custom() ) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if ( ! mi->custom()->fullSpan() ) h += 2*itemVMargin + 2*itemFrame; } @@ -1898,7 +1901,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents, 2 * itemFrame ); } - if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 ) + if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 ) w += 12; else if ( mi->popup() ) w += 2 * arrowHMargin; @@ -1917,12 +1920,12 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents, default: - return KStyle::sizeFromContents( contents, widget, contentSize, opt ); + return KStyle::tqsizeFromContents( contents, widget, contentSize, opt ); } } -// Fix Qt's wacky image alignment +// Fix Qt's wacky image tqalignment TQPixmap HighColorStyle::stylePixmap(StylePixmap stylepixmap, const TQWidget* widget, const TQStyleOption& opt) const @@ -1954,12 +1957,12 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event ) if ( (event->type() == TQEvent::Enter) && (button->isEnabled()) ) { hoverWidget = button; - button->repaint( false ); + button->tqrepaint( false ); } else if ( (event->type() == TQEvent::Leave) && - (object == hoverWidget) ) { + (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) { hoverWidget = 0L; - button->repaint( false ); + button->tqrepaint( false ); } } else if ( object->parent() && !qstrcmp( object->name(), kdeToolbarWidget ) ) { @@ -1969,8 +1972,8 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event ) if (event->type() == TQEvent::Paint ) { // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *widget = static_cast<TQWidget*>(object); - TQWidget *parent = static_cast<TQWidget*>(object->parent()); + TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *parent = TQT_TQWIDGET(object->parent()); int x_offset = widget->x(), y_offset = widget->y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { @@ -1988,7 +1991,7 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event ) if (tb) horiz_grad = tb->orientation() == Qt::Vertical; TQPainter p( widget ); - renderGradient(&p, r, parent->colorGroup().button(), horiz_grad, + renderGradient(&p, r, parent->tqcolorGroup().button(), horiz_grad, x_offset, y_offset, pr.width(), pr.height()); return false; // Now draw the contents @@ -1999,14 +2002,14 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event ) // We need to override the paint event to draw a // gradient on a QToolBarExtensionWidget. if ( event->type() == TQEvent::Paint ) { - TQWidget *widget = static_cast<TQWidget*>(object); + TQWidget *widget = TQT_TQWIDGET(object); TQRect wr = widget->rect(), tr = toolbar->rect(); TQPainter p( widget ); - renderGradient(&p, wr, toolbar->colorGroup().button(), + renderGradient(&p, wr, toolbar->tqcolorGroup().button(), toolbar->orientation() == Qt::Vertical, wr.x(), wr.y(), tr.width() - 2, tr.height() - 2); - p.setPen( toolbar->colorGroup().dark() ); + p.setPen( toolbar->tqcolorGroup().dark() ); if ( toolbar->orientation() == Qt::Horizontal ) p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); else @@ -2034,7 +2037,7 @@ void HighColorStyle::renderGradient( TQPainter* p, const TQRect& r, // We use these to draw parent-relative pixmaps for toolbar buttons // and menubar items. - GradientSet* grSet = gDict.find( clr.rgb() ); + GradientSet* grSet = gDict.tqfind( clr.rgb() ); if (!grSet) { grSet = new GradientSet(clr); diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h index f1fc44c33..98fe2f651 100644 --- a/kstyles/highcolor/highcolor.h +++ b/kstyles/highcolor/highcolor.h @@ -86,7 +86,7 @@ class HighColorStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( ControlElement element, + void tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -94,13 +94,13 @@ class HighColorStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControlMask( ControlElement element, + void tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControl( ComplexControl control, + void tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -110,7 +110,7 @@ class HighColorStyle : public KStyle SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControlMask( ComplexControl control, + void tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -126,7 +126,7 @@ class HighColorStyle : public KStyle int len = -1, const TQColor *penColor = 0 ) const; - int pixelMetric( PixelMetric m, + int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, diff --git a/kstyles/highcontrast/config/highcontrastconfig.h b/kstyles/highcontrast/config/highcontrastconfig.h index d9512cef3..d52a22b47 100644 --- a/kstyles/highcontrast/config/highcontrastconfig.h +++ b/kstyles/highcontrast/config/highcontrastconfig.h @@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE. class TQCheckBox; -class HighContrastStyleConfig: public QWidget +class HighContrastStyleConfig: public TQWidget { Q_OBJECT public: diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp index 0b9c0cfcf..a9b242f22 100644 --- a/kstyles/highcontrast/highcontrast.cpp +++ b/kstyles/highcontrast/highcontrast.cpp @@ -44,6 +44,9 @@ #include <tqlistview.h> #include <tqsettings.h> +#include <tqimage.h> +#include <tqapplication.h> + #include <kdrawutil.h> #include <kpixmapeffect.h> @@ -51,7 +54,7 @@ #include "highcontrast.moc" // -- Style Plugin Interface ------------------------- -class HighContrastStylePlugin : public QStylePlugin +class HighContrastStylePlugin : public TQStylePlugin { public: HighContrastStylePlugin() {} @@ -630,7 +633,7 @@ void HighContrastStyle::drawPrimitive (PrimitiveElement pe, } default: { - KStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + KStyle::tqdrawPrimitive( pe, p, r, cg, flags, opt ); } } } @@ -702,13 +705,13 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe, } case KPE_ListViewExpander: { - // TODO There is no pixelMetric associated with the + // TODO There is no tqpixelMetric associated with the // ListViewExpander in KStyle. // To have a properly large expander, the CC_ListView case of - // drawComplexControl should be handled. + // tqdrawComplexControl should be handled. // Probably it would be better to add a KPM_ListViewExpander metric // to the KStyle KStylePixelMetric enum, and have the KStyle - // drawComplexControl handle it. + // tqdrawComplexControl handle it. PrimitiveElement direction; if (flags & Style_On) { // Collapsed = On direction = PE_ArrowRight; @@ -729,7 +732,7 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe, } -void HighContrastStyle::drawControl (ControlElement element, +void HighContrastStyle::tqdrawControl (ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -755,9 +758,9 @@ void HighContrastStyle::drawControl (ControlElement element, drawRoundRect (p, r); const TQTabBar *tb = static_cast< const TQTabBar * >(widget); - TQTabBar::Shape shape = tb->shape(); - if (shape == TQTabBar::TriangularBelow || - shape == TQTabBar::RoundedBelow) { + TQTabBar::Shape tqshape = tb->tqshape(); + if (tqshape == TQTabBar::TriangularBelow || + tqshape == TQTabBar::RoundedBelow) { p->fillRect (r.left(), r.top(), r.width(), 2*basicLineWidth, p->pen().color()); @@ -789,7 +792,7 @@ void HighContrastStyle::drawControl (ControlElement element, if (( btnDefault || button->autoDefault() ) && (button->isEnabled())) { // Compensate for default indicator - static int di = pixelMetric( PM_ButtonDefaultIndicator ); + static int di = tqpixelMetric( PM_ButtonDefaultIndicator ); addOffset (&br, di); } @@ -860,7 +863,7 @@ void HighContrastStyle::drawControl (ControlElement element, // Does the button have a popup menu? if (popup) { - int dx = pixelMetric (PM_MenuButtonIndicator, widget); + int dx = tqpixelMetric (PM_MenuButtonIndicator, widget); drawArrow (p, TQRect(x + w - dx - 2, y + 2, dx, h - 4), PE_ArrowDown); w -= dx; } @@ -934,7 +937,7 @@ void HighContrastStyle::drawControl (ControlElement element, // RADIOBUTTON // ------------------------------------------------------------------- case CE_RadioButton: { - drawPrimitive (PE_ExclusiveIndicator, p, r, cg, flags); + tqdrawPrimitive (PE_ExclusiveIndicator, p, r, cg, flags); break; } @@ -1009,7 +1012,7 @@ void HighContrastStyle::drawControl (ControlElement element, // Do we have an icon? if ( mi->iconSet() && !mi->iconSet()->isNull() ) { TQIconSet::Mode mode; - TQRect cr = visualRect( TQRect(x, y, checkcol, h), r ); + TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r ); // Select the correct icon from the iconset if (!(flags & Style_Enabled)) @@ -1075,7 +1078,7 @@ void HighContrastStyle::drawControl (ControlElement element, // Does the menu item have a text label? if ( !s.isNull() ) { - int t = s.find( '\t' ); + int t = s.tqfind( '\t' ); int m = itemVMargin; int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; text_flags |= reverse ? AlignRight : AlignLeft; @@ -1104,22 +1107,22 @@ void HighContrastStyle::drawControl (ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( OpaqueMode ); + p->setBackgroundMode( Qt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( TransparentMode ); + p->setBackgroundMode( Qt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; - int dim = pixelMetric(PM_MenuButtonIndicator); - TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, + int dim = tqpixelMetric(PM_MenuButtonIndicator); + TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); // Draw an arrow at the far end of the menu item @@ -1129,11 +1132,11 @@ void HighContrastStyle::drawControl (ControlElement element, } default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void HighContrastStyle::drawControlMask (ControlElement element, +void HighContrastStyle::tqdrawControlMask (ControlElement element, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -1157,7 +1160,7 @@ void HighContrastStyle::drawControlMask (ControlElement element, } default: { - KStyle::drawControlMask (element, p, w, r, opt); + KStyle::tqdrawControlMask (element, p, w, r, opt); } } } @@ -1176,7 +1179,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) return sibling; } -void HighContrastStyle::drawComplexControl (ComplexControl control, +void HighContrastStyle::tqdrawComplexControl (ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1197,7 +1200,7 @@ void HighContrastStyle::drawComplexControl (ComplexControl control, setColorsText (p, cg, flags); drawRoundRect (p, r); - TQRect r2 = TQStyle::visualRect (querySubControlMetrics (CC_ComboBox, widget, SC_ComboBoxArrow), widget); + TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics (CC_ComboBox, widget, SC_ComboBoxArrow), widget); if (flags & Style_HasFocus) { TQRect r3 (r); if (r2.left() > 0) @@ -1232,12 +1235,12 @@ void HighContrastStyle::drawComplexControl (ComplexControl control, setColorsButton (p, cg, flags); // Draw arrows if required if (controls & SC_SpinWidgetDown) { - TQRect r2 = TQStyle::visualRect (querySubControlMetrics (CC_SpinWidget, widget, SC_SpinWidgetDown), widget); + TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics ((QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetDown), widget); drawRoundRect (p, r2); drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth); } if (controls & SC_SpinWidgetUp) { - TQRect r2 = TQStyle::visualRect (querySubControlMetrics (CC_SpinWidget, widget, SC_SpinWidgetUp), widget); + TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics ((QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetUp), widget); drawRoundRect (p, r2); drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth); } @@ -1273,11 +1276,11 @@ void HighContrastStyle::drawComplexControl (ComplexControl control, drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); // Check whether to draw a background pixmap - else if ( toolbutton->parentWidget() && - toolbutton->parentWidget()->backgroundPixmap() && - !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->tqparentWidget() && + toolbutton->tqparentWidget()->backgroundPixmap() && + !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } } @@ -1312,7 +1315,7 @@ void HighContrastStyle::drawComplexControl (ComplexControl control, // Paint the icon and text. if ( controls & SC_ListView ) - TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); + TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); // If we're have a branch or are expanded... if ( controls & (SC_ListViewBranch | SC_ListViewExpand) ) @@ -1458,13 +1461,13 @@ void HighContrastStyle::drawComplexControl (ComplexControl control, } default: - KStyle::drawComplexControl(control, p, widget, + KStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); break; } } -void HighContrastStyle::drawComplexControlMask(ComplexControl c, +void HighContrastStyle::tqdrawComplexControlMask(ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -1478,7 +1481,7 @@ void HighContrastStyle::drawComplexControlMask(ComplexControl c, break; } default: { - KStyle::drawComplexControlMask (c, p, w, r, o); + KStyle::tqdrawComplexControlMask (c, p, w, r, o); } } } @@ -1515,7 +1518,7 @@ TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control, switch (control) { case CC_ComboBox : { - int arrow = pixelMetric (PM_ScrollBarExtent, widget); + int arrow = tqpixelMetric (PM_ScrollBarExtent, widget); switch (subcontrol) { case SC_ComboBoxFrame: @@ -1531,7 +1534,7 @@ TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control, break; } case CC_SpinWidget : { - int arrow = pixelMetric (PM_ScrollBarExtent, 0); + int arrow = tqpixelMetric (PM_ScrollBarExtent, 0); switch (subcontrol) { case SC_SpinWidgetFrame: @@ -1559,7 +1562,7 @@ TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control, } -int HighContrastStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int HighContrastStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { //### TODO: Use the tab metrics changes from Ker. switch(m) @@ -1643,7 +1646,7 @@ int HighContrastStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } @@ -1672,8 +1675,8 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents, const TQPushButton* button = (const TQPushButton*) widget; int w = contentSize.width(); int h = contentSize.height(); - int bm = pixelMetric( PM_ButtonMargin, widget ); - int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2; + int bm = tqpixelMetric( PM_ButtonMargin, widget ); + int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2; w += bm + fw + 6; // ### Add 6 to make way for bold font. h += bm + fw; @@ -1684,7 +1687,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents, w = 80; // Compensate for default indicator - int di = pixelMetric( PM_ButtonDefaultIndicator ); + int di = tqpixelMetric( PM_ButtonDefaultIndicator ); w += di * 2; h += di * 2; } @@ -1709,7 +1712,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents, case CT_ComboBox: { const TQComboBox *cb = static_cast< const TQComboBox* > (widget); int borderSize = (cb->editable() ? 4 : 2) * basicLineWidth; - int arrowSize = pixelMetric (PM_ScrollBarExtent, cb); + int arrowSize = tqpixelMetric (PM_ScrollBarExtent, cb); return TQSize(borderSize + basicLineWidth + arrowSize, borderSize) + contentSize; } @@ -1726,8 +1729,8 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents, int w = contentSize.width(), h = contentSize.height(); if ( mi->custom() ) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if ( ! mi->custom()->fullSpan() ) h += 2*itemVMargin + 2*itemFrame; } @@ -1753,7 +1756,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents, 2 * itemFrame ); } - if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 ) + if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 ) w += 12; else if ( mi->popup() ) w += 2 * arrowHMargin; @@ -1779,7 +1782,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents, default: - return KStyle::sizeFromContents( contents, widget, contentSize, opt ); + return KStyle::tqsizeFromContents( contents, widget, contentSize, opt ); } } @@ -1807,16 +1810,16 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event) || widget->inherits ("QSpinWidget"))) { hoverWidget = widget; - widget->repaint (false); + widget->tqrepaint (false); } else if (event->type() == TQEvent::Leave && (widget->inherits ("QButton") || widget->inherits ("QComboBox") || widget->inherits ("QSpinWidget"))) { - if (object == hoverWidget) + if (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) hoverWidget = 0L; - widget->repaint (false); + widget->tqrepaint (false); } // Make sure the focus rectangle is shown correctly. else if (event->type() == TQEvent::FocusIn || event->type() == TQEvent::FocusOut) @@ -1830,9 +1833,9 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event) } if (widgetparent) - widgetparent->repaint (false); + widgetparent->tqrepaint (false); else - widget->repaint (false); + widget->tqrepaint (false); } } diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h index fb3db68b1..39b981d29 100644 --- a/kstyles/highcontrast/highcontrast.h +++ b/kstyles/highcontrast/highcontrast.h @@ -74,7 +74,7 @@ class HighContrastStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( ControlElement element, + void tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -82,13 +82,13 @@ class HighContrastStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControlMask( ControlElement element, + void tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControl( ComplexControl control, + void tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -98,7 +98,7 @@ class HighContrastStyle : public KStyle SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControlMask( ComplexControl control, + void tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -120,7 +120,7 @@ class HighContrastStyle : public KStyle int len = -1, const TQColor *penColor = 0 ) const; - int pixelMetric( PixelMetric m, + int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; int kPixelMetric( KStylePixelMetric m, diff --git a/kstyles/keramik/bitmaps.h b/kstyles/keramik/bitmaps.h index fd5dcf327..54c30dd8d 100644 --- a/kstyles/keramik/bitmaps.h +++ b/kstyles/keramik/bitmaps.h @@ -3,12 +3,12 @@ /* Image bits processed by KPixmap2Bitmaps */ // Arrow bitmaps -static const QCOORD u_arrow[]={-1,-3, 0,-3, -2,-2, 1,-2, -3,-1, 2,-1, -4,0, 3,0, -4,1, 3,1}; -static const QCOORD d_arrow[]={-4,-2, 3,-2, -4,-1, 3,-1, -3,0, 2,0, -2,1, 1,1, -1,2, 0,2}; -static const QCOORD l_arrow[]={-3,-1, -3,0, -2,-2, -2,1, -1,-3, -1,2, 0,-4, 0,3, 1,-4, 1,3}; -static const QCOORD r_arrow[]={-2,-4, -2,3, -1,-4, -1,3, 0,-3, 0,2, 1,-2, 1,1, 2,-1, 2,0}; +static const TQCOORD u_arrow[]={-1,-3, 0,-3, -2,-2, 1,-2, -3,-1, 2,-1, -4,0, 3,0, -4,1, 3,1}; +static const TQCOORD d_arrow[]={-4,-2, 3,-2, -4,-1, 3,-1, -3,0, 2,0, -2,1, 1,1, -1,2, 0,2}; +static const TQCOORD l_arrow[]={-3,-1, -3,0, -2,-2, -2,1, -1,-3, -1,2, 0,-4, 0,3, 1,-4, 1,3}; +static const TQCOORD r_arrow[]={-2,-4, -2,3, -1,-4, -1,3, 0,-3, 0,2, 1,-2, 1,1, 2,-1, 2,0}; -static const QCOORD keramik_combo_arrow[] = +static const TQCOORD keramik_combo_arrow[] = {-4,-5, 4, -5, -2 ,-2, 2, -2, -2 ,-1, 2, -1, @@ -21,7 +21,7 @@ static const QCOORD keramik_combo_arrow[] = }; -static const QCOORD keramik_up_arrow[] = +static const TQCOORD keramik_up_arrow[] = { 0, -4, 0, -4, -1, -3, 1, -3, @@ -34,7 +34,7 @@ static const QCOORD keramik_up_arrow[] = -2, 4, 2, 4 }; -static const QCOORD keramik_down_arrow[] = +static const TQCOORD keramik_down_arrow[] = { 0, 4, 0, 4, -1, 3, 1, 3, @@ -48,7 +48,7 @@ static const QCOORD keramik_down_arrow[] = }; - static const QCOORD keramik_right_arrow[] = + static const TQCOORD keramik_right_arrow[] = { 4, 0, 4, 0, 3, -1, 3, 1, @@ -61,7 +61,7 @@ static const QCOORD keramik_down_arrow[] = -4, -2, -4, 2 }; - static const QCOORD keramik_left_arrow[] = + static const TQCOORD keramik_left_arrow[] = { -4, 0, -4, 0, -3, -1, -3, 1, @@ -76,7 +76,7 @@ static const QCOORD keramik_down_arrow[] = -#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +#define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) diff --git a/kstyles/keramik/genembed.cpp b/kstyles/keramik/genembed.cpp index 2fecf94d1..b79147dda 100644 --- a/kstyles/keramik/genembed.cpp +++ b/kstyles/keramik/genembed.cpp @@ -146,7 +146,7 @@ int main(int argc, char** argv) int readJustID = 0; - if ((pos = s.findRev("-")) != -1) + if ((pos = s.tqfindRev("-")) != -1) { int suffix = evalSuffix(s.mid(pos)); if (suffix !=-1 ) @@ -156,7 +156,7 @@ int main(int argc, char** argv) } } - if (!assignID.contains(id)) + if (!assignID.tqcontains(id)) { assignID[id] = nextID; nextID += 256; @@ -222,14 +222,14 @@ int main(int argc, char** argv) cout<<"static const unsigned char "<<s.latin1()<<"[]={\n"; - Q_UINT32* read = reinterpret_cast< Q_UINT32* >(input.bits() ); + TQ_UINT32* read = reinterpret_cast< TQ_UINT32* >(input.bits() ); int size = input.width()*input.height(); for (int pos=0; pos<size; pos++) { QRgb basePix = (QRgb)*read; - if (qAlpha(basePix) != 255) + if (tqAlpha(basePix) != 255) reallySolid = false; else pixSolid++; @@ -242,7 +242,7 @@ int main(int argc, char** argv) images.push_back(image); - read = reinterpret_cast< Q_UINT32* >(input.bits() ); + read = reinterpret_cast< TQ_UINT32* >(input.bits() ); for (int pos=0; pos<size; pos++) { QRgb basePix = (QRgb)*read; @@ -252,10 +252,10 @@ int main(int argc, char** argv) int h,s,v; clr.hsv(&h,&s,&v); - v=qGray(basePix); + v=tqGray(basePix); int targetColorAlpha = 0 , greyAdd = 0; - //int srcAlpha = qAlpha(basePix); + //int srcAlpha = tqAlpha(basePix); if (s>0 || v > 128) { //Non-shadow @@ -296,8 +296,8 @@ int main(int argc, char** argv) if (reallySolid) cout<<targetColorAlpha<<","<<greyAdd<<","; else - cout<<targetColorAlpha<<","<<greyAdd<<","<<qAlpha(basePix)<<","; - //cout<<qRed(basePix)<<","<<qGreen(basePix)<<","<<qBlue(basePix)<<","<<qAlpha(basePix)<<","; + cout<<targetColorAlpha<<","<<greyAdd<<","<<tqAlpha(basePix)<<","; + //cout<<tqRed(basePix)<<","<<tqGreen(basePix)<<","<<tqBlue(basePix)<<","<<tqAlpha(basePix)<<","; if (pos%8 == 7) cout<<"\n"; @@ -346,7 +346,7 @@ int main(int argc, char** argv) cout<<"\t\t\timages.insert(image_db[c].id, &image_db[c]);\n"; cout<<"\t}\n"; cout<<"\tstatic KeramikImageDb* instance;\n"; - cout<<"\tQIntDict<KeramikEmbedImage> images;\n"; + cout<<"\tTQIntDict<KeramikEmbedImage> images;\n"; cout<<"};\n\n"; cout<<"KeramikImageDb* KeramikImageDb::instance = 0;\n\n"; diff --git a/kstyles/keramik/gradients.cpp b/kstyles/keramik/gradients.cpp index ab804d117..4a5c7dfc9 100644 --- a/kstyles/keramik/gradients.cpp +++ b/kstyles/keramik/gradients.cpp @@ -96,7 +96,7 @@ void GradientPainter::renderGradient( TQPainter* p, const TQRect& r, TQColor c, int key = entry.key(); - if ((cacheEntry = cache.find(key, false))) + if ((cacheEntry = cache.tqfind(key, false))) { if (entry == *cacheEntry) { diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 6921efa2f..9ba8cb6a2 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -33,6 +33,7 @@ // $Id$ +#include <tqapplication.h> #include <tqbitmap.h> #include <tqcheckbox.h> #include <tqcombobox.h> @@ -71,7 +72,7 @@ #define loader Keramik::PixmapLoader::the() // -- Style Plugin Interface ------------------------- -class KeramikStylePlugin : public QStylePlugin +class KeramikStylePlugin : public TQStylePlugin { public: KeramikStylePlugin() {} @@ -129,25 +130,25 @@ namespace switch(pe) { case TQStyle::PE_ArrowUp: - a.setPoints(QCOORDARRLEN(keramik_up_arrow), keramik_up_arrow); + a.setPoints(TQCOORDARRLEN(keramik_up_arrow), keramik_up_arrow); break; case TQStyle::PE_ArrowDown: - a.setPoints(QCOORDARRLEN(keramik_down_arrow), keramik_down_arrow); + a.setPoints(TQCOORDARRLEN(keramik_down_arrow), keramik_down_arrow); break; case TQStyle::PE_ArrowLeft: - a.setPoints(QCOORDARRLEN(keramik_left_arrow), keramik_left_arrow); + a.setPoints(TQCOORDARRLEN(keramik_left_arrow), keramik_left_arrow); break; default: - a.setPoints(QCOORDARRLEN(keramik_right_arrow), keramik_right_arrow); + a.setPoints(TQCOORDARRLEN(keramik_right_arrow), keramik_right_arrow); } p->save(); /*if ( down ) - p->translate( pixelMetric( PM_ButtonShiftHorizontal ), - pixelMetric( PM_ButtonShiftVertical ) ); + p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ), + tqpixelMetric( PM_ButtonShiftVertical ) ); */ if ( enabled ) { @@ -346,8 +347,8 @@ void KeramikStyle::polish(TQWidget* widget) else if ( widget->inherits( "QMenuBar" ) || widget->inherits( "QPopupMenu" ) ) widget->setBackgroundMode( NoBackground ); - else if ( widget->parentWidget() && - ( ( widget->inherits( "QListBox" ) && widget->parentWidget()->inherits( "QComboBox" ) ) || + else if ( widget->tqparentWidget() && + ( ( widget->inherits( "QListBox" ) && widget->tqparentWidget()->inherits( "QComboBox" ) ) || widget->inherits( "KCompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 4 ); @@ -363,7 +364,7 @@ void KeramikStyle::polish(TQWidget* widget) widget->installEventFilter(this); } - if (animateProgressBar && ::qt_cast<TQProgressBar*>(widget)) + if (animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget)) { widget->installEventFilter(this); progAnimWidgets[static_cast<TQProgressBar*>(widget)] = 0; @@ -387,8 +388,8 @@ void KeramikStyle::unPolish(TQWidget* widget) else if ( widget->inherits( "QMenuBar" ) || widget->inherits( "QPopupMenu" ) ) widget->setBackgroundMode( PaletteBackground ); - else if ( widget->parentWidget() && - ( ( widget->inherits( "QListBox" ) && widget->parentWidget()->inherits( "QComboBox" ) ) || + else if ( widget->tqparentWidget() && + ( ( widget->inherits( "QListBox" ) && widget->tqparentWidget()->inherits( "QComboBox" ) ) || widget->inherits( "KCompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 1 ); @@ -402,7 +403,7 @@ void KeramikStyle::unPolish(TQWidget* widget) widget->setBackgroundMode( PaletteBackground ); widget->removeEventFilter(this); } - else if ( ::qt_cast<TQProgressBar*>(widget) ) + else if ( ::tqqt_cast<TQProgressBar*>(widget) ) { progAnimWidgets.remove(static_cast<TQProgressBar*>(widget)); } @@ -412,7 +413,7 @@ void KeramikStyle::unPolish(TQWidget* widget) void KeramikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(static_cast<TQProgressBar*>(obj)); + progAnimWidgets.remove(static_cast<TQProgressBar*>(TQT_TQWIDGET(obj))); } @@ -476,13 +477,13 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQWidget* wi // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *parent = static_cast<TQWidget*>(widget->parentWidget()); + TQWidget *parent = TQT_TQWIDGET(widget->tqparentWidget()); int x_offset = widget->x(), y_offset = widget->y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { x_offset += parent->x(); y_offset += parent->y(); - parent = static_cast<TQWidget*>(parent->parent()); + parent = TQT_TQWIDGET(parent->parent()); } TQRect pr = parent->rect(); @@ -519,14 +520,14 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQWidget* wi if (painter) { Keramik::GradientPainter::renderGradient( painter, widget->rect(), - widget->colorGroup().button(), horiz_grad, false, + widget->tqcolorGroup().button(), horiz_grad, false, x_offset, y_offset, toolWidth, toolHeight); } else { TQPainter p( widget ); Keramik::GradientPainter::renderGradient( &p, widget->rect(), - widget->colorGroup().button(), horiz_grad, false, + widget->tqcolorGroup().button(), horiz_grad, false, x_offset, y_offset, toolWidth, toolHeight); } } @@ -748,8 +749,8 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, case PE_HeaderArrow: if ( flags & Style_Up ) - drawPrimitive( PE_ArrowUp, p, r, cg, Style_Enabled ); - else drawPrimitive( PE_ArrowDown, p, r, cg, Style_Enabled ); + tqdrawPrimitive( PE_ArrowUp, p, r, cg, Style_Enabled ); + else tqdrawPrimitive( PE_ArrowDown, p, r, cg, Style_Enabled ); break; @@ -944,7 +945,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, //p->setPen( cg.shadow() ); //p->drawRect( r.x()+1, r.y()+1, r.width()-2, r.height()-2); - //p->fillRect( visualRect( TQRect( x + 1, y + 1, 23, h - 2 ), r ), cg.background().dark( 105 ) ); + //p->fillRect( tqvisualRect( TQRect( x + 1, y + 1, 23, h - 2 ), r ), cg.background().dark( 105 ) ); //break; // GENERAL PANELS @@ -954,7 +955,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, if (kickerMode) { if (p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame" ) + TQCString(static_cast<TQWidget*>(static_cast<QWidget*>(static_cast<QPaintDevice*>(p->tqdevice())))->className()) == "FittsLawFrame" ) { int x2 = x + r.width() - 1; int y2 = y + r.height() - 1; @@ -970,13 +971,13 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, return; } } - KStyle::drawPrimitive(pe, p, r, cg, flags, opt); + KStyle::tqdrawPrimitive(pe, p, r, cg, flags, opt); break; } case PE_WindowFrame: { bool sunken = flags & Style_Sunken; - int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth) + int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) : opt.lineWidth(); if (lw == 2) { @@ -999,7 +1000,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, p->drawLine(x+1, y+1, x+1, y2-1); p->setPen(oldPen); } else - KStyle::drawPrimitive(pe, p, r, cg, flags, opt); + KStyle::tqdrawPrimitive(pe, p, r, cg, flags, opt); break; } @@ -1014,7 +1015,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, int x2 = r.x()+r.width()-1; int y2 = r.y()+r.height()-1; - int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth) + int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) : opt.lineWidth(); if (lw) { @@ -1034,7 +1035,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, int y = r.y(); int x2 = r.x() + r.width() - 1; int y2 = r.y() + r.height() - 1; - int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth) + int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) : opt.lineWidth(); if (lw) @@ -1092,7 +1093,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, TQWidget* paintWidget = dynamic_cast<TQWidget*>(p->device()); TQToolBar* parent = 0; if (paintWidget) - parent = ::qt_cast<TQToolBar*>(paintWidget->parentWidget()); + parent = ::tqqt_cast<TQToolBar*>(paintWidget->tqparentWidget()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal) ); if ( !(flags & Style_Horizontal) ) @@ -1123,25 +1124,25 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, switch(pe) { case PE_ArrowUp: - a.setPoints(QCOORDARRLEN(u_arrow), u_arrow); + a.setPoints(TQCOORDARRLEN(u_arrow), u_arrow); break; case PE_ArrowDown: - a.setPoints(QCOORDARRLEN(d_arrow), d_arrow); + a.setPoints(TQCOORDARRLEN(d_arrow), d_arrow); break; case PE_ArrowLeft: - a.setPoints(QCOORDARRLEN(l_arrow), l_arrow); + a.setPoints(TQCOORDARRLEN(l_arrow), l_arrow); break; default: - a.setPoints(QCOORDARRLEN(r_arrow), r_arrow); + a.setPoints(TQCOORDARRLEN(r_arrow), r_arrow); } p->save(); if ( flags & Style_Down ) - p->translate( pixelMetric( PM_ButtonShiftHorizontal ), - pixelMetric( PM_ButtonShiftVertical ) ); + p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ), + tqpixelMetric( PM_ButtonShiftVertical ) ); if ( flags & Style_Enabled ) { @@ -1162,7 +1163,7 @@ void KeramikStyle::drawPrimitive( PrimitiveElement pe, } else - KStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + KStyle::tqdrawPrimitive( pe, p, r, cg, flags, opt ); } } } @@ -1186,7 +1187,7 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe, case KPE_SliderGroove: { const TQSlider* slider = static_cast< const TQSlider* >( widget ); - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; Keramik::TilePainter::PaintMode pmod = Keramik::TilePainter::PaintNormal; @@ -1206,7 +1207,7 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe, case KPE_SliderHandle: { const TQSlider* slider = static_cast< const TQSlider* >( widget ); - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; TQColor hl = cg.highlight(); if (!disabled && flags & Style_Active) @@ -1305,16 +1306,16 @@ bool KeramikStyle::isFormWidget(const TQWidget* widget) const { //Form widgets are in the KHTMLView, but that has 2 further inner levels //of widgets - QClipperWidget, and outside of that, QViewportWidget - TQWidget* potentialClipPort = widget->parentWidget(); + TQWidget* potentialClipPort = widget->tqparentWidget(); if ( !potentialClipPort || potentialClipPort->isTopLevel() ) return false; - TQWidget* potentialViewPort = potentialClipPort->parentWidget(); + TQWidget* potentialViewPort = potentialClipPort->tqparentWidget(); if (!potentialViewPort || potentialViewPort->isTopLevel() || qstrcmp(potentialViewPort->name(), "qt_viewport") ) return false; - TQWidget* potentialKHTML = potentialViewPort->parentWidget(); + TQWidget* potentialKHTML = potentialViewPort->tqparentWidget(); if (!potentialKHTML || potentialKHTML->isTopLevel() || qstrcmp(potentialKHTML->className(), "KHTMLView") ) return false; @@ -1323,7 +1324,7 @@ bool KeramikStyle::isFormWidget(const TQWidget* widget) const return true; } -void KeramikStyle::drawControl( ControlElement element, +void KeramikStyle::tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1354,14 +1355,14 @@ void KeramikStyle::drawControl( ControlElement element, if ( btn->isDefault( ) && !flatMode ) { - drawPrimitive( PE_ButtonDefault, p, r, cg, flags ); + tqdrawPrimitive( PE_ButtonDefault, p, r, cg, flags ); } else { if (widget->parent() && widget->parent()->inherits("QToolBar")) toolbarBlendWidget = widget; - drawPrimitive( PE_ButtonCommand, p, r, cg, flags ); + tqdrawPrimitive( PE_ButtonCommand, p, r, cg, flags ); toolbarBlendWidget = 0; } @@ -1381,15 +1382,15 @@ void KeramikStyle::drawControl( ControlElement element, // Shift button contents if pushed. if ( active ) { - x += pixelMetric(PM_ButtonShiftHorizontal, widget); - y += pixelMetric(PM_ButtonShiftVertical, widget); + x += tqpixelMetric(PM_ButtonShiftHorizontal, widget); + y += tqpixelMetric(PM_ButtonShiftVertical, widget); flags |= Style_Sunken; } // Does the button have a popup menu? if ( button->isMenuButton() ) { - int dx = pixelMetric( PM_MenuButtonIndicator, widget ); + int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ); if ( button->iconSet() && !button->iconSet()->isNull() && (dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w ) { @@ -1397,7 +1398,7 @@ void KeramikStyle::drawControl( ControlElement element, } else { - drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ), + tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ), cg, flags, opt ); w -= dx; } @@ -1446,18 +1447,18 @@ void KeramikStyle::drawControl( ControlElement element, } if (cornArrow) //Draw over the icon - drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ), + tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ), cg, flags, opt ); } // Make the label indicate if the button is a default button or not - drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(), + drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, - &button->colorGroup().buttonText() ); + &button->tqcolorGroup().buttonText() ); if ( flags & Style_HasFocus ) - drawPrimitive( PE_FocusRect, p, - visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), + tqdrawPrimitive( PE_FocusRect, p, + tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags ); break; } @@ -1465,13 +1466,13 @@ void KeramikStyle::drawControl( ControlElement element, case CE_ToolButtonLabel: { //const TQToolButton *toolbutton = static_cast<const TQToolButton * >(widget); - bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" ); + bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBar" ); TQRect nr = r; if (!onToolbar) { - if (widget->parentWidget() && - !qstrcmp(widget->parentWidget()->name(),"qt_maxcontrols" ) ) + if (widget->tqparentWidget() && + !qstrcmp(widget->tqparentWidget()->name(),"qt_maxcontrols" ) ) { //Make sure we don't cut into the endline if (!qstrcmp(widget->name(), "close")) @@ -1486,7 +1487,7 @@ void KeramikStyle::drawControl( ControlElement element, // nr.setWidth(r.width()-2); //Account for shadow } - KStyle::drawControl(element, p, widget, nr, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, nr, cg, flags, opt); break; } @@ -1494,8 +1495,8 @@ void KeramikStyle::drawControl( ControlElement element, { const TQTabBar* tabBar = static_cast< const TQTabBar* >( widget ); - bool bottom = tabBar->shape() == TQTabBar::RoundedBelow || - tabBar->shape() == TQTabBar::TriangularBelow; + bool bottom = tabBar->tqshape() == TQTabBar::RoundedBelow || + tabBar->tqshape() == TQTabBar::TriangularBelow; if ( flags & Style_Selected ) { @@ -1551,7 +1552,7 @@ void KeramikStyle::drawControl( ControlElement element, tb->orientation() == Qt::Horizontal); } else - KStyle::drawControl( CE_DockWindowEmptyArea, p, + KStyle::tqdrawControl( (QStyle::ControlElement)CE_DockWindowEmptyArea, p, widget, r, cg, flags, opt ); break; } @@ -1607,7 +1608,7 @@ void KeramikStyle::drawControl( ControlElement element, bool enabled = mi->isEnabled(); bool checkable = popupmenu->isCheckable(); bool active = flags & Style_Active; - bool etchtext = styleHint( SH_EtchDisabledText ); + bool etchtext = tqstyleHint( SH_EtchDisabledText ); bool reverse = TQApplication::reverseLayout(); if ( checkable ) checkcol = QMAX( checkcol, 20 ); @@ -1641,7 +1642,7 @@ void KeramikStyle::drawControl( ControlElement element, break; } - TQRect cr = visualRect( TQRect( x + 2, y + 2, checkcol - 1, h - 4 ), r ); + TQRect cr = tqvisualRect( TQRect( x + 2, y + 2, checkcol - 1, h - 4 ), r ); // Do we have an icon? if ( mi->iconSet() ) { @@ -1680,7 +1681,7 @@ void KeramikStyle::drawControl( ControlElement element, SFlags cflags = Style_Default; cflags |= active ? Style_Enabled : Style_On; - drawPrimitive( PE_CheckMark, p, cr, cg, cflags ); + tqdrawPrimitive( PE_CheckMark, p, cr, cg, cflags ); } // Time to draw the menu item label... @@ -1724,7 +1725,7 @@ void KeramikStyle::drawControl( ControlElement element, TQString s = mi->text(); // Does the menu item have a text label? if ( !s.isNull() ) { - int t = s.find( '\t' ); + int t = s.tqfind( '\t' ); int m = itemVMargin; int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; text_flags |= reverse ? AlignRight : AlignLeft; @@ -1773,22 +1774,22 @@ void KeramikStyle::drawControl( ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( OpaqueMode ); + p->setBackgroundMode( Qt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( TransparentMode ); + p->setBackgroundMode( Qt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; - int dim = pixelMetric(PM_MenuButtonIndicator) - itemFrame; - TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim, + int dim = tqpixelMetric(PM_MenuButtonIndicator) - itemFrame; + TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); // Draw an arrow at the far end of the menu item @@ -1799,9 +1800,9 @@ void KeramikStyle::drawControl( ControlElement element, TQColorGroup g2( discol, cg.highlight(), white, white, enabled ? white : discol, discol, white ); - drawPrimitive( arrow, p, vr, g2, Style_Enabled ); + tqdrawPrimitive( arrow, p, vr, g2, Style_Enabled ); } else - drawPrimitive( arrow, p, vr, cg, + tqdrawPrimitive( arrow, p, vr, cg, enabled ? Style_Enabled : Style_Default ); } break; @@ -1914,11 +1915,11 @@ void KeramikStyle::drawControl( ControlElement element, default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void KeramikStyle::drawControlMask( ControlElement element, +void KeramikStyle::tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1926,7 +1927,7 @@ void KeramikStyle::drawControlMask( ControlElement element, { p->fillRect(r, color1); maskMode = true; - drawControl( element, p, widget, r, TQApplication::palette().active(), TQStyle::Style_Default, opt); + tqdrawControl( element, p, widget, r, TQApplication::tqpalette().active(), TQStyle::Style_Default, opt); maskMode = false; } @@ -1934,7 +1935,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const { if (combo->width() >= 80) return false; - int suggestedWidth = combo->sizeHint().width(); + int suggestedWidth = combo->tqsizeHint().width(); if (combo->width() - suggestedWidth < -5) return true; @@ -1942,7 +1943,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const return false; } -void KeramikStyle::drawComplexControl( ComplexControl control, +void KeramikStyle::tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1975,7 +1976,7 @@ void KeramikStyle::drawComplexControl( ComplexControl control, { //Double-buffer only when we are in the slower full-blend mode if (widget->parent() && - ( widget->parent()->inherits("QToolBar")|| !qstrcmp(widget->parent()->name(), kdeToolbarWidget) ) ) + ( widget->tqparent()->inherits("QToolBar")|| !qstrcmp(widget->tqparent()->name(), kdeToolbarWidget) ) ) { buf = new TQPixmap( r.width(), r.height() ); br.setX(0); @@ -1997,7 +1998,7 @@ void KeramikStyle::drawComplexControl( ComplexControl control, //but that also alters height and not just width. //readjust height to fake the other metrics (plus clear //the other areas, as appropriate). The automasker - //will take care of the overall shape. + //will take care of the overall tqshape. if ( compact ) { forceSmallMode = true; @@ -2014,7 +2015,7 @@ void KeramikStyle::drawComplexControl( ComplexControl control, if ( widget == hoverWidget ) flags |= Style_MouseOver; - drawPrimitive( PE_ButtonCommand, p2, br, cg, flags ); + tqdrawPrimitive( PE_ButtonCommand, p2, br, cg, flags ); toolbarBlendWidget = 0; } @@ -2033,17 +2034,17 @@ void KeramikStyle::drawComplexControl( ComplexControl control, if (!compact) { ar.setWidth(ar.width()-13); - TQRect rr = visualRect( TQRect( ar.x(), ar.y() + 4, + TQRect rr = tqvisualRect( TQRect( ar.x(), ar.y() + 4, loader.size(keramik_ripple ).width(), ar.height() - 8 ), widget ); - ar = visualRect( TQRect( ar.x() + loader.size( keramik_ripple ).width() + 4, ar.y(), + ar = tqvisualRect( TQRect( ar.x() + loader.size( keramik_ripple ).width() + 4, ar.y(), 11, ar.height() ), widget ); TQPointArray a; - a.setPoints(QCOORDARRLEN(keramik_combo_arrow), keramik_combo_arrow); + a.setPoints(TQCOORDARRLEN(keramik_combo_arrow), keramik_combo_arrow); a.translate( ar.x() + ar.width() / 2, ar.y() + ar.height() / 2 ); p2->setPen( cg.buttonText() ); @@ -2054,10 +2055,10 @@ void KeramikStyle::drawComplexControl( ComplexControl control, else //Size-constrained combo -- loose the ripple. { ar.setWidth(ar.width() - 7); - ar = visualRect( TQRect( ar.x(), ar.y(), 11, ar.height() ), widget); + ar = tqvisualRect( TQRect( ar.x(), ar.y(), 11, ar.height() ), widget); TQPointArray a; - a.setPoints(QCOORDARRLEN(keramik_combo_arrow), keramik_combo_arrow); + a.setPoints(TQCOORDARRLEN(keramik_combo_arrow), keramik_combo_arrow); a.translate( ar.x() + ar.width() / 2, ar.y() + ar.height() / 2 ); p2->setPen( cg.buttonText() ); @@ -2069,20 +2070,20 @@ void KeramikStyle::drawComplexControl( ComplexControl control, { if ( cb->editable() ) { - TQRect er = visualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ), widget ); + TQRect er = tqvisualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ), widget ); er.addCoords( -2, -2, 2, 2 ); p2->fillRect( er, cg.base() ); - drawPrimitive( PE_PanelLineEdit, p2, er, cg ); + tqdrawPrimitive( PE_PanelLineEdit, p2, er, cg ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( p2, er, cg.button(), Qt::black, false, pmodeFullBlend() ); } else if ( cb->hasFocus() ) { - TQRect re = TQStyle::visualRect(subRect(SR_ComboBoxFocusRect, cb), widget); + TQRect re = TQStyle::tqvisualRect(subRect(SR_ComboBoxFocusRect, cb), widget); if ( compact ) re.addCoords( 3, 3, 0, -3 ); p2->fillRect( re, cg.brush( TQColorGroup::Highlight ) ); - drawPrimitive( PE_FocusRect, p2, re, cg, + tqdrawPrimitive( PE_FocusRect, p2, re, cg, Style_FocusAtBorder, TQStyleOption( cg.highlight() ) ); } // TQComboBox draws the text on its own and uses the painter's current colors @@ -2113,7 +2114,7 @@ void KeramikStyle::drawComplexControl( ComplexControl control, case CC_SpinWidget: { const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget ); - TQRect br = visualRect( querySubControlMetrics( CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget ); + TQRect br = tqvisualRect( querySubControlMetrics( (QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget ); if ( controls & SC_SpinWidgetButtonField ) { Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() ); @@ -2128,19 +2129,19 @@ void KeramikStyle::drawComplexControl( ComplexControl control, } if ( controls & SC_SpinWidgetFrame ) - drawPrimitive( PE_PanelLineEdit, p, r, cg ); + tqdrawPrimitive( PE_PanelLineEdit, p, r, cg ); break; } case CC_ScrollBar: { const TQScrollBar* sb = static_cast< const TQScrollBar* >( widget ); - if (highlightScrollBar && sb->parentWidget()) //Don't do the check if not highlighting anyway + if (highlightScrollBar && sb->tqparentWidget()) //Don't do the check if not highlighting anyway { - if (sb->parentWidget()->colorGroup().button() != sb->colorGroup().button()) + if (sb->tqparentWidget()->tqcolorGroup().button() != sb->tqcolorGroup().button()) customScrollMode = true; } - bool horizontal = sb->orientation() == Horizontal; + bool horizontal = sb->orientation() == Qt::Horizontal; TQRect slider, subpage, addpage, subline, addline; if ( sb->minValue() == sb->maxValue() ) flags &= ~Style_Enabled; @@ -2151,7 +2152,7 @@ void KeramikStyle::drawComplexControl( ComplexControl control, addline = querySubControlMetrics( control, widget, SC_ScrollBarAddLine, opt ); if ( controls & SC_ScrollBarSubLine ) - drawPrimitive( PE_ScrollBarSubLine, p, subline, cg, + tqdrawPrimitive( PE_ScrollBarSubLine, p, subline, cg, flags | ( ( active & SC_ScrollBarSubLine ) ? Style_Down : 0 ) ); TQRegion clip; @@ -2172,21 +2173,21 @@ void KeramikStyle::drawComplexControl( ComplexControl control, p->setClipRect( slider.x(), slider.y(), addpage.right() - slider.x() + 1, slider.height() ); else p->setClipRect( slider.x(), slider.y(), slider.width(), addpage.bottom() - slider.y() + 1 ); - drawPrimitive( PE_ScrollBarSlider, p, slider, cg, + tqdrawPrimitive( PE_ScrollBarSlider, p, slider, cg, flags | ( ( active == SC_ScrollBarSlider ) ? Style_Down : 0 ) ); } p->setClipping( false ); if ( controls & ( SC_ScrollBarSubLine | SC_ScrollBarAddLine ) ) { - drawPrimitive( PE_ScrollBarAddLine, p, addline, cg, flags ); + tqdrawPrimitive( PE_ScrollBarAddLine, p, addline, cg, flags ); if ( active & SC_ScrollBarSubLine ) { if ( horizontal ) p->setClipRect( TQRect( addline.x(), addline.y(), addline.width() / 2, addline.height() ) ); else p->setClipRect( TQRect( addline.x(), addline.y(), addline.width(), addline.height() / 2 ) ); - drawPrimitive( PE_ScrollBarAddLine, p, addline, cg, flags | Style_Down ); + tqdrawPrimitive( PE_ScrollBarAddLine, p, addline, cg, flags | Style_Down ); } else if ( active & SC_ScrollBarAddLine ) { @@ -2194,7 +2195,7 @@ void KeramikStyle::drawComplexControl( ComplexControl control, p->setClipRect( TQRect( addline.x() + addline.width() / 2, addline.y(), addline.width() / 2, addline.height() ) ); else p->setClipRect( TQRect( addline.x(), addline.y() + addline.height() / 2, addline.width(), addline.height() / 2 ) ); - drawPrimitive( PE_ScrollBarAddLine, p, addline, cg, flags | Style_Down ); + tqdrawPrimitive( PE_ScrollBarAddLine, p, addline, cg, flags | Style_Down ); } } @@ -2208,14 +2209,14 @@ void KeramikStyle::drawComplexControl( ComplexControl control, // ------------------------------------------------------------------- case CC_ToolButton: { const TQToolButton *toolbutton = (const TQToolButton *) widget; - bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" ); + bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBar" ); bool onExtender = !onToolbar && - widget->parentWidget() && widget->parentWidget()->inherits( "QToolBarExtensionWidget") && - widget->parentWidget()->parentWidget()->inherits( "QToolBar" ); + widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBarExtensionWidget") && + widget->tqparentWidget()->tqparentWidget()->inherits( "QToolBar" ); bool onControlButtons = false; - if (!onToolbar && !onExtender && widget->parentWidget() && - !qstrcmp(widget->parentWidget()->name(),"qt_maxcontrols" ) ) + if (!onToolbar && !onExtender && widget->tqparentWidget() && + !qstrcmp(widget->tqparentWidget()->name(),"qt_maxcontrols" ) ) { onControlButtons = true; titleBarMode = Maximized; @@ -2249,16 +2250,16 @@ void KeramikStyle::drawComplexControl( ComplexControl control, if (!onToolbar && !onControlButtons) bflags |= Style_Horizontal; - drawPrimitive( PE_ButtonTool, p, button, cg, + tqdrawPrimitive( PE_ButtonTool, p, button, cg, bflags, opt); } // Check whether to draw a background pixmap - else if ( toolbutton->parentWidget() && - toolbutton->parentWidget()->backgroundPixmap() && - !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->tqparentWidget() && + toolbutton->tqparentWidget()->backgroundPixmap() && + !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } else if (onToolbar) @@ -2293,14 +2294,14 @@ void KeramikStyle::drawComplexControl( ComplexControl control, if (controls & SC_ToolButtonMenu) { if (mflags & (Style_Down | Style_On | Style_Raised)) - drawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt); - drawPrimitive(PE_ArrowDown, p, menuarea, cg, mflags, opt); + tqdrawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt); + tqdrawPrimitive(PE_ArrowDown, p, menuarea, cg, mflags, opt); } if (toolbutton->hasFocus() && !toolbutton->focusProxy()) { TQRect fr = toolbutton->rect(); fr.addCoords(3, 3, -3, -3); - drawPrimitive(PE_FocusRect, p, fr, cg); + tqdrawPrimitive(PE_FocusRect, p, fr, cg); } titleBarMode = None; @@ -2311,14 +2312,14 @@ void KeramikStyle::drawComplexControl( ComplexControl control, case CC_TitleBar: titleBarMode = Regular; //Handle buttons on titlebar different from toolbuttons default: - KStyle::drawComplexControl( control, p, widget, + KStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); titleBarMode = None; } } -void KeramikStyle::drawComplexControlMask( ComplexControl control, +void KeramikStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2327,8 +2328,8 @@ void KeramikStyle::drawComplexControlMask( ComplexControl control, if (control == CC_ComboBox) { maskMode = true; - drawComplexControl(CC_ComboBox, p, widget, r, - TQApplication::palette().active(), Style_Default, + tqdrawComplexControl(CC_ComboBox, p, widget, r, + TQApplication::tqpalette().active(), Style_Default, SC_ComboBoxFrame,SC_None, opt); maskMode = false; @@ -2338,7 +2339,7 @@ void KeramikStyle::drawComplexControlMask( ComplexControl control, } -int KeramikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int KeramikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { @@ -2392,11 +2393,11 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const case PM_TabBarTabShiftVertical: { - const TQTabBar* tb = ::qt_cast<const TQTabBar*>(widget); + const TQTabBar* tb = ::tqqt_cast<const TQTabBar*>(widget); if (tb) { - if (tb->shape() == TQTabBar::RoundedBelow || - tb->shape() == TQTabBar::TriangularBelow) + if (tb->tqshape() == TQTabBar::RoundedBelow || + tb->tqshape() == TQTabBar::TriangularBelow) return 0; } @@ -2408,7 +2409,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const return titleBarH; default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } @@ -2426,8 +2427,8 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, { const TQPushButton* btn = static_cast< const TQPushButton* >( widget ); - int w = contentSize.width() + 2 * pixelMetric( PM_ButtonMargin, widget ); - int h = contentSize.height() + 2 * pixelMetric( PM_ButtonMargin, widget ); + int w = contentSize.width() + 2 * tqpixelMetric( PM_ButtonMargin, widget ); + int h = contentSize.height() + 2 * tqpixelMetric( PM_ButtonMargin, widget ); if ( btn->text().isEmpty() && contentSize.width() < 32 ) return TQSize( w, h ); @@ -2440,7 +2441,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, case CT_ToolButton: { - bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" ); + bool onToolbar = widget->tqparentWidget() && widget->tqparentWidget()->inherits( "QToolBar" ); if (!onToolbar) //Behaves like a button, so scale appropriately to the border { int w = contentSize.width(); @@ -2449,7 +2450,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, } else { - return KStyle::sizeFromContents( contents, widget, contentSize, opt ); + return KStyle::tqsizeFromContents( contents, widget, contentSize, opt ); } } @@ -2473,8 +2474,8 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, int w = contentSize.width(), h = contentSize.height(); if ( mi->custom() ) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if ( ! mi->custom()->fullSpan() ) h += 2*itemVMargin + 2*itemFrame; } @@ -2500,7 +2501,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, 2 * itemFrame ); } - if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 ) + if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 ) w += itemHMargin + itemFrame*2 + 7; else if ( mi->popup() ) w += 2 * arrowHMargin; @@ -2518,7 +2519,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, } default: - return KStyle::sizeFromContents( contents, widget, contentSize, opt ); + return KStyle::tqsizeFromContents( contents, widget, contentSize, opt ); } } @@ -2532,7 +2533,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control, if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine ) { TQRect addline = querySubControlMetrics( control, widget, result, opt ); - if ( static_cast< const TQScrollBar* >( widget )->orientation() == Horizontal ) + if ( static_cast< const TQScrollBar* >( widget )->orientation() == Qt::Horizontal ) { if ( point.x() < addline.center().x() ) result = SC_ScrollBarSubLine; } @@ -2584,7 +2585,7 @@ TQRect KeramikStyle::querySubControlMetrics( ComplexControl control, { //Note that the widget here == the combo, not the completion //box, so we don't get any recursion - int suggestedWidth = widget->sizeHint().width(); + int suggestedWidth = widget->tqsizeHint().width(); TQRect def = opt.rect(); def.addCoords( 4, -4, -6, 4 ); @@ -2602,7 +2603,7 @@ TQRect KeramikStyle::querySubControlMetrics( ComplexControl control, case CC_ScrollBar: { const TQScrollBar* sb = static_cast< const TQScrollBar* >( widget ); - bool horizontal = sb->orientation() == Horizontal; + bool horizontal = sb->orientation() == Qt::Horizontal; int addline, subline, sliderpos, sliderlen, maxlen, slidermin; if ( horizontal ) { @@ -2621,7 +2622,7 @@ TQRect KeramikStyle::querySubControlMetrics( ComplexControl control, { int range = sb->maxValue() - sb->minValue(); sliderlen = ( sb->pageStep() * maxlen ) / ( range + sb->pageStep() ); - slidermin = pixelMetric( PM_ScrollBarSliderMin, sb ); + slidermin = tqpixelMetric( PM_ScrollBarSliderMin, sb ); if ( sliderlen < slidermin ) sliderlen = slidermin; if ( sliderlen > maxlen ) sliderlen = maxlen; } @@ -2661,12 +2662,12 @@ TQRect KeramikStyle::querySubControlMetrics( ComplexControl control, case CC_Slider: { const TQSlider* sl = static_cast< const TQSlider* >( widget ); - bool horizontal = sl->orientation() == Horizontal; + bool horizontal = sl->orientation() == Qt::Horizontal; TQSlider::TickSetting ticks = sl->tickmarks(); int pos = sl->sliderStart(); - int size = pixelMetric( PM_SliderControlThickness, widget ); - int handleSize = pixelMetric( PM_SliderThickness, widget ); - int len = pixelMetric( PM_SliderLength, widget ); + int size = tqpixelMetric( PM_SliderControlThickness, widget ); + int handleSize = tqpixelMetric( PM_SliderThickness, widget ); + int len = tqpixelMetric( PM_SliderLength, widget ); //Shrink the metrics if the widget is too small //to fit our normal values for them. @@ -2745,53 +2746,53 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) if ( !object->isWidgetType() ) return false; //Clear hover highlight when needed - if ( (event->type() == TQEvent::Leave) && (object == hoverWidget) ) + if ( (event->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) { - TQWidget* button = static_cast<TQWidget*>(object); + TQWidget* button = TQT_TQWIDGET(object); hoverWidget = 0; - button->repaint( false ); + button->tqrepaint( false ); return false; } //Hover highlight on buttons, toolbuttons and combos - if ( ::qt_cast<TQPushButton*>(object) || ::qt_cast<TQComboBox*>(object) || ::qt_cast<TQToolButton*>(object) ) + if ( ::tqqt_cast<TQPushButton*>(object) || ::tqqt_cast<TQComboBox*>(object) || ::tqqt_cast<TQToolButton*>(object) ) { - if (event->type() == TQEvent::Enter && static_cast<TQWidget*>(object)->isEnabled() ) + if (event->type() == TQEvent::Enter && TQT_TQWIDGET(object)->isEnabled() ) { - hoverWidget = static_cast<TQWidget*>(object); - hoverWidget->repaint( false ); + hoverWidget = TQT_TQWIDGET(object); + hoverWidget->tqrepaint( false ); } return false; } //Combo line edits get special frames - if ( event->type() == TQEvent::Paint && ::qt_cast<TQLineEdit*>(object) ) + if ( event->type() == TQEvent::Paint && ::tqqt_cast<TQLineEdit*>(object) ) { static bool recursion = false; if (recursion ) return false; recursion = true; - object->event( static_cast< TQPaintEvent* >( event ) ); - TQWidget* widget = static_cast< TQWidget* >( object ); + object->event( TQT_TQPAINTEVENT( event ) ); + TQWidget* widget = TQT_TQWIDGET( object ); TQPainter p( widget ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, widget->rect(), - widget->palette().color( TQPalette::Normal, TQColorGroup::Button ), + widget->tqpalette().color( TQPalette::Normal, TQColorGroup::Button ), Qt::black, false, Keramik::TilePainter::PaintFullBlend); recursion = false; return true; } - else if ( ::qt_cast<TQListBox*>(object) ) + else if ( ::tqqt_cast<TQListBox*>(object) ) { //Handle combobox drop downs switch (event->type()) { #ifdef HAVE_X11_EXTENSIONS_SHAPE_H - //Combo dropdowns are shaped + //Combo dropdowns are tqshaped case TQEvent::Resize: { - TQListBox* listbox = static_cast<TQListBox*>(object); - TQResizeEvent* resize = static_cast<TQResizeEvent*>(event); + TQListBox* listbox = static_cast<TQListBox*>(TQT_TQWIDGET(object)); + TQResizeEvent* resize = TQT_TQRESIZEEVENT(event); if (resize->size().height() < 6) return false; @@ -2823,8 +2824,8 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) { TQPainter p( listbox ); Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(), - listbox->palette().color( TQPalette::Normal, TQColorGroup::Button ), - listbox->palette().color( TQPalette::Normal, TQColorGroup::Background ) ); + listbox->tqpalette().color( TQPalette::Normal, TQColorGroup::Button ), + listbox->tqpalette().color( TQPalette::Normal, TQColorGroup::Background ) ); TQPaintEvent newpaint( paint->region().intersect( listbox->contentsRect() ), paint->erased() ); recursion = true; @@ -2855,10 +2856,10 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) { firstComboPopupRelease = false; - TQMouseEvent* mev = static_cast<TQMouseEvent*>(event); - TQListBox* box = static_cast<TQListBox*> (object); + TQMouseEvent* mev = TQT_TQMOUSEEVENT(event); + TQListBox* box = static_cast<TQListBox*>(TQT_TQWIDGET(object)); - TQWidget* parent = box->parentWidget(); + TQWidget* parent = box->tqparentWidget(); if (!parent) return false; @@ -2883,36 +2884,36 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) { // Draw a gradient background for custom widgets in the toolbar // that have specified a "kde toolbar widget" name. - renderToolbarWidgetBackground(0, static_cast<TQWidget*>(object)); + renderToolbarWidgetBackground(0, TQT_TQWIDGET(object)); return false; // Now draw the contents } - else if (event->type() == TQEvent::Paint && object->parent() && ::qt_cast<TQToolBar*>(object->parent()) - && !::qt_cast<TQPopupMenu*>(object) ) + else if (event->type() == TQEvent::Paint && object->parent() && ::tqqt_cast<TQToolBar*>(object->parent()) + && !::tqqt_cast<TQPopupMenu*>(object) ) { // We need to override the paint event to draw a // gradient on a QToolBarExtensionWidget. TQToolBar* toolbar = static_cast<TQToolBar*>(object->parent()); - TQWidget* widget = static_cast<TQWidget*>(object); + TQWidget* widget = TQT_TQWIDGET(object); TQRect wr = widget->rect (), tr = toolbar->rect(); TQPainter p( widget ); if ( toolbar->orientation() == Qt::Horizontal ) { - Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(), + Keramik::GradientPainter::renderGradient( &p, wr, widget->tqcolorGroup().button(), true /*horizontal*/, false /*not a menu*/, 0, widget->y(), wr.width(), tr.height()); } else { - Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(), + Keramik::GradientPainter::renderGradient( &p, wr, widget->tqcolorGroup().button(), false /*vertical*/, false /*not a menu*/, widget->x(), 0, tr.width(), wr.height()); } //Draw terminator line, too - p.setPen( toolbar->colorGroup().mid() ); + p.setPen( toolbar->tqcolorGroup().mid() ); if ( toolbar->orientation() == Qt::Horizontal ) p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); else @@ -2921,7 +2922,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) } // Track show events for progress bars - if ( animateProgressBar && ::qt_cast<TQProgressBar*>(object) ) + if ( animateProgressBar && ::tqqt_cast<TQProgressBar*>(object) ) { if ((event->type() == TQEvent::Show) && !animationTimer->isActive()) { diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h index 03d97ee3a..746626b70 100644 --- a/kstyles/keramik/keramik.h +++ b/kstyles/keramik/keramik.h @@ -70,7 +70,7 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( ControlElement element, + void tqdrawControl( ControlElement element, TQPainter* p, const TQWidget* widget, const TQRect& r, @@ -78,13 +78,13 @@ public: SFlags flags = Style_Default, const TQStyleOption& opt = TQStyleOption::Default ) const; - void drawControlMask( ControlElement element, + void tqdrawControlMask( ControlElement element, TQPainter* p, const TQWidget* widget, const TQRect& r, const TQStyleOption& opt = TQStyleOption::Default ) const; - void drawComplexControl( ComplexControl control, + void tqdrawComplexControl( ComplexControl control, TQPainter* p, const TQWidget* widget, const TQRect& r, @@ -94,13 +94,13 @@ public: SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControlMask( ComplexControl control, + void tqdrawComplexControlMask( ComplexControl control, TQPainter* p, const TQWidget* widget, const TQRect& r, const TQStyleOption& = TQStyleOption::Default ) const; - int pixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const; + int tqpixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, const TQWidget* widget, diff --git a/kstyles/keramik/pixmaploader.cpp b/kstyles/keramik/pixmaploader.cpp index 01cdf5fc6..79d26955e 100644 --- a/kstyles/keramik/pixmaploader.cpp +++ b/kstyles/keramik/pixmaploader.cpp @@ -69,13 +69,13 @@ TQImage* PixmapLoader::getDisabled(int name, const TQColor& color, const TQColor //OK, now, fill it in, using the color.. - Q_UINT32 r, g,b; - Q_UINT32 i = qGray(color.rgb()); + TQ_UINT32 r, g,b; + TQ_UINT32 i = tqGray(color.rgb()); r = (3*color.red()+i)>>2; g = (3*color.green()+i)>>2; b = (3*color.blue()+i)>>2; - Q_UINT32 br = back.red(), bg = back.green(), bb = back.blue(); + TQ_UINT32 br = back.red(), bg = back.green(), bb = back.blue(); if (edata->haveAlpha) @@ -83,21 +83,21 @@ TQImage* PixmapLoader::getDisabled(int name, const TQColor& color, const TQColor if (blend) { img->setAlphaBuffer(false); - Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() ); + TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() ); int size = img->width()*img->height() * 3; for (int pos = 0; pos < size; pos+=3) { - Q_UINT32 scale = edata->data[pos]; - Q_UINT32 add = (edata->data[pos+1]*i+127)>>8; - Q_UINT32 alpha = edata->data[pos+2]; - Q_UINT32 destAlpha = 256 - alpha; + TQ_UINT32 scale = edata->data[pos]; + TQ_UINT32 add = (edata->data[pos+1]*i+127)>>8; + TQ_UINT32 alpha = edata->data[pos+2]; + TQ_UINT32 destAlpha = 256 - alpha; - Q_UINT32 rr = clamp[((r*scale+127)>>8) + add]; - Q_UINT32 rg = clamp[((g*scale+127)>>8) + add]; - Q_UINT32 rb = clamp[((b*scale+127)>>8) + add]; + TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add]; + TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add]; + TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add]; - *write =qRgb(((rr*alpha+127)>>8) + ((br*destAlpha+127)>>8), + *write =tqRgb(((rr*alpha+127)>>8) + ((br*destAlpha+127)>>8), ((rg*alpha+127)>>8) + ((bg*destAlpha+127)>>8), ((rb*alpha+127)>>8) + ((bb*destAlpha+127)>>8)); @@ -107,20 +107,20 @@ TQImage* PixmapLoader::getDisabled(int name, const TQColor& color, const TQColor else { img->setAlphaBuffer(true); - Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() ); + TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() ); int size = img->width()*img->height() * 3; for (int pos = 0; pos < size; pos+=3) { - Q_UINT32 scale = edata->data[pos]; - Q_UINT32 add = (edata->data[pos+1]*i+127)>>8; - Q_UINT32 alpha = edata->data[pos+2]; + TQ_UINT32 scale = edata->data[pos]; + TQ_UINT32 add = (edata->data[pos+1]*i+127)>>8; + TQ_UINT32 alpha = edata->data[pos+2]; - Q_UINT32 rr = clamp[((r*scale+127)>>8) + add]; - Q_UINT32 rg = clamp[((g*scale+127)>>8) + add]; - Q_UINT32 rb = clamp[((b*scale+127)>>8) + add]; + TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add]; + TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add]; + TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add]; - *write =qRgba(rr, rg, rb, alpha); + *write =tqRgba(rr, rg, rb, alpha); write++; } @@ -130,17 +130,17 @@ TQImage* PixmapLoader::getDisabled(int name, const TQColor& color, const TQColor else { img->setAlphaBuffer(false); - Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() ); + TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() ); int size = img->width()*img->height() * 2; for (int pos = 0; pos < size; pos+=2) { - Q_UINT32 scale = edata->data[pos]; - Q_UINT32 add = (edata->data[pos+1]*i+127)>>8; - Q_UINT32 rr = clamp[((r*scale+127)>>8) + add]; - Q_UINT32 rg = clamp[((g*scale+127)>>8) + add]; - Q_UINT32 rb = clamp[((b*scale+127)>>8) + add]; - *write =qRgb(rr, rg, rb); + TQ_UINT32 scale = edata->data[pos]; + TQ_UINT32 add = (edata->data[pos+1]*i+127)>>8; + TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add]; + TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add]; + TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add]; + *write =tqRgb(rr, rg, rb); write++; } } @@ -158,14 +158,14 @@ TQImage* PixmapLoader::getColored(int name, const TQColor& color, const TQColor& TQImage* img = new TQImage(edata->width, edata->height, 32); //OK, now, fill it in, using the color.. - Q_UINT32 r, g,b; + TQ_UINT32 r, g,b; r = color.red() + 2; g = color.green() + 2; b = color.blue() + 2; -// int i = qGray(color.rgb()); +// int i = tqGray(color.rgb()); - Q_UINT32 br = back.red(), bg = back.green(), bb = back.blue(); + TQ_UINT32 br = back.red(), bg = back.green(), bb = back.blue(); if (edata->haveAlpha) { @@ -173,23 +173,23 @@ TQImage* PixmapLoader::getColored(int name, const TQColor& color, const TQColor& { img->setAlphaBuffer(false); - Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() ); + TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() ); int size = img->width()*img->height() * 3; for (int pos = 0; pos < size; pos+=3) { - Q_UINT32 scale = edata->data[pos]; - Q_UINT32 add = edata->data[pos+1]; - Q_UINT32 alpha = edata->data[pos+2]; - Q_UINT32 destAlpha = 256 - alpha; + TQ_UINT32 scale = edata->data[pos]; + TQ_UINT32 add = edata->data[pos+1]; + TQ_UINT32 alpha = edata->data[pos+2]; + TQ_UINT32 destAlpha = 256 - alpha; if (scale != 0) add = add*5/4; - Q_UINT32 rr = clamp[((r*scale+127)>>8) + add]; - Q_UINT32 rg = clamp[((g*scale+127)>>8) + add]; - Q_UINT32 rb = clamp[((b*scale+127)>>8) + add]; + TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add]; + TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add]; + TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add]; - *write =qRgb(((rr*alpha+127)>>8) + ((br*destAlpha+127)>>8), + *write =tqRgb(((rr*alpha+127)>>8) + ((br*destAlpha+127)>>8), ((rg*alpha+127)>>8) + ((bg*destAlpha+127)>>8), ((rb*alpha+127)>>8) + ((bb*destAlpha+127)>>8)); @@ -200,22 +200,22 @@ TQImage* PixmapLoader::getColored(int name, const TQColor& color, const TQColor& { img->setAlphaBuffer(true); - Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() ); + TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() ); int size = img->width()*img->height() * 3; for (int pos = 0; pos < size; pos+=3) { - Q_UINT32 scale = edata->data[pos]; - Q_UINT32 add = edata->data[pos+1]; - Q_UINT32 alpha = edata->data[pos+2]; + TQ_UINT32 scale = edata->data[pos]; + TQ_UINT32 add = edata->data[pos+1]; + TQ_UINT32 alpha = edata->data[pos+2]; if (scale != 0) add = add*5/4; - Q_UINT32 rr = clamp[((r*scale+127)>>8) + add]; - Q_UINT32 rg = clamp[((g*scale+127)>>8) + add]; - Q_UINT32 rb = clamp[((b*scale+127)>>8) + add]; + TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add]; + TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add]; + TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add]; - *write =qRgba(rr, rg, rb, alpha); + *write =tqRgba(rr, rg, rb, alpha); write++; } } @@ -224,22 +224,22 @@ TQImage* PixmapLoader::getColored(int name, const TQColor& color, const TQColor& { img->setAlphaBuffer(false); - Q_UINT32* write = reinterpret_cast< Q_UINT32* >(img->bits() ); + TQ_UINT32* write = reinterpret_cast< TQ_UINT32* >(img->bits() ); int size = img->width()*img->height() * 2; for (int pos = 0; pos < size; pos+=2) { - Q_UINT32 scale = edata->data[pos]; - Q_UINT32 add = edata->data[pos+1]; + TQ_UINT32 scale = edata->data[pos]; + TQ_UINT32 add = edata->data[pos+1]; if (scale != 0) add = add*5/4; - Q_UINT32 rr = clamp[((r*scale+127)>>8) + add]; - Q_UINT32 rg = clamp[((g*scale+127)>>8) + add]; - Q_UINT32 rb = clamp[((b*scale+127)>>8) + add]; + TQ_UINT32 rr = clamp[((r*scale+127)>>8) + add]; + TQ_UINT32 rg = clamp[((g*scale+127)>>8) + add]; + TQ_UINT32 rb = clamp[((b*scale+127)>>8) + add]; - *write =qRgb(rr, rg, rb); + *write =tqRgb(rr, rg, rb); write++; } } @@ -260,7 +260,7 @@ TQPixmap PixmapLoader::scale( int name, int width, int height, const TQColor& co int key = entry.key(); - if ((cacheEntry = m_pixmapCache.find(key, true))) + if ((cacheEntry = m_pixmapCache.tqfind(key, true))) { if (entry == *cacheEntry) //True match! return *cacheEntry->m_pixmap; @@ -422,7 +422,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const } else { - const TQBitmap* mask = scale( col, row, w, h, color, bg, disabled, false ).mask(); + const TQBitmap* mask = scale( col, row, w, h, color, bg, disabled, false ).tqmask(); if (mask) { p->setBackgroundColor(Qt::color0); @@ -442,7 +442,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const } else { - const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask(); + const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).tqmask(); if (mask) { p->setBackgroundColor(Qt::color0); diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp index 0f998b2db..9035f3b08 100644 --- a/kstyles/klegacy/klegacystyle.cpp +++ b/kstyles/klegacy/klegacystyle.cpp @@ -186,12 +186,12 @@ public: struct KLegacyImageDataKeyField { - Q_INT8 function : 8; - Q_INT8 state : 8; - Q_INT8 shadow : 4; - Q_INT8 orientation : 4; - Q_INT8 arrowDirection : 4; - Q_INT8 gapSide : 4; + TQ_INT8 function : 8; + TQ_INT8 state : 8; + TQ_INT8 shadow : 4; + TQ_INT8 orientation : 4; + TQ_INT8 arrowDirection : 4; + TQ_INT8 gapSide : 4; }; @@ -866,7 +866,7 @@ GtkObject *GtkObject::find(TQRegExp &r) const { while ((o = ot.current()) != 0) { ++ot; - // this would be nice if moc could parse this file :/ + // this would be nice if tqmoc could parse this file :/ // // if (o->className() != "GtkObject") { // qDebug("object is not a GtkObject (className = '%s')", @@ -1156,7 +1156,7 @@ bool KLegacyStylePrivate::parseClass() { return false; } - KLegacyStyleData *styledata = styleDict.find(stylename); + KLegacyStyleData *styledata = styleDict.tqfind(stylename); if (! styledata) { qWarning("no such style '%s' for class '%s' (%p)", stylename.latin1(), @@ -1227,10 +1227,10 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) { TQString border =filestream.readLine(); int lp, rp, tp, bp, l, r, t, b; - lp = border.find(','); - rp = border.find(',', lp + 1); - tp = border.find(',', rp + 1); - bp = border.find('}', tp + 1); + lp = border.tqfind(','); + rp = border.tqfind(',', lp + 1); + tp = border.tqfind(',', rp + 1); + bp = border.tqfind('}', tp + 1); l = border.left(lp).toUInt(); r = border.mid(lp + 1, rp - lp - 1).toUInt(); @@ -1336,10 +1336,10 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) { TQString border = filestream.readLine(); int lp, rp, tp, bp, l, r, t, b; - lp = border.find(','); - rp = border.find(',', lp + 1); - tp = border.find(',', rp + 1); - bp = border.find('}', tp + 1); + lp = border.tqfind(','); + rp = border.tqfind(',', lp + 1); + tp = border.tqfind(',', rp + 1); + bp = border.tqfind('}', tp + 1); l = border.left(lp).toUInt(); r = border.mid(lp + 1, rp - lp - 1).toUInt(); @@ -1486,7 +1486,7 @@ bool KLegacyStylePrivate::parsePixmapPath() { next = next.mid(1, next.length() - 2); - int start = 0, end = next.find(":"); + int start = 0, end = next.tqfind(":"); while (end != -1) { TQString path(next.mid(start, end - start)); @@ -1500,7 +1500,7 @@ bool KLegacyStylePrivate::parsePixmapPath() { } start = end + 1; - end = next.find(":", start); + end = next.tqfind(":", start); } // get the straggler @@ -1543,7 +1543,7 @@ bool KLegacyStylePrivate::parseStyle() { newstylename = newstylename.mid(1, newstylename.length() - 2); - KLegacyStyleData *styledata = styleDict.find(stylename); + KLegacyStyleData *styledata = styleDict.tqfind(stylename); if (! styledata) return false; @@ -1573,7 +1573,7 @@ bool KLegacyStylePrivate::parseStyle() { } if (next.left(5) == "base[") { - int l = next.find('['), r = next.find(']'), state; + int l = next.tqfind('['), r = next.tqfind(']'), state; if (l < 1 || r < 1 || r < l) continue; @@ -1605,9 +1605,9 @@ bool KLegacyStylePrivate::parseStyle() { int rp, gp, bp; float ri, gi, bi; - rp = color.find(','); - gp = color.find(',', rp + 1); - bp = color.find('}', gp + 1); + rp = color.tqfind(','); + gp = color.tqfind(',', rp + 1); + bp = color.tqfind('}', gp + 1); ri = color.left(rp).toFloat(); gi = color.mid(rp + 1, gp - rp - 1).toFloat(); @@ -1619,7 +1619,7 @@ bool KLegacyStylePrivate::parseStyle() { styledata->base[state].setRgb(red, green, blue); } } else if (next.left(3) == "bg[") { - int l = next.find('['), r = next.find(']'), state; + int l = next.tqfind('['), r = next.tqfind(']'), state; if (l < 1 || r < 1 || r < l) continue; @@ -1651,9 +1651,9 @@ bool KLegacyStylePrivate::parseStyle() { int rp, gp, bp; float ri, gi, bi; - rp = color.find(','); - gp = color.find(',', rp + 1); - bp = color.find('}', gp + 1); + rp = color.tqfind(','); + gp = color.tqfind(',', rp + 1); + bp = color.tqfind('}', gp + 1); ri = color.left(rp).toFloat(); gi = color.mid(rp + 1, gp - rp - 1).toFloat(); @@ -1668,7 +1668,7 @@ bool KLegacyStylePrivate::parseStyle() { if (! parseEngine(styledata)) fprintf(stderr, "engine parse error\n"); } else if (next.left(3) == "fg[") { - int l = next.find('['), r = next.find(']'), state; + int l = next.tqfind('['), r = next.tqfind(']'), state; if (l < 1 || r < 1 || r < l) continue; @@ -1700,9 +1700,9 @@ bool KLegacyStylePrivate::parseStyle() { int rp, gp, bp; float ri, gi, bi; - rp = color.find(','); - gp = color.find(',', rp + 1); - bp = color.find('}', gp + 1); + rp = color.tqfind(','); + gp = color.tqfind(',', rp + 1); + bp = color.tqfind('}', gp + 1); ri = color.left(rp).toFloat(); gi = color.mid(rp + 1, gp - rp - 1).toFloat(); @@ -1767,7 +1767,7 @@ void KLegacyStyle::polish(TQApplication *app) { priv->oldfont = app->font(); priv->oldpalette = app->palette(); - GtkObject *gobj = priv->gtkDict.find(TQMainWindow::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQMainWindow::staticMetaObject()); if (gobj) { if (gobj->font()) { @@ -1974,8 +1974,8 @@ void KLegacyStyle::polish(TQWidget *widget) { widget->setBackgroundMode(TQWidget::PaletteBackground); } - GtkObject *gobj = gobj = priv->gtkDict.find(((metaobject) ? metaobject : - widget->metaObject())); + GtkObject *gobj = gobj = priv->gtkDict.tqfind(((metaobject) ? metaobject : + widget->tqmetaObject())); if (gobj) { if (gobj->font() && (*gobj->font() != TQApplication::font())) @@ -2115,7 +2115,7 @@ void KLegacyStyle::drawMenuBarItem(TQPainter *p, int x, int y, int w, int h, TQM TQColorGroup &g, bool enabled, bool active) { if (enabled && active) { - GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr); + GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr); if (gobj) { KLegacyImageDataKey key; @@ -2147,7 +2147,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h, const TQColorGroup & g, bool sunken, const TQBrush *fill) { - GtkObject *gobj = priv->gtkDict.find(TQButton::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQButton::staticMetaObject()); if (! gobj) { KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill); @@ -2170,7 +2170,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h, void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) { - GtkObject *gobj = priv->gtkDict.find(TQPushButton::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQPushButton::staticMetaObject()); if (! gobj) { KStyle::drawPushButton(btn, p); @@ -2181,7 +2181,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) { key.cachekey = 0; key.data.function = KLegacy::Box; - TQColorGroup g = btn->colorGroup(); + TQColorGroup g = btn->tqcolorGroup(); TQBrush fill = g.brush(TQColorGroup::Button); int x1, y1, x2, y2; btn->rect().coords(&x1, &y1, &x2, &y2); @@ -2237,7 +2237,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, int state, bool down, bool enabled) { - GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject()); if (! gobj) { KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled); @@ -2260,7 +2260,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h, void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, int state) { - GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject()); if (! gobj) { KStyle::drawIndicatorMask(p, x, y, w, h, state); @@ -2283,7 +2283,7 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i TQSize KLegacyStyle::indicatorSize(void) const { - GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject()); if (! gobj) return KStyle::indicatorSize(); @@ -2320,7 +2320,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int const TQColorGroup &g, bool on, bool down, bool enabled) { - GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject()); if (! gobj) { drawExclusiveIndicator(p, x, y, w, h, g, on, down, enabled); @@ -2345,7 +2345,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w, int h, bool on) { - GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject()); if (! gobj) { KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on); @@ -2368,7 +2368,7 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w, TQSize KLegacyStyle::exclusiveIndicatorSize(void) const { - GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject()); if (! gobj) { return KStyle::indicatorSize(); @@ -2427,7 +2427,7 @@ void KLegacyStyle::drawPopupMenuItem(TQPainter *p, bool checkable, int maxpmw, i } if ( act && enabled ) { - GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr); + GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr); if (gobj) { KLegacyImageDataKey key; @@ -2501,7 +2501,7 @@ void KLegacyStyle::drawPopupMenuItem(TQPainter *p, bool checkable, int maxpmw, i TQString s = mi->text(); if ( !s.isNull() ) { // draw text - int t = s.find( '\t' ); + int t = s.tqfind( '\t' ); int m = 2; const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine; if ( t >= 0 ) { // draw tab text @@ -2531,7 +2531,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, bool sunken, bool editable, bool enabled, const TQBrush *b) { - GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQComboBox::staticMetaObject()); if (! gobj) { KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b); @@ -2571,7 +2571,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h, TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) { - GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQComboBox::staticMetaObject()); if (! gobj) { return KStyle::comboButtonRect(x, y, w, h); @@ -2648,7 +2648,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll { if (! scrollbar->isVisible()) return; - GtkObject *gobj = priv->gtkDict.find(TQScrollBar::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQScrollBar::staticMetaObject()); if (! gobj) { KStyle::drawScrollBarControls(p, scrollbar, start, controls, active); @@ -2741,7 +2741,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll (active & SubLine), x, y, buttonDim, buttonDim, - scrollbar->colorGroup(), true); + scrollbar->tqcolorGroup(), true); if (scrollbar->orientation() == Vertical) y = scrollbar->height() - buttonDim - defaultFrameWidth(); @@ -2753,7 +2753,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll (active & AddLine), x, y, buttonDim, buttonDim, - scrollbar->colorGroup(), true); + scrollbar->tqcolorGroup(), true); } p->drawPixmap(0, 0, buf); } @@ -2762,7 +2762,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, Orientation orientation, bool tickAbove, bool tickBelow) { - GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQSlider::staticMetaObject()); if (! gobj) { KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow); @@ -2789,7 +2789,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, QCOORD c, Orientation o) { - GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQSlider::staticMetaObject()); if (! gobj) { KStyle::drawSliderGroove(p, x, y, w, h, g, c, o); @@ -2816,7 +2816,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down, int x, int y, int w, int h, const TQColorGroup &g, bool enabled, const TQBrush *b) { - GtkObject *gobj = priv->gtkDict.find(&arrow_ptr); + GtkObject *gobj = priv->gtkDict.tqfind(&arrow_ptr); if (! gobj) { KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); @@ -2848,7 +2848,7 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down, int x, int y, int w, int h, const TQColorGroup &g, bool enabled, const TQBrush *b) { - GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr); + GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr); if (! gobj) { KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); @@ -2891,7 +2891,7 @@ void KLegacyStyle::drawPopupPanel(TQPainter *p, int x, int y, int w, int h, void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, bool activated, bool disabled) { - GtkObject *gobj = priv->gtkDict.find(&checkmenuitem_ptr); + GtkObject *gobj = priv->gtkDict.tqfind(&checkmenuitem_ptr); if (! gobj) { KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled); @@ -2942,7 +2942,7 @@ void KLegacyStyle::drawSplitter(TQPainter *p, int x, int y, int w, int h, void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, bool selected) { - GtkObject *gobj = priv->gtkDict.find(TQTabBar::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQTabBar::staticMetaObject()); if (! gobj) { KStyle::drawTab(p, tabbar, tab, selected); @@ -2954,8 +2954,8 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo key.data.function = KLegacy::Extension; key.data.state = (! selected) ? KLegacy::Active : KLegacy::Normal; key.data.shadow = KLegacy::Out; - key.data.gapSide = (tabbar->shape() == TQTabBar::RoundedAbove || - tabbar->shape() == TQTabBar::TriangularAbove) ? + key.data.gapSide = (tabbar->tqshape() == TQTabBar::RoundedAbove || + tabbar->tqshape() == TQTabBar::TriangularAbove) ? KLegacy::Bottom : KLegacy::Top; int ry = tab->r.top(), rh = tab->r.height(); @@ -2963,8 +2963,8 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo if (! selected) { rh -= 2; - if (tabbar->shape() == TQTabBar::RoundedAbove || - tabbar->shape() == TQTabBar::TriangularAbove) + if (tabbar->tqshape() == TQTabBar::RoundedAbove || + tabbar->tqshape() == TQTabBar::TriangularAbove) ry += 2; } @@ -2981,7 +2981,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo void KLegacyStyle::drawKBarHandle(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, KToolBarPos type, TQBrush *fill) { - GtkObject *gobj = priv->gtkDict.find(TQToolBar::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQToolBar::staticMetaObject()); if (! gobj) { KStyle::drawKBarHandle(p, x, y, w, h, g, type, fill); @@ -3043,7 +3043,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h static const TQString &modStr = KGlobal::staticQString( TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]")); - int modStrPos = s.find(modStr); + int modStrPos = s.tqfind(modStr); if (modStrPos != -1) { s.remove(modStrPos, modStr.length()+1); @@ -3082,7 +3082,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { TQWidget *w = (TQWidget *) obj; if (w->inherits("QPopupMenu") && w->width() < 700) { - GtkObject *gobj = priv->gtkDict.find(TQPopupMenu::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQPopupMenu::staticMetaObject()); if (gobj) { KLegacyImageDataKey key; @@ -3139,7 +3139,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { } } } else if (w->isTopLevel() || w->inherits("QWorkspaceChild")) { - GtkObject *gobj = priv->gtkDict.find(TQMainWindow::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQMainWindow::staticMetaObject()); if (gobj) { KLegacyImageDataKey key; @@ -3152,7 +3152,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { w->setBackgroundPixmap(*p); } } else if (w->inherits("QLineEdit")) { - GtkObject *gobj = priv->gtkDict.find(TQLineEdit::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQLineEdit::staticMetaObject()); if (gobj) { KLegacyImageDataKey key; @@ -3193,7 +3193,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { } } else if (w->inherits("QMenuBar") || w->inherits("QToolBar")) { - GtkObject *gobj = priv->gtkDict.find(TQMenuBar::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQMenuBar::staticMetaObject()); if (gobj) { KLegacyImageDataKey key; @@ -3261,12 +3261,12 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { obj->inherits("QSlider") || obj->inherits("QScrollbar")) { priv->lastWidget = (TQWidget *) obj; - priv->lastWidget->repaint(false); + priv->lastWidget->tqrepaint(false); } else if (obj->inherits("QRadioButton")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel() && w->isEnabled()) { - GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject()); if (gobj) { KLegacyImageDataKey key; @@ -3294,7 +3294,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel() && w->isEnabled()) { - GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject()); + GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject()); if (gobj) { KLegacyImageDataKey key; @@ -3327,7 +3327,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { { if (obj == priv->lastWidget) { priv->lastWidget = 0; - ((TQWidget *) obj)->repaint(false); + ((TQWidget *) obj)->tqrepaint(false); } else if (obj->inherits("QRadioButton") || obj->inherits("QCheckBox")) { TQWidget *w = (TQWidget *) obj; @@ -3335,7 +3335,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (! w->isTopLevel()) { w->setBackgroundMode(TQWidget::X11ParentRelative); w->setBackgroundOrigin(TQWidget::WidgetOrigin); - w->repaint(true); + w->tqrepaint(true); } } @@ -3349,7 +3349,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (obj->inherits("QScrollBar") && (! (me->state() & (LeftButton | MidButton | RightButton)))) { priv->hovering = true; - ((TQWidget *) obj)->repaint(false); + ((TQWidget *) obj)->tqrepaint(false); priv->hovering = false; } diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index 6b5c0961d..37bd51f15 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -78,7 +78,7 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey, { bool bOK; // find first part (red) - int nIndex = aValue.find( ',' ); + int nIndex = aValue.tqfind( ',' ); if ( nIndex == -1 ) { // return a sensible default -- Bernd @@ -91,7 +91,7 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey, // find second part (green) int nOldIndex = nIndex; - nIndex = aValue.find( ',', nOldIndex + 1 ); + nIndex = aValue.tqfind( ',', nOldIndex + 1 ); if ( nIndex == -1 ) { @@ -176,7 +176,7 @@ public: */ TQColor pixmapAveColor( const TQPixmap* p ) { - if ( colorCache.contains( p ) ) + if ( colorCache.tqcontains( p ) ) return colorCache[ p ]; TQImage to_ave = p->convertToImage(); @@ -231,104 +231,106 @@ union kthemeKey{ unsigned int cacheKey; }; +#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) static_cast<const TQPaintDevice*>(static_cast<const QPaintDevice*>(static_cast<const QPixmap*>(static_cast<const QBitmap*>(x)))) + void KThemeBase::generateBorderPix( int i ) { // separate pixmap into separate components if ( pbPixmaps[ i ] ) { // evidently I have to do masks manually... - const TQBitmap * srcMask = pbPixmaps[ i ] ->mask(); + const TQBitmap * srcMask = pbPixmaps[ i ] ->tqmask(); TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] ); TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] ); - bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ], - Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, 0, pbWidth[ i ], pbWidth[ i ], + TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( &destMask, 0, 0, srcMask, 0, 0, pbWidth[ i ], pbWidth[ i ], - Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ], + TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::TopLeft, tmp ); - bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, - pbWidth[ i ], pbWidth[ i ], Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, + pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( &destMask, 0, 0, srcMask, pbPixmaps[ i ] ->width() - pbWidth[ i ], - 0, pbWidth[ i ], pbWidth[ i ], Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], + 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::TopRight, tmp ); - bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], - pbWidth[ i ], pbWidth[ i ], Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], + pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( &destMask, 0, 0, srcMask, 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], - pbWidth[ i ], pbWidth[ i ], Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], + pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::BottomLeft, tmp ); - bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], - Qt::CopyROP, false ); + TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( &destMask, 0, 0, srcMask, pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], - Qt::CopyROP, false ); + TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::BottomRight, tmp ); tmp.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] ); destMask.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] ); - bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], 0, - pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], 0, + pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( &destMask, 0, 0, srcMask, pbWidth[ i ], 0, + bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0, pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], - Qt::CopyROP, false ); + TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::Top, tmp ); - bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], + bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], - pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], Qt::CopyROP, false ); + pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( &destMask, 0, 0, srcMask, pbWidth[ i ], + bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], - pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], Qt::CopyROP, false ); + pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::Bottom, tmp ); tmp.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 ); destMask.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 ); - bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbWidth[ i ], pbWidth[ i ], - pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbWidth[ i ], pbWidth[ i ], + pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( &destMask, 0, 0, srcMask, 0, pbWidth[ i ], pbWidth[ i ], - pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ], + pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::Left, tmp ); - bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, - Qt::CopyROP, false ); + TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( &destMask, 0, 0, srcMask, pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, - Qt::CopyROP, false ); + TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::Right, tmp ); @@ -402,7 +404,7 @@ void KThemeBase::copyWidgetConfig( int sourceID, int destID, TQString *pixnames, iTabLine = aTabLine; } -void KThemeBase::readConfig( Qt::GUIStyle /*style*/ ) +void KThemeBase::readConfig( TQt::GUIStyle /*style*/ ) { #define PREBLEND_ITEMS 12 static const WidgetType preBlend[] = @@ -541,7 +543,7 @@ KThemeBase::KThemeBase( const TQString& dir, const TQString & configFile ) configFileName = "/" + configFileName + "/"; - readConfig( Qt::WindowsStyle ); + readConfig( TQt::WindowsStyle ); cache = new KThemeCache( cacheSize ); switch ( scrollBarLayout() ) @@ -563,7 +565,7 @@ void KThemeBase::applyConfigFile( TQSettings& config ) { TQStringList keys = config.entryList( configFileName ); - if ( keys.contains( "foreground" ) ) + if ( keys.tqcontains( "foreground" ) ) { d->overrideForeground = true; d->overrideForegroundCol = readColorEntry( &config, ( configFileName + "foreground" ).latin1(), 0 ); @@ -571,7 +573,7 @@ void KThemeBase::applyConfigFile( TQSettings& config ) else d->overrideForeground = false; - if ( keys.contains( "background" ) ) + if ( keys.tqcontains( "background" ) ) { d->overrideBackground = true; d->overrideBackgroundCol = readColorEntry( &config, ( configFileName + "background" ).latin1(), 0 ); @@ -581,7 +583,7 @@ void KThemeBase::applyConfigFile( TQSettings& config ) - if ( keys.contains( "selectForeground" ) ) + if ( keys.tqcontains( "selectForeground" ) ) { d->overrideSelectForeground = true; d->overrideSelectForegroundCol = readColorEntry( &config, ( configFileName + "selectForeground" ).latin1(), 0 ); @@ -589,7 +591,7 @@ void KThemeBase::applyConfigFile( TQSettings& config ) else d->overrideSelectForeground = false; - if ( keys.contains( "selectBackground" ) ) + if ( keys.tqcontains( "selectBackground" ) ) { d->overrideSelectBackground = true; d->overrideSelectBackgroundCol = readColorEntry( &config, ( configFileName + "selectBackground" ).latin1(), 0 ); @@ -597,7 +599,7 @@ void KThemeBase::applyConfigFile( TQSettings& config ) else d->overrideSelectBackground = false; - if ( keys.contains( "windowBackground" ) ) + if ( keys.tqcontains( "windowBackground" ) ) { d->overrideWindowBackground = true; d->overrideWindowBackgroundCol = readColorEntry( &config, ( configFileName + "windowBackground" ).latin1(), 0 ); @@ -606,7 +608,7 @@ void KThemeBase::applyConfigFile( TQSettings& config ) d->overrideWindowBackground = false; - if ( keys.contains( "windowForeground" ) ) + if ( keys.tqcontains( "windowForeground" ) ) { d->overrideWindowForeground = true; d->overrideWindowForegroundCol = readColorEntry( &config, ( configFileName + "windowForeground" ).latin1(), 0 ); @@ -808,45 +810,45 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const mPainter.begin( &mask ); TQPixmap *tmp = borderPixmap( widget ) ->border( KThemePixmap::TopLeft ); - const TQBitmap *srcMask = tmp->mask(); + const TQBitmap *srcMask = tmp->tqmask(); int bdWidth = tmp->width(); - bitBlt( pixmap, 0, 0, tmp, 0, 0, bdWidth, bdWidth, - Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bdWidth, + TQt::CopyROP, false ); if ( srcMask ) - bitBlt( &mask, 0, 0, srcMask, 0, 0, bdWidth, bdWidth, - Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&mask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, + TQt::CopyROP, false ); else mPainter.fillRect( 0, 0, bdWidth, bdWidth, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight ); - srcMask = tmp->mask(); - bitBlt( pixmap, w - bdWidth, 0, tmp, 0, 0, bdWidth, - bdWidth, Qt::CopyROP, false ); + srcMask = tmp->tqmask(); + bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, + bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( &mask, w - bdWidth, 0, srcMask, 0, 0, bdWidth, - bdWidth, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, + bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft ); - srcMask = tmp->mask(); - bitBlt( pixmap, 0, h - bdWidth, tmp, 0, 0, bdWidth, - bdWidth, Qt::CopyROP, false ); + srcMask = tmp->tqmask(); + bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, + bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( &mask, 0, h - bdWidth, srcMask, 0, 0, bdWidth, - bdWidth, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&mask), 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, + bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight ); - srcMask = tmp->mask(); - bitBlt( pixmap, w - bdWidth, h - bdWidth, tmp, 0, 0, - bdWidth, bdWidth, Qt::CopyROP, false ); + srcMask = tmp->tqmask(); + bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, + bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( &mask, w - bdWidth, h - bdWidth, srcMask, 0, 0, - bdWidth, bdWidth, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, h - bdWidth, bdWidth, bdWidth, color1 ); @@ -855,21 +857,21 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const if ( w - bdWidth * 2 > 0 ) { tmp = borderPixmap( widget ) ->border( KThemePixmap::Top ); - srcMask = tmp->mask(); + srcMask = tmp->tqmask(); p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp ); if ( srcMask ) - bitBlt( &mask, bdWidth, 0, srcMask, 0, 0, - w - bdWidth * 2, bdWidth, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + w - bdWidth * 2, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::Bottom ); - srcMask = tmp->mask(); + srcMask = tmp->tqmask(); p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth, *tmp ); if ( srcMask ) - bitBlt( &mask, bdWidth, h - bdWidth, srcMask, 0, 0, - w - bdWidth * 2, bdWidth, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + w - bdWidth * 2, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth, color1 ); @@ -877,21 +879,21 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const if ( h - bdWidth * 2 > 0 ) { tmp = borderPixmap( widget ) ->border( KThemePixmap::Left ); - srcMask = tmp->mask(); + srcMask = tmp->tqmask(); p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp ); if ( srcMask ) - bitBlt( &mask, 0, bdWidth, srcMask, 0, 0, - bdWidth, h - bdWidth * 2, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&mask), 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bdWidth, h - bdWidth * 2, TQt::CopyROP, false ); else mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::Right ); - srcMask = tmp->mask(); + srcMask = tmp->tqmask(); p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, *tmp ); if ( srcMask ) - bitBlt( &mask, w - bdWidth, bdWidth, srcMask, 0, 0, - bdWidth, h - bdWidth * 2, Qt::CopyROP, false ); + bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bdWidth, h - bdWidth * 2, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, color1 ); } @@ -1030,7 +1032,7 @@ KThemePixmap* KThemeBase::gradient( int w, int h, WidgetType widget ) const *grLowColors[ widget ], KPixmapEffect::DiagonalGradient ); bitBlt( pixmaps[ widget ], offset, offset, &s, 0, 0, w - offset * 2, - h - offset * 2, Qt::CopyROP ); + h - offset * 2, TQt::CopyROP ); } } } @@ -1089,7 +1091,7 @@ KThemePixmap* KThemeBase::scalePixmap( int w, int h, WidgetType widget ) const } TQColorGroup* KThemeBase::makeColorGroup( const TQColor &fg, const TQColor &bg, - Qt::GUIStyle ) + TQt::GUIStyle ) { if ( shading == Motif ) { @@ -1098,12 +1100,12 @@ TQColorGroup* KThemeBase::makeColorGroup( const TQColor &fg, const TQColor &bg, lowlightVal = 100 + ( ( 2 * d->contrast + 4 ) * 10 ); return ( new TQColorGroup( fg, bg, bg.light( highlightVal ), bg.dark( lowlightVal ), bg.dark( 120 ), - fg, TQApplication::palette().active().base() ) ); + fg, TQApplication::tqpalette().active().base() ) ); } else return ( new TQColorGroup( fg, bg, bg.light( 150 ), bg.dark(), bg.dark( 120 ), fg, - TQApplication::palette().active().base() ) ); + TQApplication::tqpalette().active().base() ) ); } @@ -1269,22 +1271,22 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i ) TQStringList keys = config->entryList( base ); // Gradient low color or blend background - if ( keys.contains( "GradientLow" ) ) + if ( keys.tqcontains( "GradientLow" ) ) prop[ "GrLow" ] = readColorEntry( config, TQString( base + "GradientLow" ).latin1(), - &TQApplication::palette().active().background() ).name(); + &TQApplication::tqpalette().active().background() ).name(); // Gradient high color - if ( keys.contains( "GradientHigh" ) ) + if ( keys.tqcontains( "GradientHigh" ) ) prop[ "GrHigh" ] = readColorEntry( config, TQString( base + "GradientHigh" ).latin1(), - &TQApplication::palette().active().foreground() ).name(); + &TQApplication::tqpalette().active().foreground() ).name(); // Extended color attributes - if ( keys.contains( "Foreground" ) || keys.contains( "Background" ) ) + if ( keys.tqcontains( "Foreground" ) || keys.tqcontains( "Background" ) ) { TQColor fg, bg; - if ( keys.contains( "Background" ) ) + if ( keys.tqcontains( "Background" ) ) bg = readColorEntry( config, TQString( base + "Background" ).latin1(), &bg ); - if ( keys.contains( "Foreground" ) ) + if ( keys.tqcontains( "Foreground" ) ) fg = readColorEntry( config, TQString( base + "Foreground" ).latin1(), &fg ); prop[ "Foreground" ] = fg.name(); prop[ "Background" ] = bg.name(); @@ -1318,7 +1320,7 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i ) prop[ "Width" ] = TQString::number( config->readNumEntry( base + "Width", 10 ) ); else if ( i == ComboBox || i == ComboBoxDown ) { - if ( keys.contains( "Round" ) ) + if ( keys.tqcontains( "Round" ) ) prop[ "Round" ] = TQString::number( config->readBoolEntry( base + "Round", false ) ); else prop[ "Round" ] = "5000"; // invalid, used w/multiple groups @@ -1326,25 +1328,25 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i ) } else if ( i == PushButton || i == PushButtonDown ) { - if ( keys.contains( "XShift" ) ) + if ( keys.tqcontains( "XShift" ) ) prop[ "XShift" ] = TQString::number( config->readNumEntry( base + "XShift", 0 ) ); else prop[ "XShift" ] = "5000"; - if ( keys.contains( "YShift" ) ) + if ( keys.tqcontains( "YShift" ) ) prop[ "YShift" ] = TQString::number( config->readNumEntry( base + "YShift", 0 ) ); else prop[ "YShift" ] = "5000"; - if ( keys.contains( "3DFocusRect" ) ) + if ( keys.tqcontains( "3DFocusRect" ) ) prop[ "3DFRect" ] = TQString::number( config-> readBoolEntry( base + "3DFocusRect", false ) ); else prop[ "3DFRect" ] = "5000"; - if ( keys.contains( "3DFocusOffset" ) ) + if ( keys.tqcontains( "3DFocusOffset" ) ) prop[ "3DFOffset" ] = TQString::number( config-> readBoolEntry( base + "3DFocusOffset", 0 ) ); else prop[ "3DFOffset" ] = "5000"; - if ( keys.contains( "Round" ) ) + if ( keys.tqcontains( "Round" ) ) prop[ "Round" ] = TQString::number( config->readBoolEntry( base + "Round", false ) ); else prop[ "Round" ] = "5000"; @@ -1411,7 +1413,7 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname // Blend intensity tmpStr = prop[ "Blend" ]; if ( tmpStr.isEmpty() ) - tmpStr = TQString::fromLatin1( "0.0" ); + tmpStr = TQString::tqfromLatin1( "0.0" ); blends[ i ] = tmpStr.toFloat(); // Bevel contrast @@ -1427,7 +1429,7 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname if ( gradients[ i ] != GrNone || blends[ i ] != 0.0 ) grLowColors[ i ] = new TQColor( readColorEntry( prop, "GrLow", - TQApplication::palette().active(). + TQApplication::tqpalette().active(). background() ) ); else grLowColors[ i ] = NULL; @@ -1436,7 +1438,7 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname if ( gradients[ i ] != GrNone ) grHighColors[ i ] = new TQColor( readColorEntry( prop, "GrHigh", - TQApplication::palette().active(). + TQApplication::tqpalette().active(). background() ) ); else grHighColors[ i ] = NULL; @@ -1448,10 +1450,10 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname if ( fg.isValid() || bg.isValid() ) { if ( !fg.isValid() ) - fg = TQApplication::palette().active().foreground(); + fg = TQApplication::tqpalette().active().foreground(); if ( !bg.isValid() ) - bg = TQApplication::palette().active().background(); - colors[ i ] = makeColorGroup( fg, bg, Qt::WindowsStyle ); + bg = TQApplication::tqpalette().active().background(); + colors[ i ] = makeColorGroup( fg, bg, TQt::WindowsStyle ); } else colors[ i ] = NULL; @@ -1607,7 +1609,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal ) { if ( isColor( Background ) ) { - background = colorGroup( pal.active(), Background ) + background = tqcolorGroup( pal.active(), Background ) ->background(); } if ( isPixmap( Background ) ) @@ -1620,7 +1622,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal ) background.dark( lowlightVal ), background.dark( 120 ), baseText, buttonText /*CHECKME: BrightText*/, base, background ); - buttonText = colorGroup( pre, PushButton ) ->foreground(); + buttonText = tqcolorGroup( pre, PushButton ) ->foreground(); } TQColor disfg = foreground; @@ -1763,7 +1765,7 @@ KThemePixmap* KThemeCache::pixmap( int w, int h, int widgetID, bool border, key.data.border = border; key.data.mask = mask; - KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey ); + KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey ); if ( pix ) pix->updateAccessed(); return ( pix ); @@ -1778,7 +1780,7 @@ KThemePixmap* KThemeCache::horizontalPixmap( int w, int widgetID ) key.data.height = 0; key.data.border = false; key.data.mask = false; - KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey ); + KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey ); if ( pix ) pix->updateAccessed(); return ( pix ); @@ -1793,7 +1795,7 @@ KThemePixmap* KThemeCache::verticalPixmap( int h, int widgetID ) key.data.height = h; key.data.border = false; key.data.mask = false; - KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey ); + KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey ); if ( pix ) pix->updateAccessed(); return ( pix ); @@ -1812,7 +1814,7 @@ bool KThemeCache::insert( KThemePixmap *pixmap, ScaleHint scale, int widgetID, key.data.border = border; key.data.mask = mask; - if ( cache.find( ( unsigned long ) key.cacheKey, true ) != NULL ) + if ( cache.tqfind( ( unsigned long ) key.cacheKey, true ) != NULL ) { return ( true ); // a pixmap of this scale is already in there } diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index 6da89cc3e..3f0c59bab 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -120,7 +120,7 @@ inline bool KThemePixmap::isOld() * @author Daniel M. Duley <mosfet@kde.org> * */ -class KThemeCache : public QObject +class KThemeCache : public TQObject { Q_OBJECT public: @@ -300,12 +300,12 @@ public: * If a color group is set in the theme configuration * that is used, otherwise defaultColor is returned. * - * @param defaultGroup The colorGroup to set if one is available. + * @param defaultGroup The tqcolorGroup to set if one is available. * * @param widget The widget whose color group to retrieve. * */ - const TQColorGroup* colorGroup( const TQColorGroup &defaultGroup, + const TQColorGroup* tqcolorGroup( const TQColorGroup &defaultGroup, WidgetType widget ) const; TQBrush pixmapBrush( const TQColorGroup &group, TQColorGroup::ColorRole role, @@ -473,7 +473,7 @@ protected: * calculated a little differently for Motif vs Windows styles. This * is obsolete. */ - void readConfig( Qt::GUIStyle colorStyle = Qt::WindowsStyle ); + void readConfig( TQt::GUIStyle colorStyle = TQt::WindowsStyle ); void readWidgetConfig( int i, TQSettings *config, TQString *pixnames, TQString *brdnames, bool *loadArray ); void copyWidgetConfig( int sourceID, int destID, TQString *pixnames, @@ -484,7 +484,7 @@ protected: * versions. */ TQColorGroup* makeColorGroup( const TQColor &fg, const TQColor &bg, - Qt::GUIStyle style = Qt::WindowsStyle ); + TQt::GUIStyle style = TQt::WindowsStyle ); KThemePixmap* scale( int w, int h, WidgetType widget ) const; KThemePixmap* scaleBorder( int w, int h, WidgetType type ) const; KThemePixmap* gradient( int w, int h, WidgetType widget ) const ; @@ -508,21 +508,21 @@ protected: /** These are included for fuuture extension purposes.. */ - virtual int pixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const + virtual int tqpixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const { - return KStyle::pixelMetric( metric, widget ); + return KStyle::tqpixelMetric( metric, widget ); } virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRect & r, const TQColorGroup & cg, SFlags flags = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const { - KStyle::drawPrimitive ( pe, p, r, cg, + KStyle::tqdrawPrimitive ( pe, p, r, cg, flags, option ); } - virtual void drawControl( ControlElement element, + virtual void tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -530,21 +530,21 @@ protected: SFlags how = Style_Default, const TQStyleOption& opt = TQStyleOption::Default ) const { - KStyle::drawControl( element, p, widget, + KStyle::tqdrawControl( element, p, widget, r, cg, how, opt ); } - virtual void drawControlMask( ControlElement element, + virtual void tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& opt = TQStyleOption::Default ) const { - KStyle::drawControlMask( element, p, widget, r, opt ); + KStyle::tqdrawControlMask( element, p, widget, r, opt ); } - virtual void drawComplexControl( ComplexControl control, + virtual void tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget* widget, const TQRect &r, @@ -554,7 +554,7 @@ protected: SCFlags active = SC_None, const TQStyleOption& opt = TQStyleOption::Default ) const { - KStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); + KStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); } @@ -572,12 +572,12 @@ protected: } - virtual int styleHint( StyleHint sh, + virtual int tqstyleHint( StyleHint sh, const TQWidget *widget = 0, const TQStyleOption& opt = TQStyleOption::Default, QStyleHintReturn* returnData = 0 ) const { - return KStyle::styleHint( sh, + return KStyle::tqstyleHint( sh, widget, opt, returnData ); @@ -588,7 +588,7 @@ protected: const TQSize &contentsSize, const TQStyleOption& opt = TQStyleOption::Default ) const { - return KStyle::sizeFromContents( contents, + return KStyle::tqsizeFromContents( contents, widget, contentsSize, opt ); } @@ -731,7 +731,7 @@ inline TQBrush KThemeBase::pixmapBrush( const TQColorGroup &group, return ( group.color( role ) ); } -inline const TQColorGroup* KThemeBase::colorGroup( const TQColorGroup &defaultGroup, +inline const TQColorGroup* KThemeBase::tqcolorGroup( const TQColorGroup &defaultGroup, WidgetType widget ) const { return ( ( colors[ widget ] ) ? colors[ widget ] : &defaultGroup ); diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index 4927c67bc..6b1e18e82 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -76,18 +76,18 @@ Port version 0.9.7 #include <dlfcn.h> #endif -static const QCOORD u_arrow[] = { -1, -3, 0, -3, -2, -2, 1, -2, -3, -1, 2, -1, -4, 0, 3, 0, -4, 1, 3, 1}; -static const QCOORD d_arrow[] = { -4, -2, 3, -2, -4, -1, 3, -1, -3, 0, 2, 0, -2, 1, 1, 1, -1, 2, 0, 2}; -static const QCOORD l_arrow[] = { -3, -1, -3, 0, -2, -2, -2, 1, -1, -3, -1, 2, 0, -4, 0, 3, 1, -4, 1, 3}; -static const QCOORD r_arrow[] = { -2, -4, -2, 3, -1, -4, -1, 3, 0, -3, 0, 2, 1, -2, 1, 1, 2, -1, 2, 0}; +static const TQCOORD u_arrow[] = { -1, -3, 0, -3, -2, -2, 1, -2, -3, -1, 2, -1, -4, 0, 3, 0, -4, 1, 3, 1}; +static const TQCOORD d_arrow[] = { -4, -2, 3, -2, -4, -1, 3, -1, -3, 0, 2, 0, -2, 1, 1, 1, -1, 2, 0, 2}; +static const TQCOORD l_arrow[] = { -3, -1, -3, 0, -2, -2, -2, 1, -1, -3, -1, 2, 0, -4, 0, 3, 1, -4, 1, 3}; +static const TQCOORD r_arrow[] = { -2, -4, -2, 3, -1, -4, -1, 3, 0, -3, 0, 2, 1, -2, 1, 1, 2, -1, 2, 0}; -const QCOORD win_style_u_arrow[] = { 0, -2, 0, -2, -1, -1, 1, -1, -2, 0, 2, 0, -3, 1, 3, 1 }; -const QCOORD win_style_d_arrow[] = { -3, -2, 3, -2, -2, -1, 2, -1, -1, 0, 1, 0, 0, 1, 0, 1 }; -const QCOORD win_style_l_arrow[] = { 1, -3, 1, -3, 0, -2, 1, -2, -1, -1, 1, -1, -2, 0, 1, 0, -1, 1, 1, 1, 0, 2, 1, 2, 1, 3, 1, 3 }; -const QCOORD win_style_r_arrow[] = { -2, -3, -2, -3, -2, -2, -1, -2, -2, -1, 0, -1, -2, 0, 1, 0, -2, 1, 0, 1, -2, 2, -1, 2, -2, 3, -2, 3 }; +const TQCOORD win_style_u_arrow[] = { 0, -2, 0, -2, -1, -1, 1, -1, -2, 0, 2, 0, -3, 1, 3, 1 }; +const TQCOORD win_style_d_arrow[] = { -3, -2, 3, -2, -2, -1, 2, -1, -1, 0, 1, 0, 0, 1, 0, 1 }; +const TQCOORD win_style_l_arrow[] = { 1, -3, 1, -3, 0, -2, 1, -2, -1, -1, 1, -1, -2, 0, 1, 0, -1, 1, 1, 1, 0, 2, 1, 2, 1, 3, 1, 3 }; +const TQCOORD win_style_r_arrow[] = { -2, -3, -2, -3, -2, -2, -1, -2, -2, -1, 0, -1, -2, 0, 1, 0, -2, 1, 0, 1, -2, 2, -1, 2, -2, 3, -2, 3 }; -#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +#define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) static const int itemFrame = 2; @@ -107,7 +107,7 @@ Sliders are not disabled properly */ -class KThemeStylePlugin : public QStylePlugin +class KThemeStylePlugin : public TQStylePlugin { public: @@ -169,25 +169,25 @@ void kDrawWindowsArrow ( TQPainter *p, const TQStyle* style, TQStyle::PrimitiveE switch ( pe ) { case TQStyle::PE_ArrowUp: - a.setPoints( QCOORDARRLEN( win_style_u_arrow ), win_style_u_arrow ); + a.setPoints( TQCOORDARRLEN( win_style_u_arrow ), win_style_u_arrow ); break; case TQStyle::PE_ArrowDown: - a.setPoints( QCOORDARRLEN( win_style_d_arrow ), win_style_d_arrow ); + a.setPoints( TQCOORDARRLEN( win_style_d_arrow ), win_style_d_arrow ); break; case TQStyle::PE_ArrowLeft: - a.setPoints( QCOORDARRLEN( win_style_l_arrow ), win_style_l_arrow ); + a.setPoints( TQCOORDARRLEN( win_style_l_arrow ), win_style_l_arrow ); break; default: - a.setPoints( QCOORDARRLEN( win_style_r_arrow ), win_style_r_arrow ); + a.setPoints( TQCOORDARRLEN( win_style_r_arrow ), win_style_r_arrow ); } p->save(); if ( down ) { - p->translate( style->pixelMetric( TQStyle::PM_ButtonShiftHorizontal ), - style->pixelMetric( TQStyle::PM_ButtonShiftVertical ) ); + p->translate( style->tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ), + style->tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) ); } if ( enabled ) @@ -226,8 +226,8 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents, const TQPushButton * button = ( const TQPushButton* ) widget; int w = contentSize.width(); int h = contentSize.height(); - int bm = pixelMetric( PM_ButtonMargin, widget ); - int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2; + int bm = tqpixelMetric( PM_ButtonMargin, widget ); + int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2; w += bm + fw + 6; // ### Add 6 to make way for bold font. h += bm + fw; @@ -260,8 +260,8 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents, if ( mi->custom() ) { - w = mi->custom() ->sizeHint().width(); - h = mi->custom() ->sizeHint().height(); + w = mi->custom() ->tqsizeHint().width(); + h = mi->custom() ->tqsizeHint().height(); if ( ! mi->custom() ->fullSpan() ) h += 2 * itemVMargin + 2 * itemFrame; } @@ -286,7 +286,7 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents, 2 * itemFrame ); } - if ( ! mi->text().isNull() && mi->text().find( '\t' ) >= 0 ) + if ( ! mi->text().isNull() && mi->text().tqfind( '\t' ) >= 0 ) w += 12; else if ( mi->popup() ) w += 2 * arrowHMargin; @@ -320,8 +320,8 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQWidget* widget) const { TQRect bounding = cb->rect(); - int cw = pixelMetric(PM_IndicatorWidth, widget); - int ch = pixelMetric(PM_IndicatorHeight, widget); + int cw = tqpixelMetric(PM_IndicatorWidth, widget); + int ch = tqpixelMetric(PM_IndicatorHeight, widget); TQRect checkbox(bounding.x() + 2, bounding.y() + 2 + (bounding.height() - ch)/2, cw - 4, ch - 4); @@ -331,7 +331,7 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQWidget* widget) const return KStyle::subRect(sr, widget); } -int KThemeStyle::pixelMetric ( PixelMetric metric, const TQWidget * widget ) const +int KThemeStyle::tqpixelMetric ( PixelMetric metric, const TQWidget * widget ) const { switch ( metric ) { @@ -361,26 +361,26 @@ int KThemeStyle::pixelMetric ( PixelMetric metric, const TQWidget * widget ) con if ( isPixmap( ExIndicatorOn ) ) return ( uncached( ExIndicatorOn ) ->size().width() ); else - return KThemeBase::pixelMetric ( metric, widget ); + return KThemeBase::tqpixelMetric ( metric, widget ); case PM_ExclusiveIndicatorHeight: if ( isPixmap( ExIndicatorOn ) ) return ( uncached( ExIndicatorOn ) ->size().height() ); else - return KThemeBase::pixelMetric ( metric, widget ); + return KThemeBase::tqpixelMetric ( metric, widget ); case PM_IndicatorWidth: if ( isPixmap( IndicatorOn ) ) return ( uncached( IndicatorOn ) ->size().width() ); else - return KThemeBase::pixelMetric ( metric, widget ); + return KThemeBase::tqpixelMetric ( metric, widget ); case PM_IndicatorHeight: if ( isPixmap( IndicatorOn ) ) return ( uncached( IndicatorOn ) ->size().height() ); else - return KThemeBase::pixelMetric ( metric, widget ); + return KThemeBase::tqpixelMetric ( metric, widget ); case PM_SliderLength: return ( sliderButtonLength() ); @@ -389,7 +389,7 @@ int KThemeStyle::pixelMetric ( PixelMetric metric, const TQWidget * widget ) con return ( splitWidth() ); default: - return KThemeBase::pixelMetric ( metric, widget ); + return KThemeBase::tqpixelMetric ( metric, widget ); } } @@ -458,7 +458,7 @@ void KThemeStyle::paletteChanged() void KThemeStyle::unPolish( TQApplication *app ) { - app->setPalette( oldPalette, true ); + app->tqsetPalette( oldPalette, true ); } bool KThemeStyle::eventFilter( TQObject* object, TQEvent* event ) @@ -468,9 +468,9 @@ bool KThemeStyle::eventFilter( TQObject* object, TQEvent* event ) if(event->type() == TQEvent::Move || event->type() == TQEvent::Resize || event->type() == TQEvent::Show) { - TQWidget *w = static_cast<TQWidget*>(object); + TQWidget *w = TQT_TQWIDGET(object); TQPoint pos(0, 0); - pos = w->mapTo(w->topLevelWidget(), pos); + pos = w->mapTo(w->tqtopLevelWidget(), pos); TQPixmap pix(uncached( Background )->size()); TQPainter p; p.begin(&pix); @@ -490,9 +490,9 @@ bool KThemeStyle::eventFilter( TQObject* object, TQEvent* event ) } if (!qstrcmp(object->name(), "kde toolbar widget") && object->inherits("QLabel")) { - TQWidget* lb = static_cast<TQWidget*>(object); - if (lb->backgroundMode() == Qt::PaletteButton) - lb->setBackgroundMode(Qt::PaletteBackground); + TQWidget* lb = TQT_TQWIDGET(object); + if (lb->backgroundMode() == TQt::PaletteButton) + lb->setBackgroundMode(TQt::PaletteBackground); lb->removeEventFilter(this); } @@ -501,10 +501,10 @@ bool KThemeStyle::eventFilter( TQObject* object, TQEvent* event ) void KThemeStyle::polish( TQWidget *w ) { - if (::qt_cast<TQStatusBar*>(w)) + if (::tqqt_cast<TQStatusBar*>(w)) w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Normal, TQColorGroup::Background)); - if (::qt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "kde toolbar widget")) + if (::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "kde toolbar widget")) w->installEventFilter(this); if (w->backgroundPixmap() && !w->isTopLevel() && @@ -543,7 +543,7 @@ void KThemeStyle::polish( TQWidget *w ) return ; } - if ( ::qt_cast<TQMenuBar*>(w) ) + if ( ::tqqt_cast<TQMenuBar*>(w) ) { w->setBackgroundMode( TQWidget::NoBackground ); } @@ -551,7 +551,7 @@ void KThemeStyle::polish( TQWidget *w ) { w->setBackgroundMode( TQWidget::PaletteBackground ); } - else if ( ::qt_cast<TQPopupMenu*>(w) ) + else if ( ::tqqt_cast<TQPopupMenu*>(w) ) { popupPalette = w->palette(); if ( isColor( MenuItem ) || isColor( MenuItemDown ) ) @@ -559,46 +559,46 @@ void KThemeStyle::polish( TQWidget *w ) TQPalette newPal( w->palette() ); if ( isColor( MenuItem ) ) { - newPal.setActive( *colorGroup( newPal.active(), MenuItem ) ); - newPal.setDisabled( *colorGroup( newPal.active(), MenuItem ) ); + newPal.setActive( *tqcolorGroup( newPal.active(), MenuItem ) ); + newPal.setDisabled( *tqcolorGroup( newPal.active(), MenuItem ) ); } if ( isColor( MenuItemDown ) ) { - newPal.setActive( *colorGroup( newPal.active(), MenuItemDown ) ); + newPal.setActive( *tqcolorGroup( newPal.active(), MenuItemDown ) ); } w->setPalette( newPal ); } w->setBackgroundMode( TQWidget::NoBackground ); } - else if ( ::qt_cast<TQCheckBox*>(w) ) + else if ( ::tqqt_cast<TQCheckBox*>(w) ) { if ( isColor( IndicatorOff ) || isColor( IndicatorOn ) ) { TQPalette newPal( w->palette() ); if ( isColor( IndicatorOff ) ) { - newPal.setActive( *colorGroup( newPal.active(), IndicatorOff ) ); - newPal.setDisabled( *colorGroup( newPal.active(), IndicatorOff ) ); + newPal.setActive( *tqcolorGroup( newPal.active(), IndicatorOff ) ); + newPal.setDisabled( *tqcolorGroup( newPal.active(), IndicatorOff ) ); } if ( isColor( IndicatorOn ) ) - newPal.setActive( *colorGroup( newPal.active(), IndicatorOn ) ); + newPal.setActive( *tqcolorGroup( newPal.active(), IndicatorOn ) ); w->setPalette( newPal ); } } - else if ( ::qt_cast<TQRadioButton*>(w) ) + else if ( ::tqqt_cast<TQRadioButton*>(w) ) { if ( isColor( ExIndicatorOff ) || isColor( ExIndicatorOn ) ) { TQPalette newPal( w->palette() ); if ( isColor( ExIndicatorOff ) ) { - newPal.setActive( *colorGroup( newPal.active(), ExIndicatorOff ) ); - newPal.setDisabled( *colorGroup( newPal.active(), + newPal.setActive( *tqcolorGroup( newPal.active(), ExIndicatorOff ) ); + newPal.setDisabled( *tqcolorGroup( newPal.active(), ExIndicatorOff ) ); } if ( isColor( ExIndicatorOn ) ) - newPal.setActive( *colorGroup( newPal.active(), ExIndicatorOn ) ); + newPal.setActive( *tqcolorGroup( newPal.active(), ExIndicatorOn ) ); w->setPalette( newPal ); } } @@ -618,21 +618,21 @@ void KThemeStyle::unPolish( TQWidget* w ) } //Toolbar labels should nornally be PaletteButton - if ( ::qt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "kde toolbar widget")) + if ( ::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "kde toolbar widget")) w->setBackgroundMode( TQWidget::PaletteButton ); //The same for menu bars, popup menus - else if ( ::qt_cast<TQMenuBar*>(w) || ::qt_cast<TQPopupMenu*>(w) ) + else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQPopupMenu*>(w) ) w->setBackgroundMode( TQWidget::PaletteButton ); - //For toolbar internal separators, return to button, too (can't use qt_cast here since don't have access to the class) + //For toolbar internal separators, return to button, too (can't use tqqt_cast here since don't have access to the class) else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) ) w->setBackgroundMode( TQWidget::PaletteButton ); //For scrollbars, we don't do much, since the widget queries the style on the switch //Drop some custom palettes. ### this really should check the serial number to be 100% correct. - if ( ::qt_cast<TQPopupMenu*>(w) || ::qt_cast<TQCheckBox*>(w) || ::qt_cast<TQRadioButton*>(w) || ::qt_cast<TQStatusBar*>(w) ) + if ( ::tqqt_cast<TQPopupMenu*>(w) || ::tqqt_cast<TQCheckBox*>(w) || ::tqqt_cast<TQRadioButton*>(w) || ::tqqt_cast<TQStatusBar*>(w) ) w->unsetPalette(); KStyle::unPolish( w ); @@ -650,8 +650,8 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, if ( gradientHint( type ) == GrReverseBevel ) { int i; - bitBlt( p->device(), x, y, scalePixmap( w, h, type ), 0, 0, w, h, - Qt::CopyROP, true ); + bitBlt( p->tqdevice(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h, + TQt::CopyROP, true ); p->setPen( g.text() ); for ( i = 0; i < borderWidth( type ); ++i, ++x, ++y, w -= 2, h -= 2 ) p->drawRect( x, y, w, h ); @@ -690,8 +690,8 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, } if ( borderPixmap( type ) ) { - bitBlt( p->device(), x, y, scaleBorder( w, h, type ), 0, 0, w, h, - Qt::CopyROP, false ); + bitBlt( p->tqdevice(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h, + TQt::CopyROP, false ); } else drawShade( p, x, y, w, h, g, sunken, rounded, @@ -757,11 +757,11 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe return ; } - const TQColorGroup *cg = colorGroup( g, widget ); + const TQColorGroup *cg = tqcolorGroup( g, widget ); // Standard arrow types if ( arrowType() == MotifArrow ) { - mtfstyle->drawPrimitive( pe, p, r, g, flags, opt ); + mtfstyle->tqdrawPrimitive( pe, p, r, g, flags, opt ); handled = true; } @@ -773,26 +773,26 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe switch ( pe ) { case PE_ArrowUp: - a.setPoints( QCOORDARRLEN( u_arrow ), u_arrow ); + a.setPoints( TQCOORDARRLEN( u_arrow ), u_arrow ); break; case PE_ArrowDown: - a.setPoints( QCOORDARRLEN( d_arrow ), d_arrow ); + a.setPoints( TQCOORDARRLEN( d_arrow ), d_arrow ); break; case PE_ArrowLeft: - a.setPoints( QCOORDARRLEN( l_arrow ), l_arrow ); + a.setPoints( TQCOORDARRLEN( l_arrow ), l_arrow ); break; default: - a.setPoints( QCOORDARRLEN( r_arrow ), r_arrow ); + a.setPoints( TQCOORDARRLEN( r_arrow ), r_arrow ); } p->save(); if ( flags & Style_Down ) - p->translate( pixelMetric( PM_ButtonShiftHorizontal ), - pixelMetric( PM_ButtonShiftVertical ) ); + p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ), + tqpixelMetric( PM_ButtonShiftVertical ) ); if ( flags & Style_Enabled ) { @@ -846,7 +846,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe case PE_ButtonBevel: { WidgetType type = ( sunken || on || down ) ? BevelDown : Bevel; - drawBaseButton( p, x, y, w, h, *colorGroup( g, type ), ( sunken || on || down ), false, type ); + drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, type ), ( sunken || on || down ), false, type ); handled = true; break; } @@ -859,7 +859,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe } case PE_PanelDockWindow: { - drawBaseButton( p, x, y, w, h, *colorGroup( g, ToolBar ), false, false, + drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, ToolBar ), false, false, ToolBar ); handled = true; break; @@ -895,7 +895,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe { if ( isPixmap( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ) { - const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask(); + const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->tqmask(); if ( mask ) { p->setPen( Qt::color1 ); @@ -913,7 +913,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe if ( isPixmap( ( flags & Style_On ) ? IndicatorOn : IndicatorOff ) ) { const TQBitmap * mask = uncached( ( flags & Style_On ) ? IndicatorOn : - IndicatorOff ) ->mask(); + IndicatorOff ) ->tqmask(); if ( mask ) { p->setPen( Qt::color1 ); @@ -938,7 +938,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe } case PE_Splitter: { - drawBaseButton( p, x, y, w, h, *colorGroup( g, Splitter ), false, false, + drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, Splitter ), false, false, Splitter ); handled = true; break; @@ -977,10 +977,10 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe if ( !isPixmap( widget ) ) { - p->fillRect( r, colorGroup( g, widget ) ->brush( TQColorGroup::Background ) ); + p->fillRect( r, tqcolorGroup( g, widget ) ->brush( TQColorGroup::Background ) ); // Do the borders and frame drawShade( p, r.x(), r.y(), r.width(), - r.height(), *colorGroup( g, widget ), true, false, + r.height(), *tqcolorGroup( g, widget ), true, false, highlightWidth( widget ), borderWidth( widget ), shade() ); } else @@ -991,7 +991,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe *scalePixmap( r.width(), r.height(), widget ) ); drawShade( p, r.x(), r.y(), r.width(), - r.height(), *colorGroup( g, widget ), true, false, + r.height(), *tqcolorGroup( g, widget ), true, false, highlightWidth( widget ), borderWidth( widget ), shade() ); } @@ -1002,12 +1002,12 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe { bool horizontal = ( flags & Style_Horizontal ); drawBaseButton( p, r.x(), r.y(), r.width(), r.height(), - *colorGroup( g, down ? ScrollButtonDown : ScrollButton ), + *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ), down, false, down ? ScrollButtonDown : ScrollButton ); - drawPrimitive( ( horizontal ) ? PE_ArrowRight : PE_ArrowDown, p , + tqdrawPrimitive( ( horizontal ) ? PE_ArrowRight : PE_ArrowDown, p , TQRect( r.x() + 3, r.y() + 3, r.width() - 6, r.height() - 6 ), - *colorGroup( g, down ? ScrollButtonDown : ScrollButton ), + *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ), flags ); handled = true; @@ -1017,12 +1017,12 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe { bool horizontal = ( flags & Style_Horizontal ); drawBaseButton( p, r.x(), r.y(), r.width(), r.height(), - *colorGroup( g, down ? ScrollButtonDown : ScrollButton ), + *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ), down, false, down ? ScrollButtonDown : ScrollButton ); - drawPrimitive( ( horizontal ) ? PE_ArrowLeft : PE_ArrowUp, p , + tqdrawPrimitive( ( horizontal ) ? PE_ArrowLeft : PE_ArrowUp, p , TQRect( r.x() + 3, r.y() + 3, r.width() - 6, r.height() - 6 ), - *colorGroup( g, down ? ScrollButtonDown : ScrollButton ), + *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ), flags ); handled = true; break; @@ -1038,7 +1038,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe active ? HScrollBarSliderDown : HScrollBarSlider : active ? VScrollBarSliderDown : VScrollBarSlider; drawBaseButton( p, r.x()+offsetH, r.y()+offsetV, r.width()-2*offsetH, - r.height()-2*offsetV, *colorGroup( g, widget ), active, false, + r.height()-2*offsetV, *tqcolorGroup( g, widget ), active, false, widget ); int spaceW = horizontal ? r.width() - decoWidth( widget ) - 4 : @@ -1086,7 +1086,7 @@ TQPixmap* KThemeStyle::makeMenuBarCache(int w, int h) const return menuCache; } - const TQColorGroup *g = colorGroup( TQApplication::palette().active(), MenuBar); + const TQColorGroup *g = tqcolorGroup( TQApplication::tqpalette().active(), MenuBar); menuCache = new TQPixmap ( w, h ); TQPainter p(menuCache); @@ -1096,7 +1096,7 @@ TQPixmap* KThemeStyle::makeMenuBarCache(int w, int h) const } -void KThemeStyle::drawControl( ControlElement element, +void KThemeStyle::tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1115,9 +1115,9 @@ void KThemeStyle::drawControl( ControlElement element, { const TQPushButton * btn = ( const TQPushButton* ) widget; bool sunken = btn->isOn() || btn->isDown(); - int diw = pixelMetric( PM_ButtonDefaultIndicator, btn ); + int diw = tqpixelMetric( PM_ButtonDefaultIndicator, btn ); drawBaseButton( p, diw, diw, w - 2 * diw, h - 2 * diw, - *colorGroup( btn->colorGroup(), sunken ? PushButtonDown : + *tqcolorGroup( btn->tqcolorGroup(), sunken ? PushButtonDown : PushButton ), sunken, roundButton(), sunken ? PushButtonDown : PushButton ); // TODO if diw, draw fancy default button indicator @@ -1134,16 +1134,16 @@ void KThemeStyle::drawControl( ControlElement element, // Shift button contents if pushed. if ( active ) { - x += pixelMetric( PM_ButtonShiftHorizontal, widget ); - y += pixelMetric( PM_ButtonShiftVertical, widget ); + x += tqpixelMetric( PM_ButtonShiftHorizontal, widget ); + y += tqpixelMetric( PM_ButtonShiftVertical, widget ); how |= Style_Sunken; } // Does the button have a popup menu? if ( button->isMenuButton() ) { - int dx = pixelMetric( PM_MenuButtonIndicator, widget ); - drawPrimitive( PE_ArrowDown, p, TQRect( x + w - dx - 2, y + 2, dx, h - 4 ), + int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ); + tqdrawPrimitive( PE_ArrowDown, p, TQRect( x + w - dx - 2, y + 2, dx, h - 4 ), cg, how, opt ); w -= dx; } @@ -1177,49 +1177,49 @@ void KThemeStyle::drawControl( ControlElement element, if ( active || button->isDefault() && button->isEnabled() ) { // Draw "fake" bold text - this enables the font metrics to remain - // the same as computed in TQPushButton::sizeHint(), but gives + // the same as computed in TQPushButton::tqsizeHint(), but gives // a reasonable bold effect. int i; // Text shadow for ( i = 0; i < 2; i++ ) drawItem( p, TQRect( x + i + 1, y + 1, w, h ), AlignCenter | ShowPrefix, - button->colorGroup(), button->isEnabled(), NULL, + button->tqcolorGroup(), button->isEnabled(), NULL, button->text(), -1, - active ? &button->colorGroup().dark() : &button->colorGroup().mid() ); + active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() ); // Normal Text for ( i = 0; i < 2; i++ ) drawItem( p, TQRect( x + i, y, w, h ), AlignCenter | ShowPrefix, - button->colorGroup(), true, i == 0 ? button->pixmap() : NULL, + button->tqcolorGroup(), true, i == 0 ? button->pixmap() : NULL, button->text(), -1, - active ? &button->colorGroup().light() : &button->colorGroup().buttonText() ); + active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() ); } else { if ( button->isEnabled() ) { - drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->colorGroup(), + drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(), true, button->pixmap(), button->text(), -1, - active ? &button->colorGroup().light() : &button->colorGroup().buttonText() ); + active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() ); } else { //TODO: Handle reversed - drawItem( p, TQRect( x + 1, y + 1, w, h ), AlignCenter | ShowPrefix, button->colorGroup(), + drawItem( p, TQRect( x + 1, y + 1, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(), true, button->pixmap(), button->text(), -1, - &button->colorGroup().light() ); + &button->tqcolorGroup().light() ); - drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->colorGroup(), + drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(), true, button->pixmap(), button->text(), -1, - &button->colorGroup().buttonText() ); + &button->tqcolorGroup().buttonText() ); } } // Draw a focus rect if the button has focus if ( how & Style_HasFocus ) - drawPrimitive( PE_FocusRect, p, - TQStyle::visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), + tqdrawPrimitive( PE_FocusRect, p, + TQStyle::tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, how ); handled = true; break; @@ -1228,7 +1228,7 @@ void KThemeStyle::drawControl( ControlElement element, case CE_MenuBarEmptyArea: { //Expand to cover entire region - drawPrimitive(PE_PanelMenuBar, p, + tqdrawPrimitive(PE_PanelMenuBar, p, TQRect(0,0,r.width()+r.x()*2, r.height()+r.y()*2), cg, Style_Default); handled = true; @@ -1238,10 +1238,10 @@ void KThemeStyle::drawControl( ControlElement element, case CE_TabBarTab: { const TQTabBar* tb = ( const TQTabBar* ) widget; - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = tb->tqshape(); bool selected = how & Style_Selected; WidgetType widget = selected ? ActiveTab : InactiveTab; - const TQColorGroup *cg = colorGroup( tb->colorGroup(), widget ); + const TQColorGroup *cg = tqcolorGroup( tb->tqcolorGroup(), widget ); int i; int x2 = x + w - 1, y2 = y + h - 1; int bWidth = borderWidth( widget ); @@ -1252,7 +1252,7 @@ void KThemeStyle::drawControl( ControlElement element, if ( !selected ) { p->fillRect( x, y, x2 - x + 1, 2, - tb->palette().active().brush( TQColorGroup::Background ) ); + tb->tqpalette().active().brush( TQColorGroup::Background ) ); y += 2; } p->setPen( cg->text() ); @@ -1314,8 +1314,8 @@ void KThemeStyle::drawControl( ControlElement element, else p->fillRect( x, y, x2 - x + 1, y2 - y + 1, cg->background() ); } - else if ( tb->shape() == TQTabBar::RoundedBelow || - tb->shape() == TQTabBar::TriangularBelow ) + else if ( tb->tqshape() == TQTabBar::RoundedBelow || + tb->tqshape() == TQTabBar::TriangularBelow ) { if ( widget == ActiveTab ) widget = RotActiveTab; @@ -1325,7 +1325,7 @@ void KThemeStyle::drawControl( ControlElement element, if ( !selected ) { p->fillRect( x, y2 - 2, x2 - x + 1, 2, - tb->palette().active().brush( TQColorGroup::Background ) ); + tb->tqpalette().active().brush( TQColorGroup::Background ) ); y2 -= 2; } p->setPen( cg->text() ); @@ -1397,7 +1397,7 @@ void KThemeStyle::drawControl( ControlElement element, TQRect pr = mb->rect(); bool active = how & Style_Active; //bool focused = how & Style_HasFocus; - const TQColorGroup *g = colorGroup( cg, active ? MenuBarItem : MenuBar ); + const TQColorGroup *g = tqcolorGroup( cg, active ? MenuBarItem : MenuBar ); TQColor btext = g->buttonText(); TQPixmap* cache = makeMenuBarCache(pr.width(), pr.height()); @@ -1439,10 +1439,10 @@ void KThemeStyle::drawControl( ControlElement element, bool enabled = (mi? mi->isEnabled():true); bool checkable = popupmenu->isCheckable(); bool active = how & Style_Active; - bool etchtext = styleHint( SH_EtchDisabledText, 0 ); + bool etchtext = tqstyleHint( SH_EtchDisabledText, 0 ); bool reverse = TQApplication::reverseLayout(); - const TQColorGroup& cg_ours = *colorGroup( cg, active ? MenuItemDown : MenuItem ); + const TQColorGroup& cg_ours = *tqcolorGroup( cg, active ? MenuItemDown : MenuItem ); //TQColor btext = cg_ours.buttonText(); @@ -1464,7 +1464,7 @@ void KThemeStyle::drawControl( ControlElement element, drawBaseButton( p, x, y, w, h, cg_ours, true, false, MenuItemDown ); else { - drawShade( p, x, y, w, h, *colorGroup( cg_ours, MenuItem ), false, false, + drawShade( p, x, y, w, h, *tqcolorGroup( cg_ours, MenuItem ), false, false, highlightWidth( MenuItem ), borderWidth( MenuItem ), shade() ); int dw = decoWidth( MenuItem ); @@ -1474,7 +1474,7 @@ void KThemeStyle::drawControl( ControlElement element, x + dw, y + dw, w - dw * 2, h - dw * 2, cg_ours.brush( TQColorGroup::Background ) ); //cg.brush( TQColorGroup::Background )); - //colorGroup( cg_ours, MenuItem ) ->brush( TQColorGroup::Background ) ); + //tqcolorGroup( cg_ours, MenuItem ) ->brush( TQColorGroup::Background ) ); } else { @@ -1492,7 +1492,7 @@ void KThemeStyle::drawControl( ControlElement element, if ( mi->iconSet() ) { TQIconSet::Mode mode; - TQRect cr = visualRect( TQRect( x, y, checkcol, h ), r ); + TQRect cr = tqvisualRect( TQRect( x, y, checkcol, h ), r ); // Select the correct icon from the iconset if ( active ) @@ -1503,7 +1503,7 @@ void KThemeStyle::drawControl( ControlElement element, // Do we have an icon and are checked at the same time? // Then draw a "pressed" background behind the icon if ( checkable && mi->isChecked() ) //!active && -- ?? - drawBaseButton( p, cr.x(), cr.y(), cr.width(), cr.height(), *colorGroup( cg_ours, BevelDown ), true, false, BevelDown ); + drawBaseButton( p, cr.x(), cr.y(), cr.width(), cr.height(), *tqcolorGroup( cg_ours, BevelDown ), true, false, BevelDown ); // Draw the icon TQPixmap pixmap = mi->iconSet() ->pixmap( TQIconSet::Small, mode ); @@ -1530,7 +1530,7 @@ void KThemeStyle::drawControl( ControlElement element, SFlags cflags = Style_Default; cflags |= active ? Style_Enabled : Style_On; - drawPrimitive( PE_CheckMark, p, TQRect( cx + itemFrame, y + itemFrame, + tqdrawPrimitive( PE_CheckMark, p, TQRect( cx + itemFrame, y + itemFrame, checkcol - itemFrame * 2, h - itemFrame * 2 ), cg_ours, cflags ); } @@ -1580,7 +1580,7 @@ void KThemeStyle::drawControl( ControlElement element, // Does the menu item have a text label? if ( !s.isNull() ) { - int t = s.find( '\t' ); + int t = s.tqfind( '\t' ); int m = itemVMargin; int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; text_flags |= reverse ? AlignRight : AlignLeft; @@ -1627,14 +1627,14 @@ void KThemeStyle::drawControl( ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( OpaqueMode ); + p->setBackgroundMode( Qt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x + diffw, y + itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( TransparentMode ); + p->setBackgroundMode( Qt::TransparentMode ); } } @@ -1643,7 +1643,7 @@ void KThemeStyle::drawControl( ControlElement element, { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = 10 - itemFrame; //We're not very useful to inherit off, so just hardcode.. - TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim, + TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - itemFrame - dim, y + h / 2 - dim / 2, dim, dim ), r ); // Draw an arrow at the far end of the menu item @@ -1655,10 +1655,10 @@ void KThemeStyle::drawControl( ControlElement element, TQColorGroup g2( discol, cg_ours.highlight(), white, white, enabled ? white : discol, discol, white ); - drawPrimitive( arrow, p, vr, g2, Style_Enabled | Style_Down ); + tqdrawPrimitive( arrow, p, vr, g2, Style_Enabled | Style_Down ); } else - drawPrimitive( arrow, p, vr, cg_ours, + tqdrawPrimitive( arrow, p, vr, cg_ours, enabled ? Style_Enabled : Style_Default ); } handled = true; @@ -1667,7 +1667,7 @@ void KThemeStyle::drawControl( ControlElement element, case CE_ProgressBarGroove: { TQBrush bg; - const TQColorGroup * cg2 = colorGroup( cg, ProgressBg ); + const TQColorGroup * cg2 = tqcolorGroup( cg, ProgressBg ); qDrawWinPanel( p, r, *cg2, true ); bg.setColor( cg2->color( TQColorGroup::Background ) ); if ( isPixmap( ProgressBg ) ) @@ -1714,15 +1714,15 @@ void KThemeStyle::drawControl( ControlElement element, } if ( !reverse ) - drawBaseButton( p, x + pstep, y, width, h, *colorGroup( cg, ProgressBar ), false, false, ProgressBar ); + drawBaseButton( p, x + pstep, y, width, h, *tqcolorGroup( cg, ProgressBar ), false, false, ProgressBar ); else { //TODO:Optimize TQPixmap buf( width, h ); TQPainter p2( &buf ); - drawBaseButton( &p2, 0, 0, width, h, *colorGroup( cg, ProgressBar ), false, false, ProgressBar ); + drawBaseButton( &p2, 0, 0, width, h, *tqcolorGroup( cg, ProgressBar ), false, false, ProgressBar ); p2.end(); - TQPixmap mirroredPix = TQPixmap( buf.convertToImage().mirror( true, false ) ); + TQPixmap mirroredPix = TQPixmap( TQImage(buf.convertToImage()).mirror( true, false ) ); bitBlt( p->device(), x + w - width - pstep, y, &mirroredPix ); } } @@ -1735,12 +1735,12 @@ void KThemeStyle::drawControl( ControlElement element, }; if ( !handled ) - KThemeBase::drawControl( element, + KThemeBase::tqdrawControl( element, p, widget, r, cg, how, opt ); } -void KThemeStyle::drawControlMask( ControlElement element, +void KThemeStyle::tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1764,7 +1764,7 @@ void KThemeStyle::drawControlMask( ControlElement element, }; if ( !handled ) - KThemeBase::drawControlMask( element, + KThemeBase::tqdrawControlMask( element, p, widget, r, opt ); } @@ -1788,15 +1788,15 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, if ( !roundSlider() ) { const TQSlider * slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; if ( horizontal ) { - drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true, + drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, SliderGroove ), true, false, SliderGroove ); } else { - drawBaseButton( p, x, y, w, h, *colorGroup( cg, RotSliderGroove ), true, + drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, RotSliderGroove ), true, false, RotSliderGroove ); } } @@ -1804,7 +1804,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, { //This code is from HighColorDefault.. const TQSlider* slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; int gcenter = ( horizontal ? r.height() : r.width() ) / 2; TQRect gr; @@ -1840,7 +1840,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, if ( isPixmap( Slider ) ) { const TQSlider * slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; if ( horizontal ) { bitBlt( p->device(), x, y + ( h - uncached( Slider ) ->height() ) / 2, @@ -1853,8 +1853,8 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, TQWMatrix r270; r270.rotate( 270 ); vsliderCache = new TQPixmap( uncached( Slider ) ->xForm( r270 ) ); - if ( uncached( Slider ) ->mask() ) - vsliderCache->setMask( uncached( Slider ) ->mask() ->xForm( r270 ) ); + if ( uncached( Slider ) ->tqmask() ) + vsliderCache->setMask( uncached( Slider ) ->tqmask() ->xForm( r270 ) ); } bitBlt( p->device(), x + ( w - vsliderCache->width() ) / 2, y, vsliderCache ); @@ -1865,7 +1865,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, //This code again from HighColor.. //...except sans the gradient.. const TQSlider* slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; int x, y, w, h; r.rect( &x, &y, &w, &h ); int x2 = x + w - 1; @@ -1925,10 +1925,10 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, case KPE_GeneralHandle: { if ( w > h ) - drawBaseButton( p, x, y, w, h, *colorGroup( cg, HBarHandle ), false, false, + drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, HBarHandle ), false, false, HBarHandle ); else - drawBaseButton( p, x, y, w, h, *colorGroup( cg, VBarHandle ), false, false, + drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, VBarHandle ), false, false, VBarHandle ); handled = true; @@ -1950,7 +1950,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, -void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, const TQWidget * widget, +void KThemeStyle::tqdrawComplexControl ( ComplexControl control, TQPainter * p, const TQWidget * widget, const TQRect & r, const TQColorGroup & g, SFlags how , SCFlags controls, SCFlags active, const TQStyleOption & opt ) const @@ -1977,7 +1977,7 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co { WidgetType widget = ( down || on ) ? ToolButtonDown : ToolButton; - drawBaseButton( p, button.x(), button.y(), button.width(), button.height(), *colorGroup( g, widget ), down || on, false, + drawBaseButton( p, button.x(), button.y(), button.width(), button.height(), *tqcolorGroup( g, widget ), down || on, false, widget ); // int m = decoWidth( widget ); @@ -1985,7 +1985,7 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co if ( controls & SC_ToolButtonMenu ) { - drawPrimitive( PE_ArrowDown, p, menu, g, how ); + tqdrawPrimitive( PE_ArrowDown, p, menu, g, how ); /* if ( enabled ) kDrawWindowsArrow(p, this, PE_ArrowDown, false, menu.x(), menu.y(), menu.width(), menu.height(), g, true ); @@ -1998,7 +1998,7 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co { TQRect fr = toolbutton->rect(); fr.addCoords( 3, 3, -3, -3 ); - drawPrimitive( PE_FocusRect, p, fr, g ); + tqdrawPrimitive( PE_FocusRect, p, fr, g ); } handled = true; @@ -2013,7 +2013,7 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co bool sunken = ( active == SC_ComboBoxArrow ); //No frame, edit box and button for now? WidgetType widget = sunken ? ComboBoxDown : ComboBox; - drawBaseButton( p, x, y, w, h, *colorGroup( g, widget ), sunken, + drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, widget ), sunken, roundComboBox(), widget ); controls ^= SC_ComboBoxFrame; @@ -2022,7 +2022,7 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co if ( controls & SC_ComboBoxArrow ) { bool sunken = ( active == SC_ComboBoxArrow ); - TQRect ar = TQStyle::visualRect( + TQRect ar = TQStyle::tqvisualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxArrow ), widget ); ar.rect( &x, &y, &w, &h ); @@ -2041,8 +2041,8 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co else { - mtfstyle->drawPrimitive( PE_ArrowDown, p, TQRect( x, y, w, h ), *colorGroup( g, widget ), sunken ? ( how | Style_Sunken ) : how, opt ); - qDrawShadeRect( p, x, y, w, h, *colorGroup( g, widget ) ); //w-14, y+7+(h-15), 10, 3, + mtfstyle->tqdrawPrimitive( PE_ArrowDown, p, TQRect( x, y, w, h ), *tqcolorGroup( g, widget ), sunken ? ( how | Style_Sunken ) : how, opt ); + qDrawShadeRect( p, x, y, w, h, *tqcolorGroup( g, widget ) ); //w-14, y+7+(h-15), 10, 3, } controls ^= SC_ComboBoxArrow; } @@ -2071,7 +2071,7 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co if ( groove.isValid() ) { p2.fillRect( groove, TQColor( 255, 0, 0 ) ); - drawPrimitive( PE_ScrollBarSubPage, &p2, groove, g, + tqdrawPrimitive( PE_ScrollBarSubPage, &p2, groove, g, sflags | ( ( active == SC_ScrollBarSubPage ) ? Style_Down : Style_Default ) ); } @@ -2080,19 +2080,19 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co // Draw the up/left button set if ( subline.isValid() ) { - drawPrimitive( PE_ScrollBarSubLine, &p2, subline, g, + tqdrawPrimitive( PE_ScrollBarSubLine, &p2, subline, g, sflags | ( active == SC_ScrollBarSubLine ? Style_Down : Style_Default ) ); } if ( addline.isValid() ) - drawPrimitive( PE_ScrollBarAddLine, &p2, addline, g, + tqdrawPrimitive( PE_ScrollBarAddLine, &p2, addline, g, sflags | ( ( active == SC_ScrollBarAddLine ) ? Style_Down : Style_Default ) ); if ( slider.isValid() ) { //(controls & SC_ScrollBarSlider) && - drawPrimitive( PE_ScrollBarSlider, &p2, slider, g, + tqdrawPrimitive( PE_ScrollBarSlider, &p2, slider, g, sflags | ( ( active == SC_ScrollBarSlider ) ? Style_Down : Style_Default ) ); // Draw focus rect @@ -2100,7 +2100,7 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co { TQRect fr( slider.x() + 2, slider.y() + 2, slider.width() - 5, slider.height() - 5 ); - drawPrimitive( PE_FocusRect, &p2, fr, g, Style_Default ); + tqdrawPrimitive( PE_FocusRect, &p2, fr, g, Style_Default ); } p2.end(); bitBlt( p->device(), x, y, &buf ); @@ -2115,7 +2115,7 @@ void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, co if ( !handled ) { - KThemeBase::drawComplexControl ( control, p, widget, + KThemeBase::tqdrawComplexControl ( control, p, widget, r, g, how , controls, active, opt ); @@ -2128,25 +2128,25 @@ void KThemeStyle::drawBaseMask( TQPainter *p, int x, int y, int w, int h, bool round ) const { // round edge fills - static const QCOORD btm_left_fill[] = + static const TQCOORD btm_left_fill[] = { 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 0, 1, 1, 1, 2, 1, 3, 1, 4, 1, 1, 2, 2, 2, 3, 2, 4, 2, 2, 3, 3, 3, 4, 3, 3, 4, 4, 4 }; - static const QCOORD btm_right_fill[] = + static const TQCOORD btm_right_fill[] = { 0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 0, 1, 1, 1, 2, 1, 3, 1, 4, 1, 0, 2, 1, 2, 2, 2, 3, 2, 0, 3, 1, 3, 2, 3, 0, 4, 1, 4 }; - static const QCOORD top_left_fill[] = + static const TQCOORD top_left_fill[] = { 3, 0, 4, 0, 2, 1, 3, 1, 4, 1, 1, 2, 2, 2, 3, 2, 4, 2, 0, 3, 1, 3, 2, 3, 3, 3, 4, 3, 0, 4, 1, 4, 2, 4, 3, 4, 4, 4 }; - static const QCOORD top_right_fill[] = + static const TQCOORD top_right_fill[] = { 0, 0, 1, 0, 0, 1, 1, 1, 2, 1, 0, 2, 1, 2, 2, 2, 3, 2, 0, 3, 1, 3, 2, 3, 3, 3, 4, 3, 0, 4, 1, 4, 2, 4, 3, 4, 4, 4 @@ -2158,16 +2158,16 @@ void KThemeStyle::drawBaseMask( TQPainter *p, int x, int y, int w, int h, { int x2 = x + w - 1; int y2 = y + h - 1; - TQPointArray a( QCOORDARRLEN( top_left_fill ), top_left_fill ); + TQPointArray a( TQCOORDARRLEN( top_left_fill ), top_left_fill ); a.translate( 1, 1 ); p->drawPoints( a ); - a.setPoints( QCOORDARRLEN( btm_left_fill ), btm_left_fill ); + a.setPoints( TQCOORDARRLEN( btm_left_fill ), btm_left_fill ); a.translate( 1, h - 6 ); p->drawPoints( a ); - a.setPoints( QCOORDARRLEN( top_right_fill ), top_right_fill ); + a.setPoints( TQCOORDARRLEN( top_right_fill ), top_right_fill ); a.translate( w - 6, 1 ); p->drawPoints( a ); - a.setPoints( QCOORDARRLEN( btm_right_fill ), btm_right_fill ); + a.setPoints( TQCOORDARRLEN( btm_right_fill ), btm_right_fill ); a.translate( w - 6, h - 6 ); p->drawPoints( a ); @@ -2184,7 +2184,7 @@ void KThemeStyle::drawBaseMask( TQPainter *p, int x, int y, int w, int h, p->fillRect( x, y, w, h, fillBrush ); } -int KThemeStyle::styleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, QStyleHintReturn *shr ) const +int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, QStyleHintReturn *shr ) const { switch ( sh ) { @@ -2206,7 +2206,7 @@ int KThemeStyle::styleHint( StyleHint sh, const TQWidget *w, const TQStyleOption return NoBackground; default: - return KThemeBase::styleHint( sh, w, opt, shr ); + return KThemeBase::tqstyleHint( sh, w, opt, shr ); }; } diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h index 00d6256e7..b0b9bdd97 100644 --- a/kstyles/kthemestyle/kthemestyle.h +++ b/kstyles/kthemestyle/kthemestyle.h @@ -79,13 +79,13 @@ public: KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null ); ~KThemeStyle(); - virtual int pixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const; + virtual int tqpixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const; virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRect & r, const TQColorGroup & cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - virtual void drawControl( ControlElement element, + virtual void tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -93,14 +93,14 @@ public: SFlags how = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - virtual void drawControlMask( ControlElement element, + virtual void tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; - virtual void drawComplexControl( ComplexControl control, + virtual void tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget* widget, const TQRect &r, @@ -119,7 +119,7 @@ public: const TQStyleOption& = TQStyleOption::Default ) const; - virtual int styleHint( StyleHint sh, + virtual int tqstyleHint( StyleHint sh, const TQWidget *widget = 0, const TQStyleOption& = TQStyleOption::Default, QStyleHintReturn* returnData = 0 ) const; @@ -192,7 +192,7 @@ public: * @param w The rectangle width. * @param h The rectangle height. * @param sunken Draws a sunken style if @p true. - * @param rounded Draws a rounded shape if @p true. Requires bWidth to be + * @param rounded Draws a rounded tqshape if @p true. Requires bWidth to be * at least 1. * @param hWidth The highlight width. * @param bWidth The border width. diff --git a/kstyles/light/light.cpp b/kstyles/light/light.cpp index caa1d3e8f..17ecde9fc 100644 --- a/kstyles/light/light.cpp +++ b/kstyles/light/light.cpp @@ -21,10 +21,13 @@ */ #include <tqstyleplugin.h> +#include <tqimage.h> +#include <tqapplication.h> + #include "lightstyle-v2.h" #include "lightstyle-v3.h" -class LightStylePlugin : public QStylePlugin +class LightStylePlugin : public TQStylePlugin { public: LightStylePlugin(); diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index 8f673a707..6fde9549d 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -159,11 +159,11 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, if (flags & (TQStyle::Style_Down | TQStyle::Style_On | TQStyle::Style_Sunken)) - fill = &cg.brush(TQColorGroup::Midlight); + fill = &cg.tqbrush(TQColorGroup::Midlight); else - fill = &cg.brush(TQColorGroup::Button); + fill = &cg.tqbrush(TQColorGroup::Button); } else - fill = &cg.brush(TQColorGroup::Background); + fill = &cg.tqbrush(TQColorGroup::Background); drawLightBevel(p, r, cg, flags, fill); break; } @@ -176,11 +176,11 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, if (flags & TQStyle::Style_Enabled) { if (sunken) - thefill = cg.brush(TQColorGroup::Midlight); + thefill = cg.tqbrush(TQColorGroup::Midlight); else - thefill = cg.brush(TQColorGroup::Button); + thefill = cg.tqbrush(TQColorGroup::Button); } else - thefill = cg.brush(TQColorGroup::Background); + thefill = cg.tqbrush(TQColorGroup::Background); p->setPen(cg.dark()); p->drawLine(r.topLeft(), r.topRight()); @@ -224,11 +224,11 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, case PE_Indicator: const TQBrush *fill; if (! (flags & Style_Enabled)) - fill = &cg.brush(TQColorGroup::Background); + fill = &cg.tqbrush(TQColorGroup::Background); else if (flags & Style_Down) - fill = &cg.brush(TQColorGroup::Mid); + fill = &cg.tqbrush(TQColorGroup::Mid); else - fill = &cg.brush(TQColorGroup::Base); + fill = &cg.tqbrush(TQColorGroup::Base); drawLightBevel(p, r, cg, flags | Style_Sunken, fill); p->setPen(cg.text()); @@ -265,7 +265,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, cr.addCoords(2, 2, -2, -2); ir.addCoords(3, 3, -3, -3); - p->fillRect(r, cg.brush(TQColorGroup::Background)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Background)); p->setPen(cg.dark()); p->drawArc(r, 0, 16*360); @@ -294,7 +294,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, bool drawTitle = false; if ( p && p->device()->devType() == TQInternal::Widget ) { TQWidget *w = (TQWidget *) p->device(); - TQWidget *p = w->parentWidget(); + TQWidget *p = w->tqparentWidget(); if (p->inherits("QDockWindow") && ! p->inherits("QToolBar")) { drawTitle = true; title = p->caption(); @@ -307,7 +307,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, TQPixmap pm(r.height(), r.width()); TQPainter p2(&pm); p2.fillRect(0, 0, pm.width(), pm.height(), - cg.brush(TQColorGroup::Highlight)); + cg.tqbrush(TQColorGroup::Highlight)); p2.setPen(cg.highlightedText()); p2.drawText(0, 0, pm.width(), pm.height(), AlignCenter, title); p2.end(); @@ -331,7 +331,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, } } else { if (drawTitle) { - p->fillRect(r, cg.brush(TQColorGroup::Highlight)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Highlight)); p->setPen(cg.highlightedText()); p->drawText(r, AlignCenter, title); } else { @@ -366,7 +366,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, p->drawLine(r.left() + 6, r.top() + 2, r.right() - 6, r.top() + 2); } } else - TQCommonStyle::drawPrimitive(pe, p, r, cg, flags, data); + TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); break; } @@ -405,39 +405,39 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, case PE_WindowFrame: { int lw = data.isDefault() ? - pixelMetric(PM_DefaultFrameWidth) : data.lineWidth(); + tqpixelMetric(PM_DefaultFrameWidth) : data.lineWidth(); if ( ! ( flags & Style_Sunken ) ) flags |= Style_Raised; if (lw == 2) drawLightBevel(p, r, cg, flags); else - TQCommonStyle::drawPrimitive(pe, p, r, cg, flags, data); + TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); break; } case PE_PanelDockWindow: { int lw = data.isDefault() ? - pixelMetric(PM_DockWindowFrameWidth) : data.lineWidth(); + tqpixelMetric(PM_DockWindowFrameWidth) : data.lineWidth(); if (lw == 2) drawLightBevel(p, r, cg, flags | Style_Raised, - &cg.brush(TQColorGroup::Button)); + &cg.tqbrush(TQColorGroup::Button)); else - TQCommonStyle::drawPrimitive(pe, p, r, cg, flags, data); + TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); break; } case PE_PanelMenuBar: { int lw = data.isDefault() ? - pixelMetric(PM_MenuBarFrameWidth) : data.lineWidth(); + tqpixelMetric(PM_MenuBarFrameWidth) : data.lineWidth(); if (lw == 2) - drawLightBevel(p, r, cg, flags, &cg.brush(TQColorGroup::Button)); + drawLightBevel(p, r, cg, flags, &cg.tqbrush(TQColorGroup::Button)); else - TQCommonStyle::drawPrimitive(pe, p, r, cg, flags, data); + TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); break; } @@ -459,10 +459,10 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, pe = PE_ArrowUp; } - p->fillRect(fr, cg.brush((flags & Style_Down) ? + p->fillRect(fr, cg.tqbrush((flags & Style_Down) ? TQColorGroup::Midlight : TQColorGroup::Background)); - drawPrimitive(pe, p, ar, cg, flags); + tqdrawPrimitive(pe, p, ar, cg, flags); break; } @@ -484,10 +484,10 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, pe = PE_ArrowDown; } - p->fillRect(fr, cg.brush((flags & Style_Down) ? + p->fillRect(fr, cg.tqbrush((flags & Style_Down) ? TQColorGroup::Midlight : TQColorGroup::Background)); - drawPrimitive(pe, p, ar, cg, flags); + tqdrawPrimitive(pe, p, ar, cg, flags); break; } @@ -509,7 +509,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, fr.addCoords(2, 0, 0, 0); } - p->fillRect(fr, cg.brush((flags & Style_Down) ? + p->fillRect(fr, cg.tqbrush((flags & Style_Down) ? TQColorGroup::Midlight : TQColorGroup::Mid)); break; @@ -534,7 +534,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, drawLightBevel(p, fr, cg, ((flags | Style_Down) ^ Style_Down) | ((flags & Style_Enabled) ? Style_Raised : Style_Default), - &cg.brush(TQColorGroup::Button)); + &cg.tqbrush(TQColorGroup::Button)); break; } @@ -607,12 +607,12 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe, } p->restore(); } else - TQCommonStyle::drawPrimitive(pe, p, r, cg, flags, data); + TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); break; } } -void LightStyleV2::drawControl( ControlElement control, +void LightStyleV2::tqdrawControl( ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -631,7 +631,7 @@ void LightStyleV2::drawControl( ControlElement control, tr.addCoords(0, 0, 0, -1); fr.addCoords(2, 2, -2, -2); - if ( tb->shape() == TQTabBar::RoundedBelow || tb->shape() == TQTabBar::TriangularBelow) { + if ( tb->tqshape() == TQTabBar::RoundedBelow || tb->tqshape() == TQTabBar::TriangularBelow) { tr = r; tr.addCoords(0, 1, 0, 0); fr = r; fr.addCoords(2, 2,-2, -4); below = true; @@ -786,7 +786,7 @@ void LightStyleV2::drawControl( ControlElement control, if ( widget->erasePixmap() && !widget->erasePixmap()->isNull() ) p->drawPixmap( r.topLeft(), *widget->erasePixmap(), r ); else - p->fillRect(r, cg.brush(TQColorGroup::Button)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); p->setPen(cg.mid().dark(120)); p->drawLine(r.left() + 12, r.top() + 1, @@ -799,11 +799,11 @@ void LightStyleV2::drawControl( ControlElement control, if (flags & Style_Active) qDrawShadePanel(p, r, cg, true, 1, - &cg.brush(TQColorGroup::Midlight)); + &cg.tqbrush(TQColorGroup::Midlight)); else if ( widget->erasePixmap() && !widget->erasePixmap()->isNull() ) p->drawPixmap( r.topLeft(), *widget->erasePixmap(), r ); else - p->fillRect(r, cg.brush(TQColorGroup::Button)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); if ( !mi ) break; @@ -822,16 +822,16 @@ void LightStyleV2::drawControl( ControlElement control, bool reverse = TQApplication::reverseLayout(); if ( reverse ) { - cr = visualRect( cr, r ); - sr = visualRect( sr, r ); - tr = visualRect( tr, r ); - ir = visualRect( ir, r ); + cr = tqvisualRect( cr, r ); + sr = tqvisualRect( sr, r ); + tr = tqvisualRect( tr, r ); + ir = tqvisualRect( ir, r ); } if (mi->isChecked() && ! (flags & Style_Active) & (flags & Style_Enabled)) - qDrawShadePanel(p, cr, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); + qDrawShadePanel(p, cr, cg, true, 1, &cg.tqbrush(TQColorGroup::Midlight)); if (mi->iconSet()) { TQIconSet::Mode mode = @@ -850,7 +850,7 @@ void LightStyleV2::drawControl( ControlElement control, p->setPen(cg.text()); p->drawPixmap(pmr.topLeft(), pixmap); } else if (popupmenu->isCheckable() && mi->isChecked()) - drawPrimitive(PE_CheckMark, p, cr, cg, + tqdrawPrimitive(PE_CheckMark, p, cr, cg, (flags & Style_Enabled) | Style_On); TQColor textcolor; @@ -887,7 +887,7 @@ void LightStyleV2::drawControl( ControlElement control, TQString text = mi->text(); if (! text.isNull()) { - int t = text.find('\t'); + int t = text.tqfind('\t'); // draw accelerator/tab-text if (t >= 0) { @@ -919,26 +919,26 @@ void LightStyleV2::drawControl( ControlElement control, } else if (mi->pixmap()) { TQPixmap pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - p->setBackgroundMode(OpaqueMode); + p->setBackgroundMode(Qt::OpaqueMode); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); if (pixmap.depth() == 1) - p->setBackgroundMode(TransparentMode); + p->setBackgroundMode(Qt::TransparentMode); } if (mi->popup()) - drawPrimitive( (reverse ? PE_ArrowLeft : PE_ArrowRight), p, sr, cg, flags); + tqdrawPrimitive( (reverse ? PE_ArrowLeft : PE_ArrowRight), p, sr, cg, flags); break; } case CE_MenuBarEmptyArea: { - p->fillRect(r, cg.brush(TQColorGroup::Button)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); break; } case CE_DockWindowEmptyArea: { - p->fillRect(r, cg.brush(TQColorGroup::Button)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); break; } @@ -946,9 +946,9 @@ void LightStyleV2::drawControl( ControlElement control, case CE_MenuBarItem: { if (flags & Style_Active) - qDrawShadePanel(p, r, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); + qDrawShadePanel(p, r, cg, true, 1, &cg.tqbrush(TQColorGroup::Midlight)); else - p->fillRect(r, cg.brush(TQColorGroup::Button)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); if (data.isDefault()) break; @@ -961,16 +961,16 @@ void LightStyleV2::drawControl( ControlElement control, } case CE_ProgressBarGroove: - drawLightBevel(p, r, cg, Style_Sunken, &cg.brush(TQColorGroup::Background)); + drawLightBevel(p, r, cg, Style_Sunken, &cg.tqbrush(TQColorGroup::Background)); break; default: - TQCommonStyle::drawControl(control, p, widget, r, cg, flags, data); + TQCommonStyle::tqdrawControl(control, p, widget, r, cg, flags, data); break; } } -void LightStyleV2::drawControlMask( ControlElement control, +void LightStyleV2::tqdrawControlMask( ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -982,7 +982,7 @@ void LightStyleV2::drawControlMask( ControlElement control, break; default: - TQCommonStyle::drawControlMask(control, p, widget, r, data); + TQCommonStyle::tqdrawControlMask(control, p, widget, r, data); break; } } @@ -997,7 +997,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQWidget *widget) const const TQPushButton *button = (const TQPushButton *) widget; int dbw1 = 0, dbw2 = 0; if (button->isDefault() || button->autoDefault()) { - dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget); + dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget); dbw2 = dbw1 * 2; } @@ -1015,7 +1015,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQWidget *widget) const return rect; } -void LightStyleV2::drawComplexControl( ComplexControl control, +void LightStyleV2::tqdrawComplexControl( ComplexControl control, TQPainter* p, const TQWidget* widget, const TQRect& r, @@ -1031,27 +1031,27 @@ void LightStyleV2::drawComplexControl( ComplexControl control, const TQComboBox *combobox = (const TQComboBox *) widget; TQRect frame, arrow, field; frame = - TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget, + TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxFrame, data), widget); arrow = - TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget, + TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow, data), widget); field = - TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget, + TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxEditField, data), widget); if ((controls & SC_ComboBoxFrame) && frame.isValid()) drawLightBevel(p, frame, cg, flags | Style_Raised, - &cg.brush(TQColorGroup::Button)); + &cg.tqbrush(TQColorGroup::Button)); if ((controls & SC_ComboBoxArrow) && arrow.isValid()) { if (active == SC_ComboBoxArrow) - p->fillRect(arrow, cg.brush(TQColorGroup::Mid)); + p->fillRect(arrow, cg.tqbrush(TQColorGroup::Mid)); arrow.addCoords(4, 2, -2, -2); - drawPrimitive(PE_ArrowDown, p, arrow, cg, flags); + tqdrawPrimitive(PE_ArrowDown, p, arrow, cg, flags); } if ((controls & SC_ComboBoxEditField) && field.isValid()) { @@ -1065,11 +1065,11 @@ void LightStyleV2::drawComplexControl( ComplexControl control, if (flags & Style_HasFocus) { if (! combobox->editable()) { - p->fillRect( field, cg.brush( TQColorGroup::Highlight ) ); + p->fillRect( field, cg.tqbrush( TQColorGroup::Highlight ) ); TQRect fr = - TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ), + TQStyle::tqvisualRect( subRect( SR_ComboBoxFocusRect, widget ), widget ); - drawPrimitive( PE_FocusRect, p, fr, cg, + tqdrawPrimitive( PE_FocusRect, p, fr, cg, flags | Style_FocusAtBorder, TQStyleOption(cg.highlight())); } @@ -1087,14 +1087,14 @@ void LightStyleV2::drawComplexControl( ComplexControl control, const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; TQRect frame, up, down; - frame = querySubControlMetrics(CC_SpinWidget, widget, + frame = querySubControlMetrics((QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetFrame, data); up = spinwidget->upRect(); down = spinwidget->downRect(); if ((controls & SC_SpinWidgetFrame) && frame.isValid()) drawLightBevel(p, frame, cg, flags | Style_Sunken, - &cg.brush(TQColorGroup::Base)); + &cg.tqbrush(TQColorGroup::Base)); if ((controls & SC_SpinWidgetUp) && up.isValid()) { PrimitiveElement pe = PE_SpinWidgetUp; @@ -1105,7 +1105,7 @@ void LightStyleV2::drawComplexControl( ComplexControl control, p->drawLine(up.topLeft(), up.bottomLeft()); up.addCoords(1, 0, 0, 0); - p->fillRect(up, cg.brush(TQColorGroup::Button)); + p->fillRect(up, cg.tqbrush(TQColorGroup::Button)); if (active == SC_SpinWidgetUp) p->setPen(cg.mid()); else @@ -1124,7 +1124,7 @@ void LightStyleV2::drawComplexControl( ComplexControl control, up.right() - 1, up.bottom()); up.addCoords(1, 0, 0, 0); - drawPrimitive(pe, p, up, cg, flags | + tqdrawPrimitive(pe, p, up, cg, flags | ((active == SC_SpinWidgetUp) ? Style_On | Style_Sunken : Style_Raised)); } @@ -1138,7 +1138,7 @@ void LightStyleV2::drawComplexControl( ComplexControl control, p->drawLine(down.topLeft(), down.bottomLeft()); down.addCoords(1, 0, 0, 0); - p->fillRect(down, cg.brush(TQColorGroup::Button)); + p->fillRect(down, cg.tqbrush(TQColorGroup::Button)); if (active == SC_SpinWidgetDown) p->setPen(cg.mid()); else @@ -1157,7 +1157,7 @@ void LightStyleV2::drawComplexControl( ComplexControl control, down.right() - 1, down.bottom()); down.addCoords(1, 0, 0, 0); - drawPrimitive(pe, p, down, cg, flags | + tqdrawPrimitive(pe, p, down, cg, flags | ((active == SC_SpinWidgetDown) ? Style_On | Style_Sunken : Style_Raised)); } @@ -1186,52 +1186,52 @@ void LightStyleV2::drawComplexControl( ComplexControl control, subline2.moveBy(0, -addline.height()); if ((controls & SC_ScrollBarSubLine) && subline.isValid()) { - drawPrimitive(PE_ScrollBarSubLine, p, subline, cg, + tqdrawPrimitive(PE_ScrollBarSubLine, p, subline, cg, Style_Enabled | ((active == SC_ScrollBarSubLine) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if (subline2.isValid()) - drawPrimitive(PE_ScrollBarSubLine, p, subline2, cg, + tqdrawPrimitive(PE_ScrollBarSubLine, p, subline2, cg, Style_Enabled | ((active == SC_ScrollBarSubLine) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); } if ((controls & SC_ScrollBarAddLine) && addline.isValid()) - drawPrimitive(PE_ScrollBarAddLine, p, addline, cg, + tqdrawPrimitive(PE_ScrollBarAddLine, p, addline, cg, Style_Enabled | ((active == SC_ScrollBarAddLine) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarSubPage) && subpage.isValid()) - drawPrimitive(PE_ScrollBarSubPage, p, subpage, cg, + tqdrawPrimitive(PE_ScrollBarSubPage, p, subpage, cg, Style_Enabled | ((active == SC_ScrollBarSubPage) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarAddPage) && addpage.isValid()) - drawPrimitive(PE_ScrollBarAddPage, p, addpage, cg, + tqdrawPrimitive(PE_ScrollBarAddPage, p, addpage, cg, ((maxedOut) ? Style_Default : Style_Enabled) | ((active == SC_ScrollBarAddPage) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarFirst) && first.isValid()) - drawPrimitive(PE_ScrollBarFirst, p, first, cg, + tqdrawPrimitive(PE_ScrollBarFirst, p, first, cg, Style_Enabled | ((active == SC_ScrollBarFirst) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarLast) && last.isValid()) - drawPrimitive(PE_ScrollBarLast, p, last, cg, + tqdrawPrimitive(PE_ScrollBarLast, p, last, cg, Style_Enabled | ((active == SC_ScrollBarLast) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarSlider) && slider.isValid()) { - drawPrimitive(PE_ScrollBarSlider, p, slider, cg, + tqdrawPrimitive(PE_ScrollBarSlider, p, slider, cg, Style_Enabled | ((active == SC_ScrollBarSlider) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? @@ -1241,7 +1241,7 @@ void LightStyleV2::drawComplexControl( ComplexControl control, if (scrollbar->hasFocus()) { TQRect fr(slider.x() + 2, slider.y() + 2, slider.width() - 5, slider.height() - 5); - drawPrimitive(PE_FocusRect, p, fr, cg, Style_Default); + tqdrawPrimitive(PE_FocusRect, p, fr, cg, Style_Default); } } @@ -1258,7 +1258,7 @@ void LightStyleV2::drawComplexControl( ComplexControl control, if ((controls & SC_SliderGroove) && groove.isValid()) { if (flags & Style_HasFocus) - drawPrimitive( PE_FocusRect, p, groove, cg ); + tqdrawPrimitive( PE_FocusRect, p, groove, cg ); if (slider->orientation() == Qt::Horizontal) { int dh = (groove.height() - 5) / 2; @@ -1270,30 +1270,30 @@ void LightStyleV2::drawComplexControl( ComplexControl control, drawLightBevel(p, groove, cg, ((flags | Style_Raised) ^ Style_Raised) | ((flags & Style_Enabled) ? Style_Sunken : Style_Default), - &cg.brush(TQColorGroup::Midlight)); + &cg.tqbrush(TQColorGroup::Midlight)); } if ((controls & SC_SliderHandle) && handle.isValid()) { drawLightBevel(p, handle, cg, ((flags | Style_Down) ^ Style_Down) | ((flags & Style_Enabled) ? Style_Raised : Style_Default), - &cg.brush(TQColorGroup::Button)); + &cg.tqbrush(TQColorGroup::Button)); } if (controls & SC_SliderTickmarks) - TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags, + TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, SC_SliderTickmarks, active, data ); break; } case CC_ListView: // use the base style for CC_ListView - singleton->basestyle->drawComplexControl(control, p, widget, r, cg, flags, + singleton->basestyle->tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, data); break; default: - TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags, + TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, data); break; } @@ -1311,7 +1311,7 @@ TQRect LightStyleV2::querySubControlMetrics( ComplexControl control, { const TQScrollBar *scrollbar = (const TQScrollBar *) widget; int sliderstart = scrollbar->sliderStart(); - int sbextent = pixelMetric(PM_ScrollBarExtent, widget); + int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget); int maxlen = ((scrollbar->orientation() == Qt::Horizontal) ? scrollbar->width() : scrollbar->height()) - (sbextent * 3); int sliderlen; @@ -1322,7 +1322,7 @@ TQRect LightStyleV2::querySubControlMetrics( ComplexControl control, sliderlen = (scrollbar->pageStep() * maxlen) / (range + scrollbar->pageStep()); - int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget ); + int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget ); if ( sliderlen < slidermin || range > INT_MAX / 2 ) sliderlen = slidermin; if ( sliderlen > maxlen ) @@ -1409,7 +1409,7 @@ TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control, return ret; } -int LightStyleV2::pixelMetric( PixelMetric metric, +int LightStyleV2::tqpixelMetric( PixelMetric metric, const TQWidget *widget ) const { int ret; @@ -1464,7 +1464,7 @@ int LightStyleV2::pixelMetric( PixelMetric metric, case PM_SliderLength: case PM_SliderControlThickness: - ret = singleton->basestyle->pixelMetric( metric, widget ); + ret = singleton->basestyle->tqpixelMetric( metric, widget ); break; case PM_MaximumDragDistance: @@ -1472,7 +1472,7 @@ int LightStyleV2::pixelMetric( PixelMetric metric, break; default: - ret = TQCommonStyle::pixelMetric(metric, widget); + ret = TQCommonStyle::tqpixelMetric(metric, widget); break; } @@ -1490,7 +1490,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents, case CT_PushButton: { const TQPushButton *button = (const TQPushButton *) widget; - ret = TQCommonStyle::sizeFromContents( contents, widget, contentsSize, data ); + ret = TQCommonStyle::tqsizeFromContents( contents, widget, contentsSize, data ); int w = ret.width(), h = ret.height(); // only expand the button if we are displaying text... @@ -1525,8 +1525,8 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents, int w = contentsSize.width(), h = contentsSize.height(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (! mi->custom()->fullSpan() && h < 22) h = 22; } else if(mi->widget()) { @@ -1553,7 +1553,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents, maxpmw = QMAX(maxpmw, 16); w += (maxpmw * 2) + 8; - if (! mi->text().isNull() && mi->text().find('\t') >= 0) + if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0) w += 8; ret = TQSize(w, h); @@ -1579,14 +1579,14 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents, } default: - ret = TQCommonStyle::sizeFromContents(contents, widget, contentsSize, data); + ret = TQCommonStyle::tqsizeFromContents(contents, widget, contentsSize, data); break; } return ret; } -int LightStyleV2::styleHint( StyleHint stylehint, +int LightStyleV2::tqstyleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, QStyleHintReturn* returnData ) const @@ -1611,7 +1611,7 @@ int LightStyleV2::styleHint( StyleHint stylehint, break; default: - ret = TQCommonStyle::styleHint(stylehint, widget, option, returnData); + ret = TQCommonStyle::tqstyleHint(stylehint, widget, option, returnData); break; } diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h index e5a3fffac..292984811 100644 --- a/kstyles/light/lightstyle-v2.h +++ b/kstyles/light/lightstyle-v2.h @@ -48,15 +48,15 @@ public: SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption & = TQStyleOption::Default) const; TQRect subRect(SubRect, const TQWidget *) const; - void drawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default ) const; @@ -67,12 +67,12 @@ public: SubControl querySubControl(ComplexControl, const TQWidget *, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default ) const; - int pixelMetric(PixelMetric, const TQWidget * = 0 ) const; + int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const; TQSize sizeFromContents(ContentsType, const TQWidget *, const TQSize &, const TQStyleOption & = TQStyleOption::Default ) const; - int styleHint(StyleHint, const TQWidget * = 0, + int tqstyleHint(StyleHint, const TQWidget * = 0, const TQStyleOption & = TQStyleOption::Default, QStyleHintReturn * = 0 ) const; diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index 5a902d7f5..b7da954c9 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -248,7 +248,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, // fill the header if ( ! br.isValid() ) break; - p->fillRect( br, cg.brush( ( flags & Style_Down ) ? + p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); // the taskbuttons in kicker seem to allow the style to set the pencolor @@ -265,11 +265,11 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, if (flags & (TQStyle::Style_Down | TQStyle::Style_On | TQStyle::Style_Sunken)) - fill = &cg.brush(TQColorGroup::Midlight); + fill = &cg.tqbrush(TQColorGroup::Midlight); else - fill = &cg.brush(TQColorGroup::Button); + fill = &cg.tqbrush(TQColorGroup::Button); } else - fill = &cg.brush(TQColorGroup::Background); + fill = &cg.tqbrush(TQColorGroup::Background); bool etch = true; if ( flags & Style_ButtonDefault ) { @@ -277,7 +277,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, br.addCoords( 1, 1, -1, -1 ); } drawLightBevel( p, br, cg, flags, - pixelMetric( PM_DefaultFrameWidth ) + ( etch ? 1 : 0 ), + tqpixelMetric( PM_DefaultFrameWidth ) + ( etch ? 1 : 0 ), etch, true, fill ); break; } @@ -288,12 +288,12 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, if (flags & (TQStyle::Style_Down | TQStyle::Style_On | TQStyle::Style_Sunken)) - fill = &cg.brush(TQColorGroup::Midlight); + fill = &cg.tqbrush(TQColorGroup::Midlight); else - fill = &cg.brush(TQColorGroup::Button); + fill = &cg.tqbrush(TQColorGroup::Button); } else - fill = &cg.brush(TQColorGroup::Background); - drawLightBevel( p, r, cg, flags, pixelMetric( PM_DefaultFrameWidth ), + fill = &cg.tqbrush(TQColorGroup::Background); + drawLightBevel( p, r, cg, flags, tqpixelMetric( PM_DefaultFrameWidth ), false, true, fill ); break; @@ -305,11 +305,11 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, if (flags & TQStyle::Style_Enabled) { if (sunken) - thefill = cg.brush(TQColorGroup::Midlight); + thefill = cg.tqbrush(TQColorGroup::Midlight); else - thefill = cg.brush(TQColorGroup::Button); + thefill = cg.tqbrush(TQColorGroup::Button); } else - thefill = cg.brush(TQColorGroup::Background); + thefill = cg.tqbrush(TQColorGroup::Background); p->setPen( cg.dark() ); p->drawLine(r.topLeft(), r.topRight()); @@ -352,11 +352,11 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, case PE_Indicator: const TQBrush *fill; if (! (flags & Style_Enabled)) - fill = &cg.brush(TQColorGroup::Background); + fill = &cg.tqbrush(TQColorGroup::Background); else if (flags & Style_Down) - fill = &cg.brush(TQColorGroup::Mid); + fill = &cg.tqbrush(TQColorGroup::Mid); else - fill = &cg.brush(TQColorGroup::Base); + fill = &cg.tqbrush(TQColorGroup::Base); drawLightBevel( p, r, cg, flags | Style_Sunken, 2, true, true, fill ); p->setPen(cg.text()); @@ -394,7 +394,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, cr.addCoords( 2, 2, -2, -2 ); ir.addCoords( 3, 3, -3, -3 ); - p->fillRect( r, cg.brush( TQColorGroup::Background ) ); + p->fillRect( r, cg.tqbrush( TQColorGroup::Background ) ); p->setPen( flags & Style_Down ? cg.mid() : ( flags & Style_Enabled ? cg.base() : cg.background() ) ); @@ -426,7 +426,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, bool drawTitle = false; if ( p && p->device()->devType() == TQInternal::Widget ) { TQWidget *w = (TQWidget *) p->device(); - TQWidget *p = w->parentWidget(); + TQWidget *p = w->tqparentWidget(); if (p->inherits("QDockWindow") && ! p->inherits("QToolBar")) { drawTitle = true; title = p->caption(); @@ -439,7 +439,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, TQPixmap pm(r.height(), r.width()); TQPainter p2(&pm); p2.fillRect(0, 0, pm.width(), pm.height(), - cg.brush(TQColorGroup::Highlight)); + cg.tqbrush(TQColorGroup::Highlight)); p2.setPen(cg.highlightedText()); p2.drawText(0, 0, pm.width(), pm.height(), AlignCenter, title); p2.end(); @@ -460,7 +460,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, } } else { if (drawTitle) { - p->fillRect(r, cg.brush(TQColorGroup::Highlight)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Highlight)); p->setPen(cg.highlightedText()); p->drawText(r, AlignCenter, title); } else { @@ -525,13 +525,13 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.brush( TQColorGroup::Button ) ); + p->fillRect( br, cg.tqbrush( TQColorGroup::Button ) ); break; } case PE_PanelPopup: drawLightBevel( p, r, cg, flags, - ( data.isDefault() ? pixelMetric(PM_DefaultFrameWidth) : + ( data.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) : data.lineWidth() ), false, true ); break; @@ -544,7 +544,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, int cover = 0; int reallw = ( data.isDefault() ? - pixelMetric( PM_DefaultFrameWidth ) : data.lineWidth() ); + tqpixelMetric( PM_DefaultFrameWidth ) : data.lineWidth() ); cover = reallw - 1; if ( ! ( flags & Style_Sunken ) ) @@ -572,16 +572,16 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, case PE_PanelDockWindow: drawLightBevel( p, r, cg, flags, ( data.isDefault() ? - pixelMetric(PM_DefaultFrameWidth) : + tqpixelMetric(PM_DefaultFrameWidth) : data.lineWidth() ), false, false, - &cg.brush( TQColorGroup::Button ) ); + &cg.tqbrush( TQColorGroup::Button ) ); break; case PE_PanelMenuBar: drawLightBevel( p, r, cg, flags, ( data.isDefault() ? - pixelMetric(PM_MenuBarFrameWidth) : + tqpixelMetric(PM_MenuBarFrameWidth) : data.lineWidth() ), false, false, - &cg.brush( TQColorGroup::Button ) ); + &cg.tqbrush( TQColorGroup::Button ) ); break; case PE_ScrollBarSubLine: @@ -607,14 +607,14 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.brush( ( flags & Style_Down ) ? + p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); br.addCoords( 2, 2, -2, -2 ); if ( ! br.isValid() ) break; - drawPrimitive( pe, p, br, cg, flags ); + tqdrawPrimitive( pe, p, br, cg, flags ); break; } @@ -641,14 +641,14 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.brush( ( flags & Style_Down ) ? + p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); br.addCoords( 2, 2, -2, -2 ); if ( ! br.isValid() ) break; - drawPrimitive( pe, p, br, cg, flags ); + tqdrawPrimitive( pe, p, br, cg, flags ); break; } @@ -672,7 +672,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.brush( ( flags & Style_Down ) ? + p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); break; @@ -698,7 +698,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, if ( ! br.isValid() ) break; - p->fillRect( br, cg.brush( ( flags & Style_Down ) ? + p->fillRect( br, cg.tqbrush( ( flags & Style_Down ) ? TQColorGroup::Midlight : TQColorGroup::Button ) ); break; @@ -728,7 +728,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, p->drawLine( br.topRight(), br.bottomRight() ); br.addCoords( 1, 1, -1, -1 ); - p->fillRect( br, cg.brush( TQColorGroup::Highlight ) ); + p->fillRect( br, cg.tqbrush( TQColorGroup::Highlight ) ); break; } @@ -798,12 +798,12 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe, } p->restore(); } else - TQCommonStyle::drawPrimitive(pe, p, r, cg, flags, data); + TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); break; } } -void LightStyleV3::drawControl( ControlElement control, +void LightStyleV3::tqdrawControl( ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -817,7 +817,7 @@ void LightStyleV3::drawControl( ControlElement control, const TQTabBar *tb = (const TQTabBar *) widget; TQRect br = r; - if ( tb->shape() == TQTabBar::RoundedAbove ) { + if ( tb->tqshape() == TQTabBar::RoundedAbove ) { if ( ! ( flags & Style_Selected ) ) { p->setPen( cg.background() ); p->drawLine( br.left(), br.bottom(), @@ -846,13 +846,13 @@ void LightStyleV3::drawControl( ControlElement control, if ( flags & Style_Selected ) { - p->fillRect( br.right() - 3, br.top() + 1, 3, br.height() - 1, cg.brush(TQColorGroup::Highlight)); + p->fillRect( br.right() - 3, br.top() + 1, 3, br.height() - 1, cg.tqbrush(TQColorGroup::Highlight)); br.addCoords( 1, 1, -4, 0 ); } else br.addCoords( 1, 1, -1, 0 ); p->fillRect( br, cg.background() ); - } else if ( tb->shape() == TQTabBar::RoundedBelow ) { + } else if ( tb->tqshape() == TQTabBar::RoundedBelow ) { if ( ! ( flags & Style_Selected ) ) { p->setPen( cg.background() ); p->drawLine( br.left(), br.top(), @@ -884,7 +884,7 @@ void LightStyleV3::drawControl( ControlElement control, if ( flags & Style_Selected ) { - p->fillRect( br.right() - 2, br.top(), 3, br.height(), cg.brush(TQColorGroup::Highlight)); + p->fillRect( br.right() - 2, br.top(), 3, br.height(), cg.tqbrush(TQColorGroup::Highlight)); br.addCoords( 1, 0, -3, -1 ); } else @@ -892,7 +892,7 @@ void LightStyleV3::drawControl( ControlElement control, p->fillRect( br, cg.background() ); } else - TQCommonStyle::drawControl( control, p, widget, r, cg, flags, data ); + TQCommonStyle::tqdrawControl( control, p, widget, r, cg, flags, data ); break; } @@ -910,7 +910,7 @@ void LightStyleV3::drawControl( ControlElement control, if ( widget->erasePixmap() && !widget->erasePixmap()->isNull() ) p->drawPixmap( r.topLeft(), *widget->erasePixmap(), r ); else - p->fillRect(r, cg.brush(TQColorGroup::Button)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); p->setPen( cg.mid() ); p->drawLine(r.left() + 12, r.top() + 1, r.right() - 12, r.top() + 1); @@ -922,11 +922,11 @@ void LightStyleV3::drawControl( ControlElement control, if (flags & Style_Active) qDrawShadePanel(p, r, cg, true, 1, - &cg.brush(TQColorGroup::Midlight)); + &cg.tqbrush(TQColorGroup::Midlight)); else if ( widget->erasePixmap() && !widget->erasePixmap()->isNull() ) p->drawPixmap( r.topLeft(), *widget->erasePixmap(), r ); else - p->fillRect(r, cg.brush(TQColorGroup::Button)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); if ( !mi ) break; @@ -945,16 +945,16 @@ void LightStyleV3::drawControl( ControlElement control, bool reverse = TQApplication::reverseLayout(); if ( reverse ) { - cr = visualRect( cr, r ); - sr = visualRect( sr, r ); - tr = visualRect( tr, r ); - ir = visualRect( ir, r ); + cr = tqvisualRect( cr, r ); + sr = tqvisualRect( sr, r ); + tr = tqvisualRect( tr, r ); + ir = tqvisualRect( ir, r ); } if (mi->isChecked() && ! (flags & Style_Active) & (flags & Style_Enabled)) - qDrawShadePanel(p, cr, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); + qDrawShadePanel(p, cr, cg, true, 1, &cg.tqbrush(TQColorGroup::Midlight)); if (mi->iconSet()) { TQIconSet::Mode mode = @@ -973,7 +973,7 @@ void LightStyleV3::drawControl( ControlElement control, p->setPen(cg.text()); p->drawPixmap(pmr.topLeft(), pixmap); } else if (popupmenu->isCheckable() && mi->isChecked()) - drawPrimitive(PE_CheckMark, p, cr, cg, + tqdrawPrimitive(PE_CheckMark, p, cr, cg, (flags & Style_Enabled) | Style_On); TQColor textcolor; @@ -1010,7 +1010,7 @@ void LightStyleV3::drawControl( ControlElement control, TQString text = mi->text(); if (! text.isNull()) { - int t = text.find('\t'); + int t = text.tqfind('\t'); // draw accelerator/tab-text if (t >= 0) { @@ -1042,30 +1042,30 @@ void LightStyleV3::drawControl( ControlElement control, } else if (mi->pixmap()) { TQPixmap pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - p->setBackgroundMode(OpaqueMode); + p->setBackgroundMode(Qt::OpaqueMode); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); if (pixmap.depth() == 1) - p->setBackgroundMode(TransparentMode); + p->setBackgroundMode(Qt::TransparentMode); } if (mi->popup()) - drawPrimitive( (TQApplication::reverseLayout() ? PE_ArrowLeft : PE_ArrowRight), + tqdrawPrimitive( (TQApplication::reverseLayout() ? PE_ArrowLeft : PE_ArrowRight), p, sr, cg, flags); break; } case CE_MenuBarEmptyArea: { - p->fillRect(r, cg.brush(TQColorGroup::Button)); + p->fillRect(r, cg.tqbrush(TQColorGroup::Button)); break; } case CE_MenuBarItem: { if ( flags & Style_Active ) - qDrawShadePanel(p, r, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); + qDrawShadePanel(p, r, cg, true, 1, &cg.tqbrush(TQColorGroup::Midlight)); else - p->fillRect( r, cg.brush( TQColorGroup::Button ) ); + p->fillRect( r, cg.tqbrush( TQColorGroup::Button ) ); if (data.isDefault()) break; @@ -1078,17 +1078,17 @@ void LightStyleV3::drawControl( ControlElement control, } case CE_ProgressBarGroove: - drawLightBevel( p, r, cg, Style_Sunken, pixelMetric( PM_DefaultFrameWidth ), - true, true, &cg.brush( TQColorGroup::Background ) ); + drawLightBevel( p, r, cg, Style_Sunken, tqpixelMetric( PM_DefaultFrameWidth ), + true, true, &cg.tqbrush( TQColorGroup::Background ) ); break; default: - TQCommonStyle::drawControl(control, p, widget, r, cg, flags, data); + TQCommonStyle::tqdrawControl(control, p, widget, r, cg, flags, data); break; } } -void LightStyleV3::drawControlMask( ControlElement control, +void LightStyleV3::tqdrawControlMask( ControlElement control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1100,7 +1100,7 @@ void LightStyleV3::drawControlMask( ControlElement control, break; default: - TQCommonStyle::drawControlMask(control, p, widget, r, data); + TQCommonStyle::tqdrawControlMask(control, p, widget, r, data); break; } } @@ -1113,7 +1113,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQWidget *widget) const case SR_PushButtonFocusRect: { rect = TQCommonStyle::subRect( SR_PushButtonContents, widget ); - int bm = pixelMetric( PM_ButtonMargin, widget ), hbm = bm / 2; + int bm = tqpixelMetric( PM_ButtonMargin, widget ), hbm = bm / 2; rect.addCoords( hbm, hbm, -hbm, -hbm ); break; } @@ -1150,7 +1150,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQWidget *widget) const return rect; } -void LightStyleV3::drawComplexControl( ComplexControl control, +void LightStyleV3::tqdrawComplexControl( ComplexControl control, TQPainter* p, const TQWidget* widget, const TQRect& r, @@ -1166,37 +1166,37 @@ void LightStyleV3::drawComplexControl( ComplexControl control, const TQComboBox *combobox = (const TQComboBox *) widget; TQRect frame, arrow, field; frame = - TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget, + TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxFrame, data), widget); arrow = - TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget, + TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow, data), widget); field = - TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget, + TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxEditField, data), widget); if ((controls & SC_ComboBoxFrame) && frame.isValid()) - drawPrimitive( PE_Panel, p, frame, cg, flags | Style_Sunken ); + tqdrawPrimitive( PE_Panel, p, frame, cg, flags | Style_Sunken ); if ((controls & SC_ComboBoxArrow) && arrow.isValid()) { drawLightEtch( p, arrow, cg.button(), ( active == SC_ComboBoxArrow ) ); arrow.addCoords( 1, 1, -1, -1 ); - p->fillRect( arrow, cg.brush( TQColorGroup::Button ) ); + p->fillRect( arrow, cg.tqbrush( TQColorGroup::Button ) ); arrow.addCoords(3, 1, -1, -1); - drawPrimitive(PE_ArrowDown, p, arrow, cg, flags); + tqdrawPrimitive(PE_ArrowDown, p, arrow, cg, flags); } if ((controls & SC_ComboBoxEditField) && field.isValid()) { if (flags & Style_HasFocus) { if (! combobox->editable()) { TQRect fr = - TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ), + TQStyle::tqvisualRect( subRect( SR_ComboBoxFocusRect, widget ), widget ); - p->fillRect( fr, cg.brush( TQColorGroup::Highlight ) ); - drawPrimitive( PE_FocusRect, p, fr, cg, + p->fillRect( fr, cg.tqbrush( TQColorGroup::Highlight ) ); + tqdrawPrimitive( PE_FocusRect, p, fr, cg, flags | Style_FocusAtBorder, TQStyleOption(cg.highlight())); } @@ -1204,8 +1204,8 @@ void LightStyleV3::drawComplexControl( ComplexControl control, p->setPen(cg.highlightedText()); } else { p->fillRect( field, ( ( flags & Style_Enabled ) ? - cg.brush( TQColorGroup::Base ) : - cg.brush( TQColorGroup::Background ) ) ); + cg.tqbrush( TQColorGroup::Base ) : + cg.tqbrush( TQColorGroup::Background ) ) ); p->setPen( cg.text() ); } } @@ -1218,13 +1218,13 @@ void LightStyleV3::drawComplexControl( ComplexControl control, const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; TQRect frame, up, down; - frame = querySubControlMetrics(CC_SpinWidget, widget, + frame = querySubControlMetrics((QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetFrame, data); up = spinwidget->upRect(); down = spinwidget->downRect(); if ((controls & SC_SpinWidgetFrame) && frame.isValid()) - drawPrimitive( PE_Panel, p, frame, cg, flags | Style_Sunken ); + tqdrawPrimitive( PE_Panel, p, frame, cg, flags | Style_Sunken ); if ((controls & SC_SpinWidgetUp) && up.isValid()) { PrimitiveElement pe = PE_SpinWidgetUp; @@ -1235,11 +1235,11 @@ void LightStyleV3::drawComplexControl( ComplexControl control, p->drawLine( up.topLeft(), up.bottomLeft() ); up.addCoords( 1, 0, 0, 0 ); - p->fillRect( up, cg.brush( TQColorGroup::Button ) ); + p->fillRect( up, cg.tqbrush( TQColorGroup::Button ) ); drawLightEtch( p, up, cg.button(), ( active == SC_SpinWidgetUp ) ); up.addCoords( 1, 0, 0, 0 ); - drawPrimitive(pe, p, up, cg, flags | + tqdrawPrimitive(pe, p, up, cg, flags | ((active == SC_SpinWidgetUp) ? Style_On | Style_Sunken : Style_Raised)); } @@ -1253,11 +1253,11 @@ void LightStyleV3::drawComplexControl( ComplexControl control, p->drawLine( down.topLeft(), down.bottomLeft() ); down.addCoords( 1, 0, 0, 0 ); - p->fillRect( down, cg.brush( TQColorGroup::Button ) ); + p->fillRect( down, cg.tqbrush( TQColorGroup::Button ) ); drawLightEtch( p, down, cg.button(), ( active == SC_SpinWidgetDown ) ); down.addCoords( 1, 0, 0, 0 ); - drawPrimitive(pe, p, down, cg, flags | + tqdrawPrimitive(pe, p, down, cg, flags | ((active == SC_SpinWidgetDown) ? Style_On | Style_Sunken : Style_Raised)); } @@ -1286,52 +1286,52 @@ void LightStyleV3::drawComplexControl( ComplexControl control, subline2.moveBy(0, -addline.height()); if ((controls & SC_ScrollBarSubLine) && subline.isValid()) { - drawPrimitive(PE_ScrollBarSubLine, p, subline, cg, + tqdrawPrimitive(PE_ScrollBarSubLine, p, subline, cg, Style_Enabled | ((active == SC_ScrollBarSubLine) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if (subline2.isValid()) - drawPrimitive(PE_ScrollBarSubLine, p, subline2, cg, + tqdrawPrimitive(PE_ScrollBarSubLine, p, subline2, cg, Style_Enabled | ((active == SC_ScrollBarSubLine) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); } if ((controls & SC_ScrollBarAddLine) && addline.isValid()) - drawPrimitive(PE_ScrollBarAddLine, p, addline, cg, + tqdrawPrimitive(PE_ScrollBarAddLine, p, addline, cg, Style_Enabled | ((active == SC_ScrollBarAddLine) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarSubPage) && subpage.isValid()) - drawPrimitive(PE_ScrollBarSubPage, p, subpage, cg, + tqdrawPrimitive(PE_ScrollBarSubPage, p, subpage, cg, Style_Enabled | ((active == SC_ScrollBarSubPage) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarAddPage) && addpage.isValid()) - drawPrimitive(PE_ScrollBarAddPage, p, addpage, cg, + tqdrawPrimitive(PE_ScrollBarAddPage, p, addpage, cg, ((maxedOut) ? Style_Default : Style_Enabled) | ((active == SC_ScrollBarAddPage) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarFirst) && first.isValid()) - drawPrimitive(PE_ScrollBarFirst, p, first, cg, + tqdrawPrimitive(PE_ScrollBarFirst, p, first, cg, Style_Enabled | ((active == SC_ScrollBarFirst) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarLast) && last.isValid()) - drawPrimitive(PE_ScrollBarLast, p, last, cg, + tqdrawPrimitive(PE_ScrollBarLast, p, last, cg, Style_Enabled | ((active == SC_ScrollBarLast) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? Style_Horizontal : 0)); if ((controls & SC_ScrollBarSlider) && slider.isValid()) { - drawPrimitive(PE_ScrollBarSlider, p, slider, cg, + tqdrawPrimitive(PE_ScrollBarSlider, p, slider, cg, Style_Enabled | ((active == SC_ScrollBarSlider) ? Style_Down : Style_Default) | ((scrollbar->orientation() == Qt::Horizontal) ? @@ -1341,7 +1341,7 @@ void LightStyleV3::drawComplexControl( ComplexControl control, if (scrollbar->hasFocus()) { TQRect fr(slider.x() + 2, slider.y() + 2, slider.width() - 5, slider.height() - 5); - drawPrimitive(PE_FocusRect, p, fr, cg, Style_Default); + tqdrawPrimitive(PE_FocusRect, p, fr, cg, Style_Default); } } @@ -1373,7 +1373,7 @@ void LightStyleV3::drawComplexControl( ComplexControl control, if (flags & Style_HasFocus) { groove.addCoords( -2, -2, 2, 2 ); - drawPrimitive( PE_FocusRect, p, groove, cg, flags ); + tqdrawPrimitive( PE_FocusRect, p, groove, cg, flags ); } } @@ -1408,19 +1408,19 @@ void LightStyleV3::drawComplexControl( ComplexControl control, } if (controls & SC_SliderTickmarks) - TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags, + TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, SC_SliderTickmarks, active, data ); break; } case CC_ListView: // use the base style for CC_ListView - basestyle->drawComplexControl(control, p, widget, r, cg, flags, + basestyle->tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, data); break; default: - TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags, + TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, data); break; } @@ -1436,8 +1436,8 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, switch (control) { case CC_ComboBox: { - int fw = pixelMetric( PM_DefaultFrameWidth, widget ); - int sb = pixelMetric( PM_ScrollBarExtent ); // width of the arrow + int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ); + int sb = tqpixelMetric( PM_ScrollBarExtent ); // width of the arrow switch ( sc ) { case SC_ComboBoxFrame: @@ -1462,7 +1462,7 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, { const TQScrollBar *scrollbar = (const TQScrollBar *) widget; int sliderstart = scrollbar->sliderStart(); - int sbextent = pixelMetric(PM_ScrollBarExtent, widget); + int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget); int maxlen = ((scrollbar->orientation() == Qt::Horizontal) ? scrollbar->width() : scrollbar->height()) - (sbextent * 3); int sliderlen; @@ -1473,7 +1473,7 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, sliderlen = (scrollbar->pageStep() * maxlen) / (range + scrollbar->pageStep()); - int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget ); + int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget ); if ( sliderlen < slidermin || range > INT_MAX / 2 ) sliderlen = slidermin; if ( sliderlen > maxlen ) @@ -1537,12 +1537,12 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, case CC_Slider: { const TQSlider *slider = (const TQSlider *) widget; - int tickOffset = pixelMetric( PM_SliderTickmarkOffset, widget ); - int thickness = pixelMetric( PM_SliderControlThickness, widget ); + int tickOffset = tqpixelMetric( PM_SliderTickmarkOffset, widget ); + int thickness = tqpixelMetric( PM_SliderControlThickness, widget ); switch ( sc ) { case SC_SliderGroove: - if ( slider->orientation() == Horizontal ) + if ( slider->orientation() == Qt::Horizontal ) ret.setRect( 0, tickOffset, slider->width(), thickness ); else ret.setRect( tickOffset, 0, thickness, slider->height() ); @@ -1551,9 +1551,9 @@ TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, case SC_SliderHandle: { int pos = slider->sliderStart(); - int len = pixelMetric( PM_SliderLength, widget ); + int len = tqpixelMetric( PM_SliderLength, widget ); - if ( slider->orientation() == Horizontal ) + if ( slider->orientation() == Qt::Horizontal ) ret.setRect( pos + 2, tickOffset + 2, len - 4, thickness - 4 ); else ret.setRect( tickOffset + 2, pos + 2, thickness - 4, len - 4 ); @@ -1593,7 +1593,7 @@ TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control, return ret; } -int LightStyleV3::pixelMetric( PixelMetric metric, +int LightStyleV3::tqpixelMetric( PixelMetric metric, const TQWidget *widget ) const { int ret; @@ -1664,7 +1664,7 @@ int LightStyleV3::pixelMetric( PixelMetric metric, case PM_SliderControlThickness: { const TQSlider * sl = (const TQSlider *) widget; - int space = (sl->orientation() == Horizontal) ? sl->height() + int space = (sl->orientation() == Qt::Horizontal) ? sl->height() : sl->width(); int ticks = sl->tickmarks(); int n = 0; @@ -1690,7 +1690,7 @@ int LightStyleV3::pixelMetric( PixelMetric metric, break; default: - ret = TQCommonStyle::pixelMetric(metric, widget); + ret = TQCommonStyle::tqpixelMetric(metric, widget); break; } @@ -1707,8 +1707,8 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, switch (contents) { case CT_ComboBox: { - int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2; - int sb = pixelMetric( PM_ScrollBarExtent ); // width of the arrow + int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2; + int sb = tqpixelMetric( PM_ScrollBarExtent ); // width of the arrow int w = contentsSize.width(); int h = contentsSize.height(); @@ -1726,9 +1726,9 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, case CT_PushButton: { const TQPushButton *button = (const TQPushButton *) widget; - ret = TQCommonStyle::sizeFromContents( contents, widget, contentsSize, data ); + ret = TQCommonStyle::tqsizeFromContents( contents, widget, contentsSize, data ); int w = ret.width(), h = ret.height(); - int dbi = pixelMetric( PM_ButtonDefaultIndicator, widget ) * 2; + int dbi = tqpixelMetric( PM_ButtonDefaultIndicator, widget ) * 2; int mw = 80 - dbi, mh = 25 - dbi; // only expand the button if we are displaying text... @@ -1755,8 +1755,8 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, int w = contentsSize.width(), h = contentsSize.height(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (! mi->custom()->fullSpan() && h < 22) h = 22; } else if(mi->widget()) { @@ -1783,7 +1783,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, maxpmw = QMAX(maxpmw, 16); w += (maxpmw * 2) + 8; - if (! mi->text().isNull() && mi->text().find('\t') >= 0) + if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0) w += 8; ret = TQSize(w, h); @@ -1810,14 +1810,14 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, } default: - ret = TQCommonStyle::sizeFromContents(contents, widget, contentsSize, data); + ret = TQCommonStyle::tqsizeFromContents(contents, widget, contentsSize, data); break; } return ret; } -int LightStyleV3::styleHint( StyleHint stylehint, +int LightStyleV3::tqstyleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, QStyleHintReturn* returnData ) const @@ -1846,7 +1846,7 @@ int LightStyleV3::styleHint( StyleHint stylehint, break; default: - ret = TQCommonStyle::styleHint(stylehint, widget, option, returnData); + ret = TQCommonStyle::tqstyleHint(stylehint, widget, option, returnData); break; } diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h index be8812b99..a97c57643 100644 --- a/kstyles/light/lightstyle-v3.h +++ b/kstyles/light/lightstyle-v3.h @@ -52,15 +52,15 @@ public: SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption & = TQStyleOption::Default) const; TQRect subRect(SubRect, const TQWidget *) const; - void drawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &, + void tqdrawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default ) const; @@ -71,12 +71,12 @@ public: SubControl querySubControl(ComplexControl, const TQWidget *, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default ) const; - int pixelMetric(PixelMetric, const TQWidget * = 0 ) const; + int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const; TQSize sizeFromContents(ContentsType, const TQWidget *, const TQSize &, const TQStyleOption & = TQStyleOption::Default ) const; - int styleHint(StyleHint, const TQWidget * = 0, + int tqstyleHint(StyleHint, const TQWidget * = 0, const TQStyleOption & = TQStyleOption::Default, QStyleHintReturn * = 0 ) const; diff --git a/kstyles/plastik/config/plastikconf.h b/kstyles/plastik/config/plastikconf.h index 74800521c..512ad6f2e 100644 --- a/kstyles/plastik/config/plastikconf.h +++ b/kstyles/plastik/config/plastikconf.h @@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE. class TQCheckBox; -class PlastikStyleConfig: public QWidget +class PlastikStyleConfig: public TQWidget { Q_OBJECT public: diff --git a/kstyles/plastik/misc.cpp b/kstyles/plastik/misc.cpp index e1fc2df79..d1a52d61e 100644 --- a/kstyles/plastik/misc.cpp +++ b/kstyles/plastik/misc.cpp @@ -30,9 +30,9 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i if(alpha<0) alpha = 0; int inv_alpha = 255 - alpha; - TQColor result = TQColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255, - qGreen(rgb_b)*inv_alpha/255 + qGreen(rgb)*alpha/255, - qBlue(rgb_b)*inv_alpha/255 + qBlue(rgb)*alpha/255) ); + TQColor result = TQColor( tqRgb(tqRed(rgb_b)*inv_alpha/255 + tqRed(rgb)*alpha/255, + tqGreen(rgb_b)*inv_alpha/255 + tqGreen(rgb)*alpha/255, + tqBlue(rgb_b)*inv_alpha/255 + tqBlue(rgb)*alpha/255) ); return result; } diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index dd7954cc9..32b8b73c8 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -131,7 +131,7 @@ static const int arrowHMargin = 6; static const int rightBorder = 12; // -- Style Plugin Interface ------------------------- -class PlastikStylePlugin : public QStylePlugin +class PlastikStylePlugin : public TQStylePlugin { public: PlastikStylePlugin() {} @@ -201,7 +201,7 @@ void PlastikStyle::updateProgressPos() bool visible = false; for (iter = progAnimWidgets.begin(); iter != progAnimWidgets.end(); ++iter) { - if ( !::qt_cast<TQProgressBar*>(iter.key()) ) + if ( !::tqqt_cast<TQProgressBar*>(iter.key()) ) continue; pb = dynamic_cast<TQProgressBar*>(iter.key()); @@ -242,27 +242,27 @@ void PlastikStyle::polish(TQWidget* widget) connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(khtmlWidgetDestroyed(TQObject*))); } - // use qt_cast where possible to check if the widget inheits one of the classes. might improve + // use tqqt_cast where possible to check if the widget inheits one of the classes. might improve // performance compared to TQObject::inherits() - if ( ::qt_cast<TQPushButton*>(widget) || ::qt_cast<TQComboBox*>(widget) || - ::qt_cast<TQSpinWidget*>(widget) || ::qt_cast<TQSlider*>(widget) || - ::qt_cast<TQCheckBox*>(widget) || ::qt_cast<TQRadioButton*>(widget) || - ::qt_cast<TQToolButton*>(widget) || widget->inherits("QSplitterHandle") ) + if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) || + ::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) || + ::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) || + ::tqqt_cast<TQToolButton*>(widget) || widget->inherits("QSplitterHandle") ) { // widget->setBackgroundMode(PaletteBackground); widget->installEventFilter(this); - } else if (::qt_cast<TQLineEdit*>(widget)) { + } else if (::tqqt_cast<TQLineEdit*>(widget)) { widget->installEventFilter(this); - } else if (::qt_cast<TQTabBar*>(widget)) { + } else if (::tqqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(true); widget->installEventFilter(this); - } else if (::qt_cast<TQPopupMenu*>(widget)) { + } else if (::tqqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode( NoBackground ); } else if ( !qstrcmp(widget->name(), "kde toolbar widget") ) { widget->installEventFilter(this); } - if( _animateProgressBar && ::qt_cast<TQProgressBar*>(widget) ) + if( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget) ) { widget->installEventFilter(this); progAnimWidgets[widget] = 0; @@ -280,25 +280,25 @@ void PlastikStyle::unPolish(TQWidget* widget) khtmlWidgets.remove(widget); } - // use qt_cast to check if the widget inheits one of the classes. - if ( ::qt_cast<TQPushButton*>(widget) || ::qt_cast<TQComboBox*>(widget) || - ::qt_cast<TQSpinWidget*>(widget) || ::qt_cast<TQSlider*>(widget) || - ::qt_cast<TQCheckBox*>(widget) || ::qt_cast<TQRadioButton*>(widget) || - ::qt_cast<TQToolButton*>(widget) || ::qt_cast<TQLineEdit*>(widget) || + // use tqqt_cast to check if the widget inheits one of the classes. + if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) || + ::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) || + ::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) || + ::tqqt_cast<TQToolButton*>(widget) || ::tqqt_cast<TQLineEdit*>(widget) || widget->inherits("QSplitterHandle") ) { widget->removeEventFilter(this); } - else if (::qt_cast<TQTabBar*>(widget)) { + else if (::tqqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(false); widget->removeEventFilter(this); - } else if (::qt_cast<TQPopupMenu*>(widget)) { + } else if (::tqqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode( PaletteBackground ); } else if ( !qstrcmp(widget->name(), "kde toolbar widget") ) { widget->removeEventFilter(this); } - if ( ::qt_cast<TQProgressBar*>(widget) ) + if ( ::tqqt_cast<TQProgressBar*>(widget) ) { progAnimWidgets.remove(widget); } @@ -308,12 +308,12 @@ void PlastikStyle::unPolish(TQWidget* widget) void PlastikStyle::khtmlWidgetDestroyed(TQObject* obj) { - khtmlWidgets.remove(static_cast<TQWidget*>(obj)); + khtmlWidgets.remove(TQT_TQWIDGET(obj)); } void PlastikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(static_cast<TQWidget*>(obj)); + progAnimWidgets.remove(TQT_TQWIDGET(obj)); } void PlastikStyle::renderContour(TQPainter *p, @@ -662,7 +662,7 @@ void PlastikStyle::renderPixel(TQPainter *p, int key = search.key(); CacheEntry *cacheEntry; - if( (cacheEntry = pixmapCache->find(key)) ) { + if( (cacheEntry = pixmapCache->tqfind(key)) ) { if( search == *cacheEntry ) { // match! we can draw now... if(cacheEntry->pixmap) p->drawPixmap(pos, *(cacheEntry->pixmap) ); @@ -675,7 +675,7 @@ void PlastikStyle::renderPixel(TQPainter *p, TQImage aImg(1,1,32); // 1x1 aImg.setAlphaBuffer(true); - aImg.setPixel(0,0,qRgba(qRed(rgb),qGreen(rgb),qBlue(rgb),alpha)); + aImg.setPixel(0,0,tqRgba(tqRed(rgb),tqGreen(rgb),tqBlue(rgb),alpha)); TQPixmap *result = new TQPixmap(aImg); p->drawPixmap(pos, *result); @@ -696,9 +696,9 @@ void PlastikStyle::renderPixel(TQPainter *p, if(a<0) a = 0; int a_inv = 255 - a; - TQColor res = TQColor( qRgb(qRed(rgb_b)*a_inv/255 + qRed(rgb_a)*a/255, - qGreen(rgb_b)*a_inv/255 + qGreen(rgb_a)*a/255, - qBlue(rgb_b)*a_inv/255 + qBlue(rgb_a)*a/255) ); + TQColor res = TQColor( tqRgb(tqRed(rgb_b)*a_inv/255 + tqRed(rgb_a)*a/255, + tqGreen(rgb_b)*a_inv/255 + tqGreen(rgb_a)*a/255, + tqBlue(rgb_b)*a_inv/255 + tqBlue(rgb_a)*a/255) ); p->setPen(res); p->drawPoint(pos); } @@ -798,7 +798,7 @@ void PlastikStyle::renderGradient(TQPainter *painter, int key = search.key(); CacheEntry *cacheEntry; - if( (cacheEntry = pixmapCache->find(key)) ) { + if( (cacheEntry = pixmapCache->tqfind(key)) ) { if( search == *cacheEntry ) { // match! we can draw now... if(cacheEntry->pixmap) { painter->drawTiledPixmap(rect, *(cacheEntry->pixmap) ); @@ -819,7 +819,7 @@ void PlastikStyle::renderGradient(TQPainter *painter, int r_w = result->rect().width(); int r_h = result->rect().height(); int r_x, r_y, r_x2, r_y2; - result->rect().coords(&r_x, &r_y, &r_x2, &r_y2); + TQT_TQRECT_OBJECT(result->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); int rDiff, gDiff, bDiff; int rc, gc, bc; @@ -885,21 +885,21 @@ void PlastikStyle::renderPanel(TQPainter *p, r.coords(&x, &y, &x2, &y2); if (kickerMode && - p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame") { + p->tqdevice() && p->tqdevice()->devType() == TQInternal::Widget && + TQCString(static_cast<TQWidget*>(static_cast<QWidget*>(static_cast<QPaintDevice*>(p->tqdevice())))->className()) == "FittsLawFrame") { // Stolen wholesale from Keramik. I don't like it, but oh well. if (sunken) { - const QCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; + const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; p->setPen(g.background().dark()); p->drawConvexPolygon(TQPointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(TQPointArray(4, corners), 0, 3); + p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); } else { - const QCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; + const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; p->setPen(g.background().dark()); p->drawPolygon(TQPointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(TQPointArray(4, corners), 0, 3); + p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); } } else { renderContour(p, r, g.background(), getColor(g, PanelContour) ); @@ -1206,7 +1206,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe, switch( kpe ) { case KPE_SliderGroove: { const TQSlider* slider = (const TQSlider*)widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; if (horizontal) { int center = r.y()+r.height()/2; @@ -1224,7 +1224,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe, case KPE_SliderHandle: { const TQSlider* slider = (const TQSlider*)widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; const bool pressed = (flags&Style_Active); const WidgetState s = enabled?(pressed?IsPressed:IsEnabled):IsDisabled; @@ -1482,7 +1482,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, if(!kickerMode) { // detect if this is the left most header item bool isFirst = false; - TQHeader *header = dynamic_cast<TQHeader*>(p->device() ); + TQHeader *header = dynamic_cast<TQHeader*>(p->tqdevice() ); if (header) { isFirst = header->mapToIndex(header->sectionAt(r.x() ) ) == 0; } @@ -1515,7 +1515,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, case PE_ButtonTool: case PE_ButtonDropDown: case PE_ButtonCommand: { - bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget()); + bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.tqcontains(opt.widget()); renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode ); break; } @@ -1818,7 +1818,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, // -------------- case PE_Splitter: { // highlight on mouse over - TQColor color = (hoverWidget == p->device())?cg.background().light(100+_contrast):cg.background(); + TQColor color = (static_cast<QPaintDevice*>(static_cast<QWidget*>(hoverWidget)) == static_cast<QPaintDevice*>(p->tqdevice()))?TQColor(cg.background().light(100+_contrast)):cg.background(); p->fillRect(r, color); if (w > h) { if (h > 4) { @@ -1861,9 +1861,9 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, bool isEnabled = true; // panel is highlighted by default if it has focus, but if we have access to the // widget itself we can try to avoid highlighting in case it's readOnly or disabled. - if (p->device() && dynamic_cast<TQLineEdit*>(p->device())) + if (p->tqdevice() && dynamic_cast<TQLineEdit*>(p->tqdevice())) { - TQLineEdit* lineEdit = dynamic_cast<TQLineEdit*>(p->device()); + TQLineEdit* lineEdit = dynamic_cast<TQLineEdit*>(p->tqdevice()); isReadOnly = lineEdit->isReadOnly(); isEnabled = lineEdit->isEnabled(); } @@ -1880,7 +1880,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, // only thing we know is that khtml buffers its widgets into a pixmap. So // when the paint device is a TQPixmap, chances are high that we are in khtml. // It's possible that this breaks other things, so let's see how it works... - if (p->device() && dynamic_cast<TQPixmap*>(p->device() ) ) { + if (p->tqdevice() && dynamic_cast<TQPixmap*>(p->tqdevice() ) ) { contourFlags += Draw_AlphaBlend; } @@ -1941,7 +1941,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, case PE_PanelMenuBar: case PE_PanelDockWindow: { // fix for toolbar lag (from Mosfet Liquid) - TQWidget* w = dynamic_cast<TQWidget*>(p->device()); + TQWidget* w = dynamic_cast<TQWidget*>(p->tqdevice()); if(w && w->backgroundMode() == PaletteButton) w->setBackgroundMode(PaletteBackground); p->fillRect(r, cg.brush(TQColorGroup::Background)); @@ -2094,11 +2094,11 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, } } - const TQWMatrix oldMatrix( p->worldMatrix() ); + const TQWMatrix oldMatrix( p->tqworldMatrix() ); if (flags & Style_Down) { - p->translate(pixelMetric(PM_ButtonShiftHorizontal), - pixelMetric(PM_ButtonShiftVertical)); + p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), + tqpixelMetric(PM_ButtonShiftVertical)); } a.translate((r.x()+r.width()/2), (r.y()+r.height()/2)); @@ -2116,7 +2116,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, a.translate(0, 0); } - if (p->pen() == TQPen::NoPen) { + if (p->pen() == Qt::NoPen) { if (flags & Style_Enabled) { p->setPen(cg.buttonText()); } else { @@ -2132,13 +2132,13 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe, } default: { - return KStyle::drawPrimitive(pe, p, r, cg, flags, opt); + return KStyle::tqdrawPrimitive(pe, p, r, cg, flags, opt); } } } -void PlastikStyle::drawControl(ControlElement element, +void PlastikStyle::tqdrawControl(ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2171,7 +2171,7 @@ void PlastikStyle::drawControl(ControlElement element, int steps = pb->totalSteps(); const TQColor bg = enabled?cg.base():cg.background(); // background - const TQColor fg = enabled?cg.highlight():cg.background().dark(110); // foreground + const TQColor fg = enabled?cg.highlight():TQColor(cg.background().dark(110)); // foreground if( steps == 0 ) { // Busy indicator static const int barWidth = 10; @@ -2265,7 +2265,7 @@ void PlastikStyle::drawControl(ControlElement element, } else { // find the animation Offset for the current Widget TQWidget* nonConstWidget = const_cast<TQWidget*>(widget); - TQMapConstIterator<TQWidget*, int> iter = progAnimWidgets.find(nonConstWidget); + TQMapConstIterator<TQWidget*, int> iter = progAnimWidgets.tqfind(nonConstWidget); if (iter != progAnimWidgets.end()) animShift = iter.data(); } @@ -2293,14 +2293,14 @@ void PlastikStyle::drawControl(ControlElement element, case CE_TabBarTab: { const TQTabBar * tb = (const TQTabBar *) widget; bool cornerWidget = false; - if( ::qt_cast<TQTabWidget*>(tb->parent()) ) { + if( ::tqqt_cast<TQTabWidget*>(tb->parent()) ) { const TQTabWidget *tw = (const TQTabWidget*)tb->parent(); // is there a corner widget in the (top) left edge? - TQWidget *cw = tw->cornerWidget(Qt::TopLeft); + TQWidget *cw = tw->cornerWidget(TQt::TopLeft); if(cw) cornerWidget = true; } - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = tb->tqshape(); bool selected = false; if (flags & Style_Selected) selected = true; TabPosition pos; @@ -2336,7 +2336,7 @@ void PlastikStyle::drawControl(ControlElement element, renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget); break; default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } break; @@ -2379,15 +2379,15 @@ void PlastikStyle::drawControl(ControlElement element, // Shift button contents if pushed. if ( active ) { - x += pixelMetric(PM_ButtonShiftHorizontal, widget); - y += pixelMetric(PM_ButtonShiftVertical, widget); + x += tqpixelMetric(PM_ButtonShiftHorizontal, widget); + y += tqpixelMetric(PM_ButtonShiftVertical, widget); flags |= Style_Sunken; } // Does the button have a popup menu? if ( button->isMenuButton() ) { - int dx = pixelMetric( PM_MenuButtonIndicator, widget ); + int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ); if ( button->iconSet() && !button->iconSet()->isNull() && (dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w ) { @@ -2396,7 +2396,7 @@ void PlastikStyle::drawControl(ControlElement element, else { p->setPen(cg.buttonText()); - drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ), + drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ), cg, flags, opt ); w -= dx; } @@ -2422,7 +2422,7 @@ void PlastikStyle::drawControl(ControlElement element, p->drawPixmap( x + 4, y + h / 2 - pixmap.height() / 2, pixmap ); if (cornArrow) //Draw over the icon - drawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ), + drawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ), cg, flags, opt ); @@ -2432,14 +2432,14 @@ void PlastikStyle::drawControl(ControlElement element, } // Make the label indicate if the button is a default button or not - drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->colorGroup(), + drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->tqcolorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, - &button->colorGroup().buttonText() ); + &button->tqcolorGroup().buttonText() ); if ( flags & Style_HasFocus ) drawPrimitive( PE_FocusRect, p, - visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), + tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags ); break; } @@ -2489,7 +2489,7 @@ void PlastikStyle::drawControl(ControlElement element, bool enabled = mi->isEnabled(); bool checkable = popupmenu->isCheckable(); bool active = flags & Style_Active; - bool etchtext = styleHint( SH_EtchDisabledText ); + bool etchtext = tqstyleHint( SH_EtchDisabledText ); bool reverse = TQApplication::reverseLayout(); if ( checkable ) checkcol = QMAX( checkcol, 20 ); @@ -2524,7 +2524,7 @@ void PlastikStyle::drawControl(ControlElement element, break; } - TQRect cr = visualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r ); + TQRect cr = tqvisualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r ); // Do we have an icon? if ( mi->iconSet() ) { @@ -2605,7 +2605,7 @@ void PlastikStyle::drawControl(ControlElement element, TQString s = mi->text(); // Does the menu item have a text label? if ( !s.isNull() ) { - int t = s.find( '\t' ); + int t = s.tqfind( '\t' ); int m = 2; int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; text_flags |= reverse ? AlignRight : AlignLeft; @@ -2654,22 +2654,22 @@ void PlastikStyle::drawControl(ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( OpaqueMode ); + p->setBackgroundMode( Qt::OpaqueMode ); int diffw = ( ( r.width() - pixmap->width() ) / 2 ) + ( ( r.width() - pixmap->width() ) % 2 ); p->drawPixmap( r.x()+diffw, r.y()+1, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( TransparentMode ); + p->setBackgroundMode( Qt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; - int dim = pixelMetric(PM_MenuButtonIndicator) - 1; - TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, + int dim = tqpixelMetric(PM_MenuButtonIndicator) - 1; + TQRect vr = tqvisualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, r.y() + r.height() / 2 - dim / 2, dim, dim), r ); // Draw an arrow at the far end of the menu item @@ -2705,11 +2705,11 @@ void PlastikStyle::drawControl(ControlElement element, break; default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void PlastikStyle::drawControlMask(ControlElement element, +void PlastikStyle::tqdrawControlMask(ControlElement element, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -2724,12 +2724,12 @@ void PlastikStyle::drawControlMask(ControlElement element, } default: { - KStyle::drawControlMask (element, p, w, r, opt); + KStyle::tqdrawControlMask (element, p, w, r, opt); } } } -void PlastikStyle::drawComplexControlMask(ComplexControl c, +void PlastikStyle::tqdrawComplexControlMask(ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -2745,12 +2745,12 @@ void PlastikStyle::drawComplexControlMask(ComplexControl c, break; } default: { - KStyle::drawComplexControlMask (c, p, w, r, o); + KStyle::tqdrawComplexControlMask (c, p, w, r, o); } } } -void PlastikStyle::drawComplexControl(ComplexControl control, +void PlastikStyle::tqdrawComplexControl(ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2785,7 +2785,7 @@ void PlastikStyle::drawComplexControl(ComplexControl control, :cg.background(); uint contourFlags = 0; - if( khtmlWidgets.contains(cb) ) + if( khtmlWidgets.tqcontains(cb) ) contourFlags |= Draw_AlphaBlend; if (_inputFocusHighlight && hasFocus && editable && enabled) @@ -2951,10 +2951,10 @@ void PlastikStyle::drawComplexControl(ComplexControl control, // If we're pressed, on, or raised... if (bflags & (Style_Down | Style_On | Style_Raised) || widget==hoverWidget ) { drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); - } else if (tb->parentWidget() && - tb->parentWidget()->backgroundPixmap() && - !tb->parentWidget()->backgroundPixmap()->isNull()) { - TQPixmap pixmap = *(tb->parentWidget()->backgroundPixmap()); + } else if (tb->tqparentWidget() && + tb->tqparentWidget()->backgroundPixmap() && + !tb->tqparentWidget()->backgroundPixmap()->isNull()) { + TQPixmap pixmap = *(tb->tqparentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, tb->pos() ); } } @@ -3140,7 +3140,7 @@ void PlastikStyle::drawComplexControl(ComplexControl control, } default: - KStyle::drawComplexControl(control, p, widget, + KStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); break; @@ -3245,15 +3245,15 @@ TQRect PlastikStyle::querySubControlMetrics(ComplexControl control, } } -int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { // TABS // ---- case PM_TabBarTabVSpace: { const TQTabBar * tb = (const TQTabBar *) widget; - if (tb->shape() == TQTabBar::RoundedAbove || - tb->shape() == TQTabBar::RoundedBelow) + if (tb->tqshape() == TQTabBar::RoundedAbove || + tb->tqshape() == TQTabBar::RoundedBelow) return 12; else return 4; @@ -3322,7 +3322,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const return 1; case PM_DefaultFrameWidth: { - if(widget && ::qt_cast<TQPopupMenu*>(widget)) + if(widget && ::tqqt_cast<TQPopupMenu*>(widget)) return 1; else return 2; @@ -3342,7 +3342,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } @@ -3364,8 +3364,8 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, bool checkable = popup->isCheckable(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if (!mi->custom()->fullSpan() ) h += 4; } else if (mi->widget()) { @@ -3386,7 +3386,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, } } - if (!mi->text().isNull() && (mi->text().find('\t') >= 0)) { + if (!mi->text().isNull() && (mi->text().tqfind('\t') >= 0)) { w += itemHMargin + itemFrame*2 + 7; } else if (mi->popup()) { w += 2 * arrowHMargin; @@ -3411,8 +3411,8 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, { const TQPushButton* btn = static_cast<const TQPushButton*>(widget); - int w = s.width() + 2 * pixelMetric(PM_ButtonMargin, widget); - int h = s.height() + 2 * pixelMetric(PM_ButtonMargin, widget); + int w = s.width() + 2 * tqpixelMetric(PM_ButtonMargin, widget); + int h = s.height() + 2 * tqpixelMetric(PM_ButtonMargin, widget); if ( btn->text().isEmpty() && s.width() < 32 ) return TQSize(w, h); return TQSize( w+25, h+5 ); @@ -3420,20 +3420,20 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, case CT_ToolButton: { - if(widget->parent() && ::qt_cast<TQToolBar*>(widget->parent()) ) + if(widget->parent() && ::tqqt_cast<TQToolBar*>(widget->parent()) ) return TQSize( s.width()+2*4, s.height()+2*4 ); else - return KStyle::sizeFromContents (t, widget, s, opt); + return KStyle::tqsizeFromContents (t, widget, s, opt); } default: - return KStyle::sizeFromContents (t, widget, s, opt); + return KStyle::tqsizeFromContents (t, widget, s, opt); } - return KStyle::sizeFromContents (t, widget, s, opt); + return KStyle::tqsizeFromContents (t, widget, s, opt); } -int PlastikStyle::styleHint( StyleHint stylehint, +int PlastikStyle::tqstyleHint( StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, QStyleHintReturn* returnData ) const @@ -3443,7 +3443,7 @@ int PlastikStyle::styleHint( StyleHint stylehint, return 96; // Motif-like delay... default: - return KStyle::styleHint(stylehint, widget, option, returnData); + return KStyle::tqstyleHint(stylehint, widget, option, returnData); } } @@ -3455,52 +3455,52 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) if (!obj->isWidgetType() ) return false; // focus highlight - if ( ::qt_cast<TQLineEdit*>(obj) ) { - TQWidget* widget = static_cast<TQWidget*>(obj); + if ( ::tqqt_cast<TQLineEdit*>(obj) ) { + TQWidget* widget = TQT_TQWIDGET(obj); - if ( ::qt_cast<TQSpinWidget*>(widget->parentWidget()) ) + if ( ::tqqt_cast<TQSpinWidget*>(widget->tqparentWidget()) ) { - TQWidget* spinbox = widget->parentWidget(); + TQWidget* spinbox = widget->tqparentWidget(); if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { - spinbox->repaint(false); + spinbox->tqrepaint(false); } return false; } if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { - widget->repaint(false); + widget->tqrepaint(false); } return false; } - //Hover highlight... use qt_cast to check if the widget inheits one of the classes. - if ( ::qt_cast<TQPushButton*>(obj) || ::qt_cast<TQComboBox*>(obj) || - ::qt_cast<TQSpinWidget*>(obj) || ::qt_cast<TQCheckBox*>(obj) || - ::qt_cast<TQRadioButton*>(obj) || ::qt_cast<TQToolButton*>(obj) || obj->inherits("QSplitterHandle") ) + //Hover highlight... use tqqt_cast to check if the widget inheits one of the classes. + if ( ::tqqt_cast<TQPushButton*>(obj) || ::tqqt_cast<TQComboBox*>(obj) || + ::tqqt_cast<TQSpinWidget*>(obj) || ::tqqt_cast<TQCheckBox*>(obj) || + ::tqqt_cast<TQRadioButton*>(obj) || ::tqqt_cast<TQToolButton*>(obj) || obj->inherits("QSplitterHandle") ) { - if ((ev->type() == TQEvent::Enter) && static_cast<TQWidget*>(obj)->isEnabled()) + if ((ev->type() == TQEvent::Enter) && TQT_TQWIDGET(obj)->isEnabled()) { - TQWidget* button = static_cast<TQWidget*>(obj); + TQWidget* button = TQT_TQWIDGET(obj); hoverWidget = button; - button->repaint(false); + button->tqrepaint(false); } - else if ((ev->type() == TQEvent::Leave) && (obj == hoverWidget) ) + else if ((ev->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(hoverWidget)) ) { - TQWidget* button = static_cast<TQWidget*>(obj); + TQWidget* button = TQT_TQWIDGET(obj); hoverWidget = 0; - button->repaint(false); + button->tqrepaint(false); } return false; } - if ( ::qt_cast<TQTabBar*>(obj) ) { - if ((ev->type() == TQEvent::Enter) && static_cast<TQWidget*>(obj)->isEnabled()) + if ( ::tqqt_cast<TQTabBar*>(obj) ) { + if ((ev->type() == TQEvent::Enter) && TQT_TQWIDGET(obj)->isEnabled()) { - TQWidget* tabbar = static_cast<TQWidget*>(obj); + TQWidget* tabbar = TQT_TQWIDGET(obj); hoverWidget = tabbar; hoverTab = 0; - tabbar->repaint(false); + tabbar->tqrepaint(false); } else if (ev->type() == TQEvent::MouseMove) { @@ -3508,31 +3508,31 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQMouseEvent *me = dynamic_cast<TQMouseEvent*>(ev); if (tabbar && me) { - // avoid unnecessary repaints (which otherwise would occour on every + // avoid unnecessary tqrepaints (which otherwise would occour on every // MouseMove event causing high cpu load). - bool repaint = true; + bool tqrepaint = true; TQTab *tab = tabbar->selectTab(me->pos() ); if (hoverTab == tab) - repaint = false; + tqrepaint = false; hoverTab = tab; - if (repaint) - tabbar->repaint(false); + if (tqrepaint) + tabbar->tqrepaint(false); } } else if (ev->type() == TQEvent::Leave) { - TQWidget* tabbar = static_cast<TQWidget*>(obj); + TQWidget* tabbar = TQT_TQWIDGET(obj); hoverWidget = 0; hoverTab = 0; - tabbar->repaint(false); + tabbar->tqrepaint(false); } return false; } // Track show events for progress bars - if ( _animateProgressBar && ::qt_cast<TQProgressBar*>(obj) ) + if ( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(obj) ) { if ((ev->type() == TQEvent::Show) && !animationTimer->isActive()) { @@ -3541,9 +3541,9 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) } if ( !qstrcmp(obj->name(), "kde toolbar widget") ) { - TQWidget* lb = static_cast<TQWidget*>(obj); - if (lb->backgroundMode() == Qt::PaletteButton) - lb->setBackgroundMode(Qt::PaletteBackground); + TQWidget* lb = TQT_TQWIDGET(obj); + if (lb->backgroundMode() == TQt::PaletteButton) + lb->setBackgroundMode(TQt::PaletteBackground); lb->removeEventFilter(this); } diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h index 9b38d764c..64c3c3a65 100644 --- a/kstyles/plastik/plastik.h +++ b/kstyles/plastik/plastik.h @@ -81,7 +81,7 @@ public: SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawControl(ControlElement element, + void tqdrawControl(ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -89,9 +89,9 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; + void tqdrawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; - void drawComplexControl(ComplexControl control, + void tqdrawComplexControl(ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -101,7 +101,7 @@ public: SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - int pixelMetric(PixelMetric m, + int tqpixelMetric(PixelMetric m, const TQWidget *widget = 0 ) const; TQRect subRect(SubRect r, @@ -112,7 +112,7 @@ public: SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawComplexControlMask(TQStyle::ComplexControl c, + void tqdrawComplexControlMask(TQStyle::ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -123,7 +123,7 @@ public: const TQSize &s, const TQStyleOption &o) const; - int styleHint(StyleHint, const TQWidget * = 0, + int tqstyleHint(StyleHint, const TQWidget * = 0, const TQStyleOption & = TQStyleOption::Default, QStyleHintReturn * = 0 ) const; diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp index 5ddf8cd56..10945d57f 100644 --- a/kstyles/utils/installtheme/main.cpp +++ b/kstyles/utils/installtheme/main.cpp @@ -57,7 +57,7 @@ int main(int argc, char **argv) if (config.readEntry( "widgetStyle" ) == "basicstyle.la") { //OK, emit a style entry... - if (!themes.contains(name)) //Only add first occurrence, i.e. user local one. + if (!themes.tqcontains(name)) //Only add first occurrence, i.e. user local one. themes[name] = file; } } diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp index f4ed7f931..17dc46941 100644 --- a/kstyles/web/webstyle.cpp +++ b/kstyles/web/webstyle.cpp @@ -92,7 +92,7 @@ scrollBarControlsMetrics int extent = horizontal ? sb->height() : sb->width(); - TQColorGroup g = sb->colorGroup(); + TQColorGroup g = sb->tqcolorGroup(); if (sliderStart > sliderMax) sliderStart = sliderMax; @@ -303,12 +303,12 @@ WebStyle::eventFilter(TQObject * o, TQEvent * e) if (e->type() == TQEvent::Enter) { _highlightedButton = pb; - pb->repaint(false); + pb->tqrepaint(false); } else if (e->type() == TQEvent::Leave) { _highlightedButton = 0; - pb->repaint(false); + pb->tqrepaint(false); } return false; @@ -371,14 +371,14 @@ WebStyle::drawPushButton(TQPushButton * b, TQPainter * p) bool sunken(b->isDown() || b->isOn()); bool hl(_highlightedButton == b); - TQColor bg(b->colorGroup().button()); + TQColor bg(b->tqcolorGroup().button()); p->save(); - p->fillRect(b->rect(), b->colorGroup().brush(TQColorGroup::Background)); + p->fillRect(b->rect(), b->tqcolorGroup().brush(TQColorGroup::Background)); if (b->isDefault()) { - TQColor c(hl ? b->colorGroup().highlight() : b->colorGroup().mid()); + TQColor c(hl ? b->tqcolorGroup().highlight() : b->tqcolorGroup().mid()); p->setPen(contrastingForeground(c, bg)); @@ -391,26 +391,26 @@ WebStyle::drawPushButton(TQPushButton * b, TQPainter * p) 4, b->width() - 8, b->height() - 8, - b->colorGroup().brush(TQColorGroup::Button) + b->tqcolorGroup().brush(TQColorGroup::Button) ); if (b->isEnabled()) { if (sunken) { - p->setPen(contrastingForeground(b->colorGroup().light(), bg)); + p->setPen(contrastingForeground(b->tqcolorGroup().light(), bg)); } else { if (hl) - p->setPen(contrastingForeground(b->colorGroup().highlight(), bg)); + p->setPen(contrastingForeground(b->tqcolorGroup().highlight(), bg)); else - p->setPen(contrastingForeground(b->colorGroup().mid(), bg)); + p->setPen(contrastingForeground(b->tqcolorGroup().mid(), bg)); } } else { - p->setPen(b->colorGroup().button()); + p->setPen(b->tqcolorGroup().button()); } drawFunkyRect(p, 3, 3, b->width() - 6, b->height() - 6, true); @@ -459,7 +459,7 @@ WebStyle::drawScrollBarControls rSlider ); - TQColorGroup g(sb->colorGroup()); + TQColorGroup g(sb->tqcolorGroup()); if (controls & AddLine && rAdd.isValid()) { @@ -754,7 +754,7 @@ WebStyle::drawExclusiveIndicator p->setBrush(g.brush(TQColorGroup::Background)); - // Avoid misshapen ellipses. Qt or X bug ? Who knows... + // Avoid mistqshapen ellipses. Qt or X bug ? Who knows... if (0 == w % 2) --w; @@ -1450,14 +1450,14 @@ WebStyle::drawTab { TQRect r(tab->rect()); - TQColorGroup g(tabBar->colorGroup()); + TQColorGroup g(tabBar->tqcolorGroup()); p->save(); p->setPen(selected ? g.dark() : g.mid()); p->fillRect(r, g.brush(TQColorGroup::Background)); - switch (tabBar->shape()) + switch (tabBar->tqshape()) { case TQTabBar::RoundedAbove: case TQTabBar::TriangularAbove: @@ -1603,7 +1603,7 @@ WebStyle::drawKickerTaskButton static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"); - int modStrPos = s.find(modStr); + int modStrPos = s.tqfind(modStr); if (-1 != modStrPos) { diff --git a/kunittest/module.h b/kunittest/module.h index 7f4b24789..4213ddcf0 100644 --- a/kunittest/module.h +++ b/kunittest/module.h @@ -48,7 +48,7 @@ namespace KUnitTest * @code KUNITTEST_MODULE(kunittest_samplemodule,"TestSuite") @endcode */ #define KUNITTEST_MODULE(library,suite) \ - static const TQString s_kunittest_suite = TQString::fromLatin1(suite); \ + static const TQString s_kunittest_suite = TQString::tqfromLatin1(suite); \ class library##Module : public TQObject \ { \ public: \ @@ -93,7 +93,7 @@ namespace KUnitTest tester##ModuleAutoregister() \ { \ KUnitTest::Tester *test = new tester(); \ - TQString name = s_kunittest_suite + TQString::fromLatin1("::") + TQString::fromLocal8Bit(#tester); \ + TQString name = s_kunittest_suite + TQString::tqfromLatin1("::") + TQString::fromLocal8Bit(#tester); \ test->setName(name.local8Bit()); \ kunittest_registerModuleTester(name.local8Bit(), test ); \ } \ diff --git a/kunittest/runner.cpp b/kunittest/runner.cpp index 580d451b8..ebf74e213 100644 --- a/kunittest/runner.cpp +++ b/kunittest/runner.cpp @@ -187,7 +187,7 @@ namespace KUnitTest str = TQString( "%1 of %2 tests did not behave as expected (%1 unexpected passes)" ).arg( globalFails ).arg( numTests ).arg( globalXPasses ); if ( globalSkipped ) str += TQString( " (%1 tests skipped)" ).arg( globalSkipped ); - cout << str.local8Bit() << endl; + cout << str.local8Bit().data() << endl; #endif return m_registry.count(); @@ -203,7 +203,7 @@ namespace KUnitTest void Runner::runTest(const char *name) { - Tester *test = m_registry.find(name); + Tester *test = m_registry.tqfind(name); if ( test == 0L ) return; if ( s_debugCapturingEnabled ) diff --git a/kunittest/runner.h b/kunittest/runner.h index 1bd6a3d15..1e0c1ec72 100644 --- a/kunittest/runner.h +++ b/kunittest/runner.h @@ -94,7 +94,7 @@ namespace KUnitTest * * @see KUNITTEST_REGISTER_TESTER */ - class KUNITTEST_EXPORT Runner : public QObject + class KUNITTEST_EXPORT Runner : public TQObject { Q_OBJECT diff --git a/kunittest/tester.cpp b/kunittest/tester.cpp index 3faf3997e..0ad956ba0 100644 --- a/kunittest/tester.cpp +++ b/kunittest/tester.cpp @@ -48,9 +48,9 @@ namespace KUnitTest void SlotTester::allTests() { - TQStrList allSlots = metaObject()->slotNames(); + TQStrList allSlots = tqmetaObject()->slotNames(); - if ( allSlots.contains("setUp()") > 0 ) invokeMember("setUp()"); + if ( allSlots.tqcontains("setUp()") > 0 ) invokeMember("setUp()"); for ( char *sl = allSlots.first(); sl; sl = allSlots.next() ) { @@ -67,14 +67,14 @@ namespace KUnitTest } } - if ( allSlots.contains("tearDown()") > 0 ) invokeMember("tearDown()"); + if ( allSlots.tqcontains("tearDown()") > 0 ) invokeMember("tearDown()"); m_total->clear(); } TestResults *SlotTester::results(const char *sl) { - if ( m_resultsList.find(sl) == 0L ) m_resultsList.insert(sl, new TestResults()); + if ( m_resultsList.tqfind(sl) == 0L ) m_resultsList.insert(sl, new TestResults()); return m_resultsList[sl]; } diff --git a/kunittest/tester.h b/kunittest/tester.h index ff3a3d453..0b4dc382f 100644 --- a/kunittest/tester.h +++ b/kunittest/tester.h @@ -359,7 +359,7 @@ using namespace std; * * @code SKIP("Test skipped because of lack of foo support."); @endcode */ -#define SKIP( x ) skip( __FILE__, __LINE__, TQString::fromLatin1(#x)) +#define SKIP( x ) skip( __FILE__, __LINE__, TQString::tqfromLatin1(#x)) /*! * A macro testing that @p expression throws an exception that is catched @@ -519,7 +519,7 @@ namespace KUnitTest * * @see CHECK, XFAIL, SKIP */ - class KUNITTEST_EXPORT Tester : public QObject + class KUNITTEST_EXPORT Tester : public TQObject { public: Tester(const char *name = 0L) diff --git a/kutils/kcmoduleinfo.cpp b/kutils/kcmoduleinfo.cpp index fe2545a39..bb27f5c69 100644 --- a/kutils/kcmoduleinfo.cpp +++ b/kutils/kcmoduleinfo.cpp @@ -179,7 +179,7 @@ KCModuleInfo::loadAll() setNeedsTest( tmp.isValid() ? tmp.asBool() : false ); } -QString +TQString KCModuleInfo::docPath() const { if (!_allLoaded) @@ -188,7 +188,7 @@ KCModuleInfo::docPath() const return _doc; } -QString +TQString KCModuleInfo::handle() const { if (!_allLoaded) diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp index de1843b7c..642e6f1bc 100644 --- a/kutils/kcmoduleloader.cpp +++ b/kutils/kcmoduleloader.cpp @@ -72,7 +72,7 @@ KCModule* KCModuleLoader::load(const KCModuleInfo &mod, const TQString &libname, KLibFactory *factory = lib->factory(); if ( factory ) { - KCModule *module = KParts::ComponentFactory::createInstanceFromFactory<KCModule>( factory, parent, name ? name : mod.handle().latin1(), args ); + KCModule *module = KParts::ComponentFactory::createInstanceFromFactory<KCModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args ); if (module) return module; } @@ -257,7 +257,7 @@ bool KCModuleLoader::testModule( const KCModuleInfo& module ) KLibrary* library = loader->library( TQFile::encodeName((TQString("kcm_%1").arg(module.library()))) ); if( library ) { - void *test_func = library->symbol( TQString("test_%1").arg(module.factoryName()).utf8() ); + void *test_func = library->symbol( TQString(TQString("test_%1").arg(module.factoryName())).utf8() ); if( test_func ) { bool (*func)() = (bool(*)())test_func; diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 9fd95f40f..f4b4a9655 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -90,18 +90,18 @@ class KCModuleProxy::KCModuleProxyPrivate delete kcm; } - QStringList args; + TQStringList args; KCModule *kcm; QXEmbed *embedWidget; KProcess *rootProcess; - QVBox *embedFrame; - KCModuleProxyIfaceImpl *dcopObject; + TQVBox *embedFrame; + KCModuleProxyIfaceImpl *dcopObject; DCOPClient *dcopClient; - QVBoxLayout *topLayout; /* Contains TQScrollView view, and root stuff */ - KCModuleProxyRootCommunicatorImpl *rootCommunicator; - QLabel *rootInfo; - QCString dcopName; - KCModuleInfo modInfo; + TQVBoxLayout *topLayout; /* Contains TQScrollView view, and root stuff */ + KCModuleProxyRootCommunicatorImpl *rootCommunicator; + TQLabel *rootInfo; + TQCString dcopName; + KCModuleInfo modInfo; bool withFallback; bool changed; bool rootMode; @@ -161,7 +161,7 @@ KCModule * KCModuleProxy::realModule() const if( !d->isInitialized ) { - d->dcopName = moduleInfo().handle().prepend("KCModuleProxy-").utf8(); + d->dcopName = TQString(moduleInfo().handle().prepend("KCModuleProxy-")).utf8(); d->topLayout = new TQVBoxLayout( that, 0, 0, "topLayout" ); d->isInitialized = true; @@ -311,7 +311,7 @@ void KCModuleProxy::runAsRoot() TQPalette pal( red ); pal.setColor( TQColorGroup::Background, - colorGroup().background() ); + tqcolorGroup().background() ); d->embedFrame->setPalette( pal ); d->embedFrame->setLineWidth( 2 ); d->embedFrame->setMidLineWidth( 2 ); @@ -323,7 +323,7 @@ void KCModuleProxy::runAsRoot() TQLabel *lblBusy = new TQLabel(i18n("<big>Loading...</big>"), d->embedWidget, "lblBusy" ); lblBusy->setTextFormat(RichText); - lblBusy->setAlignment(AlignCenter); + lblBusy->tqsetAlignment(AlignCenter); lblBusy->setGeometry(0,0, d->kcm->width(), d->kcm->height()); lblBusy->show(); @@ -343,15 +343,15 @@ void KCModuleProxy::runAsRoot() TQString cmd = moduleInfo().service()->exec().stripWhiteSpace(); if (cmd.left(5) == "kdesu") { - cmd = cmd.remove(0,5).stripWhiteSpace(); + cmd = TQString(cmd.remove(0,5)).stripWhiteSpace(); /* Remove all kdesu switches */ while( cmd.length() > 1 && cmd[ 0 ] == '-' ) - cmd = cmd.remove( 0, cmd.find( ' ' ) ).stripWhiteSpace(); + cmd = TQString(cmd.remove( 0, cmd.tqfind( ' ' ) )).stripWhiteSpace(); } if (cmd.left(8) == "kcmshell") - cmd = cmd.remove(0,8).stripWhiteSpace(); + cmd = TQString(cmd.remove(0,8)).stripWhiteSpace(); /* Run the process */ TQString kdesu = KStandardDirs::findExe("kdesu"); @@ -416,7 +416,7 @@ void KCModuleProxy::rootExited() /* Such that the "ordinary" module loads again */ d->rootMode = false; - d->topLayout->invalidate(); + d->topLayout->tqinvalidate(); TQShowEvent ev; showEvent( &ev ); diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h index d615edc1e..fea2cf47e 100644 --- a/kutils/kcmoduleproxy.h +++ b/kutils/kcmoduleproxy.h @@ -65,7 +65,7 @@ class KProcess; * @author Matthias Kretz <kretz@kde.org> * */ -class KUTILS_EXPORT KCModuleProxy : public QWidget +class KUTILS_EXPORT KCModuleProxy : public TQWidget { Q_OBJECT diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp index 33f243529..217f40bd4 100644 --- a/kutils/kcmultidialog.cpp +++ b/kutils/kcmultidialog.cpp @@ -148,7 +148,7 @@ void KCMultiDialog::apply() TQStringList * names = moduleParentComponents[ m ]; kdDebug(710) << k_funcinfo << *names << " saved and added to the list" << endl; for( TQStringList::ConstIterator it = names->begin(); it != names->end(); ++it ) - if( updatedModules.find( *it ) == updatedModules.end() ) + if( updatedModules.tqfind( *it ) == updatedModules.end() ) updatedModules.append( *it ); } } @@ -275,7 +275,7 @@ void KCMultiDialog::addModule(const KCModuleInfo& moduleinfo, return; } KCModuleProxy * module; - if( m_orphanModules.contains( moduleinfo.service() ) ) + if( m_orphanModules.tqcontains( moduleinfo.service() ) ) { // the KCModule already exists - it was removed from the dialog in // removeAllModules @@ -328,7 +328,7 @@ void KCMultiDialog::removeAllModules() { kdDebug( 710 ) << "remove 2" << endl; KCModuleProxy * kcm = ( *it ).kcm; - TQObject * page = kcm->parent(); + TQObject * page = TQT_TQOBJECT(kcm->parent()); kcm->hide(); if( page ) { @@ -358,7 +358,7 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) if( ! obj ) return; - KCModuleProxy * module = ( KCModuleProxy* )obj->qt_cast( + KCModuleProxy * module = ( KCModuleProxy* )obj->tqqt_cast( "KCModuleProxy" ); if( ! module ) return; diff --git a/kutils/kcmultidialog.h b/kutils/kcmultidialog.h index df1707a9a..ab57012ad 100644 --- a/kutils/kcmultidialog.h +++ b/kutils/kcmultidialog.h @@ -136,7 +136,7 @@ public: * @param withfallback Try harder to load the module. Might result * in the module appearing outside the dialog. **/ - void addModule(const KCModuleInfo& moduleinfo, QStringList + void addModule(const KCModuleInfo& moduleinfo, TQStringList parentmodulenames = TQStringList(), bool withfallback=false); /** diff --git a/kutils/kfind.cpp b/kutils/kfind.cpp index 7b2da6899..d47b1c4a2 100644 --- a/kutils/kfind.cpp +++ b/kutils/kfind.cpp @@ -211,7 +211,7 @@ KDialogBase* KFind::findNextDialog( bool create ) { if ( !m_dialog && create ) { - m_dialog = new KFindNextDialog( m_pattern, parentWidget() ); + m_dialog = new KFindNextDialog( m_pattern, tqparentWidget() ); connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotFindNext() ) ); connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); } @@ -368,7 +368,7 @@ KFind::Result KFind::find() delete d->emptyMatch; d->emptyMatch = new Private::Match( d->currentId, m_index, m_matchedLength ); } else - d->incrementalPath.replace(m_pattern, new Private::Match(d->currentId, m_index, m_matchedLength)); + d->incrementalPath.tqreplace(m_pattern, new Private::Match(d->currentId, m_index, m_matchedLength)); if ( m_pattern.length() < d->matchedPattern.length() ) { @@ -471,7 +471,7 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o while (index >= 0) { // ...find the next match. - index = text.findRev(pattern, index, caseSensitive); + index = text.tqfindRev(pattern, index, caseSensitive); if (index == -1) break; @@ -488,7 +488,7 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o while (index < (int)text.length()) { // ...find the next match. - index = text.find(pattern, index, caseSensitive); + index = text.tqfind(pattern, index, caseSensitive); if (index == -1) break; @@ -507,11 +507,11 @@ int KFind::find(const TQString &text, const TQString &pattern, int index, long o // Non-whole-word search. if (options & KFindDialog::FindBackwards) { - index = text.findRev(pattern, index, caseSensitive); + index = text.tqfindRev(pattern, index, caseSensitive); } else { - index = text.find(pattern, index, caseSensitive); + index = text.tqfind(pattern, index, caseSensitive); } if (index != -1) { @@ -532,7 +532,7 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o while (index >= 0) { // ...find the next match. - index = text.findRev(pattern, index); + index = text.tqfindRev(pattern, index); if (index == -1) break; @@ -551,7 +551,7 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o while (index < (int)text.length()) { // ...find the next match. - index = text.find(pattern, index); + index = text.tqfind(pattern, index); if (index == -1) break; @@ -572,11 +572,11 @@ int KFind::find(const TQString &text, const TQRegExp &pattern, int index, long o // Non-whole-word search. if (options & KFindDialog::FindBackwards) { - index = text.findRev(pattern, index); + index = text.tqfindRev(pattern, index); } else { - index = text.find(pattern, index); + index = text.tqfind(pattern, index); } if (index != -1) { @@ -704,7 +704,7 @@ TQWidget* KFind::dialogsParent() const // If the find dialog is still up, it should get the focus when closing a message box // Otherwise, maybe the "find next?" dialog is up // Otherwise, the "view" is the parent. - return d->findDialog ? (TQWidget*)d->findDialog : ( m_dialog ? m_dialog : parentWidget() ); + return d->findDialog ? (TQWidget*)d->findDialog : ( m_dialog ? m_dialog : tqparentWidget() ); } #include "kfind.moc" diff --git a/kutils/kfind.h b/kutils/kfind.h index 502708dd1..b28f59596 100644 --- a/kutils/kfind.h +++ b/kutils/kfind.h @@ -101,9 +101,10 @@ * FindBackwards and call slotFindNext() - and reset the value afterwards. */ class KUTILS_EXPORT KFind : - public QObject + public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -388,7 +389,7 @@ signals: protected: - TQWidget* parentWidget() const { return (TQWidget *)parent(); } + TQWidget* tqparentWidget() const { return (TQWidget *)parent(); } TQWidget* dialogsParent() const; protected slots: diff --git a/kutils/kfinddialog.cpp b/kutils/kfinddialog.cpp index 7cc6dff46..c23380696 100644 --- a/kutils/kfinddialog.cpp +++ b/kutils/kfinddialog.cpp @@ -423,13 +423,13 @@ void KFindDialog::showPatterns() { if ( !d->m_regexpDialogQueryDone ) { - d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this ); + d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); d->m_regexpDialogQueryDone = true; } if ( d->m_regexpDialog ) { - KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( d->m_regexpDialog->qt_cast( "KRegExpEditorInterface" ) ); + KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( d->m_regexpDialog->tqqt_cast( "KRegExpEditorInterface" ) ); assert( iface ); iface->setRegExp( pattern() ); diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp index a9b648736..53f73e942 100644 --- a/kutils/kmultitabbar.cpp +++ b/kutils/kmultitabbar.cpp @@ -73,7 +73,7 @@ KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMult } addChild(box); setFrameStyle(NoFrame); - viewport()->setBackgroundMode(Qt::PaletteBackground); + viewport()->setBackgroundMode(TQt::PaletteBackground); /* box->setPaletteBackgroundColor(Qt::red); setPaletteBackgroundColor(Qt::green);*/ } @@ -110,7 +110,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) mainLayout->setAutoAdd(true); } - viewport()->repaint(); + viewport()->tqrepaint(); } void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) @@ -120,9 +120,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip if (m_position==KMultiTabBar::Right) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height()); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(1,0,1,viewport()->height()); @@ -130,28 +130,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip else if (m_position==KMultiTabBar::Left) { - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(23,0,23,viewport()->height()); paint->drawLine(22,0,22,viewport()->height()); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height()); } else if (m_position==KMultiTabBar::Bottom) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,viewport()->width(),0); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,1,viewport()->width(),1); } else { - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(0,23,viewport()->width(),23); paint->drawLine(0,22,viewport()->width(),22); -/* paint->setPen(colorGroup().shadow()); +/* paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,viewport()->height());*/ } @@ -378,7 +378,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p m_position=pos; for (uint i=0;i<m_tabs.count();i++) m_tabs.at(i)->setTabsPosition(m_position); - viewport()->repaint(); + viewport()->tqrepaint(); } KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup, @@ -434,29 +434,29 @@ void KMultiTabBarButton::slotClicked() void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos) { m_position=pos; - repaint(); + tqrepaint(); } void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) { m_style=style; - repaint(); + tqrepaint(); } void KMultiTabBarButton::hideEvent( TQHideEvent* he) { TQPushButton::hideEvent(he); - KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget()); + KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget()); if (tb) tb->updateSeparator(); } void KMultiTabBarButton::showEvent( TQShowEvent* he) { TQPushButton::showEvent(he); - KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget()); + KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget()); if (tb) tb->updateSeparator(); } -TQSize KMultiTabBarButton::sizeHint() const +TQSize KMultiTabBarButton::tqsizeHint() const { constPolish(); @@ -472,7 +472,7 @@ TQSize KMultiTabBarButton::sizeHint() const } #endif if ( isMenuButton() ) - w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); @@ -482,7 +482,7 @@ TQSize KMultiTabBarButton::sizeHint() const TQString s( text() ); bool empty = s.isEmpty(); if ( empty ) - s = TQString::fromLatin1("XXXX"); + s = TQString::tqfromLatin1("XXXX"); TQFontMetrics fm = fontMetrics(); TQSize sz = fm.size( ShowPrefix, s ); if(!empty || !w) @@ -491,7 +491,7 @@ TQSize KMultiTabBarButton::sizeHint() const h = QMAX(h, sz.height()); } - return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } @@ -525,7 +525,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos) } setPosition(pos); -// repaint(); +// tqrepaint(); } void KMultiTabBarTab::setIcon(const TQString& icon) @@ -577,12 +577,12 @@ void KMultiTabBarTab::updateState() if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) { setFixedWidth(24); if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { - setFixedHeight(KMultiTabBarButton::sizeHint().width()); + setFixedHeight(KMultiTabBarButton::tqsizeHint().width()); } else setFixedHeight(36); } else { setFixedHeight(24); if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { - setFixedWidth(KMultiTabBarButton::sizeHint().width()); + setFixedWidth(KMultiTabBarButton::tqsizeHint().width()); } else setFixedWidth(36); } } else { @@ -633,7 +633,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { const int height = 24; if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right)) - sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint(); + sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint(); else sh=TQSize(this->width(),this->height()); } else @@ -650,8 +650,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { if (isOn()) st|=TQStyle::Style_On; - style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); - style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st); + tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); + tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st); switch (m_position) { case KMultiTabBar::Left: @@ -667,8 +667,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) { paint->drawPixmap(0,0,pixmap); break; } -// style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), -// colorGroup(),TQStyle::Style_Enabled); +// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), +// tqcolorGroup(),TQStyle::Style_Enabled); } @@ -678,58 +678,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap pixmap; if ( iconSet()) pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ); - paint->fillRect(0, 0, 24, 24, colorGroup().background()); + paint->fillRect(0, 0, 24, 24, tqcolorGroup().background()); if (!isOn()) { if (m_position==KMultiTabBar::Right) { - paint->fillRect(0,0,21,21,TQBrush(colorGroup().background())); + paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background())); - paint->setPen(colorGroup().background().dark(150)); + paint->setPen(tqcolorGroup().background().dark(150)); paint->drawLine(0,22,23,22); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,23); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(1,0,1,23); } else if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top)) { - paint->fillRect(0,1,23,22,TQBrush(colorGroup().background())); + paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background())); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(23,0,23,23); - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(0,22,23,22); paint->drawLine(0,23,23,23); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,23,0); - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,1,23,1); } else { - paint->setPen(colorGroup().background().dark(120)); + paint->setPen(tqcolorGroup().background().dark(120)); paint->drawLine(0,23,23,23); - paint->fillRect(0,0,23,21,TQBrush(colorGroup().background())); + paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background())); paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap); - paint->setPen(colorGroup().light()); + paint->setPen(tqcolorGroup().light()); paint->drawLine(23,0,23,23); paint->drawLine(22,0,22,23); - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,0,0,23); } @@ -740,12 +740,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) { if (m_position==KMultiTabBar::Right) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-2,23,height()-2); paint->drawLine(23,0,23,height()-1); paint->drawLine(22,0,22,height()-1); - paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light())); + paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) @@ -755,9 +755,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap tpixmap(height()-25-3, width()-2); TQPainter painter(&tpixmap); - painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); + painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); - painter.setPen(colorGroup().text()); + painter.setPen(tqcolorGroup().text()); painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->rotate(90); @@ -769,25 +769,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) else if (m_position==KMultiTabBar::Top) { - paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light())); + paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { - paint->setPen(colorGroup().text()); + paint->setPen(tqcolorGroup().text()); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); } } else if (m_position==KMultiTabBar::Bottom) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,23,width()-1,23); paint->drawLine(0,22,width()-1,22); - paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light())); + paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { - paint->setPen(colorGroup().text()); + paint->setPen(tqcolorGroup().text()); paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text); } @@ -796,10 +796,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) { - paint->setPen(colorGroup().shadow()); + paint->setPen(tqcolorGroup().shadow()); paint->drawLine(0,height()-1,23,height()-1); paint->drawLine(0,height()-2,23,height()-2); - paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light())); + paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light())); paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap); if (m_showActiveTabText) { @@ -809,9 +809,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint) TQPixmap tpixmap(height()-25-3, width()-2); TQPainter painter(&tpixmap); - painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light())); + painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light())); - painter.setPen(colorGroup().text()); + painter.setPen(tqcolorGroup().text()); painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text); paint->rotate(-90); @@ -838,13 +838,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam if (bm==Vertical) { m_l=new TQVBoxLayout(this); - setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); + tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true); // setFixedWidth(24); } else { m_l=new TQHBoxLayout(this); - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true); // setFixedHeight(24); } m_l->setMargin(0); @@ -989,7 +989,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */) { for (uint i=0;i<tabs()->count();i++) tabs()->at(i)->resize(); - repaint(); + tqrepaint(); } TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();} diff --git a/kutils/kmultitabbar.h b/kutils/kmultitabbar.h index f4ae54b9b..0cbbe075a 100644 --- a/kutils/kmultitabbar.h +++ b/kutils/kmultitabbar.h @@ -53,7 +53,7 @@ class KMultiTabBarInternal; * should be raisable is left to the "user". *@author Joseph Wenninger */ -class KUTILS_EXPORT KMultiTabBar: public QWidget +class KUTILS_EXPORT KMultiTabBar: public TQWidget { Q_OBJECT public: @@ -202,7 +202,7 @@ private: * This class represents a tab bar button in a KMultiTabBarWidget. * This class should never be created except with the appendButton call of KMultiTabBar */ -class KUTILS_EXPORT KMultiTabBarButton: public QPushButton +class KUTILS_EXPORT KMultiTabBarButton: public TQPushButton { Q_OBJECT public: @@ -239,7 +239,7 @@ public slots: */ void setText(const TQString &); - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: KMultiTabBar::KMultiTabBarPosition m_position; diff --git a/kutils/kmultitabbar_p.h b/kutils/kmultitabbar_p.h index e48200160..f8d552b40 100644 --- a/kutils/kmultitabbar_p.h +++ b/kutils/kmultitabbar_p.h @@ -27,7 +27,7 @@ #include <tqscrollview.h> #include <kmultitabbar.h> -class KMultiTabBarInternal: public QScrollView +class KMultiTabBarInternal: public TQScrollView { Q_OBJECT public: diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp index 1a64d05e9..96e853534 100644 --- a/kutils/kpluginselector.cpp +++ b/kutils/kpluginselector.cpp @@ -64,7 +64,7 @@ QCheckListViewItem that holds a pointer to the KPluginInfo object. Used in the tooltip code to access additional fields */ -class KPluginInfoLVI : public QCheckListItem +class KPluginInfoLVI : public TQCheckListItem { public: KPluginInfoLVI( KPluginInfo *pluginInfo, KListView *parent ) @@ -83,7 +83,7 @@ private: The decision whether or not to show tooltips is taken in maybeTip(). See also the TQListView sources from Qt itself. */ -class KPluginListViewToolTip : public QToolTip +class KPluginListViewToolTip : public TQToolTip { public: KPluginListViewToolTip( TQWidget *parent, KListView *lv ); @@ -101,7 +101,7 @@ KPluginListViewToolTip::KPluginListViewToolTip( TQWidget *parent, KListView *lv void KPluginListViewToolTip::maybeTip( const TQPoint &pos ) { - if ( !parentWidget() || !m_listView ) + if ( !tqparentWidget() || !m_listView ) return; KPluginInfoLVI *item = dynamic_cast<KPluginInfoLVI *>( m_listView->itemAt( pos ) ); @@ -115,8 +115,8 @@ void KPluginListViewToolTip::maybeTip( const TQPoint &pos ) "<tr><td><b>License:</b></td><td>%4</td></tr></table></qt>" ).arg( item->pluginInfo()->comment(), item->pluginInfo()->author(), item->pluginInfo()->version(), item->pluginInfo()->license() ); - //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: itemRect: " << itemRect << ", tooltip: " << toolTip << endl; - tip( m_listView->itemRect( item ), toolTip ); + //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: tqitemRect: " << tqitemRect << ", tooltip: " << toolTip << endl; + tip( m_listView->tqitemRect( item ), toolTip ); } struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate @@ -192,7 +192,7 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos TQT_SLOT( executed( TQListViewItem * ) ) ); connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( executed( TQListViewItem * ) ) ); - listview->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + listview->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); listview->setAcceptDrops( false ); listview->setFullWidth( true ); listview->setSelectionModeExt( KListView::Single ); @@ -246,7 +246,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent, { //FIXME: not very verbose TQLabel * label = new TQLabel( i18n( "Error" ), parent ); - label->setAlignment( Qt::AlignCenter ); + label->tqsetAlignment( Qt::AlignCenter ); return label; } @@ -332,7 +332,7 @@ void KPluginSelectionWidget::updateConfigPage( KPluginInfo * plugininfo, d->kps->configPage( 1 ); else { - if( !d->widgetIDs.contains( plugininfo->pluginName() ) ) + if( !d->widgetIDs.tqcontains( plugininfo->pluginName() ) ) // if no widget exists for the plugin create it embeddPluginKCMs( plugininfo, checked ); else @@ -464,7 +464,7 @@ void KPluginSelectionWidget::save() names->append( TQString::null ); for( TQStringList::ConstIterator nameit = names->begin(); nameit != names->end(); ++nameit ) - if( updatedModules.find( *nameit ) == updatedModules.end() ) + if( updatedModules.tqfind( *nameit ) == updatedModules.end() ) updatedModules.append( *nameit ); } for( TQStringList::ConstIterator it = updatedModules.begin(); it != updatedModules.end(); ++it ) @@ -523,7 +523,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name ) TQBoxLayout * hbox = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); hbox->setAutoAdd( true ); - TQSplitter* splitter = new TQSplitter( TQSplitter::Horizontal, this ); + TQSplitter* splitter = new TQSplitter( Qt::Horizontal, this ); d->frame = new TQFrame( splitter, "KPluginSelector left frame" ); d->frame->setFrameStyle( TQFrame::NoFrame ); ( new TQVBoxLayout( d->frame, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); @@ -536,7 +536,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name ) TQLabel * label = new TQLabel( i18n( "(This plugin is not configurable)" ), d->widgetstack ); ( new TQVBoxLayout( label, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); - label->setAlignment( Qt::AlignCenter ); + label->tqsetAlignment( Qt::AlignCenter ); label->setMinimumSize( 200, 200 ); d->widgetstack->addWidget( label, 1 ); @@ -696,7 +696,7 @@ void KPluginSelector::defaults() // tabwidget - defaults() will be called for all of them) TQWidget * pluginconfig = d->widgetstack->visibleWidget(); - KCModuleProxy * kcm = ( KCModuleProxy* )pluginconfig->qt_cast( + KCModuleProxy * kcm = ( KCModuleProxy* )pluginconfig->tqqt_cast( "KCModuleProxy" ); if( kcm ) { diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h index 0c2f1e55d..bf351d9e5 100644 --- a/kutils/kpluginselector.h +++ b/kutils/kpluginselector.h @@ -57,7 +57,7 @@ class KConfigGroup; * @author Matthias Kretz <kretz@kde.org> * @since 3.2 */ -class KUTILS_EXPORT KPluginSelector : public QWidget +class KUTILS_EXPORT KPluginSelector : public TQWidget { friend class KPluginSelectionWidget; diff --git a/kutils/kpluginselector_p.h b/kutils/kpluginselector_p.h index 1333b2dc4..b915aae71 100644 --- a/kutils/kpluginselector_p.h +++ b/kutils/kpluginselector_p.h @@ -39,7 +39,7 @@ class KCModuleInfo; * @author Matthias Kretz <kretz@kde.org> * @since 3.2 */ -class KPluginSelectionWidget : public QWidget +class KPluginSelectionWidget : public TQWidget { Q_OBJECT public: diff --git a/kutils/kreplace.cpp b/kutils/kreplace.cpp index f825e93cc..3829f7988 100644 --- a/kutils/kreplace.cpp +++ b/kutils/kreplace.cpp @@ -50,7 +50,7 @@ KReplaceNextDialog::KReplaceNextDialog(TQWidget *parent) : { m_mainLabel = new TQLabel( this ); setMainWidget( m_mainLabel ); - resize(minimumSize()); + resize(tqminimumSize()); } void KReplaceNextDialog::setLabel( const TQString& pattern, const TQString& replacement ) @@ -90,7 +90,7 @@ KReplaceNextDialog* KReplace::dialog() { if ( !m_dialog ) { - m_dialog = new KReplaceNextDialog( parentWidget() ); + m_dialog = new KReplaceNextDialog( tqparentWidget() ); connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotReplaceAll() ) ); connect( m_dialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotSkip() ) ); connect( m_dialog, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotReplace() ) ); @@ -102,9 +102,9 @@ KReplaceNextDialog* KReplace::dialog() void KReplace::displayFinalDialog() const { if ( !m_replacements ) - KMessageBox::information(parentWidget(), i18n("No text was replaced.")); + KMessageBox::information(tqparentWidget(), i18n("No text was replaced.")); else - KMessageBox::information(parentWidget(), i18n("1 replacement done.", "%n replacements done.", m_replacements ) ); + KMessageBox::information(tqparentWidget(), i18n("1 replacement done.", "%n replacements done.", m_replacements ) ); } KFind::Result KReplace::replace() @@ -316,7 +316,7 @@ bool KReplace::shouldRestart( bool forceAsking, bool showNumMatches ) const i18n("Do you want to restart search from the end?") : i18n("Do you want to restart search at the beginning?"); - int ret = KMessageBox::questionYesNo( parentWidget(), message, TQString::null, i18n("Restart"), i18n("Stop") ); + int ret = KMessageBox::questionYesNo( tqparentWidget(), message, TQString::null, i18n("Restart"), i18n("Stop") ); return( ret == KMessageBox::Yes ); } diff --git a/kutils/kreplace.h b/kutils/kreplace.h index ea385189b..d4e9792e2 100644 --- a/kutils/kreplace.h +++ b/kutils/kreplace.h @@ -238,7 +238,7 @@ signals: * * Extra care must be taken to properly implement the "no prompt-on-replace" case. * For instance highlight isn't emitted in that case (some code might rely on it), - * and for performance reasons one should repaint after replace() ONLY if + * and for performance reasons one should tqrepaint after replace() ONLY if * prompt-on-replace was selected. * * @param text The text, in which the replacement has already been done. diff --git a/kutils/kreplacedialog.cpp b/kutils/kreplacedialog.cpp index 88c006b4d..d50bdaf03 100644 --- a/kutils/kreplacedialog.cpp +++ b/kutils/kreplacedialog.cpp @@ -32,7 +32,7 @@ /** * we need to insert the strings after the dialog is set - * up, otherwise TQComboBox will deliver an aweful big sizeHint + * up, otherwise TQComboBox will deliver an aweful big tqsizeHint * for long replacement texts. */ class KReplaceDialog::KReplaceDialogPrivate { diff --git a/kutils/ksettings/componentsdialog.cpp b/kutils/ksettings/componentsdialog.cpp index cb3695e05..cdf18c934 100644 --- a/kutils/ksettings/componentsdialog.cpp +++ b/kutils/ksettings/componentsdialog.cpp @@ -59,9 +59,9 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name ) d->iconwidget = new TQLabel( d->infowidget ); ( void )new KSeparator( d->infowidget ); d->commentwidget = new TQLabel( d->infowidget ); - d->commentwidget->setAlignment( Qt::WordBreak ); + d->commentwidget->tqsetAlignment( TQt::WordBreak ); d->descriptionwidget = new TQLabel( d->infowidget ); - d->descriptionwidget->setAlignment( Qt::WordBreak ); + d->descriptionwidget->tqsetAlignment( TQt::WordBreak ); d->listview->addColumn( TQString::null ); d->listview->header()->hide(); diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp index 35ad153ef..aedfee9d4 100644 --- a/kutils/ksettings/dialog.cpp +++ b/kutils/ksettings/dialog.cpp @@ -108,7 +108,7 @@ class PageNode if( **i < **j ) { finished = false; - qSwap( *i, *j ); + tqSwap( *i, *j ); lastswapped = j; } --i; @@ -225,7 +225,7 @@ class PageNode TQVBox * page = dlg->addVBoxPage( m_value.group->name, TQString::null, icon ); TQLabel * comment = new TQLabel( m_value.group->comment, page ); - comment->setTextFormat( Qt::RichText ); + comment->setTextFormat( TQt::RichText ); m_value.group->page = page; } List::Iterator end = m_children.end(); @@ -484,12 +484,12 @@ bool Dialog::isPluginForKCMEnabled( KCModuleInfo * moduleinfo ) const pcit != parentComponents.end(); ++pcit ) { // if the parentComponent is not registered ignore it - if( d->registeredComponents.find( *pcit ) == + if( d->registeredComponents.tqfind( *pcit ) == d->registeredComponents.end() ) continue; // we check if the parent component is a plugin - if( ! d->plugininfomap.contains( *pcit ) ) + if( ! d->plugininfomap.tqcontains( *pcit ) ) { // if not the KCModule must be enabled enabled = true; diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h index c83caeeff..13f348287 100644 --- a/kutils/ksettings/dialog.h +++ b/kutils/ksettings/dialog.h @@ -70,7 +70,7 @@ namespace KSettings * @author Matthias Kretz <kretz@kde.org> * @since 3.2 */ -class KUTILS_EXPORT Dialog : public QObject +class KUTILS_EXPORT Dialog : public TQObject { friend class PageNode; Q_OBJECT diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp index 7f20c1bc3..b3a92f600 100644 --- a/kutils/ksettings/dispatcher.cpp +++ b/kutils/ksettings/dispatcher.cpp @@ -67,7 +67,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const kdDebug( 701 ) << k_funcinfo << instanceName << endl; m_instanceName[ recv ] = instanceName; TQSignal * sig; - if( m_instanceInfo.contains( instanceName ) ) + if( m_instanceInfo.tqcontains( instanceName ) ) { sig = m_instanceInfo[ instanceName ].signal; } @@ -86,7 +86,7 @@ void Dispatcher::registerInstance( KInstance * instance, TQObject * recv, const KConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) { kdDebug( 701 ) << k_funcinfo << endl; - if( m_instanceInfo.contains( instanceName ) ) + if( m_instanceInfo.tqcontains( instanceName ) ) { KInstance * inst = m_instanceInfo[ instanceName ].instance; if( inst ) @@ -111,7 +111,7 @@ void Dispatcher::reparseConfiguration( const TQCString & instanceName ) { kdDebug( 701 ) << k_funcinfo << instanceName << endl; // check if the instanceName is valid: - if( ! m_instanceInfo.contains( instanceName ) ) + if( ! m_instanceInfo.tqcontains( instanceName ) ) return; // first we reparse the config of the instance so that the KConfig object // will be up to date diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h index 55e30412e..8bbe79fca 100644 --- a/kutils/ksettings/dispatcher.h +++ b/kutils/ksettings/dispatcher.h @@ -48,7 +48,7 @@ namespace KSettings * @author Matthias Kretz <kretz@kde.org> * @since 3.2 */ -class KUTILS_EXPORT Dispatcher : public QObject +class KUTILS_EXPORT Dispatcher : public TQObject { friend class KStaticDeleter<Dispatcher>; diff --git a/kutils/tests/kfindtest.h b/kutils/tests/kfindtest.h index b3be84a8b..847d9579c 100644 --- a/kutils/tests/kfindtest.h +++ b/kutils/tests/kfindtest.h @@ -25,7 +25,7 @@ class KFind; -class KFindTest : public QObject +class KFindTest : public TQObject { Q_OBJECT diff --git a/kutils/tests/kreplacetest.cpp b/kutils/tests/kreplacetest.cpp index a810b7706..0a33be94b 100644 --- a/kutils/tests/kreplacetest.cpp +++ b/kutils/tests/kreplacetest.cpp @@ -60,7 +60,7 @@ void KReplaceTest::replace( const TQString &pattern, const TQString &replacement slotReplaceNext(); if ( m_needEventLoop ) - qApp->eventLoop()->enterLoop(); + tqApp->eventLoop()->enterLoop(); } void KReplaceTest::slotHighlight( const TQString &str, int matchingIndex, int matchedLength ) @@ -115,7 +115,7 @@ void KReplaceTest::slotReplaceNext() } #endif if ( res == KFind::NoMatch && m_needEventLoop ) - qApp->eventLoop()->exitLoop(); + tqApp->eventLoop()->exitLoop(); } void KReplaceTest::print() diff --git a/kutils/tests/kreplacetest.h b/kutils/tests/kreplacetest.h index ff85ca34b..b8fb8120b 100644 --- a/kutils/tests/kreplacetest.h +++ b/kutils/tests/kreplacetest.h @@ -25,7 +25,7 @@ class KReplace; -class KReplaceTest : public QObject +class KReplaceTest : public TQObject { Q_OBJECT public: diff --git a/kwallet/backend/kwalletbackend.cc b/kwallet/backend/kwalletbackend.cc index c208c4d69..72b74d062 100644 --- a/kwallet/backend/kwalletbackend.cc +++ b/kwallet/backend/kwalletbackend.cc @@ -336,7 +336,7 @@ int Backend::open(const TQByteArray& password) { _hashes.clear(); // Read in the hashes TQDataStream hds(&db); - Q_UINT32 n; + TQ_UINT32 n; hds >> n; if (n > 0xffff) { // sanity check return -43; @@ -346,7 +346,7 @@ int Backend::open(const TQByteArray& password) { KMD5::Digest d, d2; // judgment day MD5Digest ba; TQMap<MD5Digest,TQValueList<MD5Digest> >::iterator it; - Q_UINT32 fsz; + TQ_UINT32 fsz; if (hds.atEnd()) return -43; hds.readRawBytes(reinterpret_cast<char *>(d), 16); hds >> fsz; @@ -422,7 +422,7 @@ int Backend::open(const TQByteArray& password) { // compare hashes int sz = encrypted.size(); for (int i = 0; i < 20; i++) { - if (testhash[i] != encrypted[sz - 20 + i]) { + if (testhash[i] != encrypted.at(sz - 20 + i)) { encrypted.fill(0); sha.reset(); return -8; // hash error. @@ -443,7 +443,7 @@ int Backend::open(const TQByteArray& password) { while (!eStream.atEnd()) { TQString folder; - Q_UINT32 n; + TQ_UINT32 n; eStream >> folder; eStream >> n; @@ -456,7 +456,7 @@ int Backend::open(const TQByteArray& password) { KWallet::Wallet::EntryType et = KWallet::Wallet::Unknown; Entry *e = new Entry; eStream >> key; - Q_INT32 x = 0; // necessary to read properly + TQ_INT32 x = 0; // necessary to read properly eStream >> x; et = static_cast<KWallet::Wallet::EntryType>(x); @@ -511,7 +511,7 @@ int Backend::sync(const TQByteArray& password) { TQByteArray hashes; TQDataStream hashStream(hashes, IO_WriteOnly); KMD5 md5; - hashStream << static_cast<Q_UINT32>(_entries.count()); + hashStream << static_cast<TQ_UINT32>(_entries.count()); // Holds decrypted data prior to encryption TQByteArray decrypted; @@ -524,16 +524,16 @@ int Backend::sync(const TQByteArray& password) { TQDataStream dStream(decrypted, IO_WriteOnly); for (FolderMap::ConstIterator i = _entries.begin(); i != _entries.end(); ++i) { dStream << i.key(); - dStream << static_cast<Q_UINT32>(i.data().count()); + dStream << static_cast<TQ_UINT32>(i.data().count()); md5.reset(); md5.update(i.key().utf8()); hashStream.writeRawBytes(reinterpret_cast<const char*>(&(md5.rawDigest()[0])), 16); - hashStream << static_cast<Q_UINT32>(i.data().count()); + hashStream << static_cast<TQ_UINT32>(i.data().count()); for (EntryMap::ConstIterator j = i.data().begin(); j != i.data().end(); ++j) { dStream << j.key(); - dStream << static_cast<Q_INT32>(j.data()->type()); + dStream << static_cast<TQ_INT32>(j.data()->type()); dStream << j.data()->value(); md5.reset(); @@ -693,7 +693,7 @@ TQPtrList<Entry> Backend::readEntryList(const TQString& key) { bool Backend::createFolder(const TQString& f) { - if (_entries.contains(f)) { + if (_entries.tqcontains(f)) { return false; } @@ -709,8 +709,8 @@ return true; int Backend::renameEntry(const TQString& oldName, const TQString& newName) { EntryMap& emap = _entries[_folder]; -EntryMap::Iterator oi = emap.find(oldName); -EntryMap::Iterator ni = emap.find(newName); +EntryMap::Iterator oi = emap.tqfind(oldName); +EntryMap::Iterator ni = emap.tqfind(newName); if (oi != emap.end() && ni == emap.end()) { Entry *e = oi.data(); @@ -720,7 +720,7 @@ EntryMap::Iterator ni = emap.find(newName); KMD5 folderMd5; folderMd5.update(_folder.utf8()); - HashMap::iterator i = _hashes.find(MD5Digest(folderMd5.rawDigest())); + HashMap::iterator i = _hashes.tqfind(MD5Digest(folderMd5.rawDigest())); if (i != _hashes.end()) { KMD5 oldMd5, newMd5; oldMd5.update(oldName.utf8()); @@ -747,7 +747,7 @@ void Backend::writeEntry(Entry *e) { KMD5 folderMd5; folderMd5.update(_folder.utf8()); - HashMap::iterator i = _hashes.find(MD5Digest(folderMd5.rawDigest())); + HashMap::iterator i = _hashes.tqfind(MD5Digest(folderMd5.rawDigest())); if (i != _hashes.end()) { KMD5 md5; md5.update(e->key().utf8()); @@ -757,7 +757,7 @@ void Backend::writeEntry(Entry *e) { bool Backend::hasEntry(const TQString& key) const { - return _entries.contains(_folder) && _entries[_folder].contains(key); + return _entries.tqcontains(_folder) && _entries[_folder].tqcontains(key); } @@ -766,8 +766,8 @@ bool Backend::removeEntry(const TQString& key) { return false; } - FolderMap::Iterator fi = _entries.find(_folder); - EntryMap::Iterator ei = fi.data().find(key); + FolderMap::Iterator fi = _entries.tqfind(_folder); + EntryMap::Iterator ei = fi.data().tqfind(key); if (fi != _entries.end() && ei != fi.data().end()) { delete ei.data(); @@ -775,7 +775,7 @@ bool Backend::removeEntry(const TQString& key) { KMD5 folderMd5; folderMd5.update(_folder.utf8()); - HashMap::iterator i = _hashes.find(MD5Digest(folderMd5.rawDigest())); + HashMap::iterator i = _hashes.tqfind(MD5Digest(folderMd5.rawDigest())); if (i != _hashes.end()) { KMD5 md5; md5.update(key.utf8()); @@ -793,7 +793,7 @@ bool Backend::removeFolder(const TQString& f) { return false; } - FolderMap::Iterator fi = _entries.find(f); + FolderMap::Iterator fi = _entries.tqfind(f); if (fi != _entries.end()) { if (_folder == f) { @@ -819,18 +819,18 @@ return false; bool Backend::folderDoesNotExist(const TQString& folder) const { KMD5 md5; md5.update(folder.utf8()); - return !_hashes.contains(MD5Digest(md5.rawDigest())); + return !_hashes.tqcontains(MD5Digest(md5.rawDigest())); } bool Backend::entryDoesNotExist(const TQString& folder, const TQString& entry) const { KMD5 md5; md5.update(folder.utf8()); - HashMap::const_iterator i = _hashes.find(MD5Digest(md5.rawDigest())); + HashMap::const_iterator i = _hashes.tqfind(MD5Digest(md5.rawDigest())); if (i != _hashes.end()) { md5.reset(); md5.update(entry.utf8()); - return !i.data().contains(MD5Digest(md5.rawDigest())); + return !i.data().tqcontains(MD5Digest(md5.rawDigest())); } return true; } diff --git a/kwallet/backend/kwalletbackend.h b/kwallet/backend/kwalletbackend.h index 9d46d25c9..a2f654ec6 100644 --- a/kwallet/backend/kwalletbackend.h +++ b/kwallet/backend/kwalletbackend.h @@ -72,7 +72,7 @@ class KDE_EXPORT Backend { const TQString& folder() const { return _folder; } // Does it have this folder? - bool hasFolder(const TQString& f) const { return _entries.contains(f); } + bool hasFolder(const TQString& f) const { return _entries.tqcontains(f); } // Look up an entry. Returns null if it doesn't exist. Entry *readEntry(const TQString& key); diff --git a/kwallet/client/kwallet.cc b/kwallet/client/kwallet.cc index 0575050e5..9fb476411 100644 --- a/kwallet/client/kwallet.cc +++ b/kwallet/client/kwallet.cc @@ -179,7 +179,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) { } // avoid deadlock if the app has some popup open (#65978/#71048) - while( TQWidget* widget = qApp->activePopupWidget()) + while( TQWidget* widget = TQT_TQWIDGET(tqApp->activePopupWidget())) widget->close(); bool isPath = ot == Path; diff --git a/kwallet/client/kwallet.h b/kwallet/client/kwallet.h index b7b3bce31..cbe8188a5 100644 --- a/kwallet/client/kwallet.h +++ b/kwallet/client/kwallet.h @@ -23,6 +23,11 @@ #define _KWALLET_H #include <tqglobal.h> + +#ifdef Q_MOC_RUN +#define Q_OS_UNIX +#endif // Q_MOC_RUN + #ifdef Q_OS_UNIX #include <tqstring.h> diff --git a/kwallet/tests/kwalletasync.cpp b/kwallet/tests/kwalletasync.cpp index 6e5c22998..072fb55f8 100644 --- a/kwallet/tests/kwalletasync.cpp +++ b/kwallet/tests/kwalletasync.cpp @@ -26,8 +26,8 @@ void openWallet() _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, qApp, TQT_SLOT( quit() ) ); - int ret = qApp->exec(); + TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + int ret = tqApp->exec(); if ( ret == 0 ) _out << "Timed out!" << endl; @@ -38,7 +38,7 @@ void openWallet() void WalletReceiver::walletOpened( bool got ) { _out << "Got async wallet: " << got << endl; - qApp->exit( 1 ); + tqApp->exit( 1 ); } int main( int argc, char *argv[] ) diff --git a/kwallet/tests/kwalletboth.cpp b/kwallet/tests/kwalletboth.cpp index f79f38567..75d303419 100644 --- a/kwallet/tests/kwalletboth.cpp +++ b/kwallet/tests/kwalletboth.cpp @@ -31,8 +31,8 @@ void openWallet() _out << "Got sync wallet: " << (wallet != 0) << endl; _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, qApp, TQT_SLOT( quit() ) ); - int ret = qApp->exec(); + TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + int ret = tqApp->exec(); if ( ret == 0 ) @@ -60,7 +60,7 @@ void openWallet() void WalletReceiver::walletOpened( bool got ) { _out << "Got async wallet: " << got << endl; - qApp->exit( 1 ); + tqApp->exit( 1 ); } int main( int argc, char *argv[] ) diff --git a/kwallet/tests/kwallettest.h b/kwallet/tests/kwallettest.h index 448cdb785..c062760a4 100644 --- a/kwallet/tests/kwallettest.h +++ b/kwallet/tests/kwallettest.h @@ -5,7 +5,7 @@ namespace KWallet { class Wallet; } -class WalletReceiver : public QObject +class WalletReceiver : public TQObject { Q_OBJECT public slots: diff --git a/libkmid/deviceman.cc b/libkmid/deviceman.cc index c8030f44e..07a0af9b2 100644 --- a/libkmid/deviceman.cc +++ b/libkmid/deviceman.cc @@ -119,7 +119,7 @@ DeviceManager::DeviceManager(int def) TQString mapurl(config->readPathEntry("mapFilename")); if ((config->readBoolEntry("useMidiMapper", false))&&(!mapurl.isEmpty())) { - mapper_tmp = new MidiMapper( mapurl.mid(mapurl.find(":")+1 ).local8Bit() ); + mapper_tmp = new MidiMapper( mapurl.mid(mapurl.tqfind(":")+1 ).local8Bit() ); } else mapper_tmp = 0L; diff --git a/libkscreensaver/kscreensaver.cpp b/libkscreensaver/kscreensaver.cpp index a35b2545d..92aa8f931 100644 --- a/libkscreensaver/kscreensaver.cpp +++ b/libkscreensaver/kscreensaver.cpp @@ -48,7 +48,7 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget() unsigned int h = 0; d = new KScreenSaverPrivate; - d->owner = find( id ); + d->owner = TQT_TQWIDGET(find( id )); if ( d->owner ) installEventFilter( this ); @@ -88,7 +88,7 @@ void KScreenSaver::embed( TQWidget *w ) bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e ) { // make sure events get to the original window owner - if ( d->owner && o == this ) { + if ( d->owner && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { TQApplication::sendEvent( d->owner, e ); return false; } diff --git a/libkscreensaver/kscreensaver.h b/libkscreensaver/kscreensaver.h index fd2068359..2879172ac 100644 --- a/libkscreensaver/kscreensaver.h +++ b/libkscreensaver/kscreensaver.h @@ -56,7 +56,7 @@ class KBlankEffectPrivate; * @short Provides a TQWidget for a screensaver to draw into. * @author Martin R. Jones <mjones@kde.org> */ -class KDE_EXPORT KScreenSaver : public QWidget +class KDE_EXPORT KScreenSaver : public TQWidget { Q_OBJECT public: @@ -91,7 +91,7 @@ private: * @short Blanks a widget using various effects. * @author Martin R. Jones <mjones@kde.org> */ -class KBlankEffect : public QObject +class KBlankEffect : public TQObject { Q_OBJECT public: diff --git a/libkscreensaver/main.cpp b/libkscreensaver/main.cpp index 50e2fb8d7..e80dd6bff 100644 --- a/libkscreensaver/main.cpp +++ b/libkscreensaver/main.cpp @@ -62,7 +62,7 @@ static void crashHandler( int ) //---------------------------------------------------------------------------- -class DemoWindow : public QWidget +class DemoWindow : public TQWidget { public: DemoWindow() : TQWidget() diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp index a28c6a124..1998bf4ed 100644 --- a/networkstatus/connectionmanager.cpp +++ b/networkstatus/connectionmanager.cpp @@ -150,7 +150,7 @@ bool ConnectionManager::askToConnect( TQWidget * mainWidget ) i18n("This application is currently in offline mode. Do you want to connect in order to carry out this operation?"), i18n("Leave Offline Mode?"), i18n("Connect"), i18n("Do Not Connect"), - TQString::fromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes ); + TQString::tqfromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes ); } #include "connectionmanager.moc" diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp index 21e34d978..8e73e4e68 100644 --- a/networkstatus/networkstatus.cpp +++ b/networkstatus/networkstatus.cpp @@ -279,7 +279,7 @@ void NetworkStatusModule::setNetworkStatus( const TQString & networkName, int st for ( NetworkUsageList::iterator it = usage.begin(); it != end; ++it ) { // only notify once per host - if ( !notified.contains( (*it).host ) ) + if ( !notified.tqcontains( (*it).host ) ) { kdDebug() << "notifying statusChange of " << networkName << " to " << (int)status << " because " << (*it).appId << " is using " << (*it).host << endl; diff --git a/win/qeventloopex.h b/win/qeventloopex.h index 26247ac82..648ddf228 100644 --- a/win/qeventloopex.h +++ b/win/qeventloopex.h @@ -28,7 +28,7 @@ class QEventLoopExPrivate; -class QEventLoopEx : public QEventLoop +class QEventLoopEx : public TQEventLoop { Q_OBJECT diff --git a/win/win32_utils2.cpp b/win/win32_utils2.cpp index 2e46d2acb..24630667a 100644 --- a/win/win32_utils2.cpp +++ b/win/win32_utils2.cpp @@ -98,7 +98,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter) // escaped '/' characters. TQString copy (kde_filters); - for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos) + for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos) copy.remove(pos, 1); //<js> @@ -112,7 +112,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter) current = *it; TQString new_f;//filter part TQString new_name;//filter name part - int p = (*it).find('|'); + int p = (*it).tqfind('|'); if (p!=-1) { new_f = current.left(p); new_name = current.mid(p+1); @@ -122,7 +122,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter) new_name = current; //nothing better } //remove (.....) from name - p=new_name.find('('); + p=new_name.tqfind('('); int p2 = new_name.findRev(')'); TQString new_name1, new_name2; if (p!=-1) |