diff --git a/keep/app/advancedbackupconfigview.ui b/keep/app/advancedbackupconfigview.ui
index 7e2452f..26411ea 100644
--- a/keep/app/advancedbackupconfigview.ui
+++ b/keep/app/advancedbackupconfigview.ui
@@ -60,7 +60,7 @@
Horizontal
-
+
optionList
diff --git a/keep/app/backuplistview.ui b/keep/app/backuplistview.ui
index 2e02aa3..9c0a0fe 100644
--- a/keep/app/backuplistview.ui
+++ b/keep/app/backuplistview.ui
@@ -38,7 +38,7 @@
unnamed
-
+
Source
diff --git a/keep/app/forcebackupdialogview.ui b/keep/app/forcebackupdialogview.ui
index ad54911..da09c07 100644
--- a/keep/app/forcebackupdialogview.ui
+++ b/keep/app/forcebackupdialogview.ui
@@ -60,7 +60,7 @@
Horizontal
-
+
Source
diff --git a/keep/app/includeexcludeview.ui b/keep/app/includeexcludeview.ui
index fe9bcd3..4637c3f 100644
--- a/keep/app/includeexcludeview.ui
+++ b/keep/app/includeexcludeview.ui
@@ -121,7 +121,7 @@
unnamed
-
+
Item
diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp
index 68a5f0c..d7a127f 100644
--- a/keep/app/keepmainwindow.cpp
+++ b/keep/app/keepmainwindow.cpp
@@ -44,7 +44,7 @@
#include "keepsettings.h"
#include "logdialog.h"
-KeepMainWindow::KeepMainWindow(TQWidget *parent, const char *name): KMainWindow(parent,name)
+KeepMainWindow::KeepMainWindow(TQWidget *parent, const char *name): TDEMainWindow(parent,name)
{
setCaption(i18n("Backup System"));
@@ -79,13 +79,13 @@ KeepMainWindow::~KeepMainWindow()
void KeepMainWindow::initActions()
{
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- new KAction( i18n("Check rdiff-backup"), "info", "", TQT_TQOBJECT(this), TQT_SLOT(slotCheckRDB()), actionCollection(), "check_rdiff-backup" );
- new KAction( i18n("Configure backups"), "configure", "", TQT_TQOBJECT(this), TQT_SLOT(slotConfigureBackup()), actionCollection(), "configure_backups" );
- new KAction( i18n("Configure"), "configure", "", TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "configure_keep" );
- new KAction( i18n("Add Backup"), "add_backup", "", TQT_TQOBJECT(this), TQT_SLOT(slotAddBackupWizard()), actionCollection(), "add_backup" );
- new KAction( i18n("Restore Backup"), "restore_dir", "", TQT_TQOBJECT(this), TQT_SLOT(slotRestoreBackupWizard()), actionCollection(), "restore_backup" );
- new KAction( i18n("Backup Now"), "force_backup", "", TQT_TQOBJECT(this), TQT_SLOT(slotForceBackup()), actionCollection(), "force_backup" );
- new KAction( i18n("View log"), "log", "", TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "view_log");
+ new TDEAction( i18n("Check rdiff-backup"), "info", "", TQT_TQOBJECT(this), TQT_SLOT(slotCheckRDB()), actionCollection(), "check_rdiff-backup" );
+ new TDEAction( i18n("Configure backups"), "configure", "", TQT_TQOBJECT(this), TQT_SLOT(slotConfigureBackup()), actionCollection(), "configure_backups" );
+ new TDEAction( i18n("Configure"), "configure", "", TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "configure_keep" );
+ new TDEAction( i18n("Add Backup"), "add_backup", "", TQT_TQOBJECT(this), TQT_SLOT(slotAddBackupWizard()), actionCollection(), "add_backup" );
+ new TDEAction( i18n("Restore Backup"), "restore_dir", "", TQT_TQOBJECT(this), TQT_SLOT(slotRestoreBackupWizard()), actionCollection(), "restore_backup" );
+ new TDEAction( i18n("Backup Now"), "force_backup", "", TQT_TQOBJECT(this), TQT_SLOT(slotForceBackup()), actionCollection(), "force_backup" );
+ new TDEAction( i18n("View log"), "log", "", TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "view_log");
}
void KeepMainWindow::initConnections()
diff --git a/keep/app/keepmainwindow.h b/keep/app/keepmainwindow.h
index b0fbde4..6171f12 100644
--- a/keep/app/keepmainwindow.h
+++ b/keep/app/keepmainwindow.h
@@ -26,7 +26,7 @@
#include "backup.h"
#include "actionview.h"
-class KeepMainWindow: public KMainWindow
+class KeepMainWindow: public TDEMainWindow
{
Q_OBJECT
diff --git a/keep/app/logdialog.cpp b/keep/app/logdialog.cpp
index 57edc25..6c04f70 100644
--- a/keep/app/logdialog.cpp
+++ b/keep/app/logdialog.cpp
@@ -66,7 +66,7 @@ void LogDialog::slotLoadLog()
while ( !stream.atEnd() ) {
line = stream.readLine(); // line of text excluding '\n'
TQStringList params = TQStringList::split("\t",line);
- KListViewItem *item = new KListViewItem(m_view->logList,params[0],params[1],params[2]);
+ TDEListViewItem *item = new TDEListViewItem(m_view->logList,params[0],params[1],params[2]);
}
file.close();
}
diff --git a/keep/app/logview.ui b/keep/app/logview.ui
index 61548b7..fe48ab4 100644
--- a/keep/app/logview.ui
+++ b/keep/app/logview.ui
@@ -32,7 +32,7 @@
unnamed
-
+
Date
diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp
index 579e255..a12ec05 100644
--- a/keep/app/restorebackupwizard.cpp
+++ b/keep/app/restorebackupwizard.cpp
@@ -46,7 +46,7 @@ RestoreBackupWizard::RestoreBackupWizard(TQWidget *parent,const char* name): KWi
this->setIcon( icons.loadIcon( "wizard",KIcon::Small ));
this->setCaption("Restore a backup");
- m_popup = new KPopupMenu(this);
+ 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()));
@@ -76,7 +76,7 @@ void RestoreBackupWizard::initConnections()
connect(restoreBackupWizard1View->btnCustomSource, TQT_SIGNAL( toggled(bool)),this,TQT_SLOT(slotCustomSourceChecked(bool)));
// Date selection popup menu
- connect(restoreBackupWizard3View->incrementList, TQT_SIGNAL(contextMenu (KListView *, TQListViewItem *, const TQPoint &)), this, TQT_SLOT(slotContextMenu(KListView *,TQListViewItem*,const TQPoint&)));
+ connect(restoreBackupWizard3View->incrementList, TQT_SIGNAL(contextMenu (TDEListView *, TQListViewItem *, const TQPoint &)), this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&)));
// Page 1 changes
connect(restoreBackupWizard1View->m_lstBackup,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotPage1Changed()));
@@ -226,7 +226,7 @@ void RestoreBackupWizard::setupPage3()
addPage( page3, "Date to restore" );
}
-void RestoreBackupWizard::slotContextMenu(KListView *list,TQListViewItem *item,const TQPoint&p)
+void RestoreBackupWizard::slotContextMenu(TDEListView *list,TQListViewItem *item,const TQPoint&p)
{
m_popup->popup(p, 1);
}
diff --git a/keep/app/restorebackupwizard.h b/keep/app/restorebackupwizard.h
index 41fd865..b331727 100644
--- a/keep/app/restorebackupwizard.h
+++ b/keep/app/restorebackupwizard.h
@@ -42,7 +42,7 @@ public:
void setBackup(Backup backup);
protected slots:
- void slotContextMenu(KListView *list,TQListViewItem * item,const TQPoint &point);
+ void slotContextMenu(TDEListView *list,TQListViewItem * item,const TQPoint &point);
void slotPage1Changed();
void slotPage2Changed();
void slotPage3Changed();
@@ -63,7 +63,7 @@ private:
void setupPage3();
void initConnections();
- KPopupMenu *m_popup;
+ TDEPopupMenu *m_popup;
TQHBox *page1,*page2,*page3;
RestoreBackupWizard1View *restoreBackupWizard1View ;
RestoreBackupWizard2View *restoreBackupWizard2View;
diff --git a/keep/app/restorebackupwizard1view.ui b/keep/app/restorebackupwizard1view.ui
index 508aade..5af77d0 100644
--- a/keep/app/restorebackupwizard1view.ui
+++ b/keep/app/restorebackupwizard1view.ui
@@ -100,7 +100,7 @@
Select the backup to restore.
-
+
Source
diff --git a/keep/app/restorebackupwizard3view.ui b/keep/app/restorebackupwizard3view.ui
index 4b3e012..57897c6 100644
--- a/keep/app/restorebackupwizard3view.ui
+++ b/keep/app/restorebackupwizard3view.ui
@@ -189,7 +189,7 @@
-
+
Date
diff --git a/keep/common/backuplistviewitem.cpp b/keep/common/backuplistviewitem.cpp
index 90f735d..48c6f1a 100644
--- a/keep/common/backuplistviewitem.cpp
+++ b/keep/common/backuplistviewitem.cpp
@@ -22,7 +22,7 @@
#include
#include
-BackupListViewItem::BackupListViewItem(KListView *parent,Backup &backup): TQListViewItem (parent)
+BackupListViewItem::BackupListViewItem(TDEListView *parent,Backup &backup): TQListViewItem (parent)
{
setBackup(backup);
}
diff --git a/keep/common/backuplistviewitem.h b/keep/common/backuplistviewitem.h
index fe1fc03..23758b8 100644
--- a/keep/common/backuplistviewitem.h
+++ b/keep/common/backuplistviewitem.h
@@ -26,7 +26,7 @@
class BackupListViewItem : public TQListViewItem
{
public:
- BackupListViewItem(KListView *parent,Backup &backup);
+ BackupListViewItem(TDEListView *parent,Backup &backup);
~BackupListViewItem();
Backup backup();
diff --git a/keep/common/includeexcludeitem.cpp b/keep/common/includeexcludeitem.cpp
index cbee5ed..ae08773 100644
--- a/keep/common/includeexcludeitem.cpp
+++ b/keep/common/includeexcludeitem.cpp
@@ -22,12 +22,12 @@
#include
#include
-IncludeExcludeItem::IncludeExcludeItem(KListView *parent,TQString includeExclude): TQListViewItem (parent)
+IncludeExcludeItem::IncludeExcludeItem(TDEListView *parent,TQString includeExclude): TQListViewItem (parent)
{
setIncludeExclude(includeExclude);
}
-IncludeExcludeItem::IncludeExcludeItem(KListView *parent,IncludeExcludeItem *item,TQString includeExclude): TQListViewItem (parent,item)
+IncludeExcludeItem::IncludeExcludeItem(TDEListView *parent,IncludeExcludeItem *item,TQString includeExclude): TQListViewItem (parent,item)
{
setIncludeExclude(includeExclude);
}
diff --git a/keep/common/includeexcludeitem.h b/keep/common/includeexcludeitem.h
index 8335aed..3315de8 100644
--- a/keep/common/includeexcludeitem.h
+++ b/keep/common/includeexcludeitem.h
@@ -26,8 +26,8 @@
class IncludeExcludeItem : public TQListViewItem
{
public:
- IncludeExcludeItem(KListView *parent,TQString includeExclude);
- IncludeExcludeItem(KListView *parent,IncludeExcludeItem *item,TQString includeExclude);
+ IncludeExcludeItem(TDEListView *parent,TQString includeExclude);
+ IncludeExcludeItem(TDEListView *parent,IncludeExcludeItem *item,TQString includeExclude);
~IncludeExcludeItem();
TQString includeExclude();
diff --git a/keep/common/incrementlistviewitem.cpp b/keep/common/incrementlistviewitem.cpp
index fecbf60..c0c4a23 100644
--- a/keep/common/incrementlistviewitem.cpp
+++ b/keep/common/incrementlistviewitem.cpp
@@ -22,12 +22,12 @@
#include
#include
-IncrementListViewItem::IncrementListViewItem(KListView *parent,TQDateTime date): TQListViewItem (parent)
+IncrementListViewItem::IncrementListViewItem(TDEListView *parent,TQDateTime date): TQListViewItem (parent)
{
setDate(date);
}
-IncrementListViewItem::IncrementListViewItem(KListView *parent,TQListViewItem *item,TQDateTime date): TQListViewItem (parent,item)
+IncrementListViewItem::IncrementListViewItem(TDEListView *parent,TQListViewItem *item,TQDateTime date): TQListViewItem (parent,item)
{
setDate(date);
}
diff --git a/keep/common/incrementlistviewitem.h b/keep/common/incrementlistviewitem.h
index a73f569..1315935 100644
--- a/keep/common/incrementlistviewitem.h
+++ b/keep/common/incrementlistviewitem.h
@@ -26,8 +26,8 @@
class IncrementListViewItem : public TQListViewItem
{
public:
- IncrementListViewItem(KListView *parent, TQDateTime date);
- IncrementListViewItem(KListView *parent, TQListViewItem *item,TQDateTime date);
+ IncrementListViewItem(TDEListView *parent, TQDateTime date);
+ IncrementListViewItem(TDEListView *parent, TQListViewItem *item,TQDateTime date);
~IncrementListViewItem();
TQDateTime date();