Browse Source

Rename a number of old tq methods that are no longer tq specific

pull/1/head
Timothy Pearson 11 years ago
parent
commit
73c1bab601
  1. 42
      keep/app/actionview.ui
  2. 4
      keep/app/addbackupwizard.cpp
  3. 12
      keep/app/addbackupwizard1view.ui
  4. 12
      keep/app/addbackupwizard2view.ui
  5. 24
      keep/app/addbackupwizard3view.ui
  6. 4
      keep/app/advancedbackupconfigdialog.cpp
  7. 2
      keep/app/advancedbackupconfigview.ui
  8. 2
      keep/app/backupconfigdialog.cpp
  9. 6
      keep/app/backuplistview.ui
  10. 8
      keep/app/forcebackupdialog.cpp
  11. 2
      keep/app/forcebackupdialogview.ui
  12. 10
      keep/app/generalconfigview.ui
  13. 4
      keep/app/includeexcludedialog.cpp
  14. 12
      keep/app/includeexcludeview.ui
  15. 6
      keep/app/keepmainwindow.cpp
  16. 2
      keep/app/logdialog.cpp
  17. 2
      keep/app/logview.ui
  18. 6
      keep/app/restorebackupwizard.cpp
  19. 12
      keep/app/restorebackupwizard1view.ui
  20. 14
      keep/app/restorebackupwizard2view.ui
  21. 14
      keep/app/restorebackupwizard3view.ui
  22. 4
      keep/common/backup.cpp
  23. 4
      keep/common/backuplistviewitem.cpp
  24. 10
      keep/common/listviewtooltip.h
  25. 6
      keep/common/rdbmanager.cpp
  26. 6
      keep/kded/keepkded.cpp

42
keep/app/actionview.ui

@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout22</cstring>
<cstring>layout22</cstring>
</property>
<vbox>
<property name="name">
@ -56,7 +56,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout21</cstring>
<cstring>layout21</cstring>
</property>
<vbox>
<property name="name">
@ -64,7 +64,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@ -82,13 +82,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>32767</height>
@ -118,7 +118,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@ -136,13 +136,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>35</height>
@ -172,7 +172,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@ -190,13 +190,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>32767</height>
@ -226,7 +226,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@ -244,13 +244,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>32767</height>
@ -280,7 +280,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15_4</cstring>
<cstring>layout15_4</cstring>
</property>
<hbox>
<property name="name">
@ -298,13 +298,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>35</width>
<height>35</height>
</size>
</property>
<property name="tqmaximumSize">
<property name="maximumSize">
<size>
<width>35</width>
<height>32767</height>
@ -357,7 +357,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@ -365,7 +365,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -447,7 +447,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -493,7 +493,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>85</height>

4
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);

12
keep/app/addbackupwizard1view.ui

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -78,7 +78,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
@ -115,7 +115,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>260</height>

12
keep/app/addbackupwizard2view.ui

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -43,7 +43,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -81,7 +81,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@ -92,7 +92,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>381</height>

24
keep/app/addbackupwizard3view.ui

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -86,7 +86,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@ -129,7 +129,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -137,7 +137,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6_2</cstring>
<cstring>layout6_2</cstring>
</property>
<hbox>
<property name="name">
@ -145,7 +145,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -187,7 +187,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@ -249,7 +249,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -298,7 +298,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@ -336,7 +336,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -388,7 +388,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>46</height>

4
keep/app/advancedbackupconfigdialog.cpp

@ -19,7 +19,7 @@
#include "advancedbackupconfigdialog.h"
#include <klocale.h>
#include <tqlayout.h>
#include <layout.h>
#include <kurl.h>
#include <dcopref.h>
#include <kdebug.h>
@ -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()

2
keep/app/advancedbackupconfigview.ui

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">

2
keep/app/backupconfigdialog.cpp

@ -19,7 +19,7 @@
#include "backupconfigdialog.h"
#include <klocale.h>
#include <tqlayout.h>
#include <layout.h>
#include <kurl.h>
#include <dcopref.h>
#include <kdebug.h>

6
keep/app/backuplistview.ui

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>480</height>

8
keep/app/forcebackupdialog.cpp

@ -19,7 +19,7 @@
#include "forcebackupdialog.h"
#include <klocale.h>
#include <tqlayout.h>
#include <layout.h>
#include <kurl.h>
#include <dcopref.h>
#include <kdebug.h>
@ -45,9 +45,9 @@
ForceBackupDialog::ForceBackupDialog(TQWidget *parent):KDialogBase(Plain, i18n("Backup now"),
Help|Cancel|Ok, Cancel, parent, "forceBackupDialog", true, false)
{
TQGridLayout* toptqlayout = new TQGridLayout(plainPage());
TQGridLayout* toplayout = new TQGridLayout(plainPage());
m_view = new ForceBackupDialogView(plainPage());
toptqlayout->addWidget(m_view,0,0);
toplayout->addWidget(m_view,0,0);
loadBackupList();
@ -93,7 +93,7 @@ void ForceBackupDialog::slotForceBackup()
void ForceBackupDialog::slotBackupError(Backup backup,TQString errorMessage)
{
KMessageBox::error(this,i18n("<p><b>An error occured making %1 backup:</b></p><p>%2</p>").tqarg(backup.source()).tqarg(errorMessage));
KMessageBox::error(this,i18n("<p><b>An error occured making %1 backup:</b></p><p>%2</p>").arg(backup.source()).arg(errorMessage));
}
#include "forcebackupdialog.moc"

2
keep/app/forcebackupdialogview.ui

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout21</cstring>
<cstring>layout21</cstring>
</property>
<vbox>
<property name="name">

10
keep/app/generalconfigview.ui

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -79,7 +79,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>120</height>

4
keep/app/includeexcludedialog.cpp

@ -19,7 +19,7 @@
#include "includeexcludedialog.h"
#include <klocale.h>
#include <tqlayout.h>
#include <layout.h>
#include <kurl.h>
#include <dcopref.h>
#include <kdebug.h>
@ -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()

12
keep/app/includeexcludeview.ui

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -61,7 +61,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout18</cstring>
<cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@ -115,7 +115,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -159,7 +159,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>121</height>

6
keep/app/keepmainwindow.cpp

@ -19,7 +19,7 @@
#include "keepmainwindow.h"
#include <tqcolor.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqvariant.h>
#include <dcopclient.h>
#include <kactioncollection.h>
@ -63,7 +63,7 @@ KeepMainWindow::KeepMainWindow(TQWidget *parent, const char *name): KMainWindow(
initActions();
initConnections();
resize( tqminimumSizeHint() );
resize( minimumSizeHint() );
createGUI(0L);
@ -125,7 +125,7 @@ void KeepMainWindow::slotCheckRDB()
{
RDBManager manager;
if ( manager.isRDB() )
KMessageBox::information(this, i18n("<b>The application rdiff-backup has been detected on your system.</b><br><br> You're running version %1 of rdiff-backup.").tqarg(manager.RDBVersion()));
KMessageBox::information(this, i18n("<b>The application rdiff-backup has been detected on your system.</b><br><br> You're running version %1 of rdiff-backup.").arg(manager.RDBVersion()));
else
KMessageBox::error(this,i18n("<b>The application rdiff-backup has not been detected on your system.</b><br><br>If rdiff-backup is not installed, Keep will not be able to make backups. To fix this problem, install rdiff-backup on your system."));

2
keep/app/logdialog.cpp

@ -19,7 +19,7 @@
#include "logdialog.h"
#include <klocale.h>
#include <tqlayout.h>
#include <layout.h>
#include <kstandarddirs.h>
#include <dcopref.h>
#include <kdebug.h>

2
keep/app/logview.ui

@ -26,7 +26,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">

6
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" );
}
@ -287,7 +287,7 @@ void RestoreBackupWizard::slotRestoreBackup()
void RestoreBackupWizard::slotRestoreError(Backup backup,TQString errorMessage)
{
KMessageBox::error(this,i18n("<p><b>An error occured restoring %1 backup:</b></p><p>%2</p>").tqarg(backup.dest()).tqarg(errorMessage));
KMessageBox::error(this,i18n("<p><b>An error occured restoring %1 backup:</b></p><p>%2</p>").arg(backup.dest()).arg(errorMessage));
}
#include "restorebackupwizard.moc"

12
keep/app/restorebackupwizard1view.ui

@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -78,7 +78,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -173,7 +173,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@ -189,7 +189,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">

14
keep/app/restorebackupwizard2view.ui

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout50</cstring>
<cstring>layout50</cstring>
</property>
<hbox>
<property name="name">
@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -70,7 +70,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout49</cstring>
<cstring>layout49</cstring>
</property>
<vbox>
<property name="name">
@ -105,7 +105,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout48</cstring>
<cstring>layout48</cstring>
</property>
<vbox>
<property name="name">
@ -146,7 +146,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>160</height>

14
keep/app/restorebackupwizard3view.ui

@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
@ -73,7 +73,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@ -97,7 +97,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -105,7 +105,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -147,7 +147,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">

4
keep/common/backup.cpp

@ -160,14 +160,14 @@ TQString Backup::htmlDesc()
if ( m_neverDelete )
del = i18n("Never delete");
else
del = i18n("%1 days").tqarg(m_deleteAfter);
del = i18n("%1 days").arg(m_deleteAfter);
if ( m_useCompression )
compression = i18n("Yes");
else
compression = i18n("No");
TQString html = "<p><b>" + i18n("Source directory:") + "</b><br>"
+ m_source + "<br><b>" + i18n("Destination directory:") + "</b><br>"
+ m_dest + "</p><p><b>" + i18n("Interval:") + "</b> " + i18n("%1 days").tqarg(m_interval)
+ m_dest + "</p><p><b>" + i18n("Interval:") + "</b> " + i18n("%1 days").arg(m_interval)
+ "<br><b>" + i18n("Delete after:") + "</b> " + del
+ "<br><b>" + i18n("Use compression:") + "</b> " + compression
+ "</p>";

4
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").tqarg(m_backup.interval()));
setText(2, i18n("%1 days").arg(m_backup.interval()));
TQString deleteAfter;
if ( m_backup.neverDelete() == true )
deleteAfter = i18n("Never");
else
deleteAfter = i18n("%1 days").tqarg(m_backup.deleteAfter());
deleteAfter = i18n("%1 days").arg(m_backup.deleteAfter());
setText(3, deleteAfter);
}

10
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,16 +61,16 @@ 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<BackupListViewItem*>(item);
TQString tipStr = backupItem->backup().htmlDesc();
/*
if( col == 0 )
tipStr = TQString( "Contents of this cell: <b>%1</b>" ).tqarg(item->text( 0 ) );
tipStr = TQString( "Contents of this cell: <b>%1</b>" ).arg(item->text( 0 ) );
else if( col == 1 )
tipStr = TQString( "Contents of that cell: <em>%1</em>" ).tqarg(item->text( 1 ) );
tipStr = TQString( "Contents of that cell: <em>%1</em>" ).arg(item->text( 1 ) );
else
tipStr = TQString( "Something else" );
*/

6
keep/common/rdbmanager.cpp

@ -191,7 +191,7 @@ TQValueList<Backup> 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;
@ -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").tqarg(backup.deleteAfter()) + "D";
*proc << "--remove-older-than" << TQString("%1").arg(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").tqarg(niceLevel);
*proc << "nice" << "-n" << TQString("%1").arg(niceLevel);
}
*proc << "rdiff-backup";

6
keep/kded/keepkded.cpp

@ -56,7 +56,7 @@ void KeepKded::slotBackupError(Backup backup,TQString errorMessage)
{
if ( KeepSettings::notifyBackupError() )
{
KNotifyClient::userEvent(0,i18n("<p><b>An error occured making %1 backup:</b></p><p>%2</p>").tqarg(backup.source()).tqarg(errorMessage),16,4);
KNotifyClient::userEvent(0,i18n("<p><b>An error occured making %1 backup:</b></p><p>%2</p>").arg(backup.source()).arg(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("<p><b>Backup %1 successfully backuped to %2</b></p>").tqarg(backup.source()).tqarg(backup.dest()),16,1);
KNotifyClient::userEvent(0,i18n("<p><b>Backup %1 successfully backuped to %2</b></p>").arg(backup.source()).arg(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::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) )
{

Loading…
Cancel
Save