diff options
| author | Christophe Giboudeaux <[email protected]> | 2013-01-02 15:28:43 +0100 |
|---|---|---|
| committer | Christophe Giboudeaux <[email protected]> | 2013-01-02 15:28:43 +0100 |
| commit | 56f1c0371c4e5d9f874dede5e4773165f88cbbb6 (patch) | |
| tree | 35f7130e0f6e0610017658643571f4229fedce55 /src/views/tooltips/filemetadatatooltip.cpp | |
| parent | ed4644bd875bce2bb797a96652b4aced9eb75976 (diff) | |
| parent | bf202f3931c804af1c03bd958a8e946bab8b4b52 (diff) | |
Merge branch 'KDE/4.10'
Conflicts:
dolphin/src/CMakeLists.txt
Diffstat (limited to 'src/views/tooltips/filemetadatatooltip.cpp')
| -rw-r--r-- | src/views/tooltips/filemetadatatooltip.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp index 1f4fb69ae..d0cba741e 100644 --- a/src/views/tooltips/filemetadatatooltip.cpp +++ b/src/views/tooltips/filemetadatatooltip.cpp @@ -22,7 +22,6 @@ #include "filemetadatatooltip.h" #include <KColorScheme> -#include <kfilemetadatawidget.h> #include <KSeparator> #include <KWindowSystem> @@ -31,6 +30,8 @@ #include <QStylePainter> #include <QVBoxLayout> +#include <nepomuk2/filemetadatawidget.h> + // For the blurred tooltip background #include <plasma/windoweffects.h> @@ -55,7 +56,7 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) : m_name->setFont(font); // Create widget for the meta data - m_fileMetaDataWidget = new KFileMetaDataWidget(this); + m_fileMetaDataWidget = new Nepomuk2::FileMetaDataWidget(this); m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText); m_fileMetaDataWidget->setReadOnly(true); connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)), |