Browse Source

Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 10 years ago
parent
commit
1b8e149d10
  1. 2
      keep/app/advancedbackupconfigdialog.cpp
  2. 2
      keep/app/advancedbackupconfigview.ui
  3. 2
      keep/app/backuplistview.ui
  4. 2
      keep/app/backuplistwidget.cpp
  5. 2
      keep/app/forcebackupdialogview.ui
  6. 4
      keep/app/includeexcludedialog.cpp
  7. 2
      keep/app/includeexcludedialog.h
  8. 2
      keep/app/includeexcludeview.ui
  9. 2
      keep/app/keepmainwindow.cpp
  10. 2
      keep/app/keepmainwindow.h
  11. 2
      keep/app/logdialog.cpp
  12. 2
      keep/app/logview.ui
  13. 2
      keep/app/restorebackupwizard.cpp
  14. 2
      keep/app/restorebackupwizard.h
  15. 2
      keep/app/restorebackupwizard1view.ui
  16. 2
      keep/app/restorebackupwizard3view.ui
  17. 2
      keep/common/backuplistviewitem.cpp
  18. 2
      keep/common/backuplistviewitem.h
  19. 2
      keep/common/includeexcludeitem.cpp
  20. 2
      keep/common/includeexcludeitem.h
  21. 2
      keep/common/incrementlistviewitem.cpp
  22. 2
      keep/common/incrementlistviewitem.h

2
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)

2
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>

2
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>

2
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>

2
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>

4
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"

2
keep/app/includeexcludedialog.h

@ -20,7 +20,7 @@
#define _INCLUDEEXCLUDEDIALOG_H_
#include <kdialogbase.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include "includeexcludeview.h"

2
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>

2
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>

2
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>

2
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>

2
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>

2
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>

2
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>

2
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>

2
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>

2
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)
{

2
keep/common/backuplistviewitem.h

@ -19,7 +19,7 @@
#ifndef _BACKUPLISTVIEWITEM_H_
#define _BACKUPLISTVIEWITEM_H_
#include <klistview.h>
#include <tdelistview.h>
#include "backup.h"

2
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)
{

2
keep/common/includeexcludeitem.h

@ -19,7 +19,7 @@
#ifndef _INCLUDEEXCLUDEITEM_H_
#define _INCLUDEEXCLUDEITEM_H_
#include <klistview.h>
#include <tdelistview.h>
#include "backup.h"

2
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)
{

2
keep/common/incrementlistviewitem.h

@ -19,7 +19,7 @@
#ifndef _INCREMENTLISTVIEWITEM_H_
#define _INCREMENTLISTVIEWITEM_H_
#include <klistview.h>
#include <tdelistview.h>
#include <tqdatetime.h>

Loading…
Cancel
Save