[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/kdecore
From: Laurent Montel <montel () kde ! org>
Date: 2005-08-05 13:37:32
Message-ID: 1123249052.825802.7467.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 443246 by mlaurent:
Merge some function (BIC)
M +1 -50 kapplication.cpp
M +8 -30 kapplication.h
--- trunk/KDE/kdelibs/kdecore/kapplication.cpp #443245:443246
@@ -1765,7 +1765,7 @@
case KIPC::ClipboardConfigChanged:
KClipboardSynchronizer::newConfiguration(arg);
break;
-
+
case KIPC::BlockShortcuts:
KGlobalAccel::blockShortcuts(arg);
emit kipcMessage(id, arg); // some apps may do additional things
@@ -2148,12 +2148,6 @@
#endif
}
-void KApplication::invokeHelp( const QString& anchor,
- const QString& _appname) const
-{
- return invokeHelp( anchor, _appname, "" );
-}
-
#ifndef Q_WS_WIN
// for win32 we're using simple help tools like Qt Assistant,
// see kapplication_win.cpp
@@ -2193,27 +2187,7 @@
-void KApplication::invokeMailer(const QString &address, const QString &subject)
-{
- return invokeMailer(address,subject,"");
-}
-void KApplication::invokeMailer(const QString &address, const QString &subject, \
const QByteArray& startup_id)
-{
- invokeMailer(address, QString::null, QString::null, subject, QString::null, \
QString::null,
- QStringList(), startup_id );
-}
-
-void KApplication::invokeMailer(const KURL &mailtoURL)
-{
- return invokeMailer( mailtoURL, "" );
-}
-
-void KApplication::invokeMailer(const KURL &mailtoURL, const QByteArray& startup_id \
)
-{
- return invokeMailer( mailtoURL, startup_id, false);
-}
-
void KApplication::invokeMailer(const KURL &mailtoURL, const QByteArray& startup_id, \
bool allowAttachments ) {
QString address = KURL::decode_string(mailtoURL.path()), subject, cc, bcc, body;
@@ -2247,12 +2221,6 @@
invokeMailer( address, cc, bcc, subject, body, QString::null, attachURLs, \
startup_id ); }
-void KApplication::invokeMailer(const QString &to, const QString &cc, const QString \
&bcc,
- const QString &subject, const QString &body,
- const QString & messageFile, const QStringList \
&attachURLs)
-{
- return invokeMailer(to,cc,bcc,subject,body,messageFile,attachURLs,"");
-}
#ifndef Q_WS_WIN
// on win32, for invoking browser we're using win32 API
@@ -2452,11 +2420,6 @@
}
#endif
-void KApplication::invokeBrowser( const QString &url )
-{
- return invokeBrowser( url, "" );
-}
-
#ifndef Q_WS_WIN
// on win32, for invoking browser we're using win32 API
// see kapplication_win.cpp
@@ -2653,12 +2616,6 @@
_name, URLs, error, dcopService, pid, startup_id, noWait);
}
-int
-KApplication::kdeinitExec( const QString& name, const QStringList &args,
- QString *error, int *pid )
-{
- return kdeinitExec( name, args, error, pid, "" );
-}
int
KApplication::kdeinitExec( const QString& name, const QStringList &args,
@@ -2668,12 +2625,6 @@
name, args, error, 0, pid, startup_id, false);
}
-int
-KApplication::kdeinitExecWait( const QString& name, const QStringList &args,
- QString *error, int *pid )
-{
- return kdeinitExecWait( name, args, error, pid, "" );
-}
int
KApplication::kdeinitExecWait( const QString& name, const QStringList &args,
--- trunk/KDE/kdelibs/kdecore/kapplication.h #443245:443246
@@ -411,13 +411,10 @@
* @param startup_id for app startup notification, "0" for none,
* "" ( empty string ) is the default
*/
- void invokeHelp( const QString& anchor,
- const QString& appname,
- const QByteArray& startup_id ) const;
- // KDE4 merge with above with startup_id = ""
void invokeHelp( const QString& anchor = QString::null,
- const QString& appname = QString::null ) const;
+ const QString& appname = QString::null,
+ const QByteArray& startup_id = "") const;
/**
* Convenience method; invokes the standard email application.
@@ -427,9 +424,7 @@
* @param startup_id for app startup notification, "0" for none,
* "" ( empty string ) is the default
*/
- void invokeMailer( const QString &address, const QString &subject, const \
QByteArray& startup_id );
- // KDE4 merge with above with startup_id = ""
- void invokeMailer( const QString &address, const QString &subject );
+ void invokeMailer( const QString &address, const QString &subject,const \
QByteArray& startup_id = "" );
/**
* Invokes the standard email application.
@@ -440,11 +435,7 @@
* @param allowAttachments whether attachments specified in mailtoURL should be \
honoured.
The default is false; do not honour requests for attachments.
*/
- void invokeMailer( const KURL &mailtoURL, const QByteArray& startup_id, bool \
allowAttachments );
- // KDE4 merge with above with allowAttachments = false
- void invokeMailer( const KURL &mailtoURL, const QByteArray& startup_id );
- // KDE4 merge with above with startup_id = ""
- void invokeMailer( const KURL &mailtoURL );
+ void invokeMailer( const KURL &mailtoURL, const QByteArray& startup_id = "" , \
bool allowAttachments = false );
/**
* Convenience method; invokes the standard email application.
@@ -463,12 +454,7 @@
*/
void invokeMailer(const QString &to, const QString &cc, const QString &bcc,
const QString &subject, const QString &body,
- const QString &messageFile, const QStringList &attachURLs,
- const QByteArray& startup_id );
- // KDE4 merge with above with startup_id = ""
- void invokeMailer(const QString &to, const QString &cc, const QString &bcc,
- const QString &subject, const QString &body,
- const QString &messageFile = QString::null, const QStringList \
&attachURLs = QStringList()); + const QString &messageFile = \
QString::null, const QStringList &attachURLs = QStringList(),const QByteArray& \
startup_id = "" );
public slots:
/**
@@ -481,9 +467,7 @@
* @param startup_id for app startup notification, "0" for none,
* "" ( empty string ) is the default
*/
- void invokeBrowser( const QString &url, const QByteArray& startup_id );
- // KDE4 merge with above with startup_id = ""
- void invokeBrowser( const QString &url );
+ void invokeBrowser( const QString &url, const QByteArray& startup_id = "" );
/**
* If the widget with focus provides a cut() slot, call that slot. Thus for a
@@ -711,11 +695,8 @@
* "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0).
*/
- static int kdeinitExec( const QString& name, const QStringList &args,
- QString *error, int *pid, const QByteArray& startup_id );
- // KDE4 merge with above with startup_id = ""
static int kdeinitExec( const QString& name, const QStringList \
&args=QStringList(),
- QString *error=0, int *pid = 0 );
+ QString *error=0, int *pid = 0, const QByteArray& startup_id = "" );
/**
* Starts a program via kdeinit and wait for it to finish.
@@ -734,11 +715,8 @@
* "" ( empty string ) is the default
* @return an error code indicating success (== 0) or failure (> 0).
*/
- static int kdeinitExecWait( const QString& name, const QStringList &args,
- QString *error, int *pid, const QByteArray& startup_id );
- // KDE4 merge with above with startup_id = ""
static int kdeinitExecWait( const QString& name, const QStringList \
&args=QStringList(),
- QString *error=0, int *pid = 0 );
+ QString *error=0, int *pid = 0, const QByteArray& startup_id = "" );
/**
* Returns a text for the window caption.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic