Browse Source

Rename many classes and header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
e72932181b
28 changed files with 35 additions and 35 deletions
  1. +1
    -1
      src/borrowerdialog.h
  2. +1
    -1
      src/collectionfieldsdialog.cpp
  3. +2
    -2
      src/configdialog.cpp
  4. +1
    -1
      src/configdialog.h
  5. +2
    -2
      src/controller.cpp
  6. +2
    -2
      src/detailedlistview.cpp
  7. +2
    -2
      src/entryeditdialog.cpp
  8. +1
    -1
      src/entryiconview.cpp
  9. +1
    -1
      src/entryupdater.cpp
  10. +1
    -1
      src/fetch/amazonfetcher.cpp
  11. +1
    -1
      src/fetch/configwidget.cpp
  12. +1
    -1
      src/fetch/execexternalfetcher.cpp
  13. +1
    -1
      src/fetch/gcstarpluginfetcher.cpp
  14. +1
    -1
      src/fetch/srufetcher.cpp
  15. +1
    -1
      src/fetch/z3950fetcher.cpp
  16. +1
    -1
      src/fetchdialog.cpp
  17. +1
    -1
      src/filterview.cpp
  18. +2
    -2
      src/groupview.cpp
  19. +1
    -1
      src/gui/lineedit.cpp
  20. +1
    -1
      src/gui/listview.cpp
  21. +1
    -1
      src/gui/listview.h
  22. +1
    -1
      src/gui/stringmapdialog.cpp
  23. +1
    -1
      src/gui/tablefieldwidget.cpp
  24. +1
    -1
      src/loanview.cpp
  25. +3
    -3
      src/mainwindow.cpp
  26. +1
    -1
      src/mainwindow.h
  27. +1
    -1
      src/newstuff/dialog.cpp
  28. +1
    -1
      xslt/discogs2tellico.xsl

+ 1
- 1
src/borrowerdialog.h View File

@@ -20,7 +20,7 @@ class KLineEdit;

#include <kdialogbase.h>

#include <klistview.h>
#include <tdelistview.h>
#include <tqdict.h>

namespace KABC {


+ 1
- 1
src/collectionfieldsdialog.cpp View File

@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kpushbutton.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>

#include <tqgroupbox.h>
#include <tqlayout.h>


+ 2
- 2
src/configdialog.cpp View File

@@ -38,11 +38,11 @@
#include <kpushbutton.h>
#include <kiconloader.h>
#include <ksortablevaluelist.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <tdehtmlview.h>
#include <tdefiledialog.h>
#include <kinputdialog.h>
#include <kfontcombo.h>
#include <tdefontcombo.h>
#include <kcolorcombo.h>

#include <tqsize.h>


+ 1
- 1
src/configdialog.h View File

@@ -17,7 +17,7 @@
#include "fetch/fetcher.h"

#include <kdialogbase.h>
#include <klistview.h>
#include <tdelistview.h>

class TDEConfig;
class KLineEdit;


+ 2
- 2
src/controller.cpp View File

@@ -41,8 +41,8 @@

#include <klocale.h>
#include <kmessagebox.h>
#include <kaction.h>
#include <ktoolbarbutton.h>
#include <tdeaction.h>
#include <tdetoolbarbutton.h>

#include <tqpopupmenu.h>



+ 2
- 2
src/detailedlistview.cpp View File

@@ -26,9 +26,9 @@
#include <klocale.h>
#include <tdeconfig.h>
#include <kapplication.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>

#include <tqptrlist.h>
#include <tqstringlist.h>


+ 2
- 2
src/entryeditdialog.cpp View File

@@ -24,11 +24,11 @@

#include <klocale.h>
#include <kmessagebox.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <kiconloader.h>
#include <tdeversion.h>
#include <kpushbutton.h>
#include <kaccel.h>
#include <tdeaccel.h>

#include <tqlayout.h>
#include <tqstringlist.h>


+ 1
- 1
src/entryiconview.cpp View File

@@ -22,7 +22,7 @@
#include "tellico_debug.h"
#include "listviewcomparison.h"

#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstringhandler.h>
#include <kiconloader.h>
#include <kwordwrap.h>


+ 1
- 1
src/entryupdater.cpp View File

@@ -23,7 +23,7 @@

#include <kdialogbase.h>
#include <klocale.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kiconloader.h>

#include <tqvbox.h>


+ 1
- 1
src/fetch/amazonfetcher.cpp View File

@@ -34,7 +34,7 @@
#include <klineedit.h>
#include <kseparator.h>
#include <kcombobox.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>

#include <tqdom.h>
#include <tqlayout.h>


+ 1
- 1
src/fetch/configwidget.cpp View File

@@ -15,7 +15,7 @@

#include <tdeconfig.h>
#include <klocale.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>

#include <tqvgroupbox.h>
#include <tqlayout.h>


+ 1
- 1
src/fetch/execexternalfetcher.cpp View File

@@ -29,7 +29,7 @@
#include <tdeconfig.h>
#include <kprocess.h>
#include <kurlrequester.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>

#include <tqlayout.h>
#include <tqlabel.h>


+ 1
- 1
src/fetch/gcstarpluginfetcher.cpp View File

@@ -29,7 +29,7 @@
#include <kprocess.h>
#include <kprocio.h>
#include <kstandarddirs.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>

#include <tqdir.h>
#include <tqlayout.h>


+ 1
- 1
src/fetch/srufetcher.cpp View File

@@ -32,7 +32,7 @@
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <knuminput.h>

#include <tqlabel.h>


+ 1
- 1
src/fetch/z3950fetcher.cpp View File

@@ -43,7 +43,7 @@
#include <knuminput.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <kseparator.h>

#include <tqfile.h>


+ 1
- 1
src/fetchdialog.cpp View File

@@ -38,7 +38,7 @@
#include <kdialogbase.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <ktextedit.h>

#include <tqlayout.h>


+ 1
- 1
src/filterview.cpp View File

@@ -22,7 +22,7 @@
#include "../tellico_debug.h"

#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kiconloader.h>

#include <tqheader.h>


+ 2
- 2
src/groupview.cpp View File

@@ -26,10 +26,10 @@
#include "listviewcomparison.h"
#include "../tellico_debug.h"

#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kaction.h>
#include <tdeaction.h>

#include <tqstringlist.h>
#include <tqcolor.h>


+ 1
- 1
src/gui/lineedit.cpp View File

@@ -14,7 +14,7 @@
#include "lineedit.h"

#include <kstdaction.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <tdespell.h>

#include <tqapplication.h>


+ 1
- 1
src/gui/listview.cpp View File

@@ -306,7 +306,7 @@ TQColor ListViewItem::backgroundColor(int column_) {

void ListViewItem::paintCell(TQPainter* p_, const TQColorGroup& cg_,
int column_, int width_, int align_) {
// taken from klistview.cpp
// taken from tdelistview.cpp
// I can't call TDEListViewItem::paintCell since TDEListViewItem::backgroundCOlor(int) is
// not virtual. I need to be sure to call ListViewItem::backgroundColor(int);
TQColorGroup cg = cg_;


+ 1
- 1
src/gui/listview.h View File

@@ -17,7 +17,7 @@
#include "../datavectors.h"
#include "../listviewcomparison.h"

#include <klistview.h>
#include <tdelistview.h>
#include <tdeversion.h>

#include <tqdict.h>


+ 1
- 1
src/gui/stringmapdialog.cpp View File

@@ -13,7 +13,7 @@

#include "stringmapdialog.h"

#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <klineedit.h>
#include <kbuttonbox.h>


+ 1
- 1
src/gui/tablefieldwidget.cpp View File

@@ -17,7 +17,7 @@
#include "../tellico_kernel.h"

#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <kinputdialog.h>



+ 1
- 1
src/loanview.cpp View File

@@ -22,7 +22,7 @@
#include "listviewcomparison.h"

#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kiconloader.h>

#include <tqheader.h>


+ 3
- 3
src/mainwindow.cpp View File

@@ -59,7 +59,7 @@
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <kmenubar.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <klocale.h>
#include <tdeconfig.h>
#include <kstdaction.h>
@@ -71,12 +71,12 @@
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <ktip.h>
#include <krecentdocument.h>
#include <tderecentdocument.h>
#include <kedittoolbar.h>
#include <kkeydialog.h>
#include <tdeio/netaccess.h>
#include <dcopclient.h>
#include <kaction.h>
#include <tdeaction.h>

#include <tqsplitter.h>
//#include <tqpainter.h>


+ 1
- 1
src/mainwindow.h View File

@@ -20,7 +20,7 @@
#include "translators/translators.h"
#include "datavectors.h"

#include <kmainwindow.h>
#include <tdemainwindow.h>

class TDEToolBar;
class KURL;


+ 1
- 1
src/newstuff/dialog.cpp View File

@@ -25,7 +25,7 @@
#include <kstatusbar.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <kaccelmanager.h>
#include <tdeaccelmanager.h>
#include <knewstuff/entry.h>
#include <knewstuff/provider.h>
#include <ktempfile.h>


+ 1
- 1
xslt/discogs2tellico.xsl View File

@@ -165,7 +165,7 @@
</year>
<tracks>
<xsl:for-each select="tracklist/track">
<xsl:for-each select="tractdelist/track">
<xsl:sort select="position" data-type="number"/>
<track>
<column><xsl:value-of select="title"/></column>


Loading…
Cancel
Save