[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ktorrent] /: Drop support for importing KDE3 torrents
From: Joris Guisson <joris.guisson () gmail ! com>
Date: 2014-11-08 11:24:03
Message-ID: E1Xn47f-0000tS-CV () scm ! kde ! org
[Download RAW message or body]
Git commit 632543b7d599beaee92d882fdee072f1fc9bd4b8 by Joris Guisson.
Committed on 08/11/2014 at 11:23.
Pushed by guisson into branch 'master'.
Drop support for importing KDE3 torrents
A +3 -0 .gitignore
M +1 -0 ChangeLog
M +0 -2 ktorrent/CMakeLists.txt
M +0 -39 ktorrent/core.cpp
M +0 -4 ktorrent/core.h
M +0 -9 ktorrent/gui.cpp
M +0 -1 ktorrent/gui.h
M +1 -2 ktorrent/ktorrentui.rc
M +0 -10 libktcore/dbus/dbussettings.cpp
M +0 -2 libktcore/dbus/dbussettings.h
M +0 -3 libktcore/ktorrent.kcfg
http://commits.kde.org/ktorrent/632543b7d599beaee92d882fdee072f1fc9bd4b8
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2ad76d6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+build
+.kdev4/
+ktorrent.kdev4
diff --git a/ChangeLog b/ChangeLog
index 5bf9d02..af27172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ Changes in 4.4:
- Fix bug causing torrent percentage to be slightly off in the files tab (315549)
- Remove estimation algorithm option
- Fix double click on subdirectory not working in fileview (337457)
+- Drop support for importing KDE3 torrents
Changes in 4.3.2:
- Backport ipfilter extraction fixes from master branch (315239)
diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt
index 7bd277f..3d61cfd 100644
--- a/ktorrent/CMakeLists.txt
+++ b/ktorrent/CMakeLists.txt
@@ -31,7 +31,6 @@ set(ktorrent_SRC
dialogs/missingfilesdlg.cpp
dialogs/importdialog.cpp
dialogs/addpeersdlg.cpp
- dialogs/torrentmigratordlg.cpp
dialogs/fileselectdlg.cpp
pref/prefdialog.cpp
@@ -63,7 +62,6 @@ kde4_add_ui_files(ktorrent_SRC
dialogs/missingfilesdlg.ui
dialogs/importdialog.ui
dialogs/addpeersdlg.ui
- dialogs/torrentmigratordlg.ui
dialogs/fileselectdlg.ui
groups/grouppolicydlg.ui
diff --git a/ktorrent/core.cpp b/ktorrent/core.cpp
index 5e28e9d..dd4f9a3 100644
--- a/ktorrent/core.cpp
+++ b/ktorrent/core.cpp
@@ -60,7 +60,6 @@
#include "dialogs/fileselectdlg.h"
#include "dialogs/missingfilesdlg.h"
#include "gui.h"
-#include "dialogs/torrentmigratordlg.h"
using namespace bt;
@@ -133,9 +132,6 @@ namespace kt
this, SLOT(onMetadataDownloaded(bt::MagnetLink, QByteArray, \
kt::MagnetLinkLoadOptions)), Qt::QueuedConnection);
- if (!Settings::oldTorrentsImported()) // check for old torrents if this \
hasn't happened yet
- QTimer::singleShot(1000, this, SLOT(checkForKDE3Torrents()));
-
mman->loadMagnets(kt::DataDir() + "magnets");
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, \
SLOT(onExit())); @@ -1331,41 +1327,6 @@ namespace kt
pman->updateGuiPlugins();
}
- void Core::checkForKDE3Torrents()
- {
- Settings::setOldTorrentsImported(true);
- Settings::self()->writeConfig();
-#ifndef Q_WS_WIN // this is only necessary on linux and other unix variants which \
support KDE3
- TorrentMigratorDlg mig(gui);
- Uint32 num = mig.findTorrentsToBeMigrated();
- if (num > 0)
- {
- if (KMessageBox::questionYesNo(gui, i18np("KTorrent has found a torrent \
from the KDE3 version of KTorrent, do you want to import it?", "KTorrent has found %1 \
torrents from the KDE3 version of KTorrent, do you want to import them?", num)) == \
KMessageBox::Yes)
- {
- mig.migrateFoundTorrents(qman);
- foreach (const QString& s, mig.getSuccessFullImports())
- loadExistingTorrent(s);
- }
- }
-#endif
- }
-
- void Core::importKDE3Torrents()
- {
- TorrentMigratorDlg mig(gui);
- Uint32 num = mig.findTorrentsToBeMigrated();
- if (num > 0)
- {
- mig.migrateFoundTorrents(qman);
- foreach (const QString& s, mig.getSuccessFullImports())
- loadExistingTorrent(s);
- }
- else
- {
- KMessageBox::information(gui, i18n("No torrents from the KDE3 version \
were found."));
- }
- }
-
DBus* Core::getExternalInterface()
{
return gui->getDBusInterface();
diff --git a/ktorrent/core.h b/ktorrent/core.h
index 321def9..cbb068e 100644
--- a/ktorrent/core.h
+++ b/ktorrent/core.h
@@ -157,9 +157,6 @@ namespace kt
/// Update the GUI plugins
void updateGuiPlugins();
- /// Import KDE3 torrents
- void importKDE3Torrents();
-
/// Handle status changes
void onStatusChanged(bt::TorrentInterface* tc);
@@ -245,7 +242,6 @@ namespace kt
void downloadFinishedSilently(KJob* job);
void emitCorruptedData(bt::TorrentInterface* tc);
void autoCheckData(bt::TorrentInterface* tc);
- void checkForKDE3Torrents();
void delayedRemove(bt::TorrentInterface* tc);
void delayedStart();
void beforeQueueReorder();
diff --git a/ktorrent/gui.cpp b/ktorrent/gui.cpp
index 7ea913b..06c15fd 100644
--- a/ktorrent/gui.cpp
+++ b/ktorrent/gui.cpp
@@ -441,15 +441,6 @@ namespace kt
connect(import_action, SIGNAL(triggered()), this, SLOT(import()));
ac->addAction("import", import_action);
-#ifndef Q_WS_WIN
- import_kde3_torrents_action = new KAction(KIcon("document-import"), \
i18n("Import KDE3 Torrents"), this);
- import_kde3_torrents_action->setToolTip(i18n("Import all torrents from the \
KDE3 version of KTorrent"));
- connect(import_kde3_torrents_action, SIGNAL(triggered()), core, \
SLOT(importKDE3Torrents()));
- ac->addAction("import_kde3_torrents", import_kde3_torrents_action);
-#else
- import_kde3_torrents_action = 0; // this action is not needed in windows
-#endif
-
show_kt_action = new KAction(KIcon("kt-show-hide"), i18n("Show/Hide \
KTorrent"), this);
connect(show_kt_action, SIGNAL(triggered()), this, SLOT(showOrHide()));
ac->addAction("show_kt", show_kt_action);
diff --git a/ktorrent/gui.h b/ktorrent/gui.h
index 734bf7f..d835c4f 100644
--- a/ktorrent/gui.h
+++ b/ktorrent/gui.h
@@ -140,7 +140,6 @@ namespace kt
KAction* paste_url_action;
KAction* ipfilter_action;
KAction* import_action;
- KAction* import_kde3_torrents_action;
KAction* show_kt_action;
KAction* paste_action;
};
diff --git a/ktorrent/ktorrentui.rc b/ktorrent/ktorrentui.rc
index 187492c..b61d739 100644
--- a/ktorrent/ktorrentui.rc
+++ b/ktorrent/ktorrentui.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui name="ktorrent" version="22">
+<gui name="ktorrent" version="23">
<MenuBar>
<Menu name="file"><text>&File</text>
<Action name="file_new"/>
@@ -8,7 +8,6 @@
<Action name="paste_url"/>
<Separator/>
<Action name="import" />
- <Action name="import_kde3_torrents" />
<Separator/>
<Action name="ipfilter_action"/>
<Merge/>
diff --git a/libktcore/dbus/dbussettings.cpp b/libktcore/dbus/dbussettings.cpp
index d55fcf9..9ca57c2 100644
--- a/libktcore/dbus/dbussettings.cpp
+++ b/libktcore/dbus/dbussettings.cpp
@@ -678,16 +678,6 @@ namespace kt
Settings::setSuppressSleep(val);
}
- bool DBusSettings::oldTorrentsImported()
- {
- return Settings::oldTorrentsImported();
- }
-
- void DBusSettings::setOldTorrentsImported(bool val)
- {
- Settings::setOldTorrentsImported(val);
- }
-
bool DBusSettings::manuallyControlTorrents()
{
return Settings::manuallyControlTorrents();
diff --git a/libktcore/dbus/dbussettings.h b/libktcore/dbus/dbussettings.h
index 248946f..87c63f8 100644
--- a/libktcore/dbus/dbussettings.h
+++ b/libktcore/dbus/dbussettings.h
@@ -166,8 +166,6 @@ namespace kt
Q_SCRIPTABLE void setPreviewSizeVideo(int val);
Q_SCRIPTABLE bool suppressSleep();
Q_SCRIPTABLE void setSuppressSleep(bool val);
- Q_SCRIPTABLE bool oldTorrentsImported();
- Q_SCRIPTABLE void setOldTorrentsImported(bool val);
Q_SCRIPTABLE bool manuallyControlTorrents();
Q_SCRIPTABLE void setManuallyControlTorrents(bool val);
Q_SCRIPTABLE bool webseedsEnabled();
diff --git a/libktcore/ktorrent.kcfg b/libktcore/ktorrent.kcfg
index 02228b9..b90141b 100644
--- a/libktcore/ktorrent.kcfg
+++ b/libktcore/ktorrent.kcfg
@@ -273,9 +273,6 @@
<entry name="suppressSleep" type="Bool">
<default>true</default>
</entry>
- <entry name="oldTorrentsImported" type="Bool">
- <default>false</default>
- </entry>
<entry name="manuallyControlTorrents" type="Bool">
<default>false</default>
</entry>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic