From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- karm/preferences.cpp | 98 ++++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'karm/preferences.cpp') diff --git a/karm/preferences.cpp b/karm/preferences.cpp index 464842b8f..24a5e8c41 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include // kapp #include @@ -51,8 +51,8 @@ void Preferences::makeBehaviorPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( behaviorPage, 0, spacingHint() ); - TQGridLayout* layout = new TQGridLayout( topLevel, 2, 2 ); - layout->setColStretch( 1, 1 ); + TQGridLayout* tqlayout = new TQGridLayout( topLevel, 2, 2 ); + tqlayout->setColStretch( 1, 1 ); _doIdleDetectionW = new TQCheckBox ( i18n("Detect desktop as idle after"), behaviorPage, "_doIdleDetectionW"); @@ -62,9 +62,9 @@ void Preferences::makeBehaviorPage() _promptDeleteW = new TQCheckBox ( i18n( "Prompt before deleting tasks" ), behaviorPage, "_promptDeleteW" ); - layout->addWidget(_doIdleDetectionW, 0, 0 ); - layout->addWidget(_idleDetectValueW, 0, 1 ); - layout->addWidget(_promptDeleteW, 1, 0 ); + tqlayout->addWidget(_doIdleDetectionW, 0, 0 ); + tqlayout->addWidget(_idleDetectValueW, 0, 1 ); + tqlayout->addWidget(_promptDeleteW, 1, 0 ); topLevel->addStretch(); @@ -79,8 +79,8 @@ void Preferences::makeDisplayPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( displayPage, 0, spacingHint() ); - TQGridLayout* layout = new TQGridLayout( topLevel, 5, 2 ); - layout->setColStretch( 1, 1 ); + TQGridLayout* tqlayout = new TQGridLayout( topLevel, 5, 2 ); + tqlayout->setColStretch( 1, 1 ); TQLabel* _displayColumnsLabelW = new TQLabel( i18n("Columns displayed:"), displayPage ); @@ -93,11 +93,11 @@ void Preferences::makeDisplayPage() _displayTotalTimeW = new TQCheckBox ( i18n("Total task time"), displayPage, "_displayTotalTimeW"); - layout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 ); - layout->addWidget(_displaySessionW, 1, 1 ); - layout->addWidget(_displayTimeW, 2, 1 ); - layout->addWidget(_displayTotalSessionW, 3, 1 ); - layout->addWidget(_displayTotalTimeW, 4, 1 ); + tqlayout->addMultiCellWidget( _displayColumnsLabelW, 0, 0, 0, 1 ); + tqlayout->addWidget(_displaySessionW, 1, 1 ); + tqlayout->addWidget(_displayTimeW, 2, 1 ); + tqlayout->addWidget(_displayTotalSessionW, 3, 1 ); + tqlayout->addWidget(_displayTotalTimeW, 4, 1 ); topLevel->addStretch(); } @@ -109,8 +109,8 @@ void Preferences::makeStoragePage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( storagePage, 0, spacingHint() ); - TQGridLayout* layout = new TQGridLayout( topLevel, 4, 2 ); - layout->setColStretch( 1, 1 ); + TQGridLayout* tqlayout = new TQGridLayout( topLevel, 4, 2 ); + tqlayout->setColStretch( 1, 1 ); // autosave _doAutoSaveW = new TQCheckBox @@ -121,19 +121,19 @@ void Preferences::makeStoragePage() // iCalendar TQLabel* _iCalFileLabel = new TQLabel( i18n("iCalendar file:"), storagePage); _iCalFileW = new KURLRequester(storagePage, "_iCalFileW"); - _iCalFileW->setFilter(TQString::fromLatin1("*.ics")); + _iCalFileW->setFilter(TQString::tqfromLatin1("*.ics")); _iCalFileW->setMode(KFile::File); // Log time? _loggingW = new TQCheckBox ( i18n("Log history"), storagePage, "_loggingW" ); - // add widgets to layout - layout->addWidget(_doAutoSaveW, 0, 0); - layout->addWidget(_autoSaveValueW, 0, 1); - layout->addWidget(_iCalFileLabel, 1, 0 ); - layout->addWidget(_iCalFileW, 1, 1 ); - layout->addWidget(_loggingW, 2, 0 ); + // add widgets to tqlayout + tqlayout->addWidget(_doAutoSaveW, 0, 0); + tqlayout->addWidget(_autoSaveValueW, 0, 1); + tqlayout->addWidget(_iCalFileLabel, 1, 0 ); + tqlayout->addWidget(_iCalFileW, 1, 1 ); + tqlayout->addWidget(_loggingW, 2, 0 ); topLevel->addStretch(); @@ -253,32 +253,32 @@ void Preferences::load() { KConfig &config = *kapp->config(); - config.setGroup( TQString::fromLatin1("Idle detection") ); - _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"), + config.setGroup( TQString::tqfromLatin1("Idle detection") ); + _doIdleDetectionV = config.readBoolEntry( TQString::tqfromLatin1("enabled"), true ); - _idleDetectValueV = config.readNumEntry(TQString::fromLatin1("period"), 15); + _idleDetectValueV = config.readNumEntry(TQString::tqfromLatin1("period"), 15); - config.setGroup( TQString::fromLatin1("Saving") ); + config.setGroup( TQString::tqfromLatin1("Saving") ); _iCalFileV = config.readPathEntry - ( TQString::fromLatin1("ical file"), - locateLocal( "appdata", TQString::fromLatin1( "karm.ics"))); + ( TQString::tqfromLatin1("ical file"), + locateLocal( "appdata", TQString::tqfromLatin1( "karm.ics"))); _doAutoSaveV = config.readBoolEntry - ( TQString::fromLatin1("auto save"), true); + ( TQString::tqfromLatin1("auto save"), true); _autoSaveValueV = config.readNumEntry - ( TQString::fromLatin1("auto save period"), 5); + ( TQString::tqfromLatin1("auto save period"), 5); _promptDeleteV = config.readBoolEntry - ( TQString::fromLatin1("prompt delete"), true); + ( TQString::tqfromLatin1("prompt delete"), true); _loggingV = config.readBoolEntry - ( TQString::fromLatin1("logging"), true); + ( TQString::tqfromLatin1("logging"), true); _displayColumnV[0] = config.readBoolEntry - ( TQString::fromLatin1("display session time"), true); + ( TQString::tqfromLatin1("display session time"), true); _displayColumnV[1] = config.readBoolEntry - ( TQString::fromLatin1("display time"), true); + ( TQString::tqfromLatin1("display time"), true); _displayColumnV[2] = config.readBoolEntry - ( TQString::fromLatin1("display total session time"), true); + ( TQString::tqfromLatin1("display total session time"), true); _displayColumnV[3] = config.readBoolEntry - ( TQString::fromLatin1("display total time"), true); + ( TQString::tqfromLatin1("display total time"), true); KEMailSettings settings; _userRealName = settings.getSetting( KEMailSettings::RealName ); @@ -288,24 +288,24 @@ void Preferences::save() { KConfig &config = *KGlobal::config(); - config.setGroup( TQString::fromLatin1("Idle detection")); - config.writeEntry( TQString::fromLatin1("enabled"), _doIdleDetectionV); - config.writeEntry( TQString::fromLatin1("period"), _idleDetectValueV); + config.setGroup( TQString::tqfromLatin1("Idle detection")); + config.writeEntry( TQString::tqfromLatin1("enabled"), _doIdleDetectionV); + config.writeEntry( TQString::tqfromLatin1("period"), _idleDetectValueV); - config.setGroup( TQString::fromLatin1("Saving")); - config.writePathEntry( TQString::fromLatin1("ical file"), _iCalFileV); - config.writeEntry( TQString::fromLatin1("auto save"), _doAutoSaveV); - config.writeEntry( TQString::fromLatin1("logging"), _loggingV); - config.writeEntry( TQString::fromLatin1("auto save period"), _autoSaveValueV); - config.writeEntry( TQString::fromLatin1("prompt delete"), _promptDeleteV); + config.setGroup( TQString::tqfromLatin1("Saving")); + config.writePathEntry( TQString::tqfromLatin1("ical file"), _iCalFileV); + config.writeEntry( TQString::tqfromLatin1("auto save"), _doAutoSaveV); + config.writeEntry( TQString::tqfromLatin1("logging"), _loggingV); + config.writeEntry( TQString::tqfromLatin1("auto save period"), _autoSaveValueV); + config.writeEntry( TQString::tqfromLatin1("prompt delete"), _promptDeleteV); - config.writeEntry( TQString::fromLatin1("display session time"), + config.writeEntry( TQString::tqfromLatin1("display session time"), _displayColumnV[0]); - config.writeEntry( TQString::fromLatin1("display time"), + config.writeEntry( TQString::tqfromLatin1("display time"), _displayColumnV[1]); - config.writeEntry( TQString::fromLatin1("display total session time"), + config.writeEntry( TQString::tqfromLatin1("display total session time"), _displayColumnV[2]); - config.writeEntry( TQString::fromLatin1("display total time"), + config.writeEntry( TQString::tqfromLatin1("display total time"), _displayColumnV[3]); config.sync(); -- cgit v1.2.1