Fix "two instances of the DragAndDropHelper" singleton: Vir found the reason, dragand...

both into libdolphinprivate and into dolphin.
Also fix missing newline in copyright header.

svn path=/trunk/KDE/kdebase/apps/; revision=882336

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dcf217d8078785ae9fbf3f51a33937292109fe93..f313563807829adcd894091583795d4c3be0b8ef 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,7 +103,6 @@ set(dolphin_SRCS
     dolphincontextmenu.cpp
     dolphinfileplacesview.cpp
     dolphinsettingsdialog.cpp
     dolphincontextmenu.cpp
     dolphinfileplacesview.cpp
     dolphinsettingsdialog.cpp

-    draganddrophelper.cpp

     filterbar.cpp
     generalsettingspage.cpp
     generalviewsettingspage.cpp
     filterbar.cpp
     generalsettingspage.cpp
     generalviewsettingspage.cpp

diff --git a/src/draganddrophelper.cpp b/src/draganddrophelper.cpp
index a4971a62cc7a08aa3088db773b74e49c384d986c..d8c55ed126751db9f1c2cf3b94a3c5048f0eed4f 100644 (file)
--- a/src/draganddrophelper.cpp
+++ b/src/draganddrophelper.cpp
@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at>                  *
 /***************************************************************************
  *   Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at>                  *

- *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *                                                                      *                                                                         *
+ *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *
+ *                                                                         *

  *   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     *
  *   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 <kfileitem.h>
 #include <kicon.h>
 #include <klocale.h>

+#include <kdebug.h>

 #include <konq_operations.h>
 
 #include <QAbstractItemView>
 #include <konq_operations.h>
 
 #include <QAbstractItemView>

diff --git a/src/draganddrophelper.h b/src/draganddrophelper.h
index c6abd46c39b9fde8b2bce0ef0479226f7b720b6e..907dd0c2c0e0c6f569057b4fd757e4516ba5571b 100644 (file)
--- a/src/draganddrophelper.h
+++ b/src/draganddrophelper.h
@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at>                  *
 /***************************************************************************
  *   Copyright (C) 2007 by Peter Penz <peter.penz@gmx.at>                  *

- *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *                                                                       *                                                                         *
+ *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *
+ *                                                                         *

  *   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     *
  *   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
 
 #ifndef DRAGANDDROPHELPER_H
 #define DRAGANDDROPHELPER_H
 

+#include "libdolphin_export.h"

 #include <QObject>
 
 class DolphinController;
 #include <QObject>
 
 class DolphinController;


@@ -39,7 +41,7 @@ class QWidget;
  * DolphinColumnView and SidebarTreeView to have a consistent
  * drag and drop behavior between all views.
  */
  * 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
 
 {
     Q_OBJECT