diff --git a/keep/app/actionview.ui b/keep/app/actionview.ui index 0e02ffd..59dc3fd 100644 --- a/keep/app/actionview.ui +++ b/keep/app/actionview.ui @@ -29,7 +29,7 @@ - layout22 + tqlayout22 @@ -56,7 +56,7 @@ - layout21 + tqlayout21 @@ -64,7 +64,7 @@ - layout15 + tqlayout15 @@ -82,13 +82,13 @@ 0 - + 35 35 - + 35 32767 @@ -118,7 +118,7 @@ - layout16 + tqlayout16 @@ -136,13 +136,13 @@ 0 - + 35 35 - + 35 35 @@ -172,7 +172,7 @@ - layout17 + tqlayout17 @@ -190,13 +190,13 @@ 0 - + 35 35 - + 35 32767 @@ -226,7 +226,7 @@ - layout15 + tqlayout15 @@ -244,13 +244,13 @@ 0 - + 35 35 - + 35 32767 @@ -280,7 +280,7 @@ - layout15_4 + tqlayout15_4 @@ -298,13 +298,13 @@ 0 - + 35 35 - + 35 32767 @@ -357,7 +357,7 @@ - layout13 + tqlayout13 @@ -365,7 +365,7 @@ - layout5 + tqlayout5 @@ -447,7 +447,7 @@ - layout4 + tqlayout4 @@ -493,7 +493,7 @@ Expanding - + 20 85 diff --git a/keep/app/addbackupwizard.cpp b/keep/app/addbackupwizard.cpp index 50522b4..1d0723a 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( minimumSizeHint() ); + resize( tqminimumSizeHint() ); 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( minimumSizeHint() ); + resize( tqminimumSizeHint() ); setNextEnabled(page1,true); setNextEnabled(page2,true); diff --git a/keep/app/addbackupwizard1view.ui b/keep/app/addbackupwizard1view.ui index 24ddd94..8c510cc 100644 --- a/keep/app/addbackupwizard1view.ui +++ b/keep/app/addbackupwizard1view.ui @@ -32,7 +32,7 @@ - layout17 + tqlayout17 @@ -40,7 +40,7 @@ - layout6 + tqlayout6 @@ -67,7 +67,7 @@ Expanding - + 20 130 @@ -78,7 +78,7 @@ - layout16 + tqlayout16 @@ -115,7 +115,7 @@ - layout11 + tqlayout11 @@ -163,7 +163,7 @@ Expanding - + 20 260 diff --git a/keep/app/addbackupwizard2view.ui b/keep/app/addbackupwizard2view.ui index f652951..9a21357 100644 --- a/keep/app/addbackupwizard2view.ui +++ b/keep/app/addbackupwizard2view.ui @@ -32,7 +32,7 @@ - layout10 + tqlayout10 @@ -43,7 +43,7 @@ - layout6 + tqlayout6 @@ -70,7 +70,7 @@ Expanding - + 20 130 @@ -81,7 +81,7 @@ - layout9 + tqlayout9 @@ -92,7 +92,7 @@ - layout8 + tqlayout8 @@ -140,7 +140,7 @@ Expanding - + 20 381 diff --git a/keep/app/addbackupwizard3view.ui b/keep/app/addbackupwizard3view.ui index 36feac2..c3d4fbe 100644 --- a/keep/app/addbackupwizard3view.ui +++ b/keep/app/addbackupwizard3view.ui @@ -32,7 +32,7 @@ - layout16 + tqlayout16 @@ -40,7 +40,7 @@ - layout6 + tqlayout6 @@ -75,7 +75,7 @@ Expanding - + 20 130 @@ -86,7 +86,7 @@ - layout15 + tqlayout15 @@ -129,7 +129,7 @@ - layout8 + tqlayout8 @@ -137,7 +137,7 @@ - layout6_2 + tqlayout6_2 @@ -145,7 +145,7 @@ - layout5 + tqlayout5 @@ -187,7 +187,7 @@ - layout4 + tqlayout4 @@ -249,7 +249,7 @@ - layout7 + tqlayout7 @@ -298,7 +298,7 @@ - layout12 + tqlayout12 @@ -336,7 +336,7 @@ - layout11 + tqlayout11 @@ -388,7 +388,7 @@ Expanding - + 20 46 diff --git a/keep/app/advancedbackupconfigdialog.cpp b/keep/app/advancedbackupconfigdialog.cpp index 0139391..32782be 100644 --- a/keep/app/advancedbackupconfigdialog.cpp +++ b/keep/app/advancedbackupconfigdialog.cpp @@ -19,7 +19,7 @@ #include "advancedbackupconfigdialog.h" #include -#include +#include #include #include #include @@ -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(minimumSizeHint()) ); + resize( TQSize(350,450).expandedTo(tqminimumSizeHint()) ); } TQStringList AdvancedBackupConfigDialog::optionList() diff --git a/keep/app/advancedbackupconfigview.ui b/keep/app/advancedbackupconfigview.ui index 7e2452f..3a84450 100644 --- a/keep/app/advancedbackupconfigview.ui +++ b/keep/app/advancedbackupconfigview.ui @@ -24,7 +24,7 @@ - layout3 + tqlayout3 diff --git a/keep/app/backupconfigdialog.cpp b/keep/app/backupconfigdialog.cpp index da305d5..cd7b5da 100644 --- a/keep/app/backupconfigdialog.cpp +++ b/keep/app/backupconfigdialog.cpp @@ -19,7 +19,7 @@ #include "backupconfigdialog.h" #include -#include +#include #include #include #include diff --git a/keep/app/backuplistview.ui b/keep/app/backuplistview.ui index 2e02aa3..3dfadce 100644 --- a/keep/app/backuplistview.ui +++ b/keep/app/backuplistview.ui @@ -32,7 +32,7 @@ - layout4 + tqlayout4 @@ -92,7 +92,7 @@ - layout3 + tqlayout3 @@ -132,7 +132,7 @@ Expanding - + 20 480 diff --git a/keep/app/forcebackupdialog.cpp b/keep/app/forcebackupdialog.cpp index 01f1df0..a272be5 100644 --- a/keep/app/forcebackupdialog.cpp +++ b/keep/app/forcebackupdialog.cpp @@ -19,7 +19,7 @@ #include "forcebackupdialog.h" #include -#include +#include #include #include #include @@ -45,9 +45,9 @@ ForceBackupDialog::ForceBackupDialog(TQWidget *parent):KDialogBase(Plain, i18n("Backup now"), Help|Cancel|Ok, Cancel, parent, "forceBackupDialog", true, false) { - TQGridLayout* toplayout = new TQGridLayout(plainPage()); + TQGridLayout* toptqlayout = new TQGridLayout(plainPage()); m_view = new ForceBackupDialogView(plainPage()); - toplayout->addWidget(m_view,0,0); + toptqlayout->addWidget(m_view,0,0); loadBackupList(); @@ -93,7 +93,7 @@ void ForceBackupDialog::slotForceBackup() void ForceBackupDialog::slotBackupError(Backup backup,TQString errorMessage) { - KMessageBox::error(this,i18n("

An error occured making %1 backup:

%2

").arg(backup.source()).arg(errorMessage)); + KMessageBox::error(this,i18n("

An error occured making %1 backup:

%2

").tqarg(backup.source()).tqarg(errorMessage)); } #include "forcebackupdialog.moc" diff --git a/keep/app/forcebackupdialogview.ui b/keep/app/forcebackupdialogview.ui index ad54911..4089138 100644 --- a/keep/app/forcebackupdialogview.ui +++ b/keep/app/forcebackupdialogview.ui @@ -24,7 +24,7 @@ - layout21 + tqlayout21 diff --git a/keep/app/generalconfigview.ui b/keep/app/generalconfigview.ui index 16b5612..e9ae822 100644 --- a/keep/app/generalconfigview.ui +++ b/keep/app/generalconfigview.ui @@ -21,7 +21,7 @@ - layout6 + tqlayout6 @@ -40,7 +40,7 @@ - layout7 + tqlayout7 @@ -79,7 +79,7 @@ - layout5 + tqlayout5 @@ -95,7 +95,7 @@ - layout4 + tqlayout4 @@ -147,7 +147,7 @@ Expanding - + 20 120 diff --git a/keep/app/includeexcludedialog.cpp b/keep/app/includeexcludedialog.cpp index 118a8a0..f8e9326 100644 --- a/keep/app/includeexcludedialog.cpp +++ b/keep/app/includeexcludedialog.cpp @@ -19,7 +19,7 @@ #include "includeexcludedialog.h" #include -#include +#include #include #include #include @@ -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(minimumSizeHint()) ); + resize( TQSize(450,450).expandedTo(tqminimumSizeHint()) ); } TQStringList IncludeExcludeDialog::includeExcludeList() diff --git a/keep/app/includeexcludeview.ui b/keep/app/includeexcludeview.ui index fe9bcd3..9aa4e6a 100644 --- a/keep/app/includeexcludeview.ui +++ b/keep/app/includeexcludeview.ui @@ -24,7 +24,7 @@ - layout6 + tqlayout6 @@ -61,7 +61,7 @@ - layout18 + tqlayout18 @@ -77,7 +77,7 @@ Expanding - + 61 20 @@ -115,7 +115,7 @@ - layout7 + tqlayout7 @@ -159,7 +159,7 @@ - layout3 + tqlayout3 @@ -183,7 +183,7 @@ Expanding - + 20 121 diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp index efcabd2..24d5e7e 100644 --- a/keep/app/keepmainwindow.cpp +++ b/keep/app/keepmainwindow.cpp @@ -19,7 +19,7 @@ #include "keepmainwindow.h" #include -#include +#include #include #include #include @@ -63,7 +63,7 @@ KeepMainWindow::KeepMainWindow(TQWidget *parent, const char *name): KMainWindow( initActions(); initConnections(); - resize( minimumSizeHint() ); + resize( tqminimumSizeHint() ); createGUI(0L); @@ -125,7 +125,7 @@ void KeepMainWindow::slotCheckRDB() { RDBManager manager; if ( manager.isRDB() ) - KMessageBox::information(this, i18n("The application rdiff-backup has been detected on your system.

You're running version %1 of rdiff-backup.").arg(manager.RDBVersion())); + KMessageBox::information(this, i18n("The application rdiff-backup has been detected on your system.

You're running version %1 of rdiff-backup.").tqarg(manager.RDBVersion())); else KMessageBox::error(this,i18n("The application rdiff-backup has not been detected on your system.

If rdiff-backup is not installed, Keep will not be able to make backups. To fix this problem, install rdiff-backup on your system.")); diff --git a/keep/app/logdialog.cpp b/keep/app/logdialog.cpp index b9b6240..57edc25 100644 --- a/keep/app/logdialog.cpp +++ b/keep/app/logdialog.cpp @@ -19,7 +19,7 @@ #include "logdialog.h" #include -#include +#include #include #include #include diff --git a/keep/app/logview.ui b/keep/app/logview.ui index 61548b7..0850e27 100644 --- a/keep/app/logview.ui +++ b/keep/app/logview.ui @@ -26,7 +26,7 @@ - layout2 + tqlayout2 diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp index 579e255..8baad04 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( minimumSizeHint() ); + resize( tqminimumSizeHint() ); } RestoreBackupWizard::~RestoreBackupWizard() @@ -222,7 +222,7 @@ void RestoreBackupWizard::setupPage3() restoreBackupWizard3View = new RestoreBackupWizard3View(page3,"restoreBackupWizard3View"); restoreBackupWizard3View->incrementList->setSorting(0,false); - restoreBackupWizard3View->lblDate->setText(TQDateTime::currentDateTime().toString(Qt::LocalDate)); + restoreBackupWizard3View->lblDate->setText(TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate)); addPage( page3, "Date to restore" ); } @@ -287,7 +287,7 @@ void RestoreBackupWizard::slotRestoreBackup() void RestoreBackupWizard::slotRestoreError(Backup backup,TQString errorMessage) { - KMessageBox::error(this,i18n("

An error occured restoring %1 backup:

%2

").arg(backup.dest()).arg(errorMessage)); + KMessageBox::error(this,i18n("

An error occured restoring %1 backup:

%2

").tqarg(backup.dest()).tqarg(errorMessage)); } #include "restorebackupwizard.moc" diff --git a/keep/app/restorebackupwizard1view.ui b/keep/app/restorebackupwizard1view.ui index 508aade..4f080b8 100644 --- a/keep/app/restorebackupwizard1view.ui +++ b/keep/app/restorebackupwizard1view.ui @@ -32,7 +32,7 @@ - layout7 + tqlayout7 @@ -40,7 +40,7 @@ - layout6 + tqlayout6 @@ -67,7 +67,7 @@ Expanding - + 20 130 @@ -78,7 +78,7 @@ - layout6 + tqlayout6 @@ -173,7 +173,7 @@ - layout9 + tqlayout9 @@ -189,7 +189,7 @@ - layout8 + tqlayout8 diff --git a/keep/app/restorebackupwizard2view.ui b/keep/app/restorebackupwizard2view.ui index 89cbf45..09df6e4 100644 --- a/keep/app/restorebackupwizard2view.ui +++ b/keep/app/restorebackupwizard2view.ui @@ -24,7 +24,7 @@ - layout50 + tqlayout50 @@ -32,7 +32,7 @@ - layout6 + tqlayout6 @@ -59,7 +59,7 @@ Expanding - + 20 130 @@ -70,7 +70,7 @@ - layout49 + tqlayout49 @@ -105,7 +105,7 @@ - layout48 + tqlayout48 @@ -146,7 +146,7 @@ - layout8 + tqlayout8 @@ -200,7 +200,7 @@ Expanding - + 20 160 diff --git a/keep/app/restorebackupwizard3view.ui b/keep/app/restorebackupwizard3view.ui index 4b3e012..8a60760 100644 --- a/keep/app/restorebackupwizard3view.ui +++ b/keep/app/restorebackupwizard3view.ui @@ -27,7 +27,7 @@ - layout11 + tqlayout11 @@ -35,7 +35,7 @@ - layout6 + tqlayout6 @@ -62,7 +62,7 @@ Expanding - + 20 130 @@ -73,7 +73,7 @@ - layout10 + tqlayout10 @@ -97,7 +97,7 @@ - layout9 + tqlayout9 @@ -105,7 +105,7 @@ - layout7 + tqlayout7 @@ -147,7 +147,7 @@ - layout8 + tqlayout8 diff --git a/keep/common/backup.cpp b/keep/common/backup.cpp index 98bb4a6..5e05a48 100644 --- a/keep/common/backup.cpp +++ b/keep/common/backup.cpp @@ -160,14 +160,14 @@ TQString Backup::htmlDesc() if ( m_neverDelete ) del = i18n("Never delete"); else - del = i18n("%1 days").arg(m_deleteAfter); + del = i18n("%1 days").tqarg(m_deleteAfter); if ( m_useCompression ) compression = i18n("Yes"); else compression = i18n("No"); TQString html = "

" + i18n("Source directory:") + "
" + m_source + "
" + i18n("Destination directory:") + "
" - + m_dest + "

" + i18n("Interval:") + " " + i18n("%1 days").arg(m_interval) + + m_dest + "

" + i18n("Interval:") + " " + i18n("%1 days").tqarg(m_interval) + "
" + i18n("Delete after:") + " " + del + "
" + i18n("Use compression:") + " " + compression + "

"; diff --git a/keep/common/backuplistviewitem.cpp b/keep/common/backuplistviewitem.cpp index 90f735d..356c482 100644 --- a/keep/common/backuplistviewitem.cpp +++ b/keep/common/backuplistviewitem.cpp @@ -46,12 +46,12 @@ void BackupListViewItem::setBackupText() { setText(0, TQDir(m_backup.source()).dirName() ); setText(1, TQDir(m_backup.dest()).dirName() ); - setText(2, i18n("%1 days").arg(m_backup.interval())); + setText(2, i18n("%1 days").tqarg(m_backup.interval())); TQString deleteAfter; if ( m_backup.neverDelete() == true ) deleteAfter = i18n("Never"); else - deleteAfter = i18n("%1 days").arg(m_backup.deleteAfter()); + deleteAfter = i18n("%1 days").tqarg(m_backup.deleteAfter()); setText(3, deleteAfter); } diff --git a/keep/common/listviewtooltip.h b/keep/common/listviewtooltip.h index 3a47b4c..5c71200 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 itemRect = listView->itemRect( item ); - if ( !itemRect.isValid() ) + const TQRect tqitemRect = listView->tqitemRect( item ); + if ( !tqitemRect.isValid() ) return; const int col = listView->header()->sectionAt( p.x() ); @@ -61,16 +61,16 @@ inline void ListViewToolTip::maybeTip( const TQPoint& p ) { if ( !headerRect.isValid() ) return; - const TQRect cellRect( headerRect.left(), itemRect.top(),headerRect.width(), itemRect.height()); + const TQRect cellRect( headerRect.left(), tqitemRect.top(),headerRect.width(), tqitemRect.height()); BackupListViewItem* backupItem = static_cast(item); TQString tipStr = backupItem->backup().htmlDesc(); /* if( col == 0 ) - tipStr = TQString( "Contents of this cell: %1" ).arg(item->text( 0 ) ); + tipStr = TQString( "Contents of this cell: %1" ).tqarg(item->text( 0 ) ); else if( col == 1 ) - tipStr = TQString( "Contents of that cell: %1" ).arg(item->text( 1 ) ); + tipStr = TQString( "Contents of that cell: %1" ).tqarg(item->text( 1 ) ); else tipStr = TQString( "Something else" ); */ diff --git a/keep/common/rdbmanager.cpp b/keep/common/rdbmanager.cpp index dcb9bf9..221fa3f 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::currentDate(); + TQDate today = TQDate::tqcurrentDate(); if ( last.date().daysTo(today) >= (*it).interval() ) { kdDebug() << "Detected outdated backup: " << (*it).source() << endl; @@ -360,7 +360,7 @@ void RDBManager::removeOldIncrements(Backup backup) // Gets the rdiff-backup process KProcess *proc = RDBProcess(); // Adds the options - *proc << "--remove-older-than" << TQString("%1").arg(backup.deleteAfter()) + "D"; + *proc << "--remove-older-than" << TQString("%1").tqarg(backup.deleteAfter()) + "D"; // Adds dest *proc << backup.dest(); // Starts the process @@ -378,7 +378,7 @@ KProcess *RDBManager::RDBProcess(bool isNice,int niceLevel) proc->setUseShell(true); if ( isNice ) { - *proc << "nice" << "-n" << TQString("%1").arg(niceLevel); + *proc << "nice" << "-n" << TQString("%1").tqarg(niceLevel); } *proc << "rdiff-backup"; diff --git a/keep/kded/keepkded.cpp b/keep/kded/keepkded.cpp index c7e517e..add6dc9 100644 --- a/keep/kded/keepkded.cpp +++ b/keep/kded/keepkded.cpp @@ -56,7 +56,7 @@ void KeepKded::slotBackupError(Backup backup,TQString errorMessage) { if ( KeepSettings::notifyBackupError() ) { - KNotifyClient::userEvent(0,i18n("

An error occured making %1 backup:

%2

").arg(backup.source()).arg(errorMessage),16,4); + KNotifyClient::userEvent(0,i18n("

An error occured making %1 backup:

%2

").tqarg(backup.source()).tqarg(errorMessage),16,4); } log("Backup Error",backup.source(),errorMessage); } @@ -65,14 +65,14 @@ void KeepKded::slotBackupSuccess(Backup backup) { if ( KeepSettings::notifyBackupSuccess() ) { - KNotifyClient::userEvent(0,i18n("

Backup %1 successfully backuped to %2

").arg(backup.source()).arg(backup.dest()),16,1); + KNotifyClient::userEvent(0,i18n("

Backup %1 successfully backuped to %2

").tqarg(backup.source()).tqarg(backup.dest()),16,1); } log("Backup Success",backup.source(),"Successfully backuped to: " + backup.dest() ); } void KeepKded::log(TQString type,TQString backup,TQString message) { - TQString logMessage = TQDateTime::currentDateTime().toString(Qt::ISODate) + "\t" + type + "\t" + backup + "\t" + message; + TQString logMessage = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + "\t" + type + "\t" + backup + "\t" + message; TQFile file( m_logFilePath ); if ( file.open(IO_WriteOnly | IO_Append) ) {