1 files changed, 92 insertions, 102 deletions

diff --git a/src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp b/src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp
index ac86b0e..cdfa870 100644
--- a/src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp
+++ b/src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp
@@ -21,130 +21,120 @@
 #include <QDebug>
 
 BtBookmarkFolder::BtBookmarkFolder(QTreeWidgetItem* parent, QString name)
-	: BtBookmarkItemBase(parent)
-{
-	setText(0, name);
-	setFlags(Qt::ItemIsEditable|Qt::ItemIsSelectable|Qt::ItemIsDragEnabled|Qt::ItemIsDropEnabled|Qt::ItemIsEnabled);
+        : BtBookmarkItemBase(parent) {
+    setText(0, name);
+    setFlags(Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled);
 }
 
-bool BtBookmarkFolder::enableAction(MenuAction action)
-{
-	if (action == ChangeFolder || action == NewFolder || action == DeleteEntries || action == ImportBookmarks )
-		return true;
-	if (action == ExportBookmarks || action == ImportBookmarks )
-		return true;
-	if ((action == PrintBookmarks) && childCount())
-		return true;
-	return false;
+bool BtBookmarkFolder::enableAction(MenuAction action) {
+    if (action == ChangeFolder || action == NewFolder || action == DeleteEntries || action == ImportBookmarks )
+        return true;
+    if (action == ExportBookmarks || action == ImportBookmarks )
+        return true;
+    if ((action == PrintBookmarks) && childCount())
+        return true;
+    return false;
 }
 
-void BtBookmarkFolder::exportBookmarks()
-{
-	QString filter = QObject::tr("BibleTime bookmark files") + QString(" (*.btb);;") + QObject::tr("All files") + QString(" (*.*)");
-	QString fileName = QFileDialog::getSaveFileName(0, QObject::tr("Export Bookmarks"), "", filter);
+void BtBookmarkFolder::exportBookmarks() {
+    QString filter = QObject::tr("BibleTime bookmark files") + QString(" (*.btb);;") + QObject::tr("All files") + QString(" (*.*)");
+    QString fileName = QFileDialog::getSaveFileName(0, QObject::tr("Export Bookmarks"), "", filter);
 
-	if (!fileName.isEmpty()) {
-		qDebug() << "exportBookmarks()";
-		BtBookmarkLoader loader;
-		loader.saveTreeFromRootItem(this, fileName, false ); //false: don't overwrite without asking
-	};
+    if (!fileName.isEmpty()) {
+        qDebug() << "exportBookmarks()";
+        BtBookmarkLoader loader;
+        loader.saveTreeFromRootItem(this, fileName, false ); //false: don't overwrite without asking
+    };
 
 }
 
-void BtBookmarkFolder::importBookmarks()
-{
-	QString filter = QObject::tr("BibleTime bookmark files") + QString(" (*.btb);;") + QObject::tr("All files") + QString(" (*.*)");
-	QString fileName = QFileDialog::getOpenFileName(0, QObject::tr("Import bookmarks"), "", filter);
-	if (!fileName.isEmpty()) {
-		qDebug() << "import bookmarks";
-		BtBookmarkLoader loader;
-		QList<QTreeWidgetItem*> itemList = loader.loadTree(fileName);
-		this->insertChildren(0, itemList);
-	};
+void BtBookmarkFolder::importBookmarks() {
+    QString filter = QObject::tr("BibleTime bookmark files") + QString(" (*.btb);;") + QObject::tr("All files") + QString(" (*.*)");
+    QString fileName = QFileDialog::getOpenFileName(0, QObject::tr("Import bookmarks"), "", filter);
+    if (!fileName.isEmpty()) {
+        qDebug() << "import bookmarks";
+        BtBookmarkLoader loader;
+        QList<QTreeWidgetItem*> itemList = loader.loadTree(fileName);
+        this->insertChildren(0, itemList);
+    };
 }
 
-QString BtBookmarkFolder::toolTip()
-{
-	return QString();
+QString BtBookmarkFolder::toolTip() {
+    return QString();
 }
 
-void BtBookmarkFolder::newSubFolder()
-{
-	if (dynamic_cast<BtBookmarkFolder*>(this)) {
-		BtBookmarkFolder* f = new BtBookmarkFolder(this, QObject::tr("New folder"));
+void BtBookmarkFolder::newSubFolder() {
+    if (dynamic_cast<BtBookmarkFolder*>(this)) {
+        BtBookmarkFolder* f = new BtBookmarkFolder(this, QObject::tr("New folder"));
 
-		treeWidget()->setCurrentItem(f);
-		f->update();
-		f->rename();
-	}
+        treeWidget()->setCurrentItem(f);
+        f->update();
+        f->rename();
+    }
 }
 
-QList<QTreeWidgetItem*> BtBookmarkFolder::getChildList() const
-{
-	QList<QTreeWidgetItem*> list;
-	for (int i = 0; i < childCount(); i++) {
-		list.append(child(i));
-	}
-	return list;
+QList<QTreeWidgetItem*> BtBookmarkFolder::getChildList() const {
+    QList<QTreeWidgetItem*> list;
+    for (int i = 0; i < childCount(); i++) {
+        list.append(child(i));
+    }
+    return list;
 }
 
-void BtBookmarkFolder::rename()
-{
-	treeWidget()->editItem(this);
+void BtBookmarkFolder::rename() {
+    treeWidget()->editItem(this);
 }
 
-void BtBookmarkFolder::update()
-{
-	qDebug() << "BtBookmarkFolder::update()";
-	BtBookmarkItemBase::update();
-	if (isExpanded() && childCount())
-		setIcon(0, util::filesystem::DirectoryUtil::getIcon(CResMgr::mainIndex::openedFolder::icon));
-	else
-		setIcon(0, util::filesystem::DirectoryUtil::getIcon(CResMgr::mainIndex::closedFolder::icon));
+void BtBookmarkFolder::update() {
+    qDebug() << "BtBookmarkFolder::update()";
+    BtBookmarkItemBase::update();
+    if (isExpanded() && childCount())
+        setIcon(0, util::filesystem::DirectoryUtil::getIcon(CResMgr::mainIndex::openedFolder::icon));
+    else
+        setIcon(0, util::filesystem::DirectoryUtil::getIcon(CResMgr::mainIndex::closedFolder::icon));
 }
 
-bool BtBookmarkFolder::hasDescendant(QTreeWidgetItem* item) const
-{
-	qDebug() << "BtBookmarkFolder::hasDescendant, this:" << this << "possible descendant:" << item;
-	
-	if (this == item) {
-		qDebug() << "it's this, return true";
-		return true;
-	}
-	if (getChildList().indexOf(item) > -1) {
-		qDebug() << "direct child, return true";
-		return true;
-	}
-	foreach(QTreeWidgetItem* childItem, getChildList()) {
-		bool subresult = false;
-		BtBookmarkFolder* folder = 0;
-		if ( (folder = dynamic_cast<BtBookmarkFolder*>(childItem)) ) {
-			subresult = folder->hasDescendant(childItem);
-		}
-		
-		if (subresult == true) {
-			qDebug() << "descendand child, return true";
-			return true;
-		}
-	}
-	qDebug() << "no child, return false";
-	return false;
+bool BtBookmarkFolder::hasDescendant(QTreeWidgetItem* item) const {
+    qDebug() << "BtBookmarkFolder::hasDescendant, this:" << this << "possible descendant:" << item;
+
+    if (this == item) {
+        qDebug() << "it's this, return true";
+        return true;
+    }
+    if (getChildList().indexOf(item) > -1) {
+        qDebug() << "direct child, return true";
+        return true;
+    }
+    foreach(QTreeWidgetItem* childItem, getChildList()) {
+        bool subresult = false;
+        BtBookmarkFolder* folder = 0;
+        if ( (folder = dynamic_cast<BtBookmarkFolder*>(childItem)) ) {
+            subresult = folder->hasDescendant(childItem);
+        }
+
+        if (subresult == true) {
+            qDebug() << "descendand child, return true";
+            return true;
+        }
+    }
+    qDebug() << "no child, return false";
+    return false;
 }
 
-BtBookmarkFolder* BtBookmarkFolder::deepCopy()
-{
-	qDebug() << "BtBookmarkFolder::deepCopy";
-	BtBookmarkFolder* newFolder = new BtBookmarkFolder(0, this->text(0));
-	foreach(QTreeWidgetItem* subitem, getChildList()) {
-		if (BtBookmarkItem* bmItem = dynamic_cast<BtBookmarkItem*>(subitem)) {
-			newFolder->addChild(new BtBookmarkItem(*bmItem));
-		} else {
-			if (BtBookmarkFolder* bmFolder = dynamic_cast<BtBookmarkFolder*>(subitem)) {
-				newFolder->addChild(bmFolder->deepCopy());
-			}
-		}
-	}
-	newFolder->update();
-	return newFolder;
+BtBookmarkFolder* BtBookmarkFolder::deepCopy() {
+    qDebug() << "BtBookmarkFolder::deepCopy";
+    BtBookmarkFolder* newFolder = new BtBookmarkFolder(0, this->text(0));
+    foreach(QTreeWidgetItem* subitem, getChildList()) {
+        if (BtBookmarkItem* bmItem = dynamic_cast<BtBookmarkItem*>(subitem)) {
+            newFolder->addChild(new BtBookmarkItem(*bmItem));
+        }
+        else {
+            if (BtBookmarkFolder* bmFolder = dynamic_cast<BtBookmarkFolder*>(subitem)) {
+                newFolder->addChild(bmFolder->deepCopy());
+            }
+        }
+    }
+    newFolder->update();
+    return newFolder;
 }