From 784a2227ffdcb03a1e37b1390a8b6e0985ddda9c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:52:08 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- src/borrowerdialog.cpp | 6 +++--- src/calendarhandler.cpp | 2 +- src/cite/clipboard.cpp | 2 +- src/cite/lyxpipe.cpp | 2 +- src/cite/openoffice.cpp | 2 +- src/collection.cpp | 2 +- src/collectionfactory.cpp | 2 +- src/collectionfieldsdialog.cpp | 4 ++-- src/collections/bibtexcollection.cpp | 2 +- src/collections/boardgamecollection.cpp | 2 +- src/collections/bookcollection.cpp | 2 +- src/collections/cardcollection.cpp | 2 +- src/collections/coincollection.cpp | 2 +- src/collections/comicbookcollection.cpp | 2 +- src/collections/filecatalog.cpp | 2 +- src/collections/gamecollection.cpp | 2 +- src/collections/musiccollection.cpp | 2 +- src/collections/stampcollection.cpp | 2 +- src/collections/videocollection.cpp | 2 +- src/collections/winecollection.cpp | 2 +- src/commands/addentries.cpp | 2 +- src/commands/addloans.cpp | 2 +- src/commands/collectioncommand.cpp | 2 +- src/commands/fieldcommand.cpp | 2 +- src/commands/filtercommand.cpp | 2 +- src/commands/modifyentries.cpp | 2 +- src/commands/modifyloans.cpp | 2 +- src/commands/removeentries.cpp | 2 +- src/commands/removeloans.cpp | 2 +- src/commands/renamecollection.cpp | 2 +- src/commands/reorderfields.cpp | 2 +- src/commands/updateentries.cpp | 2 +- src/configdialog.cpp | 2 +- src/controller.cpp | 4 ++-- src/core/netaccess.cpp | 2 +- src/core/tellico_config.kcfg | 2 +- src/detailedentryitem.cpp | 2 +- src/detailedlistview.cpp | 2 +- src/document.cpp | 6 +++--- src/entry.cpp | 2 +- src/entryeditdialog.cpp | 4 ++-- src/entrygroupitem.cpp | 2 +- src/entryiconview.cpp | 2 +- src/entrymerger.cpp | 2 +- src/entryupdater.cpp | 2 +- src/entryview.cpp | 6 +++--- src/exportdialog.cpp | 4 ++-- src/fetch/amazonfetcher.cpp | 2 +- src/fetch/animenfofetcher.cpp | 2 +- src/fetch/arxivfetcher.cpp | 2 +- src/fetch/bibsonomyfetcher.cpp | 2 +- src/fetch/citebasefetcher.cpp | 2 +- src/fetch/configwidget.cpp | 2 +- src/fetch/crossreffetcher.cpp | 2 +- src/fetch/discogsfetcher.cpp | 2 +- src/fetch/entrezfetcher.cpp | 2 +- src/fetch/execexternalfetcher.cpp | 2 +- src/fetch/fetcher.cpp | 2 +- src/fetch/fetchmanager.cpp | 6 +++--- src/fetch/googlescholarfetcher.cpp | 2 +- src/fetch/ibsfetcher.cpp | 2 +- src/fetch/imdbfetcher.cpp | 2 +- src/fetch/isbndbfetcher.cpp | 2 +- src/fetch/messagehandler.cpp | 2 +- src/fetch/srufetcher.cpp | 2 +- src/fetch/yahoofetcher.cpp | 2 +- src/fetch/z3950connection.cpp | 2 +- src/fetch/z3950fetcher.cpp | 2 +- src/fetchdialog.cpp | 2 +- src/fetcherconfigdialog.cpp | 2 +- src/field.cpp | 4 ++-- src/filehandler.cpp | 6 +++--- src/filterdialog.cpp | 2 +- src/filterview.cpp | 2 +- src/groupview.cpp | 2 +- src/gui/counteditem.cpp | 2 +- src/gui/datewidget.cpp | 4 ++-- src/gui/fieldwidget.cpp | 2 +- src/gui/imagewidget.cpp | 4 ++-- src/gui/kwidgetlister.cpp | 2 +- src/gui/previewdialog.cpp | 2 +- src/gui/stringmapdialog.cpp | 2 +- src/gui/tablefieldwidget.cpp | 2 +- src/importdialog.cpp | 2 +- src/loandialog.cpp | 4 ++-- src/loanview.cpp | 2 +- src/main.cpp | 2 +- src/mainwindow.cpp | 8 ++++---- src/newstuff/dialog.cpp | 4 ++-- src/newstuff/manager.cpp | 4 ++-- src/newstuff/providerloader.cpp | 6 +++--- src/reportdialog.cpp | 2 +- src/statusbar.cpp | 2 +- src/tellico_kernel.cpp | 6 +++--- src/tellico_strings.cpp | 2 +- src/tellico_utils.cpp | 4 ++-- src/translators/alexandriaexporter.cpp | 4 ++-- src/translators/audiofileimporter.cpp | 2 +- src/translators/bibtexexporter.cpp | 2 +- src/translators/bibtexhandler.cpp | 2 +- src/translators/bibtexmlexporter.cpp | 2 +- src/translators/csvexporter.cpp | 2 +- src/translators/csvimporter.cpp | 2 +- src/translators/gcfilmsexporter.cpp | 2 +- src/translators/griffithimporter.cpp | 2 +- src/translators/htmlexporter.cpp | 4 ++-- src/translators/importer.h | 2 +- src/translators/onixexporter.cpp | 2 +- src/translators/pdfimporter.cpp | 2 +- src/translators/pilotdbexporter.cpp | 4 ++-- src/translators/tellicoimporter.cpp | 2 +- src/translators/tellicoxmlexporter.cpp | 4 ++-- src/translators/tellicozipexporter.cpp | 2 +- src/translators/xmlimporter.cpp | 2 +- src/translators/xsltexporter.cpp | 2 +- src/translators/xsltimporter.cpp | 2 +- src/viewstack.cpp | 2 +- 117 files changed, 149 insertions(+), 149 deletions(-) diff --git a/src/borrowerdialog.cpp b/src/borrowerdialog.cpp index d9d34c7..1a3b10c 100644 --- a/src/borrowerdialog.cpp +++ b/src/borrowerdialog.cpp @@ -15,10 +15,10 @@ #include "document.h" #include "collection.h" -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/src/calendarhandler.cpp b/src/calendarhandler.cpp index 765da12..8a30619 100644 --- a/src/calendarhandler.cpp +++ b/src/calendarhandler.cpp @@ -16,7 +16,7 @@ #include "tellico_kernel.h" #include "tellico_debug.h" -#include +#include #include #include diff --git a/src/cite/clipboard.cpp b/src/cite/clipboard.cpp index 14cac58..1e76830 100644 --- a/src/cite/clipboard.cpp +++ b/src/cite/clipboard.cpp @@ -15,7 +15,7 @@ #include "../collection.h" #include "../translators/bibtexhandler.h" -#include +#include #include #include diff --git a/src/cite/lyxpipe.cpp b/src/cite/lyxpipe.cpp index 4b305d1..b08869d 100644 --- a/src/cite/lyxpipe.cpp +++ b/src/cite/lyxpipe.cpp @@ -18,7 +18,7 @@ #include "../core/tellico_config.h" #include "../tellico_debug.h" -#include +#include #include diff --git a/src/cite/openoffice.cpp b/src/cite/openoffice.cpp index e00790b..91e96ed 100644 --- a/src/cite/openoffice.cpp +++ b/src/cite/openoffice.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/collection.cpp b/src/collection.cpp index 6eaece8..7d121e0 100644 --- a/src/collection.cpp +++ b/src/collection.cpp @@ -22,7 +22,7 @@ #include "stringset.h" #include "tellico_kernel.h" -#include +#include #include #include diff --git a/src/collectionfactory.cpp b/src/collectionfactory.cpp index e6f4178..c8c0730 100644 --- a/src/collectionfactory.cpp +++ b/src/collectionfactory.cpp @@ -27,7 +27,7 @@ #include "field.h" #include "tellico_debug.h" -#include +#include using Tellico::CollectionFactory; diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp index 3c1b6d5..ef3583f 100644 --- a/src/collectionfieldsdialog.cpp +++ b/src/collectionfieldsdialog.cpp @@ -21,11 +21,11 @@ #include "tellico_utils.h" #include "tellico_debug.h" -#include +#include #include #include #include -#include +#include #include #include diff --git a/src/collections/bibtexcollection.cpp b/src/collections/bibtexcollection.cpp index 0f45384..d28268b 100644 --- a/src/collections/bibtexcollection.cpp +++ b/src/collections/bibtexcollection.cpp @@ -16,7 +16,7 @@ #include "../document.h" #include "../tellico_debug.h" -#include +#include using Tellico::Data::BibtexCollection; diff --git a/src/collections/boardgamecollection.cpp b/src/collections/boardgamecollection.cpp index 2f09199..9a73f7d 100644 --- a/src/collections/boardgamecollection.cpp +++ b/src/collections/boardgamecollection.cpp @@ -13,7 +13,7 @@ #include "boardgamecollection.h" -#include +#include namespace { static const char* boardgame_general = I18N_NOOP("General"); diff --git a/src/collections/bookcollection.cpp b/src/collections/bookcollection.cpp index 72ff534..ad3011e 100644 --- a/src/collections/bookcollection.cpp +++ b/src/collections/bookcollection.cpp @@ -13,7 +13,7 @@ #include "bookcollection.h" -#include +#include namespace { static const char* book_general = I18N_NOOP("General"); diff --git a/src/collections/cardcollection.cpp b/src/collections/cardcollection.cpp index f0f045d..0c7c534 100644 --- a/src/collections/cardcollection.cpp +++ b/src/collections/cardcollection.cpp @@ -13,7 +13,7 @@ #include "cardcollection.h" -#include +#include namespace { static const char* card_general = I18N_NOOP("General"); diff --git a/src/collections/coincollection.cpp b/src/collections/coincollection.cpp index 19499db..8b1c205 100644 --- a/src/collections/coincollection.cpp +++ b/src/collections/coincollection.cpp @@ -13,7 +13,7 @@ #include "coincollection.h" -#include +#include namespace { static const char* coin_general = I18N_NOOP("General"); diff --git a/src/collections/comicbookcollection.cpp b/src/collections/comicbookcollection.cpp index e7b7a61..0098665 100644 --- a/src/collections/comicbookcollection.cpp +++ b/src/collections/comicbookcollection.cpp @@ -13,7 +13,7 @@ #include "comicbookcollection.h" -#include +#include namespace { static const char* comic_general = I18N_NOOP("General"); diff --git a/src/collections/filecatalog.cpp b/src/collections/filecatalog.cpp index fcb0a02..92d088f 100644 --- a/src/collections/filecatalog.cpp +++ b/src/collections/filecatalog.cpp @@ -13,7 +13,7 @@ #include "filecatalog.h" -#include +#include namespace { static const char* file_general = I18N_NOOP("General"); diff --git a/src/collections/gamecollection.cpp b/src/collections/gamecollection.cpp index 4e9cf28..7f4923e 100644 --- a/src/collections/gamecollection.cpp +++ b/src/collections/gamecollection.cpp @@ -13,7 +13,7 @@ #include "gamecollection.h" -#include +#include namespace { static const char* game_general = I18N_NOOP("General"); diff --git a/src/collections/musiccollection.cpp b/src/collections/musiccollection.cpp index 8d992b8..d9ace15 100644 --- a/src/collections/musiccollection.cpp +++ b/src/collections/musiccollection.cpp @@ -13,7 +13,7 @@ #include "musiccollection.h" -#include +#include namespace { static const char* music_general = I18N_NOOP("General"); diff --git a/src/collections/stampcollection.cpp b/src/collections/stampcollection.cpp index c41f806..16431da 100644 --- a/src/collections/stampcollection.cpp +++ b/src/collections/stampcollection.cpp @@ -13,7 +13,7 @@ #include "stampcollection.h" -#include +#include namespace { static const char* stamp_general = I18N_NOOP("General"); diff --git a/src/collections/videocollection.cpp b/src/collections/videocollection.cpp index 06f3a6a..8acb86e 100644 --- a/src/collections/videocollection.cpp +++ b/src/collections/videocollection.cpp @@ -13,7 +13,7 @@ #include "videocollection.h" -#include +#include namespace { static const char* video_general = I18N_NOOP("General"); diff --git a/src/collections/winecollection.cpp b/src/collections/winecollection.cpp index 433188f..5ee0826 100644 --- a/src/collections/winecollection.cpp +++ b/src/collections/winecollection.cpp @@ -13,7 +13,7 @@ #include "winecollection.h" -#include +#include namespace { static const char* wine_general = I18N_NOOP("General"); diff --git a/src/commands/addentries.cpp b/src/commands/addentries.cpp index 87d7bc7..e4c48f9 100644 --- a/src/commands/addentries.cpp +++ b/src/commands/addentries.cpp @@ -17,7 +17,7 @@ #include "../datavectors.h" #include "../tellico_debug.h" -#include +#include using Tellico::Command::AddEntries; diff --git a/src/commands/addloans.cpp b/src/commands/addloans.cpp index bbef197..9c29b68 100644 --- a/src/commands/addloans.cpp +++ b/src/commands/addloans.cpp @@ -19,7 +19,7 @@ #include "../calendarhandler.h" #include "../tellico_debug.h" -#include +#include using Tellico::Command::AddLoans; diff --git a/src/commands/collectioncommand.cpp b/src/commands/collectioncommand.cpp index 3d4e354..dc2cdc0 100644 --- a/src/commands/collectioncommand.cpp +++ b/src/commands/collectioncommand.cpp @@ -17,7 +17,7 @@ #include "../controller.h" #include "../tellico_debug.h" -#include +#include using Tellico::Command::CollectionCommand; diff --git a/src/commands/fieldcommand.cpp b/src/commands/fieldcommand.cpp index 43c063a..c3c5a3b 100644 --- a/src/commands/fieldcommand.cpp +++ b/src/commands/fieldcommand.cpp @@ -16,7 +16,7 @@ #include "../controller.h" #include "../tellico_debug.h" -#include +#include using Tellico::Command::FieldCommand; diff --git a/src/commands/filtercommand.cpp b/src/commands/filtercommand.cpp index c95db13..4055dec 100644 --- a/src/commands/filtercommand.cpp +++ b/src/commands/filtercommand.cpp @@ -17,7 +17,7 @@ #include "../controller.h" #include "../tellico_debug.h" -#include +#include using Tellico::Command::FilterCommand; diff --git a/src/commands/modifyentries.cpp b/src/commands/modifyentries.cpp index 3db5297..5b3e6b5 100644 --- a/src/commands/modifyentries.cpp +++ b/src/commands/modifyentries.cpp @@ -16,7 +16,7 @@ #include "../controller.h" #include "../tellico_debug.h" -#include +#include using Tellico::Command::ModifyEntries; diff --git a/src/commands/modifyloans.cpp b/src/commands/modifyloans.cpp index ebddfbc..15a0e21 100644 --- a/src/commands/modifyloans.cpp +++ b/src/commands/modifyloans.cpp @@ -17,7 +17,7 @@ #include "../controller.h" #include "../calendarhandler.h" -#include +#include using Tellico::Command::ModifyLoans; diff --git a/src/commands/removeentries.cpp b/src/commands/removeentries.cpp index 1fb9b60..8cd44d7 100644 --- a/src/commands/removeentries.cpp +++ b/src/commands/removeentries.cpp @@ -15,7 +15,7 @@ #include "../collection.h" #include "../controller.h" -#include +#include using Tellico::Command::RemoveEntries; diff --git a/src/commands/removeloans.cpp b/src/commands/removeloans.cpp index 3d39886..d830347 100644 --- a/src/commands/removeloans.cpp +++ b/src/commands/removeloans.cpp @@ -18,7 +18,7 @@ #include "../calendarhandler.h" #include "../tellico_debug.h" -#include +#include using Tellico::Command::RemoveLoans; diff --git a/src/commands/renamecollection.cpp b/src/commands/renamecollection.cpp index 9aaf022..e80244c 100644 --- a/src/commands/renamecollection.cpp +++ b/src/commands/renamecollection.cpp @@ -15,7 +15,7 @@ #include "../document.h" #include "../collection.h" -#include +#include using Tellico::Command::RenameCollection; diff --git a/src/commands/reorderfields.cpp b/src/commands/reorderfields.cpp index cefb946..9419c08 100644 --- a/src/commands/reorderfields.cpp +++ b/src/commands/reorderfields.cpp @@ -16,7 +16,7 @@ #include "../controller.h" #include "../tellico_debug.h" -#include +#include using Tellico::Command::ReorderFields; diff --git a/src/commands/updateentries.cpp b/src/commands/updateentries.cpp index 32ab8e0..9871063 100644 --- a/src/commands/updateentries.cpp +++ b/src/commands/updateentries.cpp @@ -18,7 +18,7 @@ #include "../tellico_kernel.h" #include "../document.h" -#include +#include using Tellico::Command::UpdateEntries; diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 119ec74..6367d1b 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -31,7 +31,7 @@ #include "../tellico_debug.h" #include -#include +#include #include #include #include diff --git a/src/controller.cpp b/src/controller.cpp index 60166bc..f3afb2a 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -39,8 +39,8 @@ #include "entryupdater.h" #include "entrymerger.h" -#include -#include +#include +#include #include #include diff --git a/src/core/netaccess.cpp b/src/core/netaccess.cpp index 82b3fce..5b12cbe 100644 --- a/src/core/netaccess.cpp +++ b/src/core/netaccess.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/core/tellico_config.kcfg b/src/core/tellico_config.kcfg index 51ecde3..24ba5ed 100644 --- a/src/core/tellico_config.kcfg +++ b/src/core/tellico_config.kcfg @@ -6,7 +6,7 @@ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > -klocale.h +tdelocale.h diff --git a/src/detailedentryitem.cpp b/src/detailedentryitem.cpp index 5cdc8f5..bbfe657 100644 --- a/src/detailedentryitem.cpp +++ b/src/detailedentryitem.cpp @@ -18,7 +18,7 @@ #include "tellico_utils.h" #include "latin1literal.h" -#include +#include #include #include diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp index a6d91b9..938c4a4 100644 --- a/src/detailedlistview.cpp +++ b/src/detailedlistview.cpp @@ -23,7 +23,7 @@ #include "tellico_kernel.h" #include "core/tellico_config.h" -#include +#include #include #include #include diff --git a/src/document.cpp b/src/document.cpp index 91e5385..40a38dd 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -30,9 +30,9 @@ #include "progressmanager.h" #include "core/tellico_config.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/entry.cpp b/src/entry.cpp index 514ee2d..fc97354 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -23,7 +23,7 @@ #include "../isbnvalidator.h" #include "../lccnvalidator.h" -#include +#include #include diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp index 57a9977..feb57a7 100644 --- a/src/entryeditdialog.cpp +++ b/src/entryeditdialog.cpp @@ -22,8 +22,8 @@ #include "tellico_debug.h" #include "latin1literal.h" -#include -#include +#include +#include #include #include #include diff --git a/src/entrygroupitem.cpp b/src/entrygroupitem.cpp index c94fa53..3d08169 100644 --- a/src/entrygroupitem.cpp +++ b/src/entrygroupitem.cpp @@ -20,7 +20,7 @@ #include "core/tellico_config.h" #include -#include +#include #include #include diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp index 64b49e1..c932573 100644 --- a/src/entryiconview.cpp +++ b/src/entryiconview.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include diff --git a/src/entrymerger.cpp b/src/entrymerger.cpp index abe4998..62de6c1 100644 --- a/src/entrymerger.cpp +++ b/src/entrymerger.cpp @@ -20,7 +20,7 @@ #include "statusbar.h" #include "tellico_debug.h" -#include +#include #include diff --git a/src/entryupdater.cpp b/src/entryupdater.cpp index afae780..600ff4c 100644 --- a/src/entryupdater.cpp +++ b/src/entryupdater.cpp @@ -22,7 +22,7 @@ #include "document.h" #include -#include +#include #include #include diff --git a/src/entryview.cpp b/src/entryview.cpp index 37015d3..ab61616 100644 --- a/src/entryview.cpp +++ b/src/entryview.cpp @@ -29,12 +29,12 @@ #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp index b40d0a8..7ec7afe 100644 --- a/src/exportdialog.cpp +++ b/src/exportdialog.cpp @@ -30,9 +30,9 @@ #include "translators/onixexporter.h" #include "translators/gcfilmsexporter.h" -#include +#include #include -#include +#include #include #include diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp index 7f0bb56..9088643 100644 --- a/src/fetch/amazonfetcher.cpp +++ b/src/fetch/amazonfetcher.cpp @@ -27,7 +27,7 @@ #include "../isbnvalidator.h" #include "../gui/combobox.h" -#include +#include #include #include #include diff --git a/src/fetch/animenfofetcher.cpp b/src/fetch/animenfofetcher.cpp index 45396f1..9447a5f 100644 --- a/src/fetch/animenfofetcher.cpp +++ b/src/fetch/animenfofetcher.cpp @@ -22,7 +22,7 @@ #include "../imagefactory.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/fetch/arxivfetcher.cpp b/src/fetch/arxivfetcher.cpp index e3cd776..f59d246 100644 --- a/src/fetch/arxivfetcher.cpp +++ b/src/fetch/arxivfetcher.cpp @@ -23,7 +23,7 @@ #include "../imagefactory.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/fetch/bibsonomyfetcher.cpp b/src/fetch/bibsonomyfetcher.cpp index 81b13b7..3e80b10 100644 --- a/src/fetch/bibsonomyfetcher.cpp +++ b/src/fetch/bibsonomyfetcher.cpp @@ -22,7 +22,7 @@ #include "../filehandler.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/fetch/citebasefetcher.cpp b/src/fetch/citebasefetcher.cpp index 5ab886d..f5e8cd6 100644 --- a/src/fetch/citebasefetcher.cpp +++ b/src/fetch/citebasefetcher.cpp @@ -22,7 +22,7 @@ #include "../filehandler.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp index 78a385b..052868c 100644 --- a/src/fetch/configwidget.cpp +++ b/src/fetch/configwidget.cpp @@ -14,7 +14,7 @@ #include "configwidget.h" #include -#include +#include #include #include diff --git a/src/fetch/crossreffetcher.cpp b/src/fetch/crossreffetcher.cpp index 27579ab..5029f08 100644 --- a/src/fetch/crossreffetcher.cpp +++ b/src/fetch/crossreffetcher.cpp @@ -23,7 +23,7 @@ #include "../imagefactory.h" #include "../tellico_debug.h" -#include +#include #include #include #include diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp index df3042d..ba4e65c 100644 --- a/src/fetch/discogsfetcher.cpp +++ b/src/fetch/discogsfetcher.cpp @@ -22,7 +22,7 @@ #include "../entry.h" #include "../tellico_debug.h" -#include +#include #include #include #include diff --git a/src/fetch/entrezfetcher.cpp b/src/fetch/entrezfetcher.cpp index 6237f7b..07066b8 100644 --- a/src/fetch/entrezfetcher.cpp +++ b/src/fetch/entrezfetcher.cpp @@ -21,7 +21,7 @@ #include "../translators/tellicoimporter.h" #include "../tellico_debug.h" -#include +#include #include #include #include diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp index 8e87f43..d477e47 100644 --- a/src/fetch/execexternalfetcher.cpp +++ b/src/fetch/execexternalfetcher.cpp @@ -25,7 +25,7 @@ #include "../tellico_utils.h" #include "../newstuff/manager.h" -#include +#include #include #include #include diff --git a/src/fetch/fetcher.cpp b/src/fetch/fetcher.cpp index 2a6fc87..4b119a9 100644 --- a/src/fetch/fetcher.cpp +++ b/src/fetch/fetcher.cpp @@ -15,7 +15,7 @@ #include "messagehandler.h" #include "../entry.h" -#include +#include #include using Tellico::Fetch::Fetcher; diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp index 56bea0a..f51b51a 100644 --- a/src/fetch/fetchmanager.cpp +++ b/src/fetch/fetchmanager.cpp @@ -46,14 +46,14 @@ #include "googlescholarfetcher.h" #include "discogsfetcher.h" -#include +#include #include -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/src/fetch/googlescholarfetcher.cpp b/src/fetch/googlescholarfetcher.cpp index ce5081c..19e69c6 100644 --- a/src/fetch/googlescholarfetcher.cpp +++ b/src/fetch/googlescholarfetcher.cpp @@ -20,7 +20,7 @@ #include "../tellico_kernel.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/fetch/ibsfetcher.cpp b/src/fetch/ibsfetcher.cpp index f2308ef..e715e5b 100644 --- a/src/fetch/ibsfetcher.cpp +++ b/src/fetch/ibsfetcher.cpp @@ -22,7 +22,7 @@ #include "../imagefactory.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp index 2198b50..a9c0dd0 100644 --- a/src/fetch/imdbfetcher.cpp +++ b/src/fetch/imdbfetcher.cpp @@ -23,7 +23,7 @@ #include "../gui/listboxtext.h" #include "../tellico_debug.h" -#include +#include #include #include #include diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp index 3ec088a..7bf8486 100644 --- a/src/fetch/isbndbfetcher.cpp +++ b/src/fetch/isbndbfetcher.cpp @@ -21,7 +21,7 @@ #include "../entry.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/fetch/messagehandler.cpp b/src/fetch/messagehandler.cpp index 287d689..9ba0f13 100644 --- a/src/fetch/messagehandler.cpp +++ b/src/fetch/messagehandler.cpp @@ -15,7 +15,7 @@ #include "fetchmanager.h" #include "../tellico_kernel.h" -#include +#include using Tellico::Fetch::ManagerMessage; diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp index 6cc932a..ec879b2 100644 --- a/src/fetch/srufetcher.cpp +++ b/src/fetch/srufetcher.cpp @@ -27,7 +27,7 @@ #include "../tellico_utils.h" #include "../lccnvalidator.h" -#include +#include #include #include #include diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp index 31602e2..9e73b50 100644 --- a/src/fetch/yahoofetcher.cpp +++ b/src/fetch/yahoofetcher.cpp @@ -22,7 +22,7 @@ #include "../entry.h" #include "../tellico_debug.h" -#include +#include #include #include #include diff --git a/src/fetch/z3950connection.cpp b/src/fetch/z3950connection.cpp index 7817762..71cc6a2 100644 --- a/src/fetch/z3950connection.cpp +++ b/src/fetch/z3950connection.cpp @@ -29,7 +29,7 @@ extern "C" { } #endif -#include +#include #include diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp index 1737b27..7e70aa4 100644 --- a/src/fetch/z3950fetcher.cpp +++ b/src/fetch/z3950fetcher.cpp @@ -37,7 +37,7 @@ #include "../isbnvalidator.h" #include "../lccnvalidator.h" -#include +#include #include #include #include diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index 77a1020..ab9d91b 100644 --- a/src/fetchdialog.cpp +++ b/src/fetchdialog.cpp @@ -28,7 +28,7 @@ #include "tellico_utils.h" #include "stringset.h" -#include +#include #include #include #include diff --git a/src/fetcherconfigdialog.cpp b/src/fetcherconfigdialog.cpp index 69697e1..2d743a7 100644 --- a/src/fetcherconfigdialog.cpp +++ b/src/fetcherconfigdialog.cpp @@ -15,7 +15,7 @@ #include "fetch/fetchmanager.h" #include "gui/combobox.h" -#include +#include #include #include #include diff --git a/src/field.cpp b/src/field.cpp index 469d41f..4ad2fa7 100644 --- a/src/field.cpp +++ b/src/field.cpp @@ -18,8 +18,8 @@ #include "core/tellico_config.h" #include "collection.h" -#include -#include +#include +#include #include #include diff --git a/src/filehandler.cpp b/src/filehandler.cpp index b87e0a6..f5c9de9 100644 --- a/src/filehandler.cpp +++ b/src/filehandler.cpp @@ -20,10 +20,10 @@ #include "core/netaccess.h" #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/src/filterdialog.cpp b/src/filterdialog.cpp index 71bf636..8d0a877 100644 --- a/src/filterdialog.cpp +++ b/src/filterdialog.cpp @@ -21,7 +21,7 @@ #include "fieldcompletion.h" #include "../tellico_debug.h" -#include +#include #include #include #include diff --git a/src/filterview.cpp b/src/filterview.cpp index 7869355..5048f38 100644 --- a/src/filterview.cpp +++ b/src/filterview.cpp @@ -21,7 +21,7 @@ #include "listviewcomparison.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/groupview.cpp b/src/groupview.cpp index 25b248b..bce55d1 100644 --- a/src/groupview.cpp +++ b/src/groupview.cpp @@ -27,7 +27,7 @@ #include "../tellico_debug.h" #include -#include +#include #include #include diff --git a/src/gui/counteditem.cpp b/src/gui/counteditem.cpp index 56f4575..c890dea 100644 --- a/src/gui/counteditem.cpp +++ b/src/gui/counteditem.cpp @@ -15,7 +15,7 @@ #include "../tellico_utils.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp index 52e51fb..b6ad777 100644 --- a/src/gui/datewidget.cpp +++ b/src/gui/datewidget.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp index 4ac43df..41d3d82 100644 --- a/src/gui/fieldwidget.cpp +++ b/src/gui/fieldwidget.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp index 090f3c8..c336bf7 100644 --- a/src/gui/imagewidget.cpp +++ b/src/gui/imagewidget.cpp @@ -19,10 +19,10 @@ #include "../tellico_utils.h" #include -#include +#include #include #include -#include +#include #include #include diff --git a/src/gui/kwidgetlister.cpp b/src/gui/kwidgetlister.cpp index 9611152..6e2eaa1 100644 --- a/src/gui/kwidgetlister.cpp +++ b/src/gui/kwidgetlister.cpp @@ -31,7 +31,7 @@ #include "kwidgetlister.h" -#include +#include #include #include #include diff --git a/src/gui/previewdialog.cpp b/src/gui/previewdialog.cpp index ea5a8f2..673c465 100644 --- a/src/gui/previewdialog.cpp +++ b/src/gui/previewdialog.cpp @@ -16,7 +16,7 @@ #include "../entry.h" #include "../imagefactory.h" // for StyleOptions -#include +#include #include #include diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp index ba9fb18..85030d4 100644 --- a/src/gui/stringmapdialog.cpp +++ b/src/gui/stringmapdialog.cpp @@ -14,7 +14,7 @@ #include "stringmapdialog.h" #include -#include +#include #include #include #include diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp index 9df2880..5d63970 100644 --- a/src/gui/tablefieldwidget.cpp +++ b/src/gui/tablefieldwidget.cpp @@ -16,7 +16,7 @@ #include "../tellico_utils.h" #include "../tellico_kernel.h" -#include +#include #include #include #include diff --git a/src/importdialog.cpp b/src/importdialog.cpp index 928c53f..5194f70 100644 --- a/src/importdialog.cpp +++ b/src/importdialog.cpp @@ -35,7 +35,7 @@ #include "translators/referencerimporter.h" #include "translators/deliciousimporter.h" -#include +#include #include #include diff --git a/src/loandialog.cpp b/src/loandialog.cpp index 84e4796..0e9d538 100644 --- a/src/loandialog.cpp +++ b/src/loandialog.cpp @@ -21,12 +21,12 @@ #include -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/src/loanview.cpp b/src/loanview.cpp index a9305ef..324c27a 100644 --- a/src/loanview.cpp +++ b/src/loanview.cpp @@ -21,7 +21,7 @@ #include "tellico_debug.h" #include "listviewcomparison.h" -#include +#include #include #include diff --git a/src/main.cpp b/src/main.cpp index 0084c4e..d865e4d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include namespace { static const char* description = I18N_NOOP("Tellico - a collection manager for TDE"); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dcfea1c..74451ac 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -58,18 +58,18 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index 7b32f38..19ac406 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -18,7 +18,7 @@ #include "../tellico_utils.h" #include "../tellico_debug.h" -#include +#include #include #include #include @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp index afe6fe0..cfd2292 100644 --- a/src/newstuff/manager.cpp +++ b/src/newstuff/manager.cpp @@ -21,10 +21,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/src/newstuff/providerloader.cpp b/src/newstuff/providerloader.cpp index d796a3d..173457b 100644 --- a/src/newstuff/providerloader.cpp +++ b/src/newstuff/providerloader.cpp @@ -21,10 +21,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp index 20d5b2c..c47766e 100644 --- a/src/reportdialog.cpp +++ b/src/reportdialog.cpp @@ -24,7 +24,7 @@ #include "gui/combobox.h" #include "core/tellico_config.h" -#include +#include #include #include #include diff --git a/src/statusbar.cpp b/src/statusbar.cpp index 9410b7e..5c7733c 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -17,7 +17,7 @@ #include "tellico_debug.h" #include "gui/progress.h" -#include +#include #include #include #include diff --git a/src/tellico_kernel.cpp b/src/tellico_kernel.cpp index 1c5fdec..a4a5c42 100644 --- a/src/tellico_kernel.cpp +++ b/src/tellico_kernel.cpp @@ -37,11 +37,11 @@ #include "collectionfactory.h" #include "stringset.h" -#include -#include +#include +#include #include #include -#include +#include using Tellico::Kernel; Kernel* Kernel::s_self = 0; diff --git a/src/tellico_strings.cpp b/src/tellico_strings.cpp index e80cbd7..15f269b 100644 --- a/src/tellico_strings.cpp +++ b/src/tellico_strings.cpp @@ -13,7 +13,7 @@ #include "tellico_strings.h" -#include +#include const char* Tellico::errorLoad = I18N_NOOP("Tellico is unable to load the file - %1."); const char* Tellico::errorWrite = I18N_NOOP("Tellico is unable to write the file - %1."); diff --git a/src/tellico_utils.cpp b/src/tellico_utils.cpp index 51d3377..2f8b16c 100644 --- a/src/tellico_utils.cpp +++ b/src/tellico_utils.cpp @@ -17,8 +17,8 @@ #include "tellico_debug.h" #include -#include -#include +#include +#include #include #include #include diff --git a/src/translators/alexandriaexporter.cpp b/src/translators/alexandriaexporter.cpp index 6b33aec..de64fbb 100644 --- a/src/translators/alexandriaexporter.cpp +++ b/src/translators/alexandriaexporter.cpp @@ -21,8 +21,8 @@ #include "../tellico_debug.h" #include "../progressmanager.h" -#include -#include +#include +#include #include #include diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp index 20d0b18..dc376d9 100644 --- a/src/translators/audiofileimporter.cpp +++ b/src/translators/audiofileimporter.cpp @@ -34,7 +34,7 @@ #include #endif -#include +#include #include #include diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp index 537c702..7667595 100644 --- a/src/translators/bibtexexporter.cpp +++ b/src/translators/bibtexexporter.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include diff --git a/src/translators/bibtexhandler.cpp b/src/translators/bibtexhandler.cpp index 76a21bf..12636fc 100644 --- a/src/translators/bibtexhandler.cpp +++ b/src/translators/bibtexhandler.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/translators/bibtexmlexporter.cpp b/src/translators/bibtexmlexporter.cpp index a9b9592..e23b303 100644 --- a/src/translators/bibtexmlexporter.cpp +++ b/src/translators/bibtexmlexporter.cpp @@ -22,7 +22,7 @@ #include "tellico_xml.h" #include "../stringset.h" -#include +#include #include #include diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp index bea9218..69b8a07 100644 --- a/src/translators/csvexporter.cpp +++ b/src/translators/csvexporter.cpp @@ -16,7 +16,7 @@ #include "../collection.h" #include "../filehandler.h" -#include +#include #include #include #include diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index 6ce35fc..8a53ff9 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -34,7 +34,7 @@ extern "C" { #include #include #include -#include +#include #include #include diff --git a/src/translators/gcfilmsexporter.cpp b/src/translators/gcfilmsexporter.cpp index c8c17f7..c608cc7 100644 --- a/src/translators/gcfilmsexporter.cpp +++ b/src/translators/gcfilmsexporter.cpp @@ -21,7 +21,7 @@ #include "../tellico_kernel.h" #include "../imagefactory.h" -#include +#include #include namespace { diff --git a/src/translators/griffithimporter.cpp b/src/translators/griffithimporter.cpp index d0bd2f7..7bf3b08 100644 --- a/src/translators/griffithimporter.cpp +++ b/src/translators/griffithimporter.cpp @@ -16,7 +16,7 @@ #include "tellicoimporter.h" #include "../tellico_debug.h" -#include +#include #include #include diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index 2a3d1f5..e27d6e5 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -27,10 +27,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/src/translators/importer.h b/src/translators/importer.h index b6db016..f7bc49c 100644 --- a/src/translators/importer.h +++ b/src/translators/importer.h @@ -18,7 +18,7 @@ class TQWidget; #include "../datavectors.h" -#include +#include #include #include diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp index a8d70ca..86fba49 100644 --- a/src/translators/onixexporter.cpp +++ b/src/translators/onixexporter.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/translators/pdfimporter.cpp b/src/translators/pdfimporter.cpp index a258995..e2b4c8e 100644 --- a/src/translators/pdfimporter.cpp +++ b/src/translators/pdfimporter.cpp @@ -27,7 +27,7 @@ #include "../tellico_debug.h" #include -#include +#include #include #ifdef HAVE_POPPLER diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp index 934f8df..5485edf 100644 --- a/src/translators/pilotdbexporter.cpp +++ b/src/translators/pilotdbexporter.cpp @@ -18,10 +18,10 @@ #include "../collection.h" #include "../filehandler.h" -#include +#include #include #include -#include +#include #include #include diff --git a/src/translators/tellicoimporter.cpp b/src/translators/tellicoimporter.cpp index 2a0a050..a8dfb62 100644 --- a/src/translators/tellicoimporter.cpp +++ b/src/translators/tellicoimporter.cpp @@ -27,7 +27,7 @@ #include "../tellico_debug.h" #include "../progressmanager.h" -#include +#include #include #include #include diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp index 59c6dac..cd76b26 100644 --- a/src/translators/tellicoxmlexporter.cpp +++ b/src/translators/tellicoxmlexporter.cpp @@ -27,10 +27,10 @@ #include "../document.h" // needed for sorting groups #include "../translators/bibtexhandler.h" // needed for cleaning text -#include +#include #include #include -#include +#include #include #include diff --git a/src/translators/tellicozipexporter.cpp b/src/translators/tellicozipexporter.cpp index ec95771..18c7c8e 100644 --- a/src/translators/tellicozipexporter.cpp +++ b/src/translators/tellicozipexporter.cpp @@ -21,7 +21,7 @@ #include "../tellico_debug.h" #include "../progressmanager.h" -#include +#include #include #include #include diff --git a/src/translators/xmlimporter.cpp b/src/translators/xmlimporter.cpp index d3a522f..8a952a1 100644 --- a/src/translators/xmlimporter.cpp +++ b/src/translators/xmlimporter.cpp @@ -15,7 +15,7 @@ #include "../filehandler.h" #include "../collection.h" -#include +#include using Tellico::Import::XMLImporter; diff --git a/src/translators/xsltexporter.cpp b/src/translators/xsltexporter.cpp index f7151fd..c08ee0f 100644 --- a/src/translators/xsltexporter.cpp +++ b/src/translators/xsltexporter.cpp @@ -16,7 +16,7 @@ #include "tellicoxmlexporter.h" #include "../filehandler.h" -#include +#include #include #include diff --git a/src/translators/xsltimporter.cpp b/src/translators/xsltimporter.cpp index 19679d0..0b6c387 100644 --- a/src/translators/xsltimporter.cpp +++ b/src/translators/xsltimporter.cpp @@ -17,7 +17,7 @@ #include "../filehandler.h" #include "../collection.h" -#include +#include #include #include diff --git a/src/viewstack.cpp b/src/viewstack.cpp index 45632af..e6f3281 100644 --- a/src/viewstack.cpp +++ b/src/viewstack.cpp @@ -18,7 +18,7 @@ #include "imagefactory.h" #include -#include +#include #include -- cgit v1.2.3