[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/network/kftpgrabber/src
From: Jernej Kos <kostko () unimatrix-one ! org>
Date: 2006-10-31 20:41:16
Message-ID: 1162327276.712652.12445.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 600785 by kostko:
Removed useless KFTPBookmarksShare class.
M +3 -3 Makefile.am
M +0 -1 kftpbookmarks.cpp
M +0 -1 kftpbookmarks.h
D kftpbookmarksshare.cpp
D kftpbookmarksshare.h
M +0 -2 mainwindow.cpp
M +0 -7 misc/kftpapi.cpp
M +0 -3 misc/kftpapi.h
--- trunk/extragear/network/kftpgrabber/src/Makefile.am #600784:600785
@@ -11,7 +11,7 @@
noinst_HEADERS = checksumverifier.h kftpbookmarks.h kftpqueue.h \
kftpbookmarks.h mainwindow.h kftpqueue.h mainactions.h kftpbookmarkaction.h \
kftpqueueprocessor.h kftpsession.h kftpqueueconverter.h kftptransfer.h \
- kftptransferfile.h kftptransferdir.h kftpbookmarksshare.h kftpfileexistsactions.h \
+ kftptransferfile.h kftptransferdir.h kftpfileexistsactions.h \
kftpservermanagement.h statistics.h site.h queueobject.h scheduler.h queuegroup.h \
directoryscanner.h
@@ -31,7 +31,7 @@
kftpgrabber_SOURCES = main.cpp mainwindow.cpp checksumverifier.cpp \
kftpbookmarks.cpp kftpqueue.cpp mainactions.cpp kftpbookmarkaction.cpp \
kftpqueueprocessor.cpp kftpsession.cpp kftpqueueconverter.cpp kftptransfer.cpp \
- kftptransferfile.cpp kftptransferdir.cpp kftpbookmarksshare.cpp \
+ kftptransferfile.cpp kftptransferdir.cpp \
kftpfileexistsactions.cpp kftpservermanagement.cpp statistics.cpp site.cpp queueobject.cpp \
scheduler.cpp queuegroup.cpp directoryscanner.cpp
kftpgrabber_LDFLAGS = $(KDE_RPATH) $(all_libraries)
@@ -47,7 +47,7 @@
misc/interfaces/libkftpinterfaces.la \
misc/libs/ssh/libssh.a \
$(LIB_KDNSSD) -lkwalletclient $(LIBSSL) $(LIB_KPARTS) \
- $(LIB_KIO) $(LIB_KDEUI) $(LIB_KIMPROXY)
+ $(LIB_KIO) $(LIB_KDEUI)
# this is where the desktop file will go
xdg_apps_DATA = kftpgrabber.desktop
--- trunk/extragear/network/kftpgrabber/src/kftpbookmarks.cpp #600784:600785
@@ -42,7 +42,6 @@
#include "desencryptor.h"
#include "browser/view.h"
#include "kftpsession.h"
-#include "kftpbookmarksshare.h"
#include "bookmarks/listview.h"
#include "misc/config.h"
--- trunk/extragear/network/kftpgrabber/src/kftpbookmarks.h #600784:600785
@@ -48,7 +48,6 @@
namespace KFTPEngine {
class Thread;
}
-class KFTPBookmarksShare;
namespace KFTPWidgets {
namespace Bookmarks {
--- trunk/extragear/network/kftpgrabber/src/mainwindow.cpp #600784:600785
@@ -92,7 +92,6 @@
#include "kftpqueueconverter.h"
#include "kftppluginmanager.h"
#include "engine/thread.h"
-#include "kftpbookmarksshare.h"
#include "kftpservermanagement.h"
using namespace KFTPGrabberBase;
@@ -309,7 +308,6 @@
m_bookmarkMenu->popupMenu()->insertItem(loadSmallIcon("bookmark"), i18n("Edit Bookmarks..."), 1);
m_bookmarkMenu->popupMenu()->connectItem(1, this, SLOT(showBookmarkEditor()));
- m_bookmarkMenu->insert(KFTPAPI::getInstance()->bookmarksShare()->getContactList());
m_bookmarkMenu->insert(m_zeroconfMenu);
if (KFTPCore::Config::showWalletSites())
--- trunk/extragear/network/kftpgrabber/src/misc/kftpapi.cpp #600784:600785
@@ -37,7 +37,6 @@
#include "kftpwalletconnection.h"
#include "kftppluginmanager.h"
#include "kftpzeroconf.h"
-#include "kftpbookmarksshare.h"
KFTPAPI *KFTPAPI::m_instance = 0L;
@@ -52,7 +51,6 @@
KFTPAPI::KFTPAPI()
{
m_zeroconfInterface = new KFTPZeroConf(this);
- m_bookmarksShare = new KFTPBookmarksShare(this);
}
KFTPAPI::~KFTPAPI()
@@ -75,11 +73,6 @@
return m_mainWindow;
}
-KFTPBookmarksShare *KFTPAPI::bookmarksShare()
-{
- return m_bookmarksShare;
-}
-
KFTPZeroConf *KFTPAPI::zeroConfInterface()
{
return m_zeroconfInterface;
--- trunk/extragear/network/kftpgrabber/src/misc/kftpapi.h #600784:600785
@@ -44,7 +44,6 @@
class KFTPPluginManager;
class KFTPWalletConnection;
class KFTPZeroConf;
-class KFTPBookmarksShare;
/**
@author Jernej Kos
@@ -59,7 +58,6 @@
static KFTPAPI *getInstance();
- KFTPBookmarksShare *bookmarksShare();
KFTPPluginManager *pluginManager();
KFTPWalletConnection *walletConnection();
MainWindow *mainWindow();
@@ -70,7 +68,6 @@
MainWindow *m_mainWindow;
KFTPZeroConf *m_zeroconfInterface;
- KFTPBookmarksShare *m_bookmarksShare;
};
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic