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
A
Akonadi Contacts
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
PIM
Akonadi Contacts
Commits
bd2e30e1
Commit
bd2e30e1
authored
Feb 06, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use namespace
parent
f75e108b
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
40 additions
and
18 deletions
+40
-18
akonadi-contact/src/editor/addresseditor/addresseslocationgrantleeformater.cpp
...ditor/addresseditor/addresseslocationgrantleeformater.cpp
+2
-0
akonadi-contact/src/editor/addresseditor/addresseslocationgrantleeformater.h
.../editor/addresseditor/addresseslocationgrantleeformater.h
+3
-1
akonadi-contact/src/editor/addresseditor/addresseslocationviewer.cpp
...tact/src/editor/addresseditor/addresseslocationviewer.cpp
+2
-0
akonadi-contact/src/editor/addresseditor/addresseslocationviewer.h
...ontact/src/editor/addresseditor/addresseslocationviewer.h
+3
-1
akonadi-contact/src/editor/addresseditor/addresseslocationwidget.cpp
...tact/src/editor/addresseditor/addresseslocationwidget.cpp
+1
-0
akonadi-contact/src/editor/addresseditor/addresseslocationwidget.h
...ontact/src/editor/addresseditor/addresseslocationwidget.h
+3
-1
akonadi-contact/src/editor/addresseditor/addressgrantleeobject.cpp
...ontact/src/editor/addresseditor/addressgrantleeobject.cpp
+1
-1
akonadi-contact/src/editor/addresseditor/addressgrantleeobject.h
...-contact/src/editor/addresseditor/addressgrantleeobject.h
+3
-1
akonadi-contact/src/editor/addresseditor/addresslocationwidget.cpp
...ontact/src/editor/addresseditor/addresslocationwidget.cpp
+1
-1
akonadi-contact/src/editor/addresseditor/addresslocationwidget.h
...-contact/src/editor/addresseditor/addresslocationwidget.h
+3
-1
akonadi-contact/src/editor/addresseditor/addresstypedialog.cpp
...di-contact/src/editor/addresseditor/addresstypedialog.cpp
+1
-1
akonadi-contact/src/editor/addresseditor/addresstypedialog.h
akonadi-contact/src/editor/addresseditor/addresstypedialog.h
+3
-0
akonadi-contact/src/editor/addresseditor/autotests/addresseslocationviewertest.cpp
...r/addresseditor/autotests/addresseslocationviewertest.cpp
+1
-1
akonadi-contact/src/editor/addresseditor/autotests/addresseslocationwidgettest.cpp
...r/addresseditor/autotests/addresseslocationwidgettest.cpp
+1
-1
akonadi-contact/src/editor/addresseditor/autotests/addresslocationwidgettest.cpp
...tor/addresseditor/autotests/addresslocationwidgettest.cpp
+1
-1
akonadi-contact/src/editor/addresseditor/iconnamecache.cpp
akonadi-contact/src/editor/addresseditor/iconnamecache.cpp
+1
-1
akonadi-contact/src/editor/addresseditor/iconnamecache_p.h
akonadi-contact/src/editor/addresseditor/iconnamecache_p.h
+3
-1
akonadi-contact/src/editor/addresseditor/selectaddresstypecombobox.cpp
...ct/src/editor/addresseditor/selectaddresstypecombobox.cpp
+1
-1
akonadi-contact/src/editor/addresseditor/selectaddresstypecombobox.h
...tact/src/editor/addresseditor/selectaddresstypecombobox.h
+3
-1
akonadi-contact/src/editor/addresseditor/tests/main.cpp
akonadi-contact/src/editor/addresseditor/tests/main.cpp
+1
-1
akonadi-contact/src/editor/contacteditorwidget.cpp
akonadi-contact/src/editor/contacteditorwidget.cpp
+2
-2
No files found.
akonadi-contact/src/editor/addresseditor/addresseslocationgrantleeformater.cpp
View file @
bd2e30e1
...
...
@@ -26,6 +26,8 @@
#include <QVariantList>
#include <QStandardPaths>
using
namespace
Akonadi
;
AddressesLocationGrantleeFormater
::
AddressesLocationGrantleeFormater
(
QObject
*
parent
)
:
QObject
(
parent
),
mEngine
(
new
Grantlee
::
Engine
),
...
...
akonadi-contact/src/editor/addresseditor/addresseslocationgrantleeformater.h
View file @
bd2e30e1
...
...
@@ -32,6 +32,8 @@ namespace Grantlee
{
class
Engine
;
}
namespace
Akonadi
{
class
AddressesLocationGrantleeFormater
:
public
QObject
{
Q_OBJECT
...
...
@@ -50,5 +52,5 @@ private:
Grantlee
::
Template
mSelfcontainedTemplate
;
bool
mReadOnly
;
};
}
#endif // ADDRESSESLOCATIONGRANTLEEFORMATER_H
akonadi-contact/src/editor/addresseditor/addresseslocationviewer.cpp
View file @
bd2e30e1
...
...
@@ -28,6 +28,8 @@
#include <QWebSettings>
#include <QDebug>
using
namespace
Akonadi
;
AddressesLocationViewer
::
AddressesLocationViewer
(
QWidget
*
parent
)
:
QWebView
(
parent
),
mAddressesLocationGrantleeFormatter
(
new
AddressesLocationGrantleeFormater
(
this
))
...
...
akonadi-contact/src/editor/addresseditor/addresseslocationviewer.h
View file @
bd2e30e1
...
...
@@ -26,6 +26,8 @@
#include <QWebView>
#include <KContacts/Address>
namespace
Akonadi
{
class
AddressesLocationGrantleeFormater
;
class
AddressesLocationViewer
:
public
QWebView
{
...
...
@@ -55,5 +57,5 @@ private:
KContacts
::
Address
::
List
mAddresses
;
AddressesLocationGrantleeFormater
*
mAddressesLocationGrantleeFormatter
;
};
}
#endif // ADDRESSESLOCATIONVIEWER_H
akonadi-contact/src/editor/addresseditor/addresseslocationwidget.cpp
View file @
bd2e30e1
...
...
@@ -24,6 +24,7 @@
#include "addresseslocationwidget.h"
#include "addresseslocationviewer.h"
#include "addresslocationwidget.h"
using
namespace
Akonadi
;
AddressesLocationWidget
::
AddressesLocationWidget
(
QWidget
*
parent
)
:
QSplitter
(
parent
)
...
...
akonadi-contact/src/editor/addresseditor/addresseslocationwidget.h
View file @
bd2e30e1
...
...
@@ -26,6 +26,8 @@
#include <QSplitter>
#include <KContacts/Addressee>
namespace
Akonadi
{
class
AddressesLocationViewer
;
class
AddressLocationWidget
;
class
AddressesLocationWidget
:
public
QSplitter
...
...
@@ -43,5 +45,5 @@ private:
AddressesLocationViewer
*
mAddressesLocationViewer
;
AddressLocationWidget
*
mAddressLocationWidget
;
};
}
#endif // ADDRESSESLOCATIONWIDGET_H
akonadi-contact/src/editor/addresseditor/addressgrantleeobject.cpp
View file @
bd2e30e1
...
...
@@ -25,7 +25,7 @@
#include <KIconLoader>
#include <KLocalizedString>
#include <QUrlQuery>
using
namespace
Akonadi
;
AddressGrantleeObject
::
AddressGrantleeObject
(
const
KContacts
::
Address
&
address
,
int
addressIndex
,
QObject
*
parent
)
:
QObject
(
parent
),
mAddress
(
address
),
...
...
akonadi-contact/src/editor/addresseditor/addressgrantleeobject.h
View file @
bd2e30e1
...
...
@@ -25,6 +25,8 @@
#include <QObject>
#include <KContacts/Address>
namespace
Akonadi
{
class
AddressGrantleeObject
:
public
QObject
{
Q_OBJECT
...
...
@@ -63,5 +65,5 @@ private:
int
mAddressIndex
;
int
mIconSize
;
};
}
#endif // ADDRESSGRANTLEEOBJECT_H
akonadi-contact/src/editor/addresseditor/addresslocationwidget.cpp
View file @
bd2e30e1
...
...
@@ -34,7 +34,7 @@
#include <QPushButton>
#include <QDebug>
#include <QStackedWidget>
using
namespace
Akonadi
;
struct
LocaleAwareLessThan
:
std
::
binary_function
<
QString
,
QString
,
bool
>
{
bool
operator
()(
const
QString
&
s1
,
const
QString
&
s2
)
const
{
...
...
akonadi-contact/src/editor/addresseditor/addresslocationwidget.h
View file @
bd2e30e1
...
...
@@ -31,6 +31,8 @@ class QCheckBox;
class
KLineEdit
;
class
KComboBox
;
class
QPushButton
;
namespace
Akonadi
{
class
SelectAddressTypeComboBox
;
class
AddressLocationWidget
:
public
QWidget
{
...
...
@@ -82,5 +84,5 @@ private:
int
mCurrentAddress
;
Mode
mCurrentMode
;
};
}
#endif // ADDRESSLOCATIONWIDGET_H
akonadi-contact/src/editor/addresseditor/addresstypedialog.cpp
View file @
bd2e30e1
...
...
@@ -27,7 +27,7 @@
#include <QGroupBox>
#include <QCheckBox>
#include <QButtonGroup>
using
namespace
Akonadi
;
AddressTypeDialog
::
AddressTypeDialog
(
KContacts
::
Address
::
Type
type
,
QWidget
*
parent
)
:
QDialog
(
parent
)
{
...
...
akonadi-contact/src/editor/addresseditor/addresstypedialog.h
View file @
bd2e30e1
...
...
@@ -31,6 +31,8 @@ class QButtonGroup;
*
* @note This dialog is only used by AddressTypeCombo.
*/
namespace
Akonadi
{
class
AddressTypeDialog
:
public
QDialog
{
public:
...
...
@@ -44,5 +46,6 @@ private:
KContacts
::
Address
::
TypeList
mTypeList
;
};
}
#endif // ADDRESSTYPEDIALOG_H
akonadi-contact/src/editor/addresseditor/autotests/addresseslocationviewertest.cpp
View file @
bd2e30e1
...
...
@@ -23,7 +23,7 @@
#include "addresseslocationviewertest.h"
#include "../addresseslocationviewer.h"
#include <QTest>
using
namespace
Akonadi
;
AddressesLocationViewerTest
::
AddressesLocationViewerTest
(
QObject
*
parent
)
:
QObject
(
parent
)
{
...
...
akonadi-contact/src/editor/addresseditor/autotests/addresseslocationwidgettest.cpp
View file @
bd2e30e1
...
...
@@ -25,7 +25,7 @@
#include <QTest>
#include <editor/addresseditor/addresseslocationviewer.h>
#include <editor/addresseditor/addresslocationwidget.h>
using
namespace
Akonadi
;
AddressesLocationWidgetTest
::
AddressesLocationWidgetTest
(
QObject
*
parent
)
:
QObject
(
parent
)
{
...
...
akonadi-contact/src/editor/addresseditor/autotests/addresslocationwidgettest.cpp
View file @
bd2e30e1
...
...
@@ -30,7 +30,7 @@
#include <QTest>
#include <QCheckBox>
#include <editor/addresseditor/selectaddresstypecombobox.h>
using
namespace
Akonadi
;
AddressLocationWidgetTest
::
AddressLocationWidgetTest
(
QObject
*
parent
)
:
QObject
(
parent
)
{
...
...
akonadi-contact/src/editor/addresseditor/iconnamecache.cpp
View file @
bd2e30e1
...
...
@@ -20,7 +20,7 @@
#include "iconnamecache_p.h"
#include <KIconLoader>
using
namespace
Akonadi
;
Q_GLOBAL_STATIC
(
IconNameCache
,
s_iconNameCache
)
IconNameCache
*
IconNameCache
::
instance
()
...
...
akonadi-contact/src/editor/addresseditor/iconnamecache_p.h
View file @
bd2e30e1
...
...
@@ -28,6 +28,8 @@
*
* The IconNameCache caches the result of iconPath() in a map and solves the slowness.
*/
namespace
Akonadi
{
class
IconNameCache
{
public:
...
...
@@ -48,5 +50,5 @@ private:
mutable
QMap
<
Entry
,
QString
>
mCachedEntries
;
};
}
#endif
akonadi-contact/src/editor/addresseditor/selectaddresstypecombobox.cpp
View file @
bd2e30e1
...
...
@@ -25,7 +25,7 @@
#include "selectaddresstypecombobox.h"
#include <KLocalizedString>
#include <autoqpointer_p.h>
using
namespace
Akonadi
;
SelectAddressTypeComboBox
::
SelectAddressTypeComboBox
(
QWidget
*
parent
)
:
KComboBox
(
parent
)
,
mType
(
KContacts
::
Address
::
Home
)
...
...
akonadi-contact/src/editor/addresseditor/selectaddresstypecombobox.h
View file @
bd2e30e1
...
...
@@ -30,6 +30,8 @@
/**
* @short A widget for selecting the type of an address.
*/
namespace
Akonadi
{
class
SelectAddressTypeComboBox
:
public
KComboBox
{
Q_OBJECT
...
...
@@ -69,5 +71,5 @@ private:
int
mLastSelected
;
QList
<
int
>
mTypeList
;
};
}
#endif
akonadi-contact/src/editor/addresseditor/tests/main.cpp
View file @
bd2e30e1
...
...
@@ -24,7 +24,7 @@
#include <QApplication>
#include "../addresseslocationwidget.h"
using
namespace
Akonadi
;
int
main
(
int
argc
,
char
*
argv
[])
{
QApplication
app
(
argc
,
argv
);
...
...
akonadi-contact/src/editor/contacteditorwidget.cpp
View file @
bd2e30e1
...
...
@@ -100,7 +100,7 @@ public:
QCheckBox
*
mAllowRemoteContent
;
// widgets from addresses group
AddressesLocationWidget
*
mAddressesLocationWidget
;
A
konadi
::
A
ddressesLocationWidget
*
mAddressesLocationWidget
;
// widgets from general group
ImageWidget
*
mLogoWidget
;
...
...
@@ -284,7 +284,7 @@ void ContactEditorWidget::Private::initGuiContactTab()
void
ContactEditorWidget
::
Private
::
initGuiLocationTab
()
{
mAddressesLocationWidget
=
new
AddressesLocationWidget
;
mAddressesLocationWidget
=
new
A
konadi
::
A
ddressesLocationWidget
;
mTabWidget
->
addTab
(
mAddressesLocationWidget
,
i18nc
(
"@title:tab"
,
"Location"
));
}
...
...
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