Browse Source

Rename additional header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 9 years ago
parent
commit
ce769d5ff8
  1. 2
      src/app/historyAction.cpp
  2. 2
      src/app/main.cpp
  3. 4
      src/app/mainWindow.cpp
  4. 2
      src/part/Config.cpp
  5. 4
      src/part/fileTree.cpp
  6. 4
      src/part/part.cpp
  7. 6
      src/part/progressBox.cpp
  8. 4
      src/part/radialMap/builder.cpp
  9. 2
      src/part/radialMap/map.cpp
  10. 6
      src/part/radialMap/segmentTip.cpp
  11. 2
      src/part/radialMap/widget.cpp
  12. 4
      src/part/radialMap/widgetEvents.cpp
  13. 4
      src/part/settingsDialog.cpp
  14. 2
      src/part/summaryWidget.cpp

2
src/app/historyAction.cpp

@ -5,7 +5,7 @@
#include <tdeaccel.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <tdelocale.h>
inline

2
src/app/main.cpp

@ -5,7 +5,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kurl.h>
#include "mainWindow.h"

4
src/app/mainWindow.cpp

@ -15,8 +15,8 @@
#include <kedittoolbar.h> //for editToolbar dialog
#include <kkeydialog.h>
#include <klibloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kshell.h>
#include <kstatusbar.h>
#include <tdetoolbar.h>

2
src/part/Config.cpp

@ -1,7 +1,7 @@
#include "Config.h"
#include <tdeconfig.h>
#include <kglobal.h>
#include <tdeglobal.h>
bool Config::scanAcrossMounts;

4
src/part/fileTree.cpp

@ -2,8 +2,8 @@
//Copyright: See COPYING file that comes with this distribution
#include "fileTree.h"
#include <kglobal.h>
#include <klocale.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <tqfile.h>

4
src/part/part.cpp

@ -14,8 +14,8 @@
#include <tdeaboutdata.h> //::createAboutData()
#include <tdeaction.h>
#include <klocale.h>
#include <kmessagebox.h> //::start()
#include <tdelocale.h>
#include <tdemessagebox.h> //::start()
//#include <konq_operations.h>
#include <tdeparts/genericfactory.h>
#include <kstatusbar.h>

6
src/part/progressBox.cpp

@ -1,10 +1,10 @@
//Author: Max Howell <max.howell@methylblue.com>, (C) 2003-4
//Copyright: See COPYING file that comes with this distribution
#include <kglobal.h>
#include <kglobalsettings.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <tdeio/job.h>
#include <klocale.h>
#include <tdelocale.h>
#include "scan.h"
#include "progressBox.h"

4
src/part/radialMap/builder.cpp

@ -4,8 +4,8 @@
#include "builder.h"
#include "Config.h"
#include "fileTree.h"
#include <kglobal.h> //locale object
#include <klocale.h>
#include <tdeglobal.h> //locale object
#include <tdelocale.h>
#include "widget.h"

2
src/part/radialMap/map.cpp

@ -2,7 +2,7 @@
//Copyright: See COPYING file that comes with this distribution
#include <kcursor.h> //make()
#include <kglobalsettings.h> //kdeColours
#include <tdeglobalsettings.h> //kdeColours
#include <kimageeffect.h> //desaturate()
#include <tqapplication.h> //make()
#include <tqimage.h> //make() & paint()

6
src/part/radialMap/segmentTip.cpp

@ -6,9 +6,9 @@
#include <cstdlib>
#include <tdeapplication.h> //installing eventFilters
#include <kglobal.h>
#include <kglobalsettings.h>
#include <klocale.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
#include <kpixmapeffect.h>
#include <tqpainter.h>
#include <tqtooltip.h> //for its palette

2
src/part/radialMap/widget.cpp

@ -2,7 +2,7 @@
//Copyright: See COPYING file that comes with this distribution
#include <kcursor.h> //ctor
#include <klocale.h>
#include <tdelocale.h>
#include <kurl.h>
#include <tqapplication.h> //sendEvent
#include <tqbitmap.h> //ctor - finding cursor size

4
src/part/radialMap/widgetEvents.cpp

@ -10,8 +10,8 @@
#include <kiconeffect.h> //::mousePressEvent()
#include <kiconloader.h> //::mousePressEvent()
#include <tdeio/job.h> //::mousePressEvent()
#include <klocale.h>
#include <kmessagebox.h> //::mousePressEvent()
#include <tdelocale.h>
#include <tdemessagebox.h> //::mousePressEvent()
#include <tdepopupmenu.h> //::mousePressEvent()
#include <krun.h> //::mousePressEvent()
#include <kurldrag.h>

4
src/part/settingsDialog.cpp

@ -10,8 +10,8 @@
#include <kdirselectdialog.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <knuminput.h>
#include "settingsDialog.h"

2
src/part/summaryWidget.cpp

@ -7,7 +7,7 @@
#include <kcursor.h>
#include <kiconeffect.h> //MyRadialMap::mousePressEvent()
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqtextstream.h>

Loading…
Cancel
Save