From 1b8e149d105fde621e33cdfdd623ab9e39029d30 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:11:10 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- keep/app/advancedbackupconfigdialog.cpp | 2 +- keep/app/advancedbackupconfigview.ui | 2 +- keep/app/backuplistview.ui | 2 +- keep/app/backuplistwidget.cpp | 2 +- keep/app/forcebackupdialogview.ui | 2 +- keep/app/includeexcludedialog.cpp | 4 ++-- keep/app/includeexcludedialog.h | 2 +- keep/app/includeexcludeview.ui | 2 +- keep/app/keepmainwindow.cpp | 2 +- keep/app/keepmainwindow.h | 2 +- keep/app/logdialog.cpp | 2 +- keep/app/logview.ui | 2 +- keep/app/restorebackupwizard.cpp | 2 +- keep/app/restorebackupwizard.h | 2 +- keep/app/restorebackupwizard1view.ui | 2 +- keep/app/restorebackupwizard3view.ui | 2 +- keep/common/backuplistviewitem.cpp | 2 +- keep/common/backuplistviewitem.h | 2 +- keep/common/includeexcludeitem.cpp | 2 +- keep/common/includeexcludeitem.h | 2 +- keep/common/incrementlistviewitem.cpp | 2 +- keep/common/incrementlistviewitem.h | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/keep/app/advancedbackupconfigdialog.cpp b/keep/app/advancedbackupconfigdialog.cpp index 7ddbac9..9f6a5a9 100644 --- a/keep/app/advancedbackupconfigdialog.cpp +++ b/keep/app/advancedbackupconfigdialog.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include AdvancedBackupConfigDialog::AdvancedBackupConfigDialog(TQWidget *parent):KDialogBase(Plain, i18n("Advanced Backup Configuration"), Help|Ok, Ok, parent, "advancedBackupConfigDialog", true, false) diff --git a/keep/app/advancedbackupconfigview.ui b/keep/app/advancedbackupconfigview.ui index 26411ea..a1ad767 100644 --- a/keep/app/advancedbackupconfigview.ui +++ b/keep/app/advancedbackupconfigview.ui @@ -85,6 +85,6 @@ kactivelabel.h - kactionselector.h + tdeactionselector.h diff --git a/keep/app/backuplistview.ui b/keep/app/backuplistview.ui index 9c0a0fe..33603c8 100644 --- a/keep/app/backuplistview.ui +++ b/keep/app/backuplistview.ui @@ -149,7 +149,7 @@ - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h kpushbutton.h diff --git a/keep/app/backuplistwidget.cpp b/keep/app/backuplistwidget.cpp index a87319f..d63ad16 100644 --- a/keep/app/backuplistwidget.cpp +++ b/keep/app/backuplistwidget.cpp @@ -19,7 +19,7 @@ #include "backuplistwidget.h" #include -#include +#include #include #include #include diff --git a/keep/app/forcebackupdialogview.ui b/keep/app/forcebackupdialogview.ui index da09c07..6c3f97d 100644 --- a/keep/app/forcebackupdialogview.ui +++ b/keep/app/forcebackupdialogview.ui @@ -124,6 +124,6 @@ kactivelabel.h - klistview.h + tdelistview.h diff --git a/keep/app/includeexcludedialog.cpp b/keep/app/includeexcludedialog.cpp index fd2f066..ad71414 100644 --- a/keep/app/includeexcludedialog.cpp +++ b/keep/app/includeexcludedialog.cpp @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include "includeexcludeitem.h" diff --git a/keep/app/includeexcludedialog.h b/keep/app/includeexcludedialog.h index d5d79a8..5bac7c2 100644 --- a/keep/app/includeexcludedialog.h +++ b/keep/app/includeexcludedialog.h @@ -20,7 +20,7 @@ #define _INCLUDEEXCLUDEDIALOG_H_ #include -#include +#include #include "includeexcludeview.h" diff --git a/keep/app/includeexcludeview.ui b/keep/app/includeexcludeview.ui index 4637c3f..e668a67 100644 --- a/keep/app/includeexcludeview.ui +++ b/keep/app/includeexcludeview.ui @@ -210,7 +210,7 @@ kpushbutton.h kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h kpushbutton.h diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp index d7a127f..0ed19bd 100644 --- a/keep/app/keepmainwindow.cpp +++ b/keep/app/keepmainwindow.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/keep/app/keepmainwindow.h b/keep/app/keepmainwindow.h index 6171f12..14fd931 100644 --- a/keep/app/keepmainwindow.h +++ b/keep/app/keepmainwindow.h @@ -19,7 +19,7 @@ #ifndef _KEEPMAINWINDOW_H_ #define _KEEPMAINWINDOW_H_ -#include +#include #include #include diff --git a/keep/app/logdialog.cpp b/keep/app/logdialog.cpp index 6c04f70..a927b21 100644 --- a/keep/app/logdialog.cpp +++ b/keep/app/logdialog.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/keep/app/logview.ui b/keep/app/logview.ui index fe48ab4..c466874 100644 --- a/keep/app/logview.ui +++ b/keep/app/logview.ui @@ -81,6 +81,6 @@ - klistview.h + tdelistview.h diff --git a/keep/app/restorebackupwizard.cpp b/keep/app/restorebackupwizard.cpp index a12ec05..24ed330 100644 --- a/keep/app/restorebackupwizard.cpp +++ b/keep/app/restorebackupwizard.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/keep/app/restorebackupwizard.h b/keep/app/restorebackupwizard.h index b331727..8cddbe1 100644 --- a/keep/app/restorebackupwizard.h +++ b/keep/app/restorebackupwizard.h @@ -20,7 +20,7 @@ #define _RESTOREBACKUPWIZARD_H_ #include -#include +#include #include #include diff --git a/keep/app/restorebackupwizard1view.ui b/keep/app/restorebackupwizard1view.ui index 5af77d0..38fb84d 100644 --- a/keep/app/restorebackupwizard1view.ui +++ b/keep/app/restorebackupwizard1view.ui @@ -263,7 +263,7 @@ kactivelabel.h - klistview.h + tdelistview.h kactivelabel.h kurlrequester.h klineedit.h diff --git a/keep/app/restorebackupwizard3view.ui b/keep/app/restorebackupwizard3view.ui index 57897c6..439e16e 100644 --- a/keep/app/restorebackupwizard3view.ui +++ b/keep/app/restorebackupwizard3view.ui @@ -226,6 +226,6 @@ kactivelabel.h kactivelabel.h kactivelabel.h - klistview.h + tdelistview.h diff --git a/keep/common/backuplistviewitem.cpp b/keep/common/backuplistviewitem.cpp index 48c6f1a..3c7ef91 100644 --- a/keep/common/backuplistviewitem.cpp +++ b/keep/common/backuplistviewitem.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include BackupListViewItem::BackupListViewItem(TDEListView *parent,Backup &backup): TQListViewItem (parent) { diff --git a/keep/common/backuplistviewitem.h b/keep/common/backuplistviewitem.h index 23758b8..55063ce 100644 --- a/keep/common/backuplistviewitem.h +++ b/keep/common/backuplistviewitem.h @@ -19,7 +19,7 @@ #ifndef _BACKUPLISTVIEWITEM_H_ #define _BACKUPLISTVIEWITEM_H_ -#include +#include #include "backup.h" diff --git a/keep/common/includeexcludeitem.cpp b/keep/common/includeexcludeitem.cpp index ae08773..a75229a 100644 --- a/keep/common/includeexcludeitem.cpp +++ b/keep/common/includeexcludeitem.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include IncludeExcludeItem::IncludeExcludeItem(TDEListView *parent,TQString includeExclude): TQListViewItem (parent) { diff --git a/keep/common/includeexcludeitem.h b/keep/common/includeexcludeitem.h index 3315de8..4c4e08a 100644 --- a/keep/common/includeexcludeitem.h +++ b/keep/common/includeexcludeitem.h @@ -19,7 +19,7 @@ #ifndef _INCLUDEEXCLUDEITEM_H_ #define _INCLUDEEXCLUDEITEM_H_ -#include +#include #include "backup.h" diff --git a/keep/common/incrementlistviewitem.cpp b/keep/common/incrementlistviewitem.cpp index c0c4a23..1ca9249 100644 --- a/keep/common/incrementlistviewitem.cpp +++ b/keep/common/incrementlistviewitem.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include IncrementListViewItem::IncrementListViewItem(TDEListView *parent,TQDateTime date): TQListViewItem (parent) { diff --git a/keep/common/incrementlistviewitem.h b/keep/common/incrementlistviewitem.h index 1315935..d7d8df8 100644 --- a/keep/common/incrementlistviewitem.h +++ b/keep/common/incrementlistviewitem.h @@ -19,7 +19,7 @@ #ifndef _INCREMENTLISTVIEWITEM_H_ #define _INCREMENTLISTVIEWITEM_H_ -#include +#include #include