[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/knewstuff/knewstuff3
From: Frederik Gladhorn <gladhorn () kde ! org>
Date: 2009-11-20 14:55:37
Message-ID: 1258728937.038044.28507.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1052011 by gladhorn:
compile++ (within kdelibs)
and some cleanup
M +1 -1 CMakeLists.txt
M +2 -1 attica/atticaprovider.h
M +2 -2 core/cache.cpp
M +2 -0 core/cache.h
M +3 -4 core/engine.h
M +1 -3 core/installation.h
M +1 -1 core/provider.h
M +19 -26 downloaddialog.cpp
M +2 -12 downloaddialog.h
M +2 -2 entry.cpp
M +2 -2 entry.h
M +1 -2 knewstuffbutton.h
M +0 -1 ui/uploaddialog.h
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/CMakeLists.txt #1052010:1052011
@@ -14,7 +14,7 @@
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=550)
-include_directories(${LIBATTICA_INCLUDE_DIRS} ${KDE4_KIO_INCLUDES} \
${CMAKE_CURRENT_SOURCE_DIR}/..) +include_directories(${LIBATTICA_INCLUDE_DIRS} \
${KDE4_INCLUDES} ${KDE4_KIO_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/..) \
link_directories(${LIBATTICA_LIBRARY_DIRS})
set(knewstuff3_SRCS
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/attica/atticaprovider.h #1052010:1052011
@@ -21,7 +21,8 @@
#include <attica/provider.h>
namespace Attica {
-class BaseJob;}
+ class BaseJob;
+}
namespace KNS3
{
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/core/cache.cpp #1052010:1052011
@@ -18,8 +18,8 @@
#include "cache.h"
#include <QtCore/QFile>
-#include <KStandardDirs>
-#include <KDebug>
+#include <kstandarddirs.h>
+#include <kdebug.h>
using namespace KNS3;
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/core/cache.h #1052010:1052011
@@ -19,6 +19,8 @@
#define CACHE_H
#include <QtCore/QObject>
+#include <QtCore/QSet>
+
#include "engine.h"
#include "entry.h"
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/core/engine.h #1052010:1052011
@@ -21,14 +21,13 @@
#ifndef KNEWSTUFF3_ENGINE_H
#define KNEWSTUFF3_ENGINE_H
-#include "provider.h"
-#include "entry.h"
-#include "knewstuff_export.h"
-
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/QMap>
+#include "provider.h"
+#include "entry.h"
+
class KJob;
namespace KNS3
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/core/installation.h #1052010:1052011
@@ -19,12 +19,10 @@
#ifndef KNEWSTUFF3_INSTALLATION_H
#define KNEWSTUFF3_INSTALLATION_H
-#include "knewstuff_export.h"
-
#include <QtCore/QObject>
#include <QtCore/QString>
-#include <KConfigGroup>
+#include <kconfiggroup.h>
#include "entry.h"
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/core/provider.h #1052010:1052011
@@ -23,7 +23,7 @@
#include <QtCore/QList>
#include <QtCore/QString>
-#include <KUrl>
+#include <kurl.h>
#include "entry.h"
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/downloaddialog.cpp #1052010:1052011
@@ -26,9 +26,9 @@
#include <QtCore/QTimer>
#include <QtGui/QScrollBar>
-#include <KMessageBox>
-#include <KComponentData>
-#include <KAboutData>
+#include <kmessagebox.h>
+#include <kcomponentdata.h>
+#include <kaboutdata.h>
#include <ktitlewidget.h>
#include "ui/itemsmodel.h"
@@ -77,6 +77,21 @@
{
engine->init(configFile);
}
+
+ void displayMessage(const QString & msg, KTitleWidget::MessageType type, int \
timeOutMs = 0) + {
+ // stop the pending timer if present
+ messageTimer->stop();
+
+ // set text to messageLabel
+ ui.m_titleWidget->setComment(msg, type);
+
+ // single shot the resetColors timer (and create it if null)
+ if (timeOutMs > 0) {
+ //kDebug(551) << "starting the message timer for " << timeOutMs;
+ messageTimer->start(timeOutMs);
+ }
+ }
};
@@ -199,28 +214,6 @@
delete d;
}
-void DownloadDialog::hideEvent(QHideEvent * event)
-{
- KConfigGroup group(KGlobal::config(), ConfigGroup);
- saveDialogSize(group, KConfigBase::Persistent);
- KDialog::hideEvent(event);
-}
-
-void DownloadDialog::displayMessage(const QString & msg, KTitleWidget::MessageType \
type, int timeOutMs)
-{
- // stop the pending timer if present
- d->messageTimer->stop();
-
- // set text to messageLabel
- d->ui.m_titleWidget->setComment(msg, type);
-
- // single shot the resetColors timer (and create it if null)
- if (timeOutMs > 0) {
- //kDebug(551) << "starting the message timer for " << timeOutMs;
- d->messageTimer->start(timeOutMs);
- }
-}
-
void DownloadDialog::slotResetMessage() // SLOT
{
d->ui.m_titleWidget->setComment(QString());
@@ -228,7 +221,7 @@
void DownloadDialog::slotNetworkTimeout() // SLOT
{
- displayMessage(i18n("Timeout. Check Internet connection!"), \
KTitleWidget::ErrorMessage); + d->displayMessage(i18n("Timeout. Check Internet \
connection!"), KTitleWidget::ErrorMessage); }
void DownloadDialog::slotSortingSelected(int sortType) // SLOT
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/downloaddialog.h #1052010:1052011
@@ -23,10 +23,10 @@
#ifndef KNEWSTUFF3_UI_DOWNLOADDIALOG_H
#define KNEWSTUFF3_UI_DOWNLOADDIALOG_H
-#include <KDialog>
+#include <kdialog.h>
+#include <knewstuff3/knewstuff_export.h>
#include <knewstuff3/entry.h>
-#include <KTitleWidget>
namespace KNS3
{
@@ -105,13 +105,6 @@
* @return the list of entries
*/
KNS3::Entry::List installedEntries();
-
-
-
- // show a message in the bottom bar
- void displayMessage(const QString & msg,
- KTitleWidget::MessageType type = KTitleWidget::PlainMessage,
- int timeOutMs = 0);
private Q_SLOTS:
void slotEntryChanged(const KNS3::Entry& entry);
@@ -132,9 +125,6 @@
Q_SIGNALS:
void signalRequestMoreData();
-protected:
- virtual void hideEvent(QHideEvent * event);
-
private:
void init(const QString& configFile);
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/entry.cpp #1052010:1052011
@@ -20,8 +20,8 @@
#include "entry.h"
-#include <QStringList>
-#include <KDebug>
+#include <QtCore/QStringList>
+#include <kdebug.h>
#include "core/xmlloader.h"
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/entry.h #1052010:1052011
@@ -26,9 +26,9 @@
#include <QtXml/QDomElement>
#include <QtCore/QString>
-#include <KUrl>
-#include <KDebug>
+#include <kurl.h>
+#include <knewstuff3/knewstuff_export.h>
#include <knewstuff3/author.h>
namespace KNS3
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/knewstuffbutton.h #1052010:1052011
@@ -19,7 +19,7 @@
#ifndef KNEWSTUFF3BUTTON_H
#define KNEWSTUFF3BUTTON_H
-#include <KPushButton>
+#include <kpushbutton.h>
#include <knewstuff3/knewstuff_export.h>
@@ -28,7 +28,6 @@
class Engine;
-// FIXME: port properly to KNS2, less accessors for apps, more *.knsrc usage
/**
* KHotNewStuff push button that makes using KHNS in an application
* more convenient by encapsulating most of the details involved in
--- trunk/KDE/kdelibs/knewstuff/knewstuff3/ui/uploaddialog.h #1052010:1052011
@@ -22,7 +22,6 @@
#include <kdialog.h>
#include <kurl.h>
-#include <knewstuff3/knewstuff_export.h>
#include "ui_UploadDialog.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic