diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:23:13 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 04:25:13 +0200 |
commit | c4b3c076ff7d33a8205c616611477ae3c7532de7 (patch) | |
tree | 951a8f07f1a0dafc04cb0ca4b2af034809da9883 /karm | |
parent | 04b89c2dbd5fb1b865453f3977261a60a70f6bc2 (diff) | |
download | tdepim-c4b3c076ff7d33a8205c616611477ae3c7532de7.tar.gz tdepim-c4b3c076ff7d33a8205c616611477ae3c7532de7.zip |
Rename obsolete tq methods to standard names
(cherry picked from commit ba2a3ce341c0c71bbbcf350fcbcd60c552220b31)
Diffstat (limited to 'karm')
-rw-r--r-- | karm/ktimewidget.cpp | 12 | ||||
-rw-r--r-- | karm/preferences.cpp | 40 | ||||
-rw-r--r-- | karm/printdialog.cpp | 22 | ||||
-rw-r--r-- | karm/taskview.cpp | 14 | ||||
-rw-r--r-- | karm/test/lifetest.php | 2 |
5 files changed, 45 insertions, 45 deletions
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp index 01d384168..879386ada 100644 --- a/karm/ktimewidget.cpp +++ b/karm/ktimewidget.cpp @@ -63,14 +63,14 @@ protected: KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) : TQWidget(parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); _hourLE = new TQLineEdit( this); // 9999 hours > 1 year! // 999 hours = 41 days (That should be enough ...) _hourLE->setFixedWidth( fontMetrics().maxWidth() * 3 + 2 * _hourLE->frameWidth() + 2); - tqlayout->addWidget(_hourLE); + layout->addWidget(_hourLE); TimeValidator *validator = new TimeValidator( HOUR, _hourLE, "Validator for _hourLE"); _hourLE->setValidator( validator ); @@ -78,23 +78,23 @@ KArmTimeWidget::KArmTimeWidget( TQWidget* parent, const char* name ) TQLabel *hr = new TQLabel( i18n( "abbreviation for hours", " hr. " ), this ); - tqlayout->addWidget( hr ); + layout->addWidget( hr ); _minuteLE = new KarmLineEdit(this); // Minutes lineedit: Make room for 2 digits _minuteLE->setFixedWidth( fontMetrics().maxWidth() * 2 + 2 * _minuteLE->frameWidth() + 2); - tqlayout->addWidget(_minuteLE); + layout->addWidget(_minuteLE); validator = new TimeValidator( MINUTE, _minuteLE, "Validator for _minuteLE"); _minuteLE->setValidator( validator ); _minuteLE->setMaxLength(2); _minuteLE->setAlignment( TQt::AlignRight ); TQLabel *min = new TQLabel( i18n( "abbreviation for minutes", " min. " ), this ); - tqlayout->addWidget( min ); + layout->addWidget( min ); - tqlayout->addStretch(1); + layout->addStretch(1); setFocusProxy( _hourLE ); } diff --git a/karm/preferences.cpp b/karm/preferences.cpp index e187599fa..c242fa6ab 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -51,8 +51,8 @@ void Preferences::makeBehaviorPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( behaviorPage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 2, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 2, 2 ); + layout->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" ); - tqlayout->addWidget(_doIdleDetectionW, 0, 0 ); - tqlayout->addWidget(_idleDetectValueW, 0, 1 ); - tqlayout->addWidget(_promptDeleteW, 1, 0 ); + layout->addWidget(_doIdleDetectionW, 0, 0 ); + layout->addWidget(_idleDetectValueW, 0, 1 ); + layout->addWidget(_promptDeleteW, 1, 0 ); topLevel->addStretch(); @@ -79,8 +79,8 @@ void Preferences::makeDisplayPage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( displayPage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 5, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 5, 2 ); + layout->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"); - 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 ); + 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 ); topLevel->addStretch(); } @@ -109,8 +109,8 @@ void Preferences::makeStoragePage() icon ); TQVBoxLayout* topLevel = new TQVBoxLayout( storagePage, 0, spacingHint() ); - TQGridLayout* tqlayout = new TQGridLayout( topLevel, 4, 2 ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout* layout = new TQGridLayout( topLevel, 4, 2 ); + layout->setColStretch( 1, 1 ); // autosave _doAutoSaveW = new TQCheckBox @@ -128,12 +128,12 @@ void Preferences::makeStoragePage() _loggingW = new TQCheckBox ( i18n("Log history"), storagePage, "_loggingW" ); - // 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 ); + // 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 ); topLevel->addStretch(); diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp index 9d3178bcb..f3209c03d 100644 --- a/karm/printdialog.cpp +++ b/karm/printdialog.cpp @@ -48,14 +48,14 @@ PrintDialog::PrintDialog() setMainWidget(page); int year, month; - TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint()); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint()); + layout->addSpacing(10); + layout->addStretch(1); // Date Range TQGroupBox *rangeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Date Range"), page); - tqlayout->addWidget(rangeGroup); + layout->addWidget(rangeGroup); TQWidget *rangeWidget = new TQWidget(rangeGroup); TQHBoxLayout *rangeLayout = new TQHBoxLayout(rangeWidget, 0, spacingHint()); @@ -72,21 +72,21 @@ PrintDialog::PrintDialog() _to = new KDateEdit(rangeWidget); rangeLayout->addWidget(_to); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + layout->addSpacing(10); + layout->addStretch(1); _allTasks = new TQComboBox( page ); _allTasks->insertItem( i18n( "Selected Task" ) ); _allTasks->insertItem( i18n( "All Tasks" ) ); - tqlayout->addWidget( _allTasks ); + layout->addWidget( _allTasks ); _perWeek = new TQCheckBox( i18n( "Summarize per week" ), page ); - tqlayout->addWidget( _perWeek ); + layout->addWidget( _perWeek ); _totalsOnly = new TQCheckBox( i18n( "Totals only" ), page ); - tqlayout->addWidget( _totalsOnly ); + layout->addWidget( _totalsOnly ); - tqlayout->addSpacing(10); - tqlayout->addStretch(1); + layout->addSpacing(10); + layout->addStretch(1); } TQDate PrintDialog::from() const diff --git a/karm/taskview.cpp b/karm/taskview.cpp index a7aff4061..929541ace 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -820,16 +820,16 @@ void TaskView::clipTotals() i18n("Copy This Task"), i18n("Copy All Tasks") ); if (response == KMessageBox::Yes) // This task only { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); } else // All tasks { - KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::TotalTime)); } } else { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::TotalTime)); } } @@ -844,16 +844,16 @@ void TaskView::clipSession() i18n("Copy This Task"), i18n("Copy All Tasks") ); if (response == KMessageBox::Yes) // this task only { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); } else // only task { - KApplication::tqclipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, false, TimeKard::SessionTime)); } } else { - KApplication::tqclipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); + KApplication::clipboard()->setText(t.totalsAsText(this, true, TimeKard::SessionTime)); } } @@ -863,7 +863,7 @@ void TaskView::clipHistory() if (dialog.exec()== TQDialog::Accepted) { TimeKard t; - KApplication::tqclipboard()-> + KApplication::clipboard()-> setText( t.historyAsText(this, dialog.from(), dialog.to(), !dialog.allTasks(), dialog.perWeek(), dialog.totalsOnly() ) ); } } diff --git a/karm/test/lifetest.php b/karm/test/lifetest.php index 1d809bdf9..7a24bd3d7 100644 --- a/karm/test/lifetest.php +++ b/karm/test/lifetest.php @@ -96,7 +96,7 @@ if ($argv[1]!="--batch") echo "(b) make sure the code still builds (make)\n"; echo "(c) run automated test routines like this (make check)\n\n"; - echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardtqlayout (setxkbmap us). This must be run in X environment.\n + echo "This program simulates keypresses, so please leave the keyboard alone during the test. Please use a us or de keyboardlayout (setxkbmap us). This must be run in X environment.\n You must have XAutomation installed to run this."; system("xte -h 2&>/dev/null",$rc); if ($rc==0) echo " You have.\n"; |