diff options
| author | David Faure <[email protected]> | 2008-11-10 13:48:43 +0000 |
|---|---|---|
| committer | David Faure <[email protected]> | 2008-11-10 13:48:43 +0000 |
| commit | e98e218564694ccca6c0a2962e56ffb7256a11ea (patch) | |
| tree | de4713d22d0b1a91ed354cef4a937818332832e0 /src | |
| parent | a7838db28e24e9618a39954524f055dc3335f7a9 (diff) | |
Fix "two instances of the DragAndDropHelper" singleton: Vir found the reason, draganddrophelper.cpp was compiled
both into libdolphinprivate and into dolphin.
Also fix missing newline in copyright header.
svn path=/trunk/KDE/kdebase/apps/; revision=882336
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/draganddrophelper.cpp | 4 | ||||
| -rw-r--r-- | src/draganddrophelper.h | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dcf217d80..f31356380 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -103,7 +103,6 @@ set(dolphin_SRCS dolphincontextmenu.cpp dolphinfileplacesview.cpp dolphinsettingsdialog.cpp - draganddrophelper.cpp filterbar.cpp generalsettingspage.cpp generalviewsettingspage.cpp diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp index a4971a62c..d8c55ed12 100644 --- a/src/draganddrophelper.cpp +++ b/src/draganddrophelper.cpp @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2007 by Peter Penz <[email protected]> * - * Copyright (C) 2007 by David Faure <[email protected]> * * * + * Copyright (C) 2007 by David Faure <[email protected]> * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * @@ -25,6 +26,7 @@ #include <kfileitem.h> #include <kicon.h> #include <klocale.h> +#include <kdebug.h> #include <konq_operations.h> #include <QAbstractItemView> diff --git a/src/draganddrophelper.h b/src/draganddrophelper.h index c6abd46c3..907dd0c2c 100644 --- a/src/draganddrophelper.h +++ b/src/draganddrophelper.h @@ -1,6 +1,7 @@ /*************************************************************************** * Copyright (C) 2007 by Peter Penz <[email protected]> * - * Copyright (C) 2007 by David Faure <[email protected]> * * * + * Copyright (C) 2007 by David Faure <[email protected]> * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * @@ -20,6 +21,7 @@ #ifndef DRAGANDDROPHELPER_H #define DRAGANDDROPHELPER_H +#include "libdolphin_export.h" #include <QObject> class DolphinController; @@ -39,7 +41,7 @@ class QWidget; * DolphinColumnView and SidebarTreeView to have a consistent * drag and drop behavior between all views. */ -class DragAndDropHelper : public QObject +class LIBDOLPHINPRIVATE_EXPORT DragAndDropHelper : public QObject { Q_OBJECT |