Commit 6ebfe298 authored by Matthias Kretz's avatar Matthias Kretz
Browse files

merge the kinstance-redesign branch back to trunk.

svn path=/trunk/KDE/kdepim/kioslave/; revision=628296
parent fb940f2b
......@@ -29,7 +29,7 @@ typedef KGenericFactory<ConfigModule, QWidget> MailTransportConfigFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_mailtransport, MailTransportConfigFactory( "mailtrasnport" ) )
ConfigModule::ConfigModule( QWidget * parent, const QStringList & args ) :
KCModule( MailTransportConfigFactory::instance(), parent, args )
KCModule( MailTransportConfigFactory::componentData(), parent, args )
{
setButtons( 0 );
QVBoxLayout *l = new QVBoxLayout( this );
......
......@@ -27,6 +27,7 @@
#include <kmessagebox.h>
#include <kstringhandler.h>
#include <kwallet.h>
#include <kconfiggroup.h>
using namespace MailTransport;
using namespace KWallet;
......
......@@ -32,6 +32,7 @@
#include <kstaticdeleter.h>
#include <kurl.h>
#include <kwallet.h>
#include <kconfiggroup.h>
#include <QApplication>
#include <QDBusConnection>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment