SVN_SILENT:

Make dolphinremoteencoding included in dolphinprivate.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 629adea88b987406c8577b5f2d1988b326c56af0..7ab2c5a28e5e5453ac662b4202780e19fb423b0f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,8 @@ set(dolphinprivate_LIB_SRCS
     dolphincategorydrawer.cpp
     dolphinview.cpp
     dolphinviewactionhandler.cpp
     dolphincategorydrawer.cpp
     dolphinview.cpp
     dolphinviewactionhandler.cpp

-    dolphinviewautoscroller.cpp    
+    dolphinviewautoscroller.cpp
+    dolphinremoteencoding.cpp

     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp
     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp


@@ -74,7 +75,6 @@ install(TARGETS dolphinprivate  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 set(dolphinpart_SRCS
    dolphinpart.cpp
 
 set(dolphinpart_SRCS
    dolphinpart.cpp

-   dolphinremoteencoding.cpp

 )
 
 
 )
 
 


@@ -90,7 +90,6 @@ install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 ##########################################
 
 set(dolphin_SRCS
 ##########################################
 
 set(dolphin_SRCS

-    dolphinremoteencoding.cpp

     dolphinapplication.cpp
     dolphinmainwindow.cpp
     dolphinnewmenu.cpp
     dolphinapplication.cpp
     dolphinmainwindow.cpp
     dolphinnewmenu.cpp

diff --git a/src/dolphinremoteencoding.h b/src/dolphinremoteencoding.h
index 97b6f8b60cb89a37bc4fe83c3dc4cd9b3936e7d1..54499f78b175db15ce1620d985e7b2d7225e013f 100644 (file)
--- a/src/dolphinremoteencoding.h
+++ b/src/dolphinremoteencoding.h
@@ -23,6 +23,7 @@
 #include <QStringList>
 #include <QtGui/QAction>
 #include <kurl.h>
 #include <QStringList>
 #include <QtGui/QAction>
 #include <kurl.h>

+#include "libdolphin_export.h"

 
 
 class KActionMenu;
 
 
 class KActionMenu;


@@ -34,7 +35,7 @@ class DolphinViewActionHandler;
  * When browsing remote url, its possible to change encoding from Tools Menu.
  */
 
  * When browsing remote url, its possible to change encoding from Tools Menu.
  */
 

-class DolphinRemoteEncoding: public QObject
+class LIBDOLPHINPRIVATE_EXPORT DolphinRemoteEncoding: public QObject

 {
   Q_OBJECT
 public:
 {
   Q_OBJECT
 public:

diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp
index da903c92f0dd00e7013e40d8d440cd9985cd480d..6b0a454a70b2ac32a18006f1864a3aa8041dc16e 100644 (file)
--- a/src/dolphinsortfilterproxymodel.cpp
+++ b/src/dolphinsortfilterproxymodel.cpp
@@ -2,7 +2,7 @@
  *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
  *   Copyright (C) 2006 by Dominic Battre <dominic@battre.de>              *
  *   Copyright (C) 2006 by Martin Pool <mbp@canonical.com>                 *
  *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
  *   Copyright (C) 2006 by Dominic Battre <dominic@battre.de>              *
  *   Copyright (C) 2006 by Martin Pool <mbp@canonical.com>                 *

- *   Copyright (C) 2007 by Rafael Fernández López <ereslibre@kde.org>    *
+ *   Copyright (C) 2007 by Rafael Fernández López <ereslibre@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  *
  *                                                                         *
  *   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  *