[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/knewstuffrefactor [POSSIBLY UNSAFE]
From: Jeremy Paul Whiting <jeremy () scitools ! com>
Date: 2009-10-02 23:18:48
Message-ID: 1254525528.596912.13589.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1030685 by whiting:
engine created, initially a copy of core/CoreEngine, ClientPrivate no longer derives \
from CoreEngine (or DXSEngine), still need to move a lot of functionality from the \
download dialog into the engine, and into the base Provider class, but its a start
M +1 -1 CMakeLists.txt
M +8 -15 knewstuff3/CMakeLists.txt
A knewstuff3/client.cpp knewstuff3/engine.cpp#1029482 [License: LGPL \
(v2.1+)] A knewstuff3/client.h knewstuff3/engine.h#1029482 [License: \
LGPL (v2.1+)] D knewstuff3/core/coreengine.cpp
D knewstuff3/core/coreengine.h
D knewstuff3/core/entry.cpp
D knewstuff3/core/entry.h
M +3 -3 knewstuff3/core/entryhandler.h
M +3 -3 knewstuff3/core/entryloader.h
M +4 -4 knewstuff3/core/feed.h
M +1 -1 knewstuff3/core/providerhandler.h
M +1 -1 knewstuff3/core/providerloader.h
A knewstuff3/engine.cpp knewstuff3/core/coreengine.cpp#1029482 \
[POSSIBLY UNSAFE: setShellCommand] [License: LGPL (v2.1+)] A \
knewstuff3/engine.h knewstuff3/core/coreengine.h#1029482 [License: LGPL (v2.1+)] A \
knewstuff3/entry.cpp knewstuff3/core/entry.cpp#1029482 [License: LGPL (v2.1+)] A \
knewstuff3/entry.h knewstuff3/core/entry.h#1029482 [License: LGPL (v2.1+)] A \
knewstuff3/provider.cpp knewstuff3/providerbase.cpp#1029482 [License: LGPL (v2.1+)] \
A knewstuff3/provider.h knewstuff3/providerbase.h#1029482 [License: \
LGPL (v2.1+)] D knewstuff3/providerbase.cpp
D knewstuff3/providerbase.h
M +24 -24 knewstuff3/ui/downloaddialog.cpp
M +9 -8 knewstuff3/ui/downloaddialog.h
M +4 -4 knewstuff3/ui/itemsmodel.h
M +4 -4 knewstuff3/ui/itemsviewdelegate.h
--- branches/work/knewstuffrefactor/CMakeLists.txt #1030684:1030685
@@ -1,4 +1,4 @@
add_subdirectory(data)
add_subdirectory(knewstuff2)
-add_subdirectory(knewstuff3)
+#add_subdirectory(knewstuff3)
add_subdirectory(tests)
--- branches/work/knewstuffrefactor/knewstuff3/CMakeLists.txt #1030684:1030685
@@ -8,25 +8,15 @@
core/ktranslatable.cpp
core/author.cpp
core/category.cpp
- core/entry.cpp
- core/entryhandler.cpp
- core/entryloader.cpp
+# core/entryhandler.cpp
+# core/entryloader.cpp
core/feed.cpp
- core/provider.cpp
- core/providerhandler.cpp
- core/providerloader.cpp
- core/coreengine.cpp
+# core/providerhandler.cpp
+# core/providerloader.cpp
core/installation.cpp
core/security.cpp
- providerbase.cpp
)
-set(knewstuff3_dxs_SRCS
- dxs/soap.cpp
- dxs/dxs.cpp
- dxs/dxsengine.cpp
-)
-
set(knewstuff3_ui_SRCS
ui/kdxsrating.cpp
ui/kdxscomment.cpp
@@ -47,12 +37,15 @@
)
set(knewstuff3_SRCS
+ client.cpp
engine.cpp
+ entry.cpp
+ provider.cpp
)
kde4_add_ui_files(knewstuff3_ui_SRCS ui/DownloadDialog.ui ui/UploadDialog.ui)
-kde4_add_library(knewstuff3 SHARED ${knewstuff3_core_SRCS} ${knewstuff3_dxs_SRCS} \
${knewstuff3_ui_SRCS} ${knewstuff3_SRCS}) +kde4_add_library(knewstuff3 SHARED \
${knewstuff3_core_SRCS} ${knewstuff3_ui_SRCS} ${knewstuff3_SRCS})
target_link_libraries(knewstuff3 ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY})
target_link_libraries(knewstuff3 LINK_INTERFACE_LIBRARIES kdeui kdecore \
${QT_QTGUI_LIBRARY} )
--- branches/work/knewstuffrefactor/knewstuff3/core/entryhandler.h #1030684:1030685
@@ -16,10 +16,10 @@
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef KNEWSTUFF2_ENTRY_HANDLER_H
-#define KNEWSTUFF2_ENTRY_HANDLER_H
+#ifndef KNEWSTUFF3_ENTRY_HANDLER_H
+#define KNEWSTUFF3_ENTRY_HANDLER_H
-#include <knewstuff2/core/entry.h>
+#include <knewstuff3/entry.h>
#include <QtXml/QDomDocument>
#include <QtXml/QDomElement>
--- branches/work/knewstuffrefactor/knewstuff3/core/entryloader.h #1030684:1030685
@@ -15,10 +15,10 @@
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef KNEWSTUFF2_ENTRY_LOADER_H
-#define KNEWSTUFF2_ENTRY_LOADER_H
+#ifndef KNEWSTUFF3_ENTRY_LOADER_H
+#define KNEWSTUFF3_ENTRY_LOADER_H
-#include <knewstuff2/core/entry.h>
+#include <knewstuff3/entry.h>
#include <QtXml/qdom.h>
#include <QtCore/QObject>
--- branches/work/knewstuffrefactor/knewstuff3/core/feed.h #1030684:1030685
@@ -15,11 +15,11 @@
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef KNEWSTUFF2_FEED_H
-#define KNEWSTUFF2_FEED_H
+#ifndef KNEWSTUFF3_FEED_H
+#define KNEWSTUFF3_FEED_H
-#include <knewstuff2/core/ktranslatable.h>
-#include <knewstuff2/core/entry.h>
+#include <knewstuff3/core/ktranslatable.h>
+#include <knewstuff3/entry.h>
#include <kurl.h>
--- branches/work/knewstuffrefactor/knewstuff3/core/providerhandler.h \
#1030684:1030685 @@ -19,7 +19,7 @@
#ifndef KNEWSTUFF2_PROVIDER_HANDLER_H
#define KNEWSTUFF2_PROVIDER_HANDLER_H
-#include <knewstuff2/core/provider.h>
+#include <knewstuff3/provider.h>
#include <QtXml/qdom.h>
#include <QtCore/QObject>
--- branches/work/knewstuffrefactor/knewstuff3/core/providerloader.h #1030684:1030685
@@ -19,7 +19,7 @@
#ifndef KNEWSTUFF2_PROVIDER_LOADER_H
#define KNEWSTUFF2_PROVIDER_LOADER_H
-#include <knewstuff2/core/provider.h>
+#include <knewstuff3/provider.h>
#include <QtXml/qdom.h>
#include <QtCore/QObject>
--- branches/work/knewstuffrefactor/knewstuff3/ui/downloaddialog.cpp #1030684:1030685
@@ -33,13 +33,13 @@
#include <kdebug.h>
-#include "knewstuff2/core/provider.h"
-#include "knewstuff2/core/providerhandler.h"
-#include "knewstuff2/core/entry.h"
-#include "knewstuff2/core/entryhandler.h"
-#include "knewstuff2/core/category.h"
+//#include "knewstuff2/core/provider.h"
+#include "knewstuff3/core/providerhandler.h"
+//#include "knewstuff2/core/entry.h"
+#include "knewstuff3/core/entryhandler.h"
+#include "knewstuff3/core/category.h"
-#include "knewstuff2/dxs/dxs.h"
+//#include "knewstuff3/dxs/dxs.h"
// local includes
#include "ui_DownloadDialog.h"
@@ -53,7 +53,7 @@
using namespace KNS;
-DownloadDialog::DownloadDialog(DxsEngine* _engine, QWidget * _parent)
+DownloadDialog::DownloadDialog(Engine* _engine, QWidget * _parent)
: KDialog(_parent)
{
setButtons(0);
@@ -167,25 +167,25 @@
{
kDebug(551) << "perform action: " << action;
const Provider * provider = m_providers.contains(entry) ? m_providers[entry] : \
NULL;
- Dxs * dxs = m_engine->dxsObject(provider);
+ //Dxs * dxs = m_engine->dxsObject(provider);
switch (action) {
case kViewInfo:
- if (provider && dxs) {
- if (provider->webService().isValid()) {
- dxs->call_info();
- } else {
+ //if (provider && dxs) {
+ //if (provider->webService().isValid()) {
+ // dxs->call_info();
+ //} else {
slotInfo(provider->name().representation(),
provider->webAccess().pathOrUrl(),
QString());
- }
- }
+ //}
+ //}
break;
case kComments:
// show the entry's comments
- if (provider && dxs) {
- connect(dxs, SIGNAL(signalComments(QStringList)), this, \
SLOT(slotComments(QStringList)));
- dxs->call_comments(entry->idNumber());
- }
+ //if (provider && dxs) {
+ // connect(dxs, SIGNAL(signalComments(QStringList)), this, \
SLOT(slotComments(QStringList))); + // \
dxs->call_comments(entry->idNumber()); + //}
break;
case kChanges:
// show the entry's changelog
@@ -223,9 +223,9 @@
int ret = commentDialog->exec();
if (ret == QDialog::Accepted) {
QString s = commentDialog->comment();
- if (dxs && !s.isEmpty()) {
- dxs->call_comment(entry->idNumber(), s);
- }
+ //if (dxs && !s.isEmpty()) {
+ // dxs->call_comment(entry->idNumber(), s);
+ //}
}
}
break;
@@ -235,9 +235,9 @@
int ret = ratingDialog->exec();
if (ret == QDialog::Accepted) {
int rating = ratingDialog->rating();
- if (dxs) {
- dxs->call_rating(entry->idNumber(), rating);
- }
+ //if (dxs) {
+ // dxs->call_rating(entry->idNumber(), rating);
+ //}
}
}
break;
--- branches/work/knewstuffrefactor/knewstuff3/ui/downloaddialog.h #1030684:1030685
@@ -1,9 +1,9 @@
/*
- This file is part of KNewStuff2.
+ knewstuff3/ui/downloaddialog.h.
Copyright (C) 2005 by Enrico Ros <eros.kde@email.it>
Copyright (C) 2005 - 2007 Josef Spillner <spillner@kde.org>
Copyright (C) 2007 Dirk Mueller <mueller@kde.org>
- Copyright (C) 2007 Jeremy Whiting <jeremy@scitools.com>
+ Copyright (C) 2007-2009 Jeremy Whiting <jeremy@scitools.com>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -19,16 +19,17 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef KNEWSTUFF2_UI_DOWNLOADDIALOG_H
-#define KNEWSTUFF2_UI_DOWNLOADDIALOG_H
+#ifndef KNEWSTUFF3_UI_DOWNLOADDIALOG_H
+#define KNEWSTUFF3_UI_DOWNLOADDIALOG_H
#include <QMutex>
#include <kdialog.h>
#include <ktitlewidget.h>
-#include <knewstuff2/dxs/dxsengine.h>
-#include <knewstuff2/core/category.h>
+#include <knewstuff3/engine.h>
+#include <knewstuff3/core/feed.h>
+#include <knewstuff3/core/category.h>
#include "ui_DownloadDialog.h"
@@ -70,7 +71,7 @@
Q_OBJECT
public:
- DownloadDialog(DxsEngine* engine, QWidget * parent);
+ DownloadDialog(Engine* engine, QWidget * parent);
~DownloadDialog();
enum EntryAction {
@@ -152,7 +153,7 @@
QTimer * messageTimer;
QTimer * networkTimer;
- DxsEngine *m_engine;
+ Engine *m_engine;
QMap<QString, QString> categorymap;
QMap<const Feed*, KNS::ItemsModel*> m_models;
QSortFilterProxyModel * m_filteredModel;
--- branches/work/knewstuffrefactor/knewstuff3/ui/itemsmodel.h #1030684:1030685
@@ -1,5 +1,5 @@
/*
- This file is part of KNewStuff2.
+ knewstuff3/ui/itemsmodel.h.
Copyright (C) 2008 Jeremy Whiting <jeremy@scitools.com>
This library is free software; you can redistribute it and/or
@@ -16,13 +16,13 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef KNEWSTUFF2_UI_ITEMSMODEL_H
-#define KNEWSTUFF2_UI_ITEMSMODEL_H
+#ifndef KNEWSTUFF3_UI_ITEMSMODEL_H
+#define KNEWSTUFF3_UI_ITEMSMODEL_H
#include <QAbstractListModel>
#include <QtGui/QImage>
-#include <knewstuff2/core/entry.h>
+#include <knewstuff3/entry.h>
namespace KNS
{
--- branches/work/knewstuffrefactor/knewstuff3/ui/itemsviewdelegate.h \
#1030684:1030685 @@ -16,8 +16,8 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef KNEWSTUFF2_UI_ITEMSVIEWDELEGATE_H
-#define KNEWSTUFF2_UI_ITEMSVIEWDELEGATE_H
+#ifndef KNEWSTUFF3_UI_ITEMSVIEWDELEGATE_H
+#define KNEWSTUFF3_UI_ITEMSVIEWDELEGATE_H
#include <kwidgetitemdelegate.h>
@@ -28,8 +28,8 @@
#include <QtGui/QLabel>
#include <QtGui/QToolButton>
-#include <knewstuff2/core/entry.h>
-#include <knewstuff2/ui/downloaddialog.h>
+#include <knewstuff3/entry.h>
+#include <knewstuff3/ui/downloaddialog.h>
#include <kicon.h>
#include <kmenu.h>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic