Signed-off-by: Robin Burchell <[email protected]>
---
libseaside.pro | 3 +++
src/seasidelistitem.cpp | 24 ++++--------------------
src/seasidelistitem_p.h | 41 +++++++++++++++++++++++++++++++++++++++++
src/seasidelistitemlarge.cpp | 24 ++++--------------------
src/seasidelistitemlarge.h | 4 ++--
src/seasidelistitemsmall.cpp | 24 ++++--------------------
src/seasidelistitemsmall.h | 4 ++--
7 files changed, 60 insertions(+), 64 deletions(-)
create mode 100644 src/seasidelistitem_p.h
diff --git a/libseaside.pro b/libseaside.pro
index 594d258..0269ef3 100644
--- a/libseaside.pro
+++ b/libseaside.pro
@@ -72,6 +72,9 @@ theme.files = theme/*
theme.path = $$SEASIDE_THEME_DIR
theme.CONFIG += no_check_exist
+# private headers, that shouldn't be installed
+HEADERS += src/seasidelistitem_p.h
+
INSTALLS += \
target \
headers \
diff --git a/src/seasidelistitem.cpp b/src/seasidelistitem.cpp
index b83afe0..1f492ae 100644
--- a/src/seasidelistitem.cpp
+++ b/src/seasidelistitem.cpp
@@ -17,6 +17,7 @@
#include <MButton>
#include "seasidelistitem.h"
+#include "seasidelistitem_p.h"
#include "seasidelabel.h"
#include <MWidgetCreator>
@@ -25,27 +26,10 @@ M_REGISTER_WIDGET(SeasideListItem);
#define SCREEN_WIDTH 400
-class SeasideListItemPriv
+SeasideListItem::SeasideListItem(MWidget *parent, int mode)
+ : MWidgetController(parent)
+ , priv(new SeasideListItemPriv)
{
-public:
- MImageWidget *image;
- SeasideLabel *name;
- SeasideLabel *detail;
- SeasideLabel *status;
- QStringList *detailList;
- MImageWidget *favorite;
- MImageWidget *presence;
- MButton *button;
- MImageWidget *email;
- MImageWidget *sms;
- MImageWidget *im;
- MImageWidget *call;
- QUuid *uuid;
-};
-
-SeasideListItem::SeasideListItem(MWidget *parent, int mode):
MWidgetController(parent)
-{
- priv = new SeasideListItemPriv;
setObjectName("SeasideListItem");
if(mode == 0){ //large list item
diff --git a/src/seasidelistitem_p.h b/src/seasidelistitem_p.h
new file mode 100644
index 0000000..36d06f3
--- /dev/null
+++ b/src/seasidelistitem_p.h
@@ -0,0 +1,41 @@
+/*
+ * libseaside - Library that provides an interface to the Contacts application
+ * Copyright © 2010, Intel Corporation
+ *
+ * This program is licensed under the terms and conditions of the
+ * Apache License, version 2.0. The full text of the Apache License is at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+
+#ifndef SEASIDELISTITEM_P_H
+#define SEASIDELISTITEM_P_H
+
+class QStringList;
+class QUuid;
+
+class MImageWidget;
+class MButton;
+
+class SeasideLabel;
+
+#include "seasidelabel.h"
+
+struct SeasideListItemPriv
+{
+ MImageWidget *image;
+ SeasideLabel *name;
+ SeasideLabel *detail;
+ SeasideLabel *status;
+ QStringList *detailList;
+ MImageWidget *favorite;
+ MImageWidget *presence;
+ MButton *button;
+ MImageWidget *email;
+ MImageWidget *sms;
+ MImageWidget *im;
+ MImageWidget *call;
+ QUuid *uuid;
+};
+
+#endif // SEASIDELISTITEM_P_H
diff --git a/src/seasidelistitemlarge.cpp b/src/seasidelistitemlarge.cpp
index 92d704e..8a6b10e 100644
--- a/src/seasidelistitemlarge.cpp
+++ b/src/seasidelistitemlarge.cpp
@@ -17,6 +17,7 @@
#include <MButton>
#include "seasidelistitemlarge.h"
+#include "seasidelistitem_p.h"
#include "seasidelabel.h"
#include <MWidgetCreator>
@@ -26,27 +27,10 @@ M_REGISTER_WIDGET(SeasideListItemLarge);
#define SCREEN_WIDTH 400
-class SeasideListItemLargePriv
+SeasideListItemLarge::SeasideListItemLarge(MWidget *parent)
+ : MWidgetController(parent)
+ , priv(new SeasideListItemPriv)
{
-public:
- MImageWidget *image;
- SeasideLabel *name;
- SeasideLabel *detail;
- SeasideLabel *status;
- QStringList *detailList;
- MImageWidget *favorite;
- MImageWidget *presence;
- MButton *button;
- MImageWidget *email;
- MImageWidget *sms;
- MImageWidget *im;
- MImageWidget *call;
- QUuid *uuid;
-};
-
-SeasideListItemLarge::SeasideListItemLarge(MWidget *parent):
MWidgetController(parent)
-{
- priv = new SeasideListItemLargePriv;
setObjectName("SeasideListItemLarge");
QGraphicsGridLayout *grid = new QGraphicsGridLayout;
diff --git a/src/seasidelistitemlarge.h b/src/seasidelistitemlarge.h
index fb20396..812ac48 100644
--- a/src/seasidelistitemlarge.h
+++ b/src/seasidelistitemlarge.h
@@ -13,7 +13,7 @@
#include <MWidgetController>
#include "seaside.h"
-class SeasideListItemLargePriv;
+struct SeasideListItemPriv;
/*
* SeasideListItemLarge: Styling Notes
@@ -53,7 +53,7 @@ protected slots:
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
private:
- SeasideListItemLargePriv *priv;
+ SeasideListItemPriv *priv;
QPixmap getAvatar(QString avatar);
Q_DISABLE_COPY(SeasideListItemLarge);
};
diff --git a/src/seasidelistitemsmall.cpp b/src/seasidelistitemsmall.cpp
index 2feb6f5..8623c42 100644
--- a/src/seasidelistitemsmall.cpp
+++ b/src/seasidelistitemsmall.cpp
@@ -17,6 +17,7 @@
#include <MButton>
#include "seasidelistitemsmall.h"
+#include "seasidelistitem_p.h"
#include "seasidelabel.h"
#include <MWidgetCreator>
@@ -26,27 +27,10 @@ M_REGISTER_WIDGET(SeasideListItemSmall)
#define SCREEN_WIDTH 400
-class SeasideListItemSmallPriv
+SeasideListItemSmall::SeasideListItemSmall(MWidget *parent)
+ : MWidgetController(parent)
+ , priv(new SeasideListItemPriv)
{
-public:
- MImageWidget *image;
- SeasideLabel *name;
- SeasideLabel *detail;
- SeasideLabel *status;
- QStringList *detailList;
- MImageWidget *favorite;
- MImageWidget *presence;
- MButton *button;
- MImageWidget *email;
- MImageWidget *sms;
- MImageWidget *im;
- MImageWidget *call;
- QUuid *uuid;
-};
-
-SeasideListItemSmall::SeasideListItemSmall(MWidget *parent):
MWidgetController(parent)
-{
- priv = new SeasideListItemSmallPriv;
setObjectName("SeasideListItemSmall");
QGraphicsGridLayout *grid = new QGraphicsGridLayout;
diff --git a/src/seasidelistitemsmall.h b/src/seasidelistitemsmall.h
index 9a7b7d6..b1cba36 100644
--- a/src/seasidelistitemsmall.h
+++ b/src/seasidelistitemsmall.h
@@ -13,7 +13,7 @@
#include <MWidgetController>
#include "seaside.h"
-class SeasideListItemSmallPriv;
+struct SeasideListItemPriv;
/*
* SeasideListItemSmall: Styling Notes
@@ -53,7 +53,7 @@ protected slots:
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
private:
- SeasideListItemSmallPriv *priv;
+ SeasideListItemPriv *priv;
QPixmap getAvatar(QString avatar);
Q_DISABLE_COPY(SeasideListItemSmall);
};
--
1.7.4.1
_______________________________________________
MeeGo-dev mailing list
[email protected]
http://lists.meego.com/listinfo/meego-dev
http://wiki.meego.com/Mailing_list_guidelines
