From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwin/clients/keramik/embedtool.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kwin/clients/keramik/embedtool.cpp') diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp index fe34ffcb4..4f5135a3f 100644 --- a/kwin/clients/keramik/embedtool.cpp +++ b/kwin/clients/keramik/embedtool.cpp @@ -60,7 +60,7 @@ private: KeramikEmbedder::KeramikEmbedder() { - TQDateTime date( TQDateTime::tqcurrentDateTime() ); + TQDateTime date( TQDateTime::currentDateTime() ); TQString datestring( date.toString() ); file = new TQFile( "tiles.h" ); @@ -100,19 +100,19 @@ void KeramikEmbedder::embed( const char *name ) TQString codename( basename ); TQImage image( name ); - codename = codename.tqreplace( TQRegExp("[^a-zA-Z0-9]"), "_" ); + codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" ); stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t"; stream.setf( TQTextStream::hex | TQTextStream::right ); stream.fill( '0' ); int pixels = image.width() * image.height(); - TQ_UINT32 *data = reinterpret_cast( image.bits() ); + Q_UINT32 *data = reinterpret_cast( image.bits() ); bool hasAlpha = false; for ( int i = 0, j = 0; i < pixels; i++ ) { - if ( tqAlpha( *data ) && tqAlpha( *data ) != 0xff ) + if ( qAlpha( *data ) && qAlpha( *data ) != 0xff ) hasAlpha = true; stream << "0x" << qSetW(8) << *(data++); -- cgit v1.2.1