[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim/frameworks] /: Reactivate code
From: Montel Laurent <montel () kde ! org>
Date: 2014-06-30 18:58:58
Message-ID: E1X1gn4-000563-2l () scm ! kde ! org
[Download RAW message or body]
Git commit 6600e40816d8fbdaf3b5bd07e0b6a4f783af1803 by Montel Laurent.
Committed on 30/06/2014 at 18:58.
Pushed by mlaurent into branch 'frameworks'.
Reactivate code
M +1 -1 akregator/configuration/akregator_config_advanced.cpp
M +2 -1 examples/coisceim/coisceimpart.cpp
M +2 -1 kaddressbook/kaddressbookpart.cpp
M +2 -1 kjots/kjotspart.cpp
M +1 -1 kmail/configuredialog/configmodule.h
M +2 -2 kontact/plugins/akregator/akregator_plugin.cpp
M +15 -15 kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
M +2 -2 kontact/plugins/kjots/kjots_plugin.cpp
M +11 -11 kontact/plugins/kmail/kmail_plugin.cpp
M +4 -1 kontact/plugins/knotes/knotes_plugin.cpp
M +2 -2 kontact/plugins/korganizer/journalplugin.cpp
M +2 -2 kontact/plugins/korganizer/korganizerplugin.cpp
M +2 -2 kontact/plugins/korganizer/todoplugin.cpp
M +2 -1 kontact/plugins/specialdates/specialdates_plugin.cpp
M +2 -1 kontact/plugins/summary/summaryview_plugin.cpp
M +0 -1 kontact/src/mainwindow.cpp
M +2 -5 kontact/src/mainwindow.h
M +2 -1 korganizer/korganizer_part.cpp
M +4 -4 libkleo/ui/messagebox.cpp
http://commits.kde.org/kdepim/6600e40816d8fbdaf3b5bd07e0b6a4f783af1803
diff --git a/akregator/configuration/akregator_config_advanced.cpp \
b/akregator/configuration/akregator_config_advanced.cpp index 6b7b77c..568d2d8 100644
--- a/akregator/configuration/akregator_config_advanced.cpp
+++ b/akregator/configuration/akregator_config_advanced.cpp
@@ -35,7 +35,7 @@
using namespace Akregator;
-//QT5 K_PLUGIN_FACTORY(KCMAkregatorAdvancedConfigFactory, \
registerPlugin<KCMAkregatorAdvancedConfig>();) \
+K_PLUGIN_FACTORY(KCMAkregatorAdvancedConfigFactory, \
registerPlugin<KCMAkregatorAdvancedConfig>();) \
K_EXPORT_PLUGIN(KCMAkregatorAdvancedConfigFactory( "kcmakradvancedconfig" ))
KCMAkregatorAdvancedConfig::KCMAkregatorAdvancedConfig( QWidget* parent, const \
QVariantList& args )
diff --git a/examples/coisceim/coisceimpart.cpp b/examples/coisceim/coisceimpart.cpp
index 936bc41..12d95aa 100644
--- a/examples/coisceim/coisceimpart.cpp
+++ b/examples/coisceim/coisceimpart.cpp
@@ -45,7 +45,7 @@ const K4AboutData &createAboutData()
return aboutData;
}
-//QT5 K_PLUGIN_FACTORY(CoisceimPartFactory, registerPlugin<CoisceimPart>();)
+K_PLUGIN_FACTORY(CoisceimPartFactory, registerPlugin<CoisceimPart>();)
K_EXPORT_PLUGIN(CoisceimPartFactory(createAboutData()))
CoisceimPart::CoisceimPart( QWidget *parentWidget, QObject *parent, const \
QVariantList & /*args*/ ) @@ -62,3 +62,4 @@ CoisceimPart::CoisceimPart( QWidget \
*parentWidget, QObject *parent, const QVaria CoisceimPart::~CoisceimPart()
{
}
+#include "coisceimpart.moc"
diff --git a/kaddressbook/kaddressbookpart.cpp b/kaddressbook/kaddressbookpart.cpp
index 4d0109c..34c9a93 100644
--- a/kaddressbook/kaddressbookpart.cpp
+++ b/kaddressbook/kaddressbookpart.cpp
@@ -33,7 +33,7 @@
#include <QVBoxLayout>
-//QT5 K_PLUGIN_FACTORY( KAddressBookFactory, registerPlugin<KAddressBookPart>(); )
+K_PLUGIN_FACTORY( KAddressBookFactory, registerPlugin<KAddressBookPart>(); )
K_EXPORT_PLUGIN( KAddressBookFactory( AboutData() ) )
KAddressBookPart::KAddressBookPart( QWidget *parentWidget, QObject *parent,
@@ -95,3 +95,4 @@ void KAddressBookPart::guiActivateEvent( KParts::GUIActivateEvent \
*e ) KParts::ReadOnlyPart::guiActivateEvent( e );
}
+#include "kaddressbookpart.moc"
diff --git a/kjots/kjotspart.cpp b/kjots/kjotspart.cpp
index df4dce5..fe93756 100644
--- a/kjots/kjotspart.cpp
+++ b/kjots/kjotspart.cpp
@@ -49,7 +49,7 @@ const K4AboutData &createAboutData()
return aboutData;
}
-//QT5 K_PLUGIN_FACTORY(KJotsPartFactory, registerPlugin<KJotsPart>();)
+K_PLUGIN_FACTORY(KJotsPartFactory, registerPlugin<KJotsPart>();)
K_EXPORT_PLUGIN(KJotsPartFactory(createAboutData()))
KJotsPart::KJotsPart( QWidget *parentWidget, QObject *parent, const QVariantList & \
/*args*/ ) @@ -111,3 +111,4 @@ void KJotsPart::activeAnchorChanged(const QString \
&anchorTarget, const QString & // {
// return false;
// }
+#include "kjotspart.moc"
diff --git a/kmail/configuredialog/configmodule.h \
b/kmail/configuredialog/configmodule.h index 0c4e387..f2e6b1e 100644
--- a/kmail/configuredialog/configmodule.h
+++ b/kmail/configuredialog/configmodule.h
@@ -31,7 +31,7 @@ class ConfigModule : public KCModule
{
public:
explicit ConfigModule( QWidget *parent=0 )
- : KCModule ( parent ) //QT5
+ : KCModule ( parent )
{}
~ConfigModule() {}
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp \
b/kontact/plugins/akregator/akregator_plugin.cpp index e85f7aa..15175cc 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -34,7 +34,7 @@
#include <KLocalizedString>
#include <QIcon>
-//QT5 EXPORT_KONTACT_PLUGIN( AkregatorPlugin, akregator )
+EXPORT_KONTACT_PLUGIN( AkregatorPlugin, akregator )
AkregatorPlugin::AkregatorPlugin( KontactInterface::Core *core, const QVariantList & \
) : KontactInterface::Plugin( core, core, "akregator" ), m_interface( 0 )
@@ -157,4 +157,4 @@ int AkregatorUniqueAppHandler::newInstance()
return KontactInterface::UniqueAppHandler::newInstance();
}
-
+#include "akregator_plugin.moc"
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp \
b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index 490d45a..6925343 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -24,7 +24,7 @@
#include <KontactInterface/Core>
-#include <KAction>
+#include <QAction>
#include <KActionCollection>
#include <KCmdLineArgs>
#include <QDebug>
@@ -36,7 +36,7 @@
#include <QDBusMessage>
#include <QDBusReply>
-//QT5 EXPORT_KONTACT_PLUGIN( KAddressBookPlugin, kaddressbook )
+EXPORT_KONTACT_PLUGIN( KAddressBookPlugin, kaddressbook )
KAddressBookPlugin::KAddressBookPlugin( KontactInterface::Core *core, const \
QVariantList & ) : KontactInterface::Plugin( core, core, "kaddressbook" )
@@ -44,39 +44,39 @@ KAddressBookPlugin::KAddressBookPlugin( KontactInterface::Core \
*core, const QVar //QT5 setComponentData( KontactPluginFactory::componentData() );
- KAction *action =
- new KAction( QIcon::fromTheme( QLatin1String("contact-new") ),
+ QAction *action =
+ new QAction( QIcon::fromTheme( QLatin1String("contact-new") ),
i18nc( "@action:inmenu", "New Contact..." ), this );
actionCollection()->addAction( QLatin1String("new_contact"), action );
connect( action, SIGNAL(triggered(bool)), SLOT(slotNewContact()) );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_C ) );
- action->setHelpText(
- i18nc( "@info:status", "Create a new contact" ) );
+ //action->setHelpText(
+ // i18nc( "@info:status", "Create a new contact" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create a new contact." \
) ); insertNewAction( action );
action =
- new KAction( QIcon::fromTheme( QLatin1String("user-group-new") ),
+ new QAction( QIcon::fromTheme( QLatin1String("user-group-new") ),
i18nc( "@action:inmenu", "New Contact Group..." ), this );
actionCollection()->addAction( QLatin1String("new_contactgroup"), action );
connect( action, SIGNAL(triggered(bool)), SLOT(slotNewContactGroup()) );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_G ) );
- action->setHelpText(
- i18nc( "@info:status", "Create a new contact group" ) );
+ //action->setHelpText(
+ // i18nc( "@info:status", "Create a new contact group" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create a new contact \
group." ) ); insertNewAction( action );
- KAction *syncAction =
- new KAction( QIcon::fromTheme( QLatin1String("view-refresh") ),
+ QAction *syncAction =
+ new QAction( QIcon::fromTheme( QLatin1String("view-refresh") ),
i18nc( "@action:inmenu", "Sync Contacts" ), this );
actionCollection()->addAction( QLatin1String("kaddressbook_sync"), syncAction );
connect( syncAction, SIGNAL(triggered(bool)), SLOT(slotSyncContacts()) );
- syncAction->setHelpText(
- i18nc( "@info:status", "Synchronize groupware contacts" ) );
+ //syncAction->setHelpText(
+ // i18nc( "@info:status", "Synchronize groupware contacts" ) );
syncAction->setWhatsThis(
i18nc( "@info:whatsthis",
"Choose this option to synchronize your groupware contacts." ) );
@@ -137,7 +137,7 @@ KParts::ReadOnlyPart *KAddressBookPlugin::createPart()
// disable the Ctrl+N shortcut, as it is used by Kontact already
if ( part->action( "akonadi_contact_create" ) ) {
- KAction *newAction = qobject_cast<KAction*>( part->action( \
"akonadi_contact_create" ) ); + QAction *newAction = qobject_cast<QAction*>( \
part->action( "akonadi_contact_create" ) ); if ( newAction ) {
newAction->setShortcut( QKeySequence() );
}
@@ -199,4 +199,4 @@ int KAddressBookUniqueAppHandler::newInstance()
return KontactInterface::UniqueAppHandler::newInstance();
}
-
+#include "kaddressbook_plugin.moc"
diff --git a/kontact/plugins/kjots/kjots_plugin.cpp \
b/kontact/plugins/kjots/kjots_plugin.cpp index 19b2314..febc24d 100644
--- a/kontact/plugins/kjots/kjots_plugin.cpp
+++ b/kontact/plugins/kjots/kjots_plugin.cpp
@@ -32,7 +32,7 @@
#include <QIcon>
#include <KLocalizedString>
-//QT5 EXPORT_KONTACT_PLUGIN( KJotsPlugin, kjots )
+EXPORT_KONTACT_PLUGIN( KJotsPlugin, kjots )
KJotsPlugin::KJotsPlugin( KontactInterface::Core *core, const QVariantList & )
: KontactInterface::Plugin( core, core, "kjots" ), m_interface( 0 )
@@ -144,4 +144,4 @@ int KJotsUniqueAppHandler::newInstance()
}
-
+#include "kjots_plugin.moc"
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp \
b/kontact/plugins/kmail/kmail_plugin.cpp index ca72d01..d3bb4cd 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -34,7 +34,7 @@
#include <KontactInterface/Core>
-#include <KAction>
+#include <QAction>
#include <KActionCollection>
#include <QDebug>
#include <QIcon>
@@ -47,20 +47,20 @@
using namespace KCalUtils;
using namespace KCalCore;
-//QT5 EXPORT_KONTACT_PLUGIN( KMailPlugin, kmail )
+EXPORT_KONTACT_PLUGIN( KMailPlugin, kmail )
KMailPlugin::KMailPlugin( KontactInterface::Core *core, const QVariantList & )
: KontactInterface::Plugin( core, core, "kmail2" ), m_instance( 0 )
{
//QT5 setComponentData( KontactPluginFactory::componentData() );
- KAction *action =
- new KAction( QIcon::fromTheme( QLatin1String("mail-message-new") ),
+ QAction *action =
+ new QAction( QIcon::fromTheme( QLatin1String("mail-message-new") ),
i18nc( "@action:inmenu", "New Message..." ), this );
actionCollection()->addAction( QLatin1String("new_mail"), action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_M ) );
- action->setHelpText(
- i18nc( "@info:status", "Create a new mail message" ) );
+ //action->setHelpText(
+ // i18nc( "@info:status", "Create a new mail message" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create "
@@ -68,11 +68,11 @@ KMailPlugin::KMailPlugin( KontactInterface::Core *core, const \
QVariantList & ) connect( action, SIGNAL(triggered(bool)), SLOT(slotNewMail()) );
insertNewAction( action );
- KAction *syncAction =
- new KAction( QIcon::fromTheme( QLatin1String("view-refresh") ),
+ QAction *syncAction =
+ new QAction( QIcon::fromTheme( QLatin1String("view-refresh") ),
i18nc( "@action:inmenu", "Sync Mail" ), this );
- syncAction->setHelpText(
- i18nc( "@info:status", "Synchronize groupware mail" ) );
+ //syncAction->setHelpText(
+ // i18nc( "@info:status", "Synchronize groupware mail" ) );
syncAction->setWhatsThis(
i18nc( "@info:whatsthis",
"Choose this option to synchronize your groupware email." ) \
); @@ -250,4 +250,4 @@ bool KMailPlugin::queryClose() const
QDBusReply<bool> canClose = kmail.canQueryClose();
return canClose;
}
-
+#include "kmail_plugin.moc"
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp \
b/kontact/plugins/knotes/knotes_plugin.cpp index e80619c..5bc6498 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -55,7 +55,7 @@ using namespace KCalCore;
#include <QDBusMessage>
#include <QDropEvent>
-//QT5 EXPORT_KONTACT_PLUGIN( KNotesPlugin, knotes )
+EXPORT_KONTACT_PLUGIN( KNotesPlugin, knotes )
KNotesPlugin::KNotesPlugin( KontactInterface::Core *core, const QVariantList & )
: KontactInterface::Plugin( core, core, "knotes" ),
@@ -246,3 +246,6 @@ int KNotesUniqueAppHandler::newInstance()
(void)plugin()->part();
return KontactInterface::UniqueAppHandler::newInstance();
}
+
+#include "knotes_plugin.moc"
+
diff --git a/kontact/plugins/korganizer/journalplugin.cpp \
b/kontact/plugins/korganizer/journalplugin.cpp index 879ca23..995a90e 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -36,7 +36,7 @@
#include <KAction>
#include <QIcon>
-//QT5 EXPORT_KONTACT_PLUGIN( JournalPlugin, journal )
+EXPORT_KONTACT_PLUGIN( JournalPlugin, journal )
JournalPlugin::JournalPlugin( KontactInterface::Core *core, const QVariantList & )
: KontactInterface::Plugin( core, core, "korganizer", "journal" ), mIface( 0 )
@@ -162,4 +162,4 @@ bool JournalPlugin::isRunningStandalone() const
{
return mUniqueAppWatcher->isRunningStandalone();
}
-
+#include "journalplugin.moc"
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp \
b/kontact/plugins/korganizer/korganizerplugin.cpp index cc3f0da..e5dd272 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -51,7 +51,7 @@
#include <QDropEvent>
-//QT5 EXPORT_KONTACT_PLUGIN( KOrganizerPlugin, korganizer )
+EXPORT_KONTACT_PLUGIN( KOrganizerPlugin, korganizer )
KOrganizerPlugin::KOrganizerPlugin( KontactInterface::Core *core, const QVariantList \
& ) : KontactInterface::Plugin( core, core, "korganizer", "calendar" ), mIface( 0 )
@@ -267,4 +267,4 @@ void KOrganizerPlugin::processDropEvent( QDropEvent *event )
//QT5 qWarning() << QString::fromLatin1( "Cannot handle drop events of type '%1'." \
).arg( QLatin1String(event->format()) ); }
-
+#include "korganizerplugin.moc"
diff --git a/kontact/plugins/korganizer/todoplugin.cpp \
b/kontact/plugins/korganizer/todoplugin.cpp index 504b3ec..3a741f0 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -49,7 +49,7 @@
#include <QDropEvent>
-//QT5 EXPORT_KONTACT_PLUGIN( TodoPlugin, todo )
+EXPORT_KONTACT_PLUGIN( TodoPlugin, todo )
TodoPlugin::TodoPlugin( KontactInterface::Core *core, const QVariantList & )
: KontactInterface::Plugin( core, core, "korganizer", "todo" ), mIface( 0 )
@@ -269,4 +269,4 @@ void TodoPlugin::processDropEvent( QDropEvent *event )
//QT5 qWarning() << QString::fromLatin1("Cannot handle drop events of type '%1'." \
).arg( QLatin1String(event->format()) ); }
-
+#include "todoplugin.moc"
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp \
b/kontact/plugins/specialdates/specialdates_plugin.cpp index 6d29c63..7463da6 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -32,7 +32,7 @@
#include <KLocalizedString>
#include <KIconLoader>
-//QT5 EXPORT_KONTACT_PLUGIN( SpecialdatesPlugin, specialdates )
+EXPORT_KONTACT_PLUGIN( SpecialdatesPlugin, specialdates )
SpecialdatesPlugin::SpecialdatesPlugin( KontactInterface::Core *core, const \
QVariantList & ) : KontactInterface::Plugin( core, core, 0 ), mAboutData( 0 )
@@ -73,3 +73,4 @@ const K4AboutData *SpecialdatesPlugin::aboutData() const
#endif
}
#endif
+#include "specialdates_plugin.moc"
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp \
b/kontact/plugins/summary/summaryview_plugin.cpp index e972856..98652d2 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -36,7 +36,7 @@
#include <QMenu>
-//QT5 EXPORT_KONTACT_PLUGIN( SummaryView, summary )
+EXPORT_KONTACT_PLUGIN( SummaryView, summary )
SummaryView::SummaryView( KontactInterface::Core *core, const QVariantList & )
: KontactInterface::Plugin( core, core, 0 ), mAboutData( 0 ), mPart( 0 )
@@ -137,3 +137,4 @@ const K4AboutData *SummaryView::aboutData() const
}
#endif
+#include "summaryview_plugin.moc"
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 563514f..ef677ff 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -36,7 +36,6 @@ using namespace Kontact;
#include <libkdepim/progresswidget/statusbarprogresswidget.h>
#include <KontactInterface/Core>
-#include <KontactInterface/Plugin>
#include <KPIMUtils/KFileIO>
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 977672d..3c7aa9f 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -26,13 +26,10 @@
#include "kontact_export.h"
#include <KontactInterface/Core>
+#include <KontactInterface/Plugin>
#include <KUrl>
#include <QAction>
-namespace KontactInterface {
-class Plugin;
-}
-
class KActionMenu;
class KWebView;
class KPluginInfo;
@@ -153,7 +150,7 @@ private:
}
-//QT5 Q_DECLARE_METATYPE( KontactInterface::Plugin * )
+Q_DECLARE_METATYPE( KontactInterface::Plugin * )
#endif
// vim: sw=2 sts=2 et
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 7eb69f5..19ae079 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -46,7 +46,7 @@ static const K4AboutData &createAboutData()
return about;
}
-//QT5 K_PLUGIN_FACTORY( KOrganizerFactory, registerPlugin<KOrganizerPart>(); )
+K_PLUGIN_FACTORY( KOrganizerFactory, registerPlugin<KOrganizerPart>(); )
K_EXPORT_PLUGIN( KOrganizerFactory( createAboutData() ) )
KOrganizerPart::KOrganizerPart( QWidget *parentWidget, QObject *parent, const \
QVariantList & ) @@ -195,3 +195,4 @@ void KOrganizerPart::setTitle()
emit setWindowCaption( title );*/
}
+#include "korganizer_part.moc"
diff --git a/libkleo/ui/messagebox.cpp b/libkleo/ui/messagebox.cpp
index 4bd38a1..3fbe534 100644
--- a/libkleo/ui/messagebox.cpp
+++ b/libkleo/ui/messagebox.cpp
@@ -47,7 +47,7 @@
#include <kdialog.h>
#include <klocale.h>
-#include <ksavefile.h>
+#include <QSaveFile>
#include <kguiitem.h>
#include <kdebug.h>
#include <ktextedit.h>
@@ -141,9 +141,9 @@ void AuditLogViewer::slotUser1() {
if ( fileName.isEmpty() )
return;
- KSaveFile file( fileName );
+ QSaveFile file( fileName );
- if ( file.open() ) {
+ if ( file.open(QIODevice::ReadWrite) ) {
QTextStream s( &file );
s << "<html><head>";
if ( !windowTitle().isEmpty() ) {
@@ -155,7 +155,7 @@ void AuditLogViewer::slotUser1() {
<< m_log
<< "\n</body></html>" << endl;
s.flush();
- file.finalize();
+ file.commit();
}
if ( const int err = file.error() )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic