wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fixes:

Browse Source 
-) #include <dbus/qdbus.h> => #include <QtDBus>
-) enableButtonSeparator => showButtonSeparator
-) let the dbus adaptors be auto-generated from the xml files
-) some other minor fixes for deprecated or removed methods


svn path=/trunk/KDE/kdepim/; revision=557764
wilder-work
Reinhold Kainhofer 20 years ago
parent 98481e1dd2
commit fcdd5f3ea1
7 changed files with 3 additions and 249 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      kmailpartadaptor.cpp
  2. 48
      kmailpartadaptor.h
  3. 2
      kmcomposewin.cpp
  4. 2
      kmfoldercachedimap.cpp
  5. 2
      kmmsgpartdlg.cpp
  6. 74
      mailcomposeradaptor.cpp
  7. 68
      mailcomposeradaptor.h

56
kmailpartadaptor.cpp
Unescape View File

@ -1,56 +0,0 @@
/*
* This file was generated by dbusidl2cpp version 0.6
* Command line was: dbusidl2cpp -m -a kmailpartadaptor -- org.kde.kmail.kmailpart.xml
*
* dbusidl2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved.
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
* before re-generating it.
*/
#include "kmailpartadaptor.h"
#include <QtCore/QMetaObject>
#include <QtCore/QByteArray>
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QVariant>
/*
* Implementation of adaptor class KmailpartAdaptor
*/
KmailpartAdaptor::KmailpartAdaptor(QObject *parent)
: QDBusAbstractAdaptor(parent)
{
// constructor
setAutoRelaySignals(true);
}
KmailpartAdaptor::~KmailpartAdaptor()
{
// destructor
}
void KmailpartAdaptor::exit()
{
// handle method call org.kde.kmail.kmailpart.exit
QMetaObject::invokeMethod(parent(), "exit");
// Alternative:
//static_cast<YourObjectType *>(parent())->exit();
}
void KmailpartAdaptor::save()
{
// handle method call org.kde.kmail.kmailpart.save
QMetaObject::invokeMethod(parent(), "save");
// Alternative:
//static_cast<YourObjectType *>(parent())->save();
}
#include "kmailpartadaptor.moc"

48
kmailpartadaptor.h
Unescape View File

@ -1,48 +0,0 @@
/*
* This file was generated by dbusidl2cpp version 0.6
* Command line was: dbusidl2cpp -m -a kmailpartadaptor -- org.kde.kmail.kmailpart.xml
*
* dbusidl2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved.
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
* before re-generating it.
*/
#ifndef KMAILPARTADAPTOR_H_320651150894158
#define KMAILPARTADAPTOR_H_320651150894158
#include <QtCore/QObject>
#include <dbus/qdbus.h>
class QByteArray;
template<class T> class QList;
template<class Key, class Value> class QMap;
class QString;
class QStringList;
class QVariant;
/*
* Adaptor class for interface org.kde.kmail.kmailpart
*/
class KmailpartAdaptor: public QDBusAbstractAdaptor
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.kmail.kmailpart")
Q_CLASSINFO("D-Bus Introspection", ""
" <interface name=\"org.kde.kmail.kmailpart\" >\n"
" <method name=\"save\" />\n"
" <method name=\"exit\" />\n"
" </interface>\n"
"")
public:
KmailpartAdaptor(QObject *parent);
virtual ~KmailpartAdaptor();
public: // PROPERTIES
public Q_SLOTS: // METHODS
void exit();
void save();
Q_SIGNALS: // SIGNALS
};
#endif

2
kmcomposewin.cpp
Unescape View File

@ -4364,7 +4364,7 @@ void KMComposeWin::slotSpellcheckConfig()
dlg.setButtons( KDialog::Ok|KDialog::Cancel );
dlg.setDefaultButton( KDialog::Ok );
dlg.setModal( true );
dlg.enableButtonSeparator( true );
dlg.showButtonSeparator( true );
KWin kwin;
Q3TabDialog qtd (this, "tabdialog", true);
KSpellConfig mKSpellConfig (&qtd);

2
kmfoldercachedimap.cpp
Unescape View File

@ -119,7 +119,7 @@ DImapTroubleShootDialog::DImapTroubleShootDialog( QWidget* parent )
"you will loose all your local changes for this folder "
"and all its subfolders.</p>" );
topLayout->addWidget( new QLabel( txt, page ) );
enableButtonSeparator( true );
showButtonSeparator( true );
setButtonText( User1, i18n( "Refresh &Cache" ) );
setButtonText( User2, i18n( "Rebuild &Index" ) );

2
kmmsgpartdlg.cpp
Unescape View File

@ -55,7 +55,7 @@ KMMsgPartDialog::KMMsgPartDialog( const QString & caption,
setButtons( Ok|Cancel|Help );
setDefaultButton( Ok );
setModal( true );
enableButtonSeparator( true );
showButtonSeparator( true );
// tmp vars:
QGridLayout * glay;

74
mailcomposeradaptor.cpp
Unescape View File

@ -1,74 +0,0 @@
/*
* This file was generated by dbusidl2cpp version 0.6
* Command line was: dbusidl2cpp -m -a mailcomposeradaptor -- org.kde.kmail.mailcomposer.xml
*
* dbusidl2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved.
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
* before re-generating it.
*/
#include "mailcomposeradaptor.h"
#include <QtCore/QMetaObject>
#include <QtCore/QByteArray>
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QVariant>
/*
* Implementation of adaptor class MailcomposerAdaptor
*/
MailcomposerAdaptor::MailcomposerAdaptor(QObject *parent)
: QDBusAbstractAdaptor(parent)
{
// constructor
setAutoRelaySignals(true);
}
MailcomposerAdaptor::~MailcomposerAdaptor()
{
// destructor
}
void MailcomposerAdaptor::addAttachment(const QString &name, const QString &cte, const QByteArray &data, const QString &type, const QString &subType, const QString &paramAttr, const QString &paramValue, const QString &contDisp)
{
// handle method call org.kde.kmail.mailcomposer.addAttachment
QMetaObject::invokeMethod(parent(), "addAttachment", Q_ARG(QString, name), Q_ARG(QString, cte), Q_ARG(QByteArray, data), Q_ARG(QString, type), Q_ARG(QString, subType), Q_ARG(QString, paramAttr), Q_ARG(QString, paramValue), Q_ARG(QString, contDisp));
// Alternative:
//static_cast<YourObjectType *>(parent())->addAttachment(name, cte, data, type, subType, paramAttr, paramValue, contDisp);
}
void MailcomposerAdaptor::addAttachment(const QString &url, const QString &comment)
{
// handle method call org.kde.kmail.mailcomposer.addAttachment
QMetaObject::invokeMethod(parent(), "addAttachment", Q_ARG(QString, url), Q_ARG(QString, comment));
// Alternative:
//static_cast<YourObjectType *>(parent())->addAttachment(url, comment);
}
void MailcomposerAdaptor::send(int how)
{
// handle method call org.kde.kmail.mailcomposer.send
QMetaObject::invokeMethod(parent(), "send", Q_ARG(int, how));
// Alternative:
//static_cast<YourObjectType *>(parent())->send(how);
}
void MailcomposerAdaptor::setBody(const QString &body)
{
// handle method call org.kde.kmail.mailcomposer.setBody
QMetaObject::invokeMethod(parent(), "setBody", Q_ARG(QString, body));
// Alternative:
//static_cast<YourObjectType *>(parent())->setBody(body);
}
#include "mailcomposeradaptor.moc"

68
mailcomposeradaptor.h
Unescape View File

@ -1,68 +0,0 @@
/*
* This file was generated by dbusidl2cpp version 0.6
* Command line was: dbusidl2cpp -m -a mailcomposeradaptor -- org.kde.kmail.mailcomposer.xml
*
* dbusidl2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved.
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
* before re-generating it.
*/
#ifndef MAILCOMPOSERADAPTOR_H_146551150893499
#define MAILCOMPOSERADAPTOR_H_146551150893499
#include <QtCore/QObject>
#include <dbus/qdbus.h>
class QByteArray;
template<class T> class QList;
template<class Key, class Value> class QMap;
class QString;
class QStringList;
class QVariant;
/*
* Adaptor class for interface org.kde.kmail.mailcomposer
*/
class MailcomposerAdaptor: public QDBusAbstractAdaptor
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.kmail.mailcomposer")
Q_CLASSINFO("D-Bus Introspection", ""
" <interface name=\"org.kde.kmail.mailcomposer\" >\n"
" <method name=\"send\" >\n"
" <arg direction=\"in\" type=\"i\" name=\"how\" />\n"
" </method>\n"
" <method name=\"addAttachment\" >\n"
" <arg direction=\"in\" type=\"s\" name=\"url\" />\n"
" <arg direction=\"in\" type=\"s\" name=\"comment\" />\n"
" </method>\n"
" <method name=\"setBody\" >\n"
" <arg direction=\"in\" type=\"s\" name=\"body\" />\n"
" </method>\n"
" <method name=\"addAttachment\" >\n"
" <arg direction=\"in\" type=\"s\" name=\"name\" />\n"
" <arg direction=\"in\" type=\"s\" name=\"cte\" />\n"
" <arg direction=\"in\" type=\"ay\" name=\"data\" />\n"
" <arg direction=\"in\" type=\"s\" name=\"type\" />\n"
" <arg direction=\"in\" type=\"s\" name=\"subType\" />\n"
" <arg direction=\"in\" type=\"s\" name=\"paramAttr\" />\n"
" <arg direction=\"in\" type=\"s\" name=\"paramValue\" />\n"
" <arg direction=\"in\" type=\"s\" name=\"contDisp\" />\n"
" </method>\n"
" </interface>\n"
"")
public:
MailcomposerAdaptor(QObject *parent);
virtual ~MailcomposerAdaptor();
public: // PROPERTIES
public Q_SLOTS: // METHODS
void addAttachment(const QString &name, const QString &cte, const QByteArray &data, const QString &type, const QString &subType, const QString &paramAttr, const QString &paramValue, const QString &contDisp);
void addAttachment(const QString &url, const QString &comment);
void send(int how);
void setBody(const QString &body);
Q_SIGNALS: // SIGNALS
};
#endif
Write Preview
Loading…
Cancel
Save