Browse Source

Rename additional header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 8 years ago
parent
commit
047100f357
15 changed files with 27 additions and 27 deletions
  1. +1
    -1
      src/kmplayer_koffice_part.cpp
  2. +1
    -1
      src/kmplayer_part.cpp
  3. +3
    -3
      src/kmplayerapp.cpp
  4. +3
    -3
      src/kmplayerbroadcast.cpp
  5. +3
    -3
      src/kmplayerconfig.cpp
  6. +1
    -1
      src/kmplayercontrolpanel.cpp
  7. +1
    -1
      src/kmplayerpartbase.cpp
  8. +3
    -3
      src/kmplayerprocess.cpp
  9. +2
    -2
      src/kmplayertvsource.cpp
  10. +2
    -2
      src/kmplayervdr.cpp
  11. +2
    -2
      src/kmplayerview.cpp
  12. +1
    -1
      src/main.cpp
  13. +1
    -1
      src/playlistview.cpp
  14. +2
    -2
      src/pref.cpp
  15. +1
    -1
      src/viewarea.cpp

+ 1
- 1
src/kmplayer_koffice_part.cpp View File

@ -33,7 +33,7 @@
#include <tqvaluelist.h>
#include <kprocess.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
#include <tdeconfig.h>


+ 1
- 1
src/kmplayer_part.cpp View File

@ -35,7 +35,7 @@ class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, tdeactionco
#include <ksimpleconfig.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kinstance.h>
#include <tdeparts/factory.h>
#include <kstaticdeleter.h>


+ 3
- 3
src/kmplayerapp.cpp View File

@ -41,13 +41,13 @@
#include <tdeversion.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <klineeditdlg.h>
#include <kmenubar.h>
#include <tdemenubar.h>
#include <kstatusbar.h>
#include <kurldrag.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstdaction.h>
#include <kdebug.h>


+ 3
- 3
src/kmplayerbroadcast.cpp View File

@ -33,13 +33,13 @@
#include <tqfile.h>
#include <tqtimer.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kled.h>
#include <tdeconfig.h>
#include <kprocess.h>
#include <kprocctrl.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include "kmplayerbroadcast.h"
#include "kmplayerprocess.h"
@ -470,7 +470,7 @@ TQFrame * KMPlayerBroadcastConfig::prefPage (TQWidget * parent) {
KDE_NO_EXPORT bool KMPlayerBroadcastConfig::broadcasting () const {
return m_ffserver_process && m_ffserver_process->isRunning ();
}
#include <kglobal.h>
#include <tdeglobal.h>
#include <kstandarddirs.h>
static const char ffserverconf[] =


+ 3
- 3
src/kmplayerconfig.cpp View File

@ -38,10 +38,10 @@
#include <tdeapplication.h>
#include <kurl.h>
#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kcombobox.h>
#include <kmessagebox.h>
#include <kglobalsettings.h>
#include <tdemessagebox.h>
#include <tdeglobalsettings.h>
#include "kmplayersource.h"
#include "kmplayerconfig.h"


+ 1
- 1
src/kmplayercontrolpanel.cpp View File

@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include "kmplayerview.h"


+ 1
- 1
src/kmplayerpartbase.cpp View File

@ -36,7 +36,7 @@
#include <tqregexp.h>
#include <tqtextstream.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
#include <kbookmarkmenu.h>


+ 3
- 3
src/kmplayerprocess.cpp View File

@ -39,10 +39,10 @@
#include <kprocess.h>
#include <kdebug.h>
#include <kprocctrl.h>
#include <kprotocolmanager.h>
#include <tdeprotocolmanager.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <tdeio/job.h>


+ 2
- 2
src/kmplayertvsource.cpp View File

@ -33,9 +33,9 @@
#include <tqpopupmenu.h>
#include <tqfontmetrics.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <klineedit.h>
#include <kurlrequester.h>
#include <kcombobox.h>


+ 2
- 2
src/kmplayervdr.cpp View File

@ -40,9 +40,9 @@
#include <tqsocket.h>
#include <tqeventloop.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <klineedit.h>
#include <kurlrequester.h>
#include <kcombobox.h>


+ 2
- 2
src/kmplayerview.cpp View File

@ -43,7 +43,7 @@
#include <kiconloader.h>
#include <kstatusbar.h>
#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeactioncollection.h>
#include <kstdaction.h>
@ -51,7 +51,7 @@
#include <kurldrag.h>
#include <kfinddialog.h>
#include <dcopclient.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <kstaticdeleter.h>
#include "kmplayerview.h"


+ 1
- 1
src/main.cpp View File

@ -19,7 +19,7 @@ email :
#include <config.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdemacros.h>
#include <dcopclient.h>


+ 1
- 1
src/playlistview.cpp View File

@ -35,7 +35,7 @@
#include <kfinddialog.h>
#include <kurldrag.h>
#include <tdeaction.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include "playlistview.h"


+ 2
- 2
src/pref.cpp View File

@ -42,10 +42,10 @@
#include <tqtimer.h>
#include <tqfont.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <klineedit.h>
#include <kiconloader.h>
#include <tdeversion.h>


+ 1
- 1
src/viewarea.cpp View File

@ -34,7 +34,7 @@
#include <kstatusbar.h>
#include <kstdaction.h>
#include <tdeshortcut.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include "kmplayerview.h"


Loading…
Cancel
Save