Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
KDE Pim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Unmaintained
KDE Pim
Commits
2f10a836
Commit
2f10a836
authored
Jul 16, 2015
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Astyle kdelibs
parent
ebe656c3
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
19 additions
and
19 deletions
+19
-19
akonadiconsole/tagpropertiesdialog.cpp
akonadiconsole/tagpropertiesdialog.cpp
+3
-3
grantleeeditor/grantleethemeeditor/grantleethemeeditor_debug.cpp
...eeditor/grantleethemeeditor/grantleethemeeditor_debug.cpp
+0
-1
incidenceeditor-ng/incidenceattendee.cpp
incidenceeditor-ng/incidenceattendee.cpp
+1
-1
kleopatra/libkleopatraclient/core/command.cpp
kleopatra/libkleopatraclient/core/command.cpp
+4
-3
kleopatra/utils/filedialog.cpp
kleopatra/utils/filedialog.cpp
+2
-1
kmail/kmcommands.cpp
kmail/kmcommands.cpp
+1
-1
knotes/notes/knote.cpp
knotes/notes/knote.cpp
+1
-1
korganizer/actionmanager.cpp
korganizer/actionmanager.cpp
+3
-3
korganizer/kontactplugin/specialdates/korganizer_kontactplugins_specialdates_debug.cpp
...ialdates/korganizer_kontactplugins_specialdates_debug.cpp
+0
-1
korganizer/views/listview/kolistview.cpp
korganizer/views/listview/kolistview.cpp
+0
-1
libkdepim/ldap/ldapsearchdialog.cpp
libkdepim/ldap/ldapsearchdialog.cpp
+1
-1
libksieve/ksieveui/widgets/managesievewidget.cpp
libksieve/ksieveui/widgets/managesievewidget.cpp
+3
-2
No files found.
akonadiconsole/tagpropertiesdialog.cpp
View file @
2f10a836
...
...
@@ -117,9 +117,9 @@ void TagPropertiesDialog::setupUi()
// not resource context at all, we need to retrieve the IDs the hard way
QSqlQuery
query
(
DbAccess
::
database
());
query
.
prepare
(
QStringLiteral
(
"SELECT ResourceTable.name, TagRemoteIdResourceRelationTable.remoteId "
"FROM TagRemoteIdResourceRelationTable "
"LEFT JOIN ResourceTable ON ResourceTable.id = TagRemoteIdResourceRelationTable.resourceId "
"WHERE TagRemoteIdResourceRelationTable.tagid = ?"
));
"FROM TagRemoteIdResourceRelationTable "
"LEFT JOIN ResourceTable ON ResourceTable.id = TagRemoteIdResourceRelationTable.resourceId "
"WHERE TagRemoteIdResourceRelationTable.tagid = ?"
));
query
.
addBindValue
(
mTag
.
id
());
if
(
query
.
exec
())
{
while
(
query
.
next
())
{
...
...
grantleeeditor/grantleethemeeditor/grantleethemeeditor_debug.cpp
View file @
2f10a836
...
...
@@ -20,4 +20,3 @@
#include "grantleethemeeditor_debug.h"
Q_LOGGING_CATEGORY
(
GRANTLEETHEMEEDITOR_LOG
,
"log_grantleethemeeditor"
)
incidenceeditor-ng/incidenceattendee.cpp
View file @
2f10a836
...
...
@@ -486,7 +486,7 @@ void IncidenceAttendee::slotSelectAddresses()
rsvp
,
partStat
,
KCalCore
::
Attendee
::
ReqParticipant
));
));
if
(
pos
<
0
)
{
pos
=
dataModel
()
->
rowCount
()
-
1
;
}
...
...
kleopatra/libkleopatraclient/core/command.cpp
View file @
2f10a836
...
...
@@ -600,7 +600,7 @@ void Command::Private::run()
err
=
assuan_new
(
&
naked_ctx
);
if
(
err
)
{
out
.
errorString
=
i18n
(
"Could not allocate resources to connect to Kleopatra UI server at %1: %2"
,
socketName
,
to_error_string
(
err
));
,
socketName
,
to_error_string
(
err
));
goto
leave
;
}
...
...
@@ -631,7 +631,7 @@ void Command::Private::run()
if
(
err
)
{
out
.
errorString
=
i18n
(
"Could not connect to Kleopatra UI server at %1: %2"
,
socketName
,
to_error_string
(
err
));
socketName
,
to_error_string
(
err
));
goto
leave
;
}
...
...
@@ -707,8 +707,9 @@ void Command::Private::run()
if
(
err
)
{
if
(
gpg_err_code
(
err
)
==
GPG_ERR_CANCELED
)
{
out
.
canceled
=
true
;
}
else
}
else
{
out
.
errorString
=
i18n
(
"Command (%1) failed: %2"
,
QString
::
fromLatin1
(
in
.
command
.
constData
()),
to_error_string
(
err
));
}
goto
leave
;
}
...
...
kleopatra/utils/filedialog.cpp
View file @
2f10a836
...
...
@@ -99,8 +99,9 @@ QString FileDialog::getSaveFileName(QWidget *parent, const QString &caption, con
QString
FileDialog
::
getSaveFileNameEx
(
QWidget
*
parent
,
const
QString
&
caption
,
const
QString
&
dirID
,
const
QString
&
proposedFileName
,
const
QString
&
filter
)
{
if
(
proposedFileName
.
isEmpty
())
if
(
proposedFileName
.
isEmpty
())
{
return
getSaveFileName
(
parent
,
caption
,
dirID
,
filter
);
}
const
QString
fname
=
QFileDialog
::
getSaveFileName
(
parent
,
caption
,
QDir
(
dir
(
dirID
)).
filePath
(
proposedFileName
),
filter
);
update
(
fname
,
dirID
);
return
fname
;
...
...
kmail/kmcommands.cpp
View file @
2f10a836
...
...
@@ -341,7 +341,7 @@ void KMCommand::slotMsgTransfered(const Akonadi::Item::List &msgs)
#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
mRetrievedMsgs
.
append
(
msgs
);
#else
Q_FOREACH
(
const
Akonadi
::
Item
&
item
,
msgs
)
{
Q_FOREACH
(
const
Akonadi
::
Item
&
item
,
msgs
)
{
mRetrievedMsgs
.
append
(
item
);
}
#endif
...
...
knotes/notes/knote.cpp
View file @
2f10a836
...
...
@@ -606,7 +606,7 @@ void KNote::slotUpdateKeepAboveBelow(bool save)
}
else
if
(
m_keepBelow
->
isChecked
())
{
attribute
->
setKeepAbove
(
false
);
attribute
->
setKeepBelow
(
true
);
KWindowSystem
::
setState
(
winId
(),
state
|
NET
::
KeepBelow
);
KWindowSystem
::
setState
(
winId
(),
state
|
NET
::
KeepBelow
);
}
else
{
attribute
->
setKeepAbove
(
false
);
attribute
->
setKeepBelow
(
false
);
...
...
korganizer/actionmanager.cpp
View file @
2f10a836
...
...
@@ -845,7 +845,7 @@ void ActionManager::file_new()
void
ActionManager
::
file_open
()
{
const
QString
defaultPath
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
GenericDataLocation
)
+
QLatin1String
(
"/korganizer/"
)
;
const
QUrl
url
=
QFileDialog
::
getOpenFileUrl
(
dialogParent
(),
QString
(),
QUrl
::
fromLocalFile
(
defaultPath
),
QStringLiteral
(
"text/calendar"
)
);
const
QUrl
url
=
QFileDialog
::
getOpenFileUrl
(
dialogParent
(),
QString
(),
QUrl
::
fromLocalFile
(
defaultPath
),
QStringLiteral
(
"text/calendar"
));
file_open
(
url
);
}
...
...
@@ -1054,8 +1054,8 @@ void ActionManager::exportHTML(KOrg::HTMLExportSettings *settings, bool autoMode
const
QString
fileName
=
QFileDialog
::
getSaveFileName
(
dialogParent
(),
i18n
(
"Select path for HTML calendar export"
),
QStandardPaths
::
writableLocation
(
QStandardPaths
::
DocumentsLocation
),
i18n
(
"HTML Files (*.html)"
));
QStandardPaths
::
writableLocation
(
QStandardPaths
::
DocumentsLocation
),
i18n
(
"HTML Files (*.html)"
));
settings
->
setOutputFile
(
fileName
);
settings
->
save
();
}
...
...
korganizer/kontactplugin/specialdates/korganizer_kontactplugins_specialdates_debug.cpp
View file @
2f10a836
...
...
@@ -20,4 +20,3 @@
#include "korganizer_kontactplugins_specialdates_debug.h"
Q_LOGGING_CATEGORY
(
KORGANIZER_KONTACTPLUGINS_SPECIALDATES_LOG
,
"log_korganizer_kontactplugins_specialdates"
)
korganizer/views/listview/kolistview.cpp
View file @
2f10a836
...
...
@@ -51,7 +51,6 @@ KOListView::KOListView(const Akonadi::ETMCalendar::Ptr &calendar,
connect
(
mListView
,
SIGNAL
(
showNewEventPopupSignal
()),
SLOT
(
showNewEventPopup
()));
connect
(
mListView
,
&
EventViews
::
EventView
::
datesSelected
,
this
,
&
KOEventView
::
datesSelected
);
...
...
libkdepim/ldap/ldapsearchdialog.cpp
View file @
2f10a836
...
...
@@ -895,7 +895,7 @@ void LdapSearchDialog::slotUser1()
// set a comment where the contact came from
contact
.
setNote
(
i18nc
(
"arguments are host name, datetime"
,
"Imported from LDAP directory %1 on %2"
,
items
.
at
(
i
).
second
,
QLocale
().
toString
(
now
,
QLocale
::
ShortFormat
)));
items
.
at
(
i
).
second
,
QLocale
().
toString
(
now
,
QLocale
::
ShortFormat
)));
d
->
mSelectedContacts
.
append
(
contact
);
}
...
...
libksieve/ksieveui/widgets/managesievewidget.cpp
View file @
2f10a836
...
...
@@ -146,8 +146,9 @@ void ManageSieveWidget::slotContextMenuRequested(const QPoint &p)
menu
.
addAction
(
KStandardGuiItem
::
cancel
().
text
(),
this
,
SLOT
(
slotCancelFetch
()));
}
}
if
(
!
menu
.
actions
().
isEmpty
()
)
menu
.
exec
(
mTreeView
->
viewport
()
->
mapToGlobal
(
p
)
);
if
(
!
menu
.
actions
().
isEmpty
())
{
menu
.
exec
(
mTreeView
->
viewport
()
->
mapToGlobal
(
p
));
}
}
void
ManageSieveWidget
::
slotCancelFetch
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment