Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/7/head
Michele Calgaro 11 months ago
parent 4586cddf97
commit 66f17b6eee
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -82,11 +82,11 @@ void AddBackupWizard::initView()
void AddBackupWizard::initConnections()
{
connect( addBackupWizard1View->source, TQT_SIGNAL( textChanged(const TQString&)), this, TQT_SLOT( slotPage1Changed() ) );
connect( addBackupWizard2View->dest, TQT_SIGNAL( textChanged(const TQString&)), this, TQT_SLOT( slotPage2Changed() ) );
connect( addBackupWizard3View->advancedConfig, TQT_SIGNAL( clicked()),this,TQT_SLOT(slotShowAdvancedConfig()));
connect( addBackupWizard1View->includeExclude, TQT_SIGNAL( clicked()),this,TQT_SLOT(slotShowIncludeExclude()));
connect( finishButton(), TQT_SIGNAL( clicked()), this, TQT_SLOT( slotFinishClicked() ) );
connect( addBackupWizard1View->source, TQ_SIGNAL( textChanged(const TQString&)), this, TQ_SLOT( slotPage1Changed() ) );
connect( addBackupWizard2View->dest, TQ_SIGNAL( textChanged(const TQString&)), this, TQ_SLOT( slotPage2Changed() ) );
connect( addBackupWizard3View->advancedConfig, TQ_SIGNAL( clicked()),this,TQ_SLOT(slotShowAdvancedConfig()));
connect( addBackupWizard1View->includeExclude, TQ_SIGNAL( clicked()),this,TQ_SLOT(slotShowIncludeExclude()));
connect( finishButton(), TQ_SIGNAL( clicked()), this, TQ_SLOT( slotFinishClicked() ) );
}
void AddBackupWizard::setupPage1()

@ -52,7 +52,7 @@ BackupConfigDialog::BackupConfigDialog(TQWidget *parent):KDialogBase(Plain, i18n
topLayout->addWidget( m_backupListWidget );
setMainWidget(page);
connect( this, TQT_SIGNAL( okClicked()),this, TQT_SLOT(saveSettings()));
connect( this, TQ_SIGNAL( okClicked()),this, TQ_SLOT(saveSettings()));
}
void BackupConfigDialog::saveSettings()

@ -35,9 +35,9 @@ BackupListWidget::BackupListWidget(TQWidget *parent,char *name): BackupListView(
new ListViewToolTip(m_lstBackup);
slotReadSettings();
connect( m_btnAdd, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotAddClicked() ) );
connect( m_btnRemove, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotRemoveClicked() ) );
connect( m_btnEdit, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEditClicked() ) );
connect( m_btnAdd, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotAddClicked() ) );
connect( m_btnRemove, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotRemoveClicked() ) );
connect( m_btnEdit, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotEditClicked() ) );
}
BackupListWidget::~BackupListWidget()
@ -75,7 +75,7 @@ void BackupListWidget::slotSaveSettings()
void BackupListWidget::slotAddClicked()
{
AddBackupWizard *wizard = new AddBackupWizard(this,"addBackupWizard");
connect(wizard,TQT_SIGNAL(backupSetted(Backup) ), this, TQT_SLOT(slotAddBackup(Backup)));
connect(wizard,TQ_SIGNAL(backupSetted(Backup) ), this, TQ_SLOT(slotAddBackup(Backup)));
wizard->show();
}
@ -86,7 +86,7 @@ void BackupListWidget::slotEditClicked()
{
BackupListViewItem *backupItem = static_cast<BackupListViewItem*>(item);
AddBackupWizard *wizard = new AddBackupWizard(backupItem->backup(),this,"addBackupWizard");
connect(wizard,TQT_SIGNAL(backupSetted(Backup) ), this, TQT_SLOT(slotUpdateBackup(Backup)));
connect(wizard,TQ_SIGNAL(backupSetted(Backup) ), this, TQ_SLOT(slotUpdateBackup(Backup)));
wizard->show();
}
}

@ -52,9 +52,9 @@ ForceBackupDialog::ForceBackupDialog(TQWidget *parent):KDialogBase(Plain, i18n("
loadBackupList();
m_manager = new RDBManager();
connect( m_manager, TQT_SIGNAL(backupError(Backup,TQString)), this, TQT_SLOT(slotBackupError(Backup,TQString)) );
connect( m_manager, TQ_SIGNAL(backupError(Backup,TQString)), this, TQ_SLOT(slotBackupError(Backup,TQString)) );
connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotForceBackup()));
connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotForceBackup()));
}
ForceBackupDialog::~ForceBackupDialog()

@ -49,9 +49,9 @@ IncludeExcludeDialog::IncludeExcludeDialog(TQWidget *parent):KDialogBase(Plain,
m_view->includeExcludeList->setSorting(-1);
connect(m_view->include,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotInclude()));
connect(m_view->exclude,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotExclude()));
connect(m_view->remove,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotRemove()));
connect(m_view->include,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotInclude()));
connect(m_view->exclude,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotExclude()));
connect(m_view->remove,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotRemove()));
resize( TQSize(450,450).expandedTo(minimumSizeHint()) );
}

@ -78,26 +78,26 @@ KeepMainWindow::~KeepMainWindow()
void KeepMainWindow::initActions()
{
KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
new TDEAction( i18n("Check rdiff-backup"), "application-vnd.tde.info", "", this, TQT_SLOT(slotCheckRDB()), actionCollection(), "check_rdiff-backup" );
new TDEAction( i18n("Configure backups"), "configure", "", this, TQT_SLOT(slotConfigureBackup()), actionCollection(), "configure_backups" );
new TDEAction( i18n("Configure"), "configure", "", this, TQT_SLOT(slotConfigure()), actionCollection(), "configure_keep" );
new TDEAction( i18n("Add Backup"), "add_backup", "", this, TQT_SLOT(slotAddBackupWizard()), actionCollection(), "add_backup" );
new TDEAction( i18n("Restore Backup"), "restore_dir", "", this, TQT_SLOT(slotRestoreBackupWizard()), actionCollection(), "restore_backup" );
new TDEAction( i18n("Backup Now"), "force_backup", "", this, TQT_SLOT(slotForceBackup()), actionCollection(), "force_backup" );
new TDEAction( i18n("View log"), "text-x-log", "", this, TQT_SLOT(slotViewLog()), actionCollection(), "view_log");
KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
new TDEAction( i18n("Check rdiff-backup"), "application-vnd.tde.info", "", this, TQ_SLOT(slotCheckRDB()), actionCollection(), "check_rdiff-backup" );
new TDEAction( i18n("Configure backups"), "configure", "", this, TQ_SLOT(slotConfigureBackup()), actionCollection(), "configure_backups" );
new TDEAction( i18n("Configure"), "configure", "", this, TQ_SLOT(slotConfigure()), actionCollection(), "configure_keep" );
new TDEAction( i18n("Add Backup"), "add_backup", "", this, TQ_SLOT(slotAddBackupWizard()), actionCollection(), "add_backup" );
new TDEAction( i18n("Restore Backup"), "restore_dir", "", this, TQ_SLOT(slotRestoreBackupWizard()), actionCollection(), "restore_backup" );
new TDEAction( i18n("Backup Now"), "force_backup", "", this, TQ_SLOT(slotForceBackup()), actionCollection(), "force_backup" );
new TDEAction( i18n("View log"), "text-x-log", "", this, TQ_SLOT(slotViewLog()), actionCollection(), "view_log");
}
void KeepMainWindow::initConnections()
{
connect( m_actionView->m_btnAddWizard, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotAddBackupWizard() ) );
connect( m_actionView->m_btnRestoreWizard, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotRestoreBackupWizard() ) );
connect( m_actionView->m_btnForce, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotForceBackup() ) );
connect( m_actionView->m_btnBackupConfig, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotConfigureBackup() ) );
connect( m_actionView->m_btnLog, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotViewLog() ) );
connect( m_actionView->m_btnLoadDaemon, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotLoadDaemon() ) );
connect( m_actionView->m_btnUnloadDaemon, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotUnloadDaemon() ) );
connect( m_actionView->m_btnReloadDaemon, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotReloadDaemon() ) );
connect( m_actionView->m_btnAddWizard, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotAddBackupWizard() ) );
connect( m_actionView->m_btnRestoreWizard, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotRestoreBackupWizard() ) );
connect( m_actionView->m_btnForce, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotForceBackup() ) );
connect( m_actionView->m_btnBackupConfig, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotConfigureBackup() ) );
connect( m_actionView->m_btnLog, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotViewLog() ) );
connect( m_actionView->m_btnLoadDaemon, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotLoadDaemon() ) );
connect( m_actionView->m_btnUnloadDaemon, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotUnloadDaemon() ) );
connect( m_actionView->m_btnReloadDaemon, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotReloadDaemon() ) );
}
void KeepMainWindow::slotRefreshGUI()
@ -169,7 +169,7 @@ void KeepMainWindow::slotConfigure()
void KeepMainWindow::slotAddBackupWizard()
{
AddBackupWizard *addBackupWizard = new AddBackupWizard(this, "addBackupWizard");
connect( addBackupWizard, TQT_SIGNAL( backupSetted(Backup)), this, TQT_SLOT( slotAddBackup(Backup) ) );
connect( addBackupWizard, TQ_SIGNAL( backupSetted(Backup)), this, TQ_SLOT( slotAddBackup(Backup) ) );
addBackupWizard->show();
}

@ -40,7 +40,7 @@
RestoreBackupWizard::RestoreBackupWizard(TQWidget *parent,const char* name): KWizard( parent, name, true)
{
m_manager = new RDBManager();
connect( m_manager, TQT_SIGNAL(backupError(Backup,TQString)), this, TQT_SLOT(slotRestoreError(Backup,TQString)) );
connect( m_manager, TQ_SIGNAL(backupError(Backup,TQString)), this, TQ_SLOT(slotRestoreError(Backup,TQString)) );
TDEIconLoader icons;
this->setIcon( icons.loadIcon( "wizard",TDEIcon::Small ));
@ -48,9 +48,9 @@ RestoreBackupWizard::RestoreBackupWizard(TQWidget *parent,const char* name): KWi
m_popup = new TDEPopupMenu(this);
m_popup->insertTitle(i18n("Menu"));
m_popup->insertItem(i18n("Show differences destination/backup"), this, TQT_SLOT(slotShowDiff()));
m_popup->insertItem(i18n("List changed files"), this, TQT_SLOT(slotShowChanged()));
m_popup->insertItem(i18n("List files"), this, TQT_SLOT(slotShowList()));
m_popup->insertItem(i18n("Show differences destination/backup"), this, TQ_SLOT(slotShowDiff()));
m_popup->insertItem(i18n("List changed files"), this, TQ_SLOT(slotShowChanged()));
m_popup->insertItem(i18n("List files"), this, TQ_SLOT(slotShowList()));
setupPage1();
setupPage2();
@ -73,25 +73,25 @@ RestoreBackupWizard::~RestoreBackupWizard()
void RestoreBackupWizard::initConnections()
{
// If custom source setted
connect(restoreBackupWizard1View->btnCustomSource, TQT_SIGNAL( toggled(bool)),this,TQT_SLOT(slotCustomSourceChecked(bool)));
connect(restoreBackupWizard1View->btnCustomSource, TQ_SIGNAL( toggled(bool)),this,TQ_SLOT(slotCustomSourceChecked(bool)));
// Date selection popup menu
connect(restoreBackupWizard3View->incrementList, TQT_SIGNAL(contextMenu (TDEListView *, TQListViewItem *, const TQPoint &)), this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&)));
connect(restoreBackupWizard3View->incrementList, TQ_SIGNAL(contextMenu (TDEListView *, TQListViewItem *, const TQPoint &)), this, TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&)));
// Page 1 changes
connect(restoreBackupWizard1View->m_lstBackup,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotPage1Changed()));
connect(restoreBackupWizard1View->btnCustomSource,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotPage1Changed()));
connect(restoreBackupWizard1View->customSource,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotPage1Changed()));
connect(restoreBackupWizard1View->m_lstBackup,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotPage1Changed()));
connect(restoreBackupWizard1View->btnCustomSource,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotPage1Changed()));
connect(restoreBackupWizard1View->customSource,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotPage1Changed()));
// Page 2 changes
connect(restoreBackupWizard2View->btnCustomDest,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotPage2Changed()));
connect(restoreBackupWizard2View->customDest,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotPage2Changed()));
connect(restoreBackupWizard2View->btnCustomDest,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotPage2Changed()));
connect(restoreBackupWizard2View->customDest,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotPage2Changed()));
// Page 3 Changes
connect(restoreBackupWizard3View->incrementList,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotPage3Changed()));
connect(restoreBackupWizard3View->incrementList,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotPage3Changed()));
// Finish button
connect(finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotRestoreBackup()));
connect(finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotRestoreBackup()));
}
void RestoreBackupWizard::slotPage1Changed()

@ -62,7 +62,7 @@ TQString RDBManager::compareAtTime(Backup backup, TQDateTime date)
*proc << TQString(TQFile::encodeName(TDEProcess::quote(backup.dest())));
// Adds the listener
RDBListener *listen = new RDBListener();
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdOut(TDEProcess *,char *,int)));
// Starts the process
if ( !proc->start(TDEProcess::Block, TDEProcess::AllOutput) )
kdDebug() << "Error starting rdiff-backup" << endl;
@ -89,7 +89,7 @@ TQString RDBManager::listChangedSince(Backup backup, TQDateTime date)
*proc << TQString(TQFile::encodeName(TDEProcess::quote(backup.dest())));
// Adds a listener
RDBListener *listen = new RDBListener();
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdOut(TDEProcess *,char *,int)));
// Starts the process
if ( !proc->start(TDEProcess::Block, TDEProcess::AllOutput) )
kdDebug() << "Error starting rdiff-backup" << endl;
@ -116,7 +116,7 @@ TQString RDBManager::listAtTime(Backup backup, TQDateTime date)
*proc << TQString(TQFile::encodeName(TDEProcess::quote(backup.dest())));
// Adds a listener
RDBListener *listen = new RDBListener();
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdOut(TDEProcess *,char *,int)));
// Starts the process
if ( !proc->start(TDEProcess::Block, TDEProcess::AllOutput) )
kdDebug() << "Error starting rdiff-backup" << endl;
@ -144,7 +144,7 @@ TQValueList<TQDateTime> RDBManager::incrementList(Backup backup)
*proc << TQString(TQFile::encodeName(TDEProcess::quote(backup.dest())));
// Adds a listener
RDBListener *listen = new RDBListener();
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdOut(TDEProcess *,char *,int)));
// Starts the process
if ( !proc->start(TDEProcess::Block, TDEProcess::AllOutput) )
kdDebug() << "Error starting rdiff-backup" << endl;
@ -214,8 +214,8 @@ void RDBManager::slotRestoreBackup(Backup backup,TQDateTime time)
*proc << TQString(TQFile::encodeName(TDEProcess::quote(backup.source())));
// Adds a listener (for output recording)
RDBListener *listen = new RDBListener();
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdErr(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdErr(TDEProcess *,char *,int)));
// Starts the process
if ( !proc->start(TDEProcess::Block, TDEProcess::AllOutput) )
kdDebug() << "Error starting rdiff-backup" << endl;
@ -239,7 +239,7 @@ bool RDBManager::isRDB()
*proc << "-V";
// Adds a listener (for output recording)
RDBListener *listen = new RDBListener();
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdOut(TDEProcess *,char *,int)));
// Starts the process
if ( !proc->start(TDEProcess::Block, TDEProcess::AllOutput) )
kdDebug() << "Error starting rdiff-backup" << endl;
@ -264,7 +264,7 @@ TQString RDBManager::RDBVersion()
*proc << "-V";
// Adds a listener (for output recording)
RDBListener *listen = new RDBListener();
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdOut(TDEProcess *,char *,int)));
// Starts the process
if ( !proc->start(TDEProcess::Block, TDEProcess::AllOutput) )
kdDebug() << "Error starting rdiff-backup" << endl;
@ -329,8 +329,8 @@ void RDBManager::doBackup(Backup backup)
*proc << TQString(TQFile::encodeName(TDEProcess::quote(backup.dest())));
// Adds a listener (for output recording)
RDBListener *listen = new RDBListener();
connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)),listen,TQT_SLOT(receivedStdErr(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdOut(TDEProcess *,char *,int)));
connect(proc,TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)),listen,TQ_SLOT(receivedStdErr(TDEProcess *,char *,int)));
// Starts the process
if ( !proc->start(TDEProcess::Block, TDEProcess::AllOutput) )
kdDebug() << "Error starting rdiff-backup" << endl;

@ -37,13 +37,13 @@ KeepKded::KeepKded(const TQCString &name): KDEDModule(name)
m_logFilePath = locateLocal( "data", "keep/keep.log", true );
m_manager = new RDBManager();
connect( m_manager, TQT_SIGNAL(backupError(Backup,TQString)), this, TQT_SLOT(slotBackupError(Backup,TQString)) );
connect( m_manager, TQT_SIGNAL(backupSuccess(Backup)), this, TQT_SLOT(slotBackupSuccess(Backup)) );
connect( m_manager, TQ_SIGNAL(backupError(Backup,TQString)), this, TQ_SLOT(slotBackupError(Backup,TQString)) );
connect( m_manager, TQ_SIGNAL(backupSuccess(Backup)), this, TQ_SLOT(slotBackupSuccess(Backup)) );
slotCheckBackup();
m_timer = new TQTimer(this);
connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckBackup()) );
connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCheckBackup()) );
m_timer->start( 1000 * 60 * 60 );
}

Loading…
Cancel
Save