Rename many classes and header files to avoid conflicts with KDE4

10 years ago · 1b8e149d10
22 changed files with 23 additions and 23 deletions
--- a/keep/app/advancedbackupconfigdialog.cpp
+++ b/keep/app/advancedbackupconfigdialog.cpp
@ -29,7 +29,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <tqstringlist.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>

 AdvancedBackupConfigDialog::AdvancedBackupConfigDialog(TQWidget *parent):KDialogBase(Plain, i18n("Advanced Backup Configuration"),
 	Help|Ok, Ok, parent, "advancedBackupConfigDialog", true, false)
--- a/keep/app/advancedbackupconfigview.ui
+++ b/keep/app/advancedbackupconfigview.ui
@ -85,6 +85,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kactivelabel.h</includehint>
-    <includehint>kactionselector.h</includehint>
+    <includehint>tdeactionselector.h</includehint>
 </includehints>
 </UI>
--- a/keep/app/backuplistview.ui
+++ b/keep/app/backuplistview.ui
@ -149,7 +149,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
--- a/keep/app/backuplistwidget.cpp
+++ b/keep/app/backuplistwidget.cpp
@ -19,7 +19,7 @@
 #include "backuplistwidget.h"

 #include <tqpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqstringlist.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
--- a/keep/app/forcebackupdialogview.ui
+++ b/keep/app/forcebackupdialogview.ui
@ -124,6 +124,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/keep/app/includeexcludedialog.cpp
+++ b/keep/app/includeexcludedialog.cpp
@ -30,8 +30,8 @@
 #include <kpushbutton.h>
 #include <kiconloader.h>
 #include <tqstringlist.h>
-#include <kactionselector.h>
-#include <klistview.h>
+#include <tdeactionselector.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>

 #include "includeexcludeitem.h"
--- a/keep/app/includeexcludedialog.h
+++ b/keep/app/includeexcludedialog.h
@ -20,7 +20,7 @@
 #define _INCLUDEEXCLUDEDIALOG_H_

 #include <kdialogbase.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>

 #include "includeexcludeview.h"

--- a/keep/app/includeexcludeview.ui
+++ b/keep/app/includeexcludeview.ui
@ -210,7 +210,7 @@
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>
--- a/keep/app/keepmainwindow.cpp
+++ b/keep/app/keepmainwindow.cpp
@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqvariant.h>
 #include <dcopclient.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kstdaction.h>
 #include <kdebug.h>
 #include <klocale.h>
--- a/keep/app/keepmainwindow.h
+++ b/keep/app/keepmainwindow.h
@ -19,7 +19,7 @@
 #ifndef _KEEPMAINWINDOW_H_
 #define _KEEPMAINWINDOW_H_

-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <ktabwidget.h>
 #include <tqhbox.h>

--- a/keep/app/logdialog.cpp
+++ b/keep/app/logdialog.cpp
@ -24,7 +24,7 @@
 #include <dcopref.h>
 #include <kdebug.h>
 #include <kactivelabel.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <kcombobox.h>
 #include <tqfile.h>
--- a/keep/app/logview.ui
+++ b/keep/app/logview.ui
@ -81,6 +81,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/keep/app/restorebackupwizard.cpp
+++ b/keep/app/restorebackupwizard.cpp
@ -20,7 +20,7 @@

 #include <tqpushbutton.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kactivelabel.h>
--- a/keep/app/restorebackupwizard.h
+++ b/keep/app/restorebackupwizard.h
@ -20,7 +20,7 @@
 #define _RESTOREBACKUPWIZARD_H_ 

 #include <kwizard.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqhbox.h>
 #include <tqlistview.h>

--- a/keep/app/restorebackupwizard1view.ui
+++ b/keep/app/restorebackupwizard1view.ui
@ -263,7 +263,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
    <includehint>kactivelabel.h</includehint>
    <includehint>kurlrequester.h</includehint>
    <includehint>klineedit.h</includehint>
--- a/keep/app/restorebackupwizard3view.ui
+++ b/keep/app/restorebackupwizard3view.ui
@ -226,6 +226,6 @@
    <includehint>kactivelabel.h</includehint>
    <includehint>kactivelabel.h</includehint>
    <includehint>kactivelabel.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
--- a/keep/common/backuplistviewitem.cpp
+++ b/keep/common/backuplistviewitem.cpp
@ -20,7 +20,7 @@

 #include <klocale.h>
 #include <tqdir.h>
-#include <klistview.h>
+#include <tdelistview.h>

 BackupListViewItem::BackupListViewItem(TDEListView *parent,Backup &backup): TQListViewItem (parent) 
 { 
--- a/keep/common/backuplistviewitem.h
+++ b/keep/common/backuplistviewitem.h
@ -19,7 +19,7 @@
 #ifndef _BACKUPLISTVIEWITEM_H_
 #define _BACKUPLISTVIEWITEM_H_

-#include <klistview.h>
+#include <tdelistview.h>

 #include "backup.h"

--- a/keep/common/includeexcludeitem.cpp
+++ b/keep/common/includeexcludeitem.cpp
@ -20,7 +20,7 @@

 #include <klocale.h>
 #include <tqdir.h>
-#include <klistview.h>
+#include <tdelistview.h>

 IncludeExcludeItem::IncludeExcludeItem(TDEListView *parent,TQString includeExclude): TQListViewItem (parent) 
 { 
--- a/keep/common/includeexcludeitem.h
+++ b/keep/common/includeexcludeitem.h
@ -19,7 +19,7 @@
 #ifndef _INCLUDEEXCLUDEITEM_H_
 #define _INCLUDEEXCLUDEITEM_H_

-#include <klistview.h>
+#include <tdelistview.h>

 #include "backup.h"

--- a/keep/common/incrementlistviewitem.cpp
+++ b/keep/common/incrementlistviewitem.cpp
@ -20,7 +20,7 @@

 #include <klocale.h>
 #include <tqdir.h>
-#include <klistview.h>
+#include <tdelistview.h>

 IncrementListViewItem::IncrementListViewItem(TDEListView *parent,TQDateTime date): TQListViewItem (parent) 
 { 
--- a/keep/common/incrementlistviewitem.h
+++ b/keep/common/incrementlistviewitem.h
@ -19,7 +19,7 @@
 #ifndef _INCREMENTLISTVIEWITEM_H_
 #define _INCREMENTLISTVIEWITEM_H_

-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqdatetime.h>