diff options
Diffstat (limited to 'src/views/versioncontrol/versioncontrolobserver.h')
| -rw-r--r-- | src/views/versioncontrol/versioncontrolobserver.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index d12d2cfe0..a43dc3415 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -20,12 +20,12 @@ #ifndef VERSIONCONTROLOBSERVER_H #define VERSIONCONTROLOBSERVER_H -#include <libdolphin_export.h> +#include "libdolphin_export.h" #include <KFileItem> +#include <QUrl> #include <kversioncontrolplugin2.h> #include <QList> -#include <QMutex> #include <QObject> #include <QString> @@ -100,11 +100,7 @@ private slots: void slotThreadFinished(); private: - struct ItemState - { - KFileItem item; - KVersionControlPlugin2::ItemVersion version; - }; + typedef QPair<KFileItem, KVersionControlPlugin2::ItemVersion> ItemState; void updateItemStates(); @@ -128,7 +124,7 @@ private: * Returns a matching plugin for the given directory. * 0 is returned, if no matching plugin has been found. */ - KVersionControlPlugin* searchPlugin(const KUrl& directory) const; + KVersionControlPlugin* searchPlugin(const QUrl& directory) const; /** * Returns true, if the directory contains a version control information. |
