Browse Source

Rename additional header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 8 years ago
parent
commit
9a89a60c56
30 changed files with 46 additions and 46 deletions
  1. +1
    -1
      krename/ProgressDialog.cpp
  2. +1
    -1
      krename/batchrenamer.cpp
  3. +2
    -2
      krename/commandplugin.cpp
  4. +1
    -1
      krename/confdialog.cpp
  5. +1
    -1
      krename/coorddialog.cpp
  6. +1
    -1
      krename/dateplugin.cpp
  7. +1
    -1
      krename/datetime.cpp
  8. +2
    -2
      krename/dsdirselectdialog.cpp
  9. +2
    -2
      krename/encodingplugin.cpp
  10. +1
    -1
      krename/fileoperation.cpp
  11. +1
    -1
      krename/fileplugin.cpp
  12. +1
    -1
      krename/guimodeselector.cpp
  13. +1
    -1
      krename/helpdialog.cpp
  14. +1
    -1
      krename/kmyhistorycombo.cpp
  15. +1
    -1
      krename/kmylistbox.cpp
  16. +1
    -1
      krename/kmylistview.cpp
  17. +4
    -4
      krename/krenameimpl.cpp
  18. +2
    -2
      krename/main.cpp
  19. +1
    -1
      krename/mydirplugin.cpp
  20. +1
    -1
      krename/myinputdialog.cpp
  21. +1
    -1
      krename/numberdialog.cpp
  22. +1
    -1
      krename/permission.cpp
  23. +1
    -1
      krename/pictureplugin.cpp
  24. +2
    -2
      krename/profiledlg.cpp
  25. +2
    -2
      krename/replacedialog.cpp
  26. +1
    -1
      krename/semantic.cache
  27. +4
    -4
      krename/tabs.cpp
  28. +1
    -1
      krename/translitplugin.h
  29. +2
    -2
      krename/undodialog.cpp
  30. +4
    -4
      krename/wizard.cpp

+ 1
- 1
krename/ProgressDialog.cpp View File

@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdelistview.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <krun.h>


+ 1
- 1
krename/batchrenamer.cpp View File

@ -40,7 +40,7 @@
#include <tdeapplication.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <tdelocale.h>
// Own includes
#include "ProgressDialog.h"


+ 2
- 2
krename/commandplugin.cpp View File

@ -26,10 +26,10 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <klineedit.h>
#include <tdelistbox.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kprocess.h>


+ 1
- 1
krename/confdialog.cpp View File

@ -27,7 +27,7 @@
// KDE includes
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
ConfDialog::ConfDialog( TQWidget* parent, const char* name )
: KDialogBase( KDialogBase::IconList, "KRename",


+ 1
- 1
krename/coorddialog.cpp View File

@ -26,7 +26,7 @@
// KDE includes
#include <tdeapplication.h>
#include <klocale.h>
#include <tdelocale.h>
DSLineEdit::DSLineEdit( TQWidget* parent, const char* name )
: KLineEdit( parent, name )


+ 1
- 1
krename/dateplugin.cpp View File

@ -22,7 +22,7 @@
// KDE includes
#include <tdefileitem.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <tdelocale.h>
DatePlugin::DatePlugin()
: FilePlugin(0)


+ 1
- 1
krename/datetime.cpp View File

@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <kdatepik.h>
#include <knuminput.h>
#include <klocale.h>
#include <tdelocale.h>
// OS includes
#include <stdio.h>


+ 2
- 2
krename/dsdirselectdialog.cpp View File

@ -26,8 +26,8 @@
#include <tqvbox.h>
// KDE includes
#include <kdiroperator.h>
#include <klocale.h>
#include <tdediroperator.h>
#include <tdelocale.h>
#include <kurlcombobox.h>
DSDirSelectDialog::DSDirSelectDialog( TQWidget* parent )


+ 2
- 2
krename/encodingplugin.cpp View File

@ -29,8 +29,8 @@
#include <tdeapplication.h>
#include <kcombobox.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
const TQString EncodingPlugin::getName() const
{


+ 1
- 1
krename/fileoperation.cpp View File

@ -17,7 +17,7 @@
// KDE includes
#include <tdeapplication.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>


+ 1
- 1
krename/fileplugin.cpp View File

@ -28,7 +28,7 @@
#include <tdefilemetainfo.h>
#include <klineedit.h>
#include <tdelistbox.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kiconloader.h>
#include <kpushbutton.h>


+ 1
- 1
krename/guimodeselector.cpp View File

@ -25,7 +25,7 @@
#include <tqradiobutton.h>
// KDE includes
#include <klocale.h>
#include <tdelocale.h>
GUIModeSelector::GUIModeSelector()
{


+ 1
- 1
krename/helpdialog.cpp View File

@ -23,7 +23,7 @@
#include <tqlineedit.h>
// KDE includes
#include <klocale.h>
#include <tdelocale.h>
#include <tdelistview.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>


+ 1
- 1
krename/kmyhistorycombo.cpp View File

@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tqpopupmenu.h>
#include <tqtimer.h>


+ 1
- 1
krename/kmylistbox.cpp View File

@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <kdirlister.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdeio/previewjob.h>
#include <tdeio/netaccess.h>
#include <tqptrlist.h>


+ 1
- 1
krename/kmylistview.cpp View File

@ -20,7 +20,7 @@
// KDE includes
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <krun.h>


+ 4
- 4
krename/krenameimpl.cpp View File

@ -47,12 +47,12 @@
#include <tdefileitem.h>
#include <khelpmenu.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kmenubar.h>
#include <tdemessagebox.h>
#include <tdemenubar.h>
#include <tdepopupmenu.h>
#include <kurlrequester.h>
#include <ktempfile.h>
#include <klocale.h>
#include <tdetempfile.h>
#include <tdelocale.h>
#include <tdeio/netaccess.h>
// QT includes


+ 2
- 2
krename/main.cpp View File

@ -25,8 +25,8 @@
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kimageio.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
// Own includes
#include "wizard.h"


+ 1
- 1
krename/mydirplugin.cpp View File

@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <tdelocale.h>
// QT includes
#include <tqlabel.h>


+ 1
- 1
krename/myinputdialog.cpp View File

@ -19,7 +19,7 @@
#include <klineedit.h>
#include <kpushbutton.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqtooltip.h>


+ 1
- 1
krename/numberdialog.cpp View File

@ -26,7 +26,7 @@
// KDE includes
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kpushbutton.h>
#include <tqcheckbox.h>


+ 1
- 1
krename/permission.cpp View File

@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <kcombobox.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
// OS includes
#include <stdio.h>


+ 1
- 1
krename/pictureplugin.cpp View File

@ -22,7 +22,7 @@
// KDE includes
#include <tdeapplication.h>
#include <klocale.h>
#include <tdelocale.h>
PicturePlugin::PicturePlugin()
: FilePlugin( 0 )


+ 2
- 2
krename/profiledlg.cpp View File

@ -27,8 +27,8 @@
#include <kiconloader.h>
#include <kinputdialog.h>
#include <tdelistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>


+ 2
- 2
krename/replacedialog.cpp View File

@ -28,9 +28,9 @@
// KDE includes
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdelistview.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include <kpushbutton.h>
#include <kregexpeditorinterface.h>


+ 1
- 1
krename/semantic.cache
File diff suppressed because it is too large
View File


+ 4
- 4
krename/tabs.cpp View File

@ -27,11 +27,11 @@
// KDE includes
#include <tdeapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemenubar.h>
#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kstartupinfo.h>
#include <tdestartupinfo.h>
tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
: TQDialog(parent,name)


+ 1
- 1
krename/translitplugin.h View File

@ -26,7 +26,7 @@
// KDE includes
#include <tdeapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kcombobox.h>
// #include <kdebug.h>


+ 2
- 2
krename/undodialog.cpp View File

@ -23,8 +23,8 @@
// KDE includes
#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kprocess.h>
#include <ktextbrowser.h>
#include <kurlrequester.h>


+ 4
- 4
krename/wizard.cpp View File

@ -22,10 +22,10 @@
// KDE includes
#include <tdeapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kstartupinfo.h>
#include <tdelocale.h>
#include <tdemenubar.h>
#include <tdemessagebox.h>
#include <tdestartupinfo.h>
// TQt includes
#include <tqlabel.h>


Loading…
Cancel
Save