[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepimlibs/akonadi/contact/actions
From: Tobias Koenig <tokoe () kde ! org>
Date: 2010-11-24 5:35:59
Message-ID: 20101124053559.69309AC8A2 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1200162 by tokoe:
Smaller coding style fixes and reorder the enums to
stay backward compatible
M +2 -2 contactactionssettings.kcfg.cmake
M +0 -2 dialphonenumberaction.cpp
M +2 -0 qdialer.cpp
M +1 -3 qdialer.h
M +0 -1 qskypedialer.cpp
M +0 -1 qskypedialer.h
--- trunk/KDE/kdepimlibs/akonadi/contact/actions/contactactionssettings.kcfg.cmake \
#1200161:1200162 @@ -41,8 +41,8 @@
<entry type="Enum" name="DialPhoneNumberAction">
<choices>
<choice name="UseSkype"/>
+ <choice name="UseExternalPhoneApplication"/>
<choice name="UseWinCE"/>
- <choice name="UseExternalPhoneApplication"/>
</choices>
<whatsthis>Defines which application shall be used to dial the phone number of \
a contact. If 'Skype' is selected the Skype application will be started (if installed \
on the computer) and the number is dialed. If 'External Application' is selected, a \
command with placeholders can be defined.</whatsthis> \
<default>@AKONADI_PHONE_DIAL_DEFAULT@</default> @@ -60,8 +60,8 @@
<entry type="Enum" name="SendSmsAction">
<choices>
<choice name="UseSkypeSms"/>
+ <choice name="UseExternalSmsApplication"/>
<choice name="UseWinCESms"/>
- <choice name="UseExternalSmsApplication"/>
</choices>
<whatsthis>Defines which application shall be used to send an SMS to the phone \
number of a contact. If 'Skype' is selected the Skype application will be started (if \
installed on the computer) and the SMS is sent via Skype. If 'External Application' \
is selected, a command with placeholders can be defined.</whatsthis> \
<default>@AKONADI_SEND_SMS_DEFAULT@</default>
--- trunk/KDE/kdepimlibs/akonadi/contact/actions/dialphonenumberaction.cpp \
#1200161:1200162 @@ -73,7 +73,6 @@
return;
}
-
QString command = ContactActionsSettings::self()->phoneCommand();
if ( command.isEmpty() ) {
@@ -90,4 +89,3 @@
KRun::runCommand( command, 0 );
}
-
--- trunk/KDE/kdepimlibs/akonadi/contact/actions/qdialer.cpp #1200161:1200162
@@ -36,12 +36,14 @@
bool QDialer::dialNumber(const QString &number)
{
mErrorMessage = i18n("Dialing a number is not supported");
+
return false;
}
bool QDialer::sendSms( const QString &number, const QString &text )
{
mErrorMessage = i18n("Sending a SMS is not supported");
+
return false;
}
--- trunk/KDE/kdepimlibs/akonadi/contact/actions/qdialer.h #1200161:1200162
@@ -38,10 +38,8 @@
QString errorMessage() const;
protected:
-
QString mApplicationName;
QString mErrorMessage;
};
-#endif // QDIALER_H
-
+#endif
--- trunk/KDE/kdepimlibs/akonadi/contact/actions/qskypedialer.cpp #1200161:1200162
@@ -161,4 +161,3 @@
return true;
}
-
--- trunk/KDE/kdepimlibs/akonadi/contact/actions/qskypedialer.h #1200161:1200162
@@ -41,7 +41,6 @@
bool initializeSkype();
QDBusInterface* mInterface;
-
};
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic