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 --- kscreensaver/ChangeLog | 6 +++--- kscreensaver/blankscrn.cpp | 2 +- kscreensaver/random.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kscreensaver') diff --git a/kscreensaver/ChangeLog b/kscreensaver/ChangeLog index bc3f31d23..52a485af7 100644 --- a/kscreensaver/ChangeLog +++ b/kscreensaver/ChangeLog @@ -6,8 +6,8 @@ * banner.h, banner.cpp: -added cycling color option -added "show current time" option - -tqreplaced the readEntry()'s with the appropriate read*Entry()'s - * tqreplaced the glocale->translate with i18n in + -replaced the readEntry()'s with the appropriate read*Entry()'s + * replaced the glocale->translate with i18n in attraction.cpp, banner.cpp, bat.cpp, blankscrn.cpp, blob.cpp, bouboule.cpp, flame.cpp, forest.cpp, hop.cpp, laser.cpp, lines.cpp, lissie.cpp, main.cpp, morph3d.cpp, pipes.cpp, polygon.cpp, pyro.cpp, rock.cpp, @@ -43,7 +43,7 @@ Version 0.3.7 -added tqgeometry management to all screensaver setups except kmorph3d (Mario +added geometry management to all screensaver setups except kmorph3d (Mario Weilguni ) Version 0.3.6 diff --git a/kscreensaver/blankscrn.cpp b/kscreensaver/blankscrn.cpp index 114bff145..1f57726b2 100644 --- a/kscreensaver/blankscrn.cpp +++ b/kscreensaver/blankscrn.cpp @@ -69,7 +69,7 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name ) grid->setRowStretch( 2, 10 ); grid->setRowStretch( 3, 20 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } // read settings from config file diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp index 84f4ab419..cd984a145 100644 --- a/kscreensaver/random.cpp +++ b/kscreensaver/random.cpp @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) int howoften = 1; if ( defaults.count() != 0 ) { TQFileInfo fi( tempSaverFileList[i] ); - if ( def_numbers.tqcontains( fi.fileName() ) ) + if ( def_numbers.contains( fi.fileName() ) ) howoften = def_numbers[fi.fileName()]; else howoften = 0; @@ -271,7 +271,7 @@ KRandomSetup::KRandomSetup( TQWidget *parent, const char *name ) manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main); grid->addWidget(manipulateScreen, 1, 0); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); KConfig config("krandom.kssrc"); config.setGroup("Settings"); -- cgit v1.2.1