From d4e451a0473e72da9b344e196f2996695ecea04d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:09:43 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- keep/app/actionview.ui | 22 +++++++++++----------- keep/app/addbackupwizard.cpp | 4 ++-- keep/app/addbackupwizard1view.ui | 4 ++-- keep/app/addbackupwizard2view.ui | 4 ++-- keep/app/addbackupwizard3view.ui | 4 ++-- keep/app/advancedbackupconfigdialog.cpp | 2 +- keep/app/backuplistview.ui | 2 +- keep/app/generalconfigview.ui | 2 +- keep/app/includeexcludedialog.cpp | 2 +- keep/app/includeexcludeview.ui | 4 ++-- keep/app/keepmainwindow.cpp | 2 +- keep/app/restorebackupwizard.cpp | 4 ++-- keep/app/restorebackupwizard1view.ui | 2 +- keep/app/restorebackupwizard2view.ui | 4 ++-- keep/app/restorebackupwizard3view.ui | 2 +- keep/common/listviewtooltip.h | 6 +++--- keep/common/rdbmanager.cpp | 2 +- keep/kded/keepkded.cpp | 2 +- 18 files changed, 37 insertions(+), 37 deletions(-) diff --git a/keep/app/actionview.ui b/keep/app/actionview.ui index 59dc3fd..3c7c540 100644 --- a/keep/app/actionview.ui +++ b/keep/app/actionview.ui @@ -82,13 +82,13 @@ 0 - + 35 35 - + 35 32767 @@ -136,13 +136,13 @@ 0 - + 35 35 - + 35 35 @@ -190,13 +190,13 @@ 0 - + 35 35 - + 35 32767 @@ -244,13 +244,13 @@ 0 - + 35 35 - + 35 32767 @@ -298,13 +298,13 @@ 0 - + 35 35 - + 35 32767 @@ -493,7 +493,7 @@ Expanding - + 20 85 diff --git a/keep/app/addbackupwizard.cpp b/keep/app/addbackupwizard.cpp index 1d0723a..50522b4 100644 --- a/keep/app/addbackupwizard.cpp +++ b/keep/app/addbackupwizard.cpp @@ -28,7 +28,7 @@ AddBackupWizard::AddBackupWizard(TQWidget *parent,const char* name): KWizard( parent, name, true) { initView(); - resize( tqminimumSizeHint() ); + resize( minimumSizeHint() ); setNextEnabled(page1,false); setNextEnabled(page2,false); @@ -58,7 +58,7 @@ AddBackupWizard::AddBackupWizard(Backup backup,TQWidget *parent,const char* name includeExcludeDialog->setIncludeExcludeList(backup.includeExcludeList()); advancedBackupConfigDialog->setOptionList(backup.optionList()); - resize( tqminimumSizeHint() ); + resize( minimumSizeHint() ); setNextEnabled(page1,true); setNextEnabled(page2,true); diff --git a/keep/app/addbackupwizard1view.ui b/keep/app/addbackupwizard1view.ui index 8c510cc..66ffc11 100644 --- a/keep/app/addbackupwizard1view.ui +++ b/keep/app/addbackupwizard1view.ui @@ -67,7 +67,7 @@ Expanding - + 20 130 @@ -163,7 +163,7 @@ Expanding - + 20 260 diff --git a/keep/app/addbackupwizard2view.ui b/keep/app/addbackupwizard2view.ui index 9a21357..61c93a0 100644 --- a/keep/app/addbackupwizard2view.ui +++ b/keep/app/addbackupwizard2view.ui @@ -70,7 +70,7 @@ Expanding - + 20 130 @@ -140,7 +140,7 @@ Expanding - + 20 381 diff --git a/keep/app/addbackupwizard3view.ui b/keep/app/addbackupwizard3view.ui index c3d4fbe..5cb9380 100644 --- a/keep/app/addbackupwizard3view.ui +++ b/keep/app/addbackupwizard3view.ui @@ -75,7 +75,7 @@ Expanding - + 20 130 @@ -388,7 +388,7 @@ Expanding - + 20 46 diff --git a/keep/app/advancedbackupconfigdialog.cpp b/keep/app/advancedbackupconfigdialog.cpp index 32782be..7ddbac9 100644 --- a/keep/app/advancedbackupconfigdialog.cpp +++ b/keep/app/advancedbackupconfigdialog.cpp @@ -39,7 +39,7 @@ AdvancedBackupConfigDialog::AdvancedBackupConfigDialog(TQWidget *parent):KDialog topLayout->addWidget( m_advancedBackupConfigView,0,0 ); m_advancedBackupConfigView->optionList->availableListBox()->insertStringList(allOptionList()); - resize( TQSize(350,450).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(350,450).expandedTo(minimumSizeHint()) ); } TQStringList AdvancedBackupConfigDialog::optionList() diff --git a/keep/app/backuplistview.ui b/keep/app/backuplistview.ui index 3dfadce..7f2405b 100644 --- a/keep/app/backuplistview.ui +++ b/keep/app/backuplistview.ui @@ -132,7 +132,7 @@ Expanding - + 20 480 diff --git a/keep/app/generalconfigview.ui b/keep/app/generalconfigview.ui index e9ae822..e3cd75f 100644 --- a/keep/app/generalconfigview.ui +++ b/keep/app/generalconfigview.ui @@ -147,7 +147,7 @@ Expanding - + 20 120 diff --git a/keep/app/includeexcludedialog.cpp b/keep/app/includeexcludedialog.cpp index f8e9326..2173d27 100644 --- a/keep/app/includeexcludedialog.cpp +++ b/keep/app/includeexcludedialog.cpp @@ -53,7 +53,7 @@ IncludeExcludeDialog::IncludeExcludeDialog(TQWidget *parent):KDialogBase(Plain, connect(m_view->exclude,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotExclude())); connect(m_view->remove,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotRemove())); - resize( TQSize(450,450).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(450,450).expandedTo(minimumSizeHint()) ); } TQStringList IncludeExcludeDialog::includeExcludeList() diff --git a/keep/app/includeexcludeview.ui b/keep/app/includeexcludeview.ui index 9aa4e6a..e0588ae 100644 --- a/keep/app/includeexcludeview.ui +++ b/keep/app/includeexcludeview.ui @@ -77,7 +77,7 @@ Expanding - + 61 20 @@ -183,7 +183,7 @@ Expanding - + 20 121 diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp index 24d5e7e..fcd1cb2 100644 --- a/keep/app/keepmainwindow.cpp +++ b/keep/app/keepmainwindow.cpp @@ -63,7 +63,7 @@ KeepMainWindow::KeepMainWindow(TQWidget *parent, const char *name): KMainWindow( initActions(); initConnections(); - resize( tqminimumSizeHint() ); + resize( minimumSizeHint() ); createGUI(0L); diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp index 8baad04..93418b8 100644 --- a/keep/app/restorebackupwizard.cpp +++ b/keep/app/restorebackupwizard.cpp @@ -62,7 +62,7 @@ RestoreBackupWizard::RestoreBackupWizard(TQWidget *parent,const char* name): KWi setNextEnabled(page2,true); setFinishEnabled(page3, false); - resize( tqminimumSizeHint() ); + resize( minimumSizeHint() ); } RestoreBackupWizard::~RestoreBackupWizard() @@ -222,7 +222,7 @@ void RestoreBackupWizard::setupPage3() restoreBackupWizard3View = new RestoreBackupWizard3View(page3,"restoreBackupWizard3View"); restoreBackupWizard3View->incrementList->setSorting(0,false); - restoreBackupWizard3View->lblDate->setText(TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate)); + restoreBackupWizard3View->lblDate->setText(TQDateTime::currentDateTime().toString(Qt::LocalDate)); addPage( page3, "Date to restore" ); } diff --git a/keep/app/restorebackupwizard1view.ui b/keep/app/restorebackupwizard1view.ui index 4f080b8..34add72 100644 --- a/keep/app/restorebackupwizard1view.ui +++ b/keep/app/restorebackupwizard1view.ui @@ -67,7 +67,7 @@ Expanding - + 20 130 diff --git a/keep/app/restorebackupwizard2view.ui b/keep/app/restorebackupwizard2view.ui index 09df6e4..5850d3c 100644 --- a/keep/app/restorebackupwizard2view.ui +++ b/keep/app/restorebackupwizard2view.ui @@ -59,7 +59,7 @@ Expanding - + 20 130 @@ -200,7 +200,7 @@ Expanding - + 20 160 diff --git a/keep/app/restorebackupwizard3view.ui b/keep/app/restorebackupwizard3view.ui index 8a60760..61a3890 100644 --- a/keep/app/restorebackupwizard3view.ui +++ b/keep/app/restorebackupwizard3view.ui @@ -62,7 +62,7 @@ Expanding - + 20 130 diff --git a/keep/common/listviewtooltip.h b/keep/common/listviewtooltip.h index 5c71200..a0bd3cc 100644 --- a/keep/common/listviewtooltip.h +++ b/keep/common/listviewtooltip.h @@ -49,8 +49,8 @@ inline void ListViewToolTip::maybeTip( const TQPoint& p ) { if ( !item ) return; - const TQRect tqitemRect = listView->tqitemRect( item ); - if ( !tqitemRect.isValid() ) + const TQRect itemRect = listView->itemRect( item ); + if ( !itemRect.isValid() ) return; const int col = listView->header()->sectionAt( p.x() ); @@ -61,7 +61,7 @@ inline void ListViewToolTip::maybeTip( const TQPoint& p ) { if ( !headerRect.isValid() ) return; - const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width(), tqitemRect.height()); + const TQRect cellRect( headerRect.left(), itemRect.top(),headerRect.width(), itemRect.height()); BackupListViewItem* backupItem = static_cast(item); diff --git a/keep/common/rdbmanager.cpp b/keep/common/rdbmanager.cpp index 221fa3f..fb2fa3b 100644 --- a/keep/common/rdbmanager.cpp +++ b/keep/common/rdbmanager.cpp @@ -191,7 +191,7 @@ TQValueList RDBManager::outdatedBackupList() for ( it = backups.begin(); it != backups.end(); ++it ) { TQDateTime last = lastIncrement(*it); - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); if ( last.date().daysTo(today) >= (*it).interval() ) { kdDebug() << "Detected outdated backup: " << (*it).source() << endl; diff --git a/keep/kded/keepkded.cpp b/keep/kded/keepkded.cpp index add6dc9..6593ba2 100644 --- a/keep/kded/keepkded.cpp +++ b/keep/kded/keepkded.cpp @@ -72,7 +72,7 @@ void KeepKded::slotBackupSuccess(Backup backup) void KeepKded::log(TQString type,TQString backup,TQString message) { - TQString logMessage = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + "\t" + type + "\t" + backup + "\t" + message; + TQString logMessage = TQDateTime::currentDateTime().toString(Qt::ISODate) + "\t" + type + "\t" + backup + "\t" + message; TQFile file( m_logFilePath ); if ( file.open(IO_WriteOnly | IO_Append) ) {