kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

move connectimporter into the dombuilder

Browse source 
svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=211920
This commit is contained in:
Alexander Kellett 2003-03-06 22:02:36 +00:00
parent 716fa5978a
commit ac6e315e78
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
keditbookmarks/importers.cpp
View file

@ -126,18 +126,27 @@ void ImportCommand::unexecute() {
}
}
void ImportCommand::connectImporter(const QObject *importer, const QObject *builder) {
//////////////////////////////
void KBookmarkDomBuilder::connectImporter(const QObject *importer) {
connect(importer, SIGNAL( newBookmark(const QString &, const QCString &, const QString &) ),
builder, SLOT( newBookmark(const QString &, const QCString &, const QString &) ));
SLOT( newBookmark(const QString &, const QCString &, const QString &) ));
connect(importer, SIGNAL( newFolder(const QString &, bool, const QString &) ),
builder, SLOT( newFolder(const QString &, bool, const QString &) ));
SLOT( newFolder(const QString &, bool, const QString &) ));
connect(importer, SIGNAL( newSeparator() ),
builder, SLOT( newSeparator() ) );
SLOT( newSeparator() ) );
connect(importer, SIGNAL( endFolder() ),
builder, SLOT( endFolder() ) );
SLOT( endFolder() ) );
}
//////////////////////////////
KBookmarkDomBuilder::KBookmarkDomBuilder(const KBookmarkGroup &bkGroup) {
m_stack.push(&bkGroup);
}
KBookmarkDomBuilder::~KBookmarkDomBuilder() {
m_list.clear();
m_stack.clear();
}
void KBookmarkDomBuilder::newBookmark(const QString &text, const QCString &url, const QString &additionnalInfo) {
KBookmark bk = m_stack.top()->addBookmark(
@ -178,15 +187,6 @@ void ImportCommand::doCreateHoldingFolder(KBookmarkGroup &bkGroup) {
m_group = bkGroup.address();
}
KBookmarkDomBuilder::KBookmarkDomBuilder(const KBookmarkGroup &bkGroup) {
m_stack.push(&bkGroup);
}
KBookmarkDomBuilder::~KBookmarkDomBuilder() {
m_list.clear();
m_stack.clear();
}
/* -------------------------------------- */
QString OperaImportCommand::requestFilename() const {
@ -196,7 +196,7 @@ QString OperaImportCommand::requestFilename() const {
void OperaImportCommand::doExecute(const KBookmarkGroup &bkGroup) {
KBookmarkDomBuilder builder(bkGroup);
KOperaBookmarkImporter importer(m_fileName);
connectImporter(&importer, &builder);
builder.connectImporter(&importer);
importer.parseOperaBookmarks();
}
@ -209,7 +209,7 @@ QString IEImportCommand::requestFilename() const {
void IEImportCommand::doExecute(const KBookmarkGroup &bkGroup) {
KBookmarkDomBuilder builder(bkGroup);
KIEBookmarkImporter importer(m_fileName);
connectImporter(&importer, &builder);
builder.connectImporter(&importer);
importer.parseIEBookmarks();
}
@ -218,7 +218,7 @@ void IEImportCommand::doExecute(const KBookmarkGroup &bkGroup) {
void HTMLImportCommand::doExecute(const KBookmarkGroup &bkGroup) {
KBookmarkDomBuilder builder(bkGroup);
KNSBookmarkImporter importer(m_fileName);
connectImporter(&importer, &builder);
builder.connectImporter(&importer);
importer.parseNSBookmarks(m_utf8);
}

3
keditbookmarks/importers.h
View file

@ -89,8 +89,6 @@ protected:
m_utf8 = utf8;
}
void connectImporter(const QObject *importer, const QObject *builder);
virtual void doCreateHoldingFolder(KBookmarkGroup &bkGroup);
virtual void doExecute(const KBookmarkGroup &) = 0;
@ -108,6 +106,7 @@ class KBookmarkDomBuilder : public QObject {
public:
KBookmarkDomBuilder(const KBookmarkGroup &group);
virtual ~KBookmarkDomBuilder();
void connectImporter(const QObject *);
protected slots:
void newBookmark(const QString &text, const QCString &url, const QString &additionnalInfo);
void newFolder(const QString &text, bool open, const QString &additionnalInfo);