Merge branch 'master' into frameworks

[dolphin.git] / src / panels / information / filemetadataconfigurationdialog.cpp

diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index efbe784a4cc7ca4da45e34880423713214c059f6..15f1f4f5fcd45cc092d7ef89fbd0c06e3da72a88 100644 (file)
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2010 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -19,7 +19,12 @@
 
 #include "filemetadataconfigurationdialog.h"
 
+#ifndef HAVE_BALOO
 #include <kfilemetadataconfigurationwidget.h>
+#else
+#include <Baloo/FileMetaDataConfigWidget>
+#endif
+
 #include <KLocale>
 #include <QLabel>
 #include <QVBoxLayout>
@@ -34,13 +39,17 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent
     setButtons(KDialog::Ok | KDialog::Cancel);
     setDefaultButton(KDialog::Ok);
 
-
     m_descriptionLabel = new QLabel(i18nc("@label::textbox",
                                           "Select which data should "
                                           "be shown:"), this);
     m_descriptionLabel->setWordWrap(true);
 
+#ifndef HAVE_BALOO
     m_configWidget = new KFileMetaDataConfigurationWidget(this);
+#else
+    m_configWidget = new Baloo::FileMetaDataConfigWidget(this);
+#endif
+
 
     QWidget* mainWidget = new QWidget(this);
     QVBoxLayout* topLayout = new QVBoxLayout(mainWidget);
@@ -90,4 +99,3 @@ QString FileMetaDataConfigurationDialog::description() const
     return m_descriptionLabel->text();
 }
 
-#include "filemetadataconfigurationdialog.moc"