← Back to branch summary

~paulbrianstewart/ubuntu/oneiric/tellico/852247-Formatting-Fix

~paulbrianstewart/ubuntu/oneiric/tellico/852247-Formatting-Fix

« back to all changes in this revision

Viewing changes to src/translators/dcimporter.cpp

Committer: Bazaar Package Importer
Author(s): Stephan Hermann
Date: 2008-01-31 19:33:05 UTC
mfrom: (0.1.13 upstream)
Revision ID: james.westby@ubuntu.com-20080131193305-9l01m5gfhykl6pkl

Tags: 1.3-1ubuntu1

* Merge from debian unstable, remaining changes:
  - debian/control: build-dep on kdepim-dev
  - debian/control: drop versioned python from tellico-data suggests
  - debian/rules: call dh_icons

files added:
doc/CMakeLists.txt

doc/en/CMakeLists.txt

doc/fr/CMakeLists.txt

icons/boardgame.png

icons/hi128-mime-application-x-tellico.png

icons/hi16-mime-application-x-tellico.png

icons/hi22-mime-application-x-tellico.png

icons/hi32-mime-application-x-tellico.png

icons/hi48-mime-application-x-tellico.png

icons/hi64-mime-application-x-tellico.png

icons/nocover_boardgame.png

po/CMakeLists.txt

po/README

po/uk.gmo

po/uk.po

src/barcode

src/barcode/Makefile.am

src/barcode/Makefile.in

src/barcode/barcode.cpp

src/barcode/barcode.h

src/barcode/barcode_v4l.cpp

src/barcode/barcode_v4l.h

src/collections/boardgamecollection.cpp

src/collections/boardgamecollection.h

src/core/drophandler.cpp

src/core/drophandler.h

src/core/tellico-1-3-update.pl

src/core/tellico-rename.upd

src/core/tellico.upd

src/entrymerger.cpp

src/entrymerger.h

src/fetch/arxivfetcher.cpp

src/fetch/arxivfetcher.h

src/fetch/bibsonomyfetcher.cpp

src/fetch/bibsonomyfetcher.h

src/fetch/citebasefetcher.cpp

src/fetch/citebasefetcher.h

src/fetch/crossreffetcher.cpp

src/fetch/crossreffetcher.h

src/fetch/gcstarpluginfetcher.cpp

src/fetch/gcstarpluginfetcher.h

src/fetch/scripts/boardgamegeek.rb

src/fetch/scripts/boardgamegeek.rb.spec

src/rtf2html

src/rtf2html/Makefile.am

src/rtf2html/Makefile.in

src/rtf2html/common.h

src/rtf2html/dbg_iter.h

src/rtf2html/fmt_opts.cpp

src/rtf2html/fmt_opts.h

src/rtf2html/rtf2html.cpp

src/rtf2html/rtf2html.h

src/rtf2html/rtf_keyword.cpp

src/rtf2html/rtf_keyword.h

src/rtf2html/rtf_table.cpp

src/rtf2html/rtf_table.h

src/rtf2html/rtf_tools.h

src/translators/deliciousimporter.cpp

src/translators/deliciousimporter.h

src/translators/griffith2tellico.py

src/translators/griffithimporter.cpp

src/translators/griffithimporter.h

src/translators/libcsv.c

src/translators/libcsv.h

src/translators/pdfimporter.cpp

src/translators/pdfimporter.h

src/translators/referencerimporter.cpp

src/translators/referencerimporter.h

src/xmphandler.cpp

src/xmphandler.h

tellico.xml

xslt/arxiv2tellico.xsl

xslt/crossref2tellico.xsl

xslt/delicious2tellico.xsl

xslt/referencer2tellico.xsl

xslt/welcome.html

xslt/xmp2tellico.xsl

files removed:
debian/tellico-data.sharedmimeinfo

icons/hi128-mime-tellico.png

icons/hi16-mime-tellico.png

icons/hi22-mime-tellico.png

icons/hi32-mime-tellico.png

icons/hi48-mime-tellico.png

icons/hi64-mime-tellico.png

src/tests/formattest.cpp

tellico-rename.upd

tellico.upd

files modified:
ChangeLog

Makefile.am

Makefile.in

acinclude.m4

aclocal.m4

admin/acinclude.m4.in

admin/am_edit

admin/conf.change.pl

admin/config.guess

admin/config.sub

config.h.in

configure

configure.in

configure.in.in

debian/changelog

debian/control

debian/copyright

debian/rules

debian/tellico-data.install

doc/Makefile.in

doc/en/Makefile.in

doc/en/advanced.docbook

doc/en/configuration.docbook

doc/en/details.docbook

doc/en/fundamentals.docbook

doc/en/importing-exporting.docbook

doc/en/index.docbook

doc/fr/Makefile.in

doc/fr/details.docbook

doc/fr/fundamentals.docbook

doc/fr/index.docbook

icons/Makefile.am

icons/Makefile.in

po/Makefile.am

po/Makefile.in

po/bg.gmo

po/bg.po

po/ca.gmo

po/ca.po

po/cs.gmo

po/cs.po

po/de.gmo

po/de.po

po/ee.gmo

po/ee.po

po/en_GB.gmo

po/en_GB.po

po/es.gmo

po/es.po

po/fi.gmo

po/fi.po

po/fr.gmo

po/fr.po

po/hu.gmo

po/hu.po

po/it.gmo

po/it.po

po/nb.gmo

po/nb.po

po/nl.gmo

po/nl.po

po/nn.gmo

po/nn.po

po/pl.gmo

po/pl.po

po/pt.gmo

po/pt.po

po/pt_BR.gmo

po/pt_BR.po

po/ro.gmo

po/ro.po

po/ru.gmo

po/ru.po

po/sv.gmo

po/sv.po

po/tellico.pot

po/tr.gmo

po/tr.po

src/Makefile.am

src/Makefile.in

src/calendarhandler.cpp

src/cite/Makefile.in

src/cite/actionmanager.cpp

src/cite/lyxpipe.cpp

src/cite/ooo/Makefile.in

src/cite/openoffice.cpp

src/collection.cpp

src/collection.h

src/collectionfactory.cpp

src/collectionfactory.h

src/collections/Makefile.am

src/collections/Makefile.in

src/collections/bibtexcollection.cpp

src/collections/bookcollection.cpp

src/collections/cardcollection.cpp

src/collections/coincollection.cpp

src/collections/comicbookcollection.cpp

src/collections/filecatalog.cpp

src/collections/gamecollection.cpp

src/collections/musiccollection.cpp

src/collections/stampcollection.cpp

src/collections/videocollection.cpp

src/collections/winecollection.cpp

src/commands/Makefile.in

src/configdialog.cpp

src/configdialog.h

src/controller.cpp

src/controller.h

src/core/Makefile.am

src/core/Makefile.in

src/core/dcopinterface.cpp

src/core/dcopinterface.h

src/core/dcopinterface_skel.cpp

src/core/netaccess.cpp

src/core/netaccess.h

src/core/tellico_config.cpp

src/core/tellico_config.kcfg

src/core/tellico_config.kcfgc

src/core/tellico_config_addons.cpp

src/detailedentryitem.cpp

src/detailedlistview.cpp

src/detailedlistview.h

src/document.cpp

src/document.h

src/entry.cpp

src/entryeditdialog.cpp

src/entryeditdialog.h

src/entrygroupitem.h

src/entryiconview.cpp

src/entryiconview.h

src/entryitem.cpp

src/entryupdater.cpp

src/entryview.cpp

src/entryview.h

src/exportdialog.cpp

src/fetch/Makefile.am

src/fetch/Makefile.in

src/fetch/amazonfetcher.cpp

src/fetch/amazonfetcher.h

src/fetch/animenfofetcher.cpp

src/fetch/animenfofetcher.h

src/fetch/configwidget.cpp

src/fetch/configwidget.h

src/fetch/entrezfetcher.cpp

src/fetch/entrezfetcher.h

src/fetch/execexternalfetcher.cpp

src/fetch/execexternalfetcher.h

src/fetch/fetch.h

src/fetch/fetcher.cpp

src/fetch/fetcher.h

src/fetch/fetchmanager.cpp

src/fetch/fetchmanager.h

src/fetch/ibsfetcher.cpp

src/fetch/ibsfetcher.h

src/fetch/imdbfetcher.cpp

src/fetch/imdbfetcher.h

src/fetch/isbndbfetcher.cpp

src/fetch/isbndbfetcher.h

src/fetch/scripts/Makefile.am

src/fetch/scripts/Makefile.in

src/fetch/scripts/ministerio_de_cultura.py

src/fetch/srufetcher.cpp

src/fetch/srufetcher.h

src/fetch/yahoofetcher.cpp

src/fetch/yahoofetcher.h

src/fetch/z3950connection.cpp

src/fetch/z3950fetcher.cpp

src/fetch/z3950fetcher.h

src/fetchdialog.cpp

src/fetchdialog.h

src/field.cpp

src/filehandler.cpp

src/filehandler.h

src/filterdialog.cpp

src/filterview.cpp

src/groupview.cpp

src/groupview.h

src/gui/Makefile.in

src/gui/imagefieldwidget.cpp

src/gui/imagewidget.cpp

src/gui/imagewidget.h

src/gui/richtextlabel.cpp

src/image.cpp

src/image.h

src/imagefactory.cpp

src/imagefactory.h

src/importdialog.cpp

src/importdialog.h

src/isbnvalidator.cpp

src/isbnvalidator.h

src/listviewcomparison.cpp

src/listviewcomparison.h

src/main.cpp

src/mainwindow.cpp

src/mainwindow.h

src/newstuff/Makefile.in

src/newstuff/dialog.cpp

src/ptrvector.h

src/reportdialog.cpp

src/tellico_debug.h

src/tellico_kernel.cpp

src/tellico_kernel.h

src/tellico_utils.cpp

src/tellicoui.rc

src/tests/Makefile.am

src/tests/Makefile.in

src/tests/isbntest.cpp

src/translators/Makefile.am

src/translators/Makefile.in

src/translators/alexandriaexporter.cpp

src/translators/alexandriaexporter.h

src/translators/alexandriaimporter.h

src/translators/amcimporter.cpp

src/translators/audiofileimporter.cpp

src/translators/audiofileimporter.h

src/translators/bibtexexporter.cpp

src/translators/bibtexhandler.cpp

src/translators/bibteximporter.cpp

src/translators/bibteximporter.h

src/translators/bibtexmlexporter.h

src/translators/btparse/Makefile.in

src/translators/btparse/ast.c

src/translators/btparse/bibtex.c

src/translators/btparse/bibtex_ast.c

src/translators/btparse/btparse.h

src/translators/btparse/error.c

src/translators/btparse/error.h

src/translators/btparse/input.c

src/translators/btparse/lex_auxiliary.c

src/translators/btparse/lex_auxiliary.h

src/translators/btparse/names.c

src/translators/btparse/parse_auxiliary.c

src/translators/btparse/scan.c

src/translators/btparse/sym.c

src/translators/btparse/tokens.h

src/translators/csvexporter.cpp

src/translators/csvimporter.cpp

src/translators/csvimporter.h

src/translators/dcimporter.cpp

src/translators/exporter.h

src/translators/filelistingimporter.cpp

src/translators/filelistingimporter.h

src/translators/freedb_util.cpp

src/translators/freedbimporter.cpp

src/translators/gcfilmsexporter.cpp

src/translators/gcfilmsexporter.h

src/translators/gcfilmsimporter.cpp

src/translators/gcfilmsimporter.h

src/translators/htmlexporter.cpp

src/translators/importer.h

src/translators/onixexporter.cpp

src/translators/pilotdb/Makefile.in

src/translators/pilotdb/libflatfile/Makefile.in

src/translators/pilotdb/libpalm/Block.h

src/translators/pilotdb/libpalm/Makefile.in

src/translators/pilotdbexporter.cpp

src/translators/risimporter.cpp

src/translators/risimporter.h

src/translators/tellico_xml.cpp

src/translators/tellico_xml.h

src/translators/tellicoimporter.cpp

src/translators/tellicoimporter.h

src/translators/tellicoxmlexporter.cpp

src/translators/tellicoxmlexporter.h

src/translators/tellicozipexporter.h

src/translators/textimporter.cpp

src/translators/textimporter.h

src/translators/translators.h

src/translators/xsltexporter.h

src/translators/xslthandler.cpp

src/translators/xsltimporter.cpp

tellico.desktop

tellico.dtd

tellico.lsm

x-tellico.desktop

xslt/Makefile.am

xslt/Makefile.in

xslt/amazon2tellico.xsl

xslt/entry-templates/Album.xsl

xslt/entry-templates/Compact.xsl

xslt/entry-templates/Default.xsl

xslt/entry-templates/Fancy.xsl

xslt/entry-templates/Makefile.in

xslt/entry-templates/Video.xsl

xslt/gcstar2tellico.xsl

xslt/isbndb2tellico.xsl

xslt/mods2tellico.xsl

xslt/pubmed2tellico.xsl

xslt/report-templates/Makefile.in

xslt/tellico-by-author.xsl

xslt/tellico-by-title.xsl

xslt/tellico-common.xsl

xslt/tellico-printing.xsl

xslt/tellico2html.js

xslt/tellico2html.xsl

xslt/tellico2onix.xsl

xslt/yahoo2tellico.xsl

Show diffs side-by-side

added added

removed removed

src/translators/dcimporter.cpp

14

14

#include "dcimporter.h"

15

15

#include "../collections/bookcollection.h"

16

16

#include "tellico_xml.h"

17

#include "../tellico_debug.h"

17

18

18

19

using Tellico::Import::DCImporter;

19

20

Older »