Commit a0e1c07b authored by JanKusanagi's avatar JanKusanagi

Partial refactoring of Post

parent 69afead8
......@@ -238,7 +238,7 @@ QString ASActivity::getToString()
return m_recipientsToString;
}
QString ASActivity::getCCString()
QString ASActivity::getCcString()
{
return m_recipientsCcString;
}
......
......@@ -57,7 +57,7 @@ public:
QString getContent();
QString getToString();
QString getCCString();
QString getCcString();
QStringList getRecipientsIdList();
bool isShared();
......
......@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
{
QApplication dianaraApp(argc, argv);
dianaraApp.setApplicationName("Dianara");
dianaraApp.setApplicationVersion("1.4.2-dev+1");
dianaraApp.setApplicationVersion("1.4.2-dev+2");
dianaraApp.setOrganizationName("JanCoding");
dianaraApp.setOrganizationDomain("jancoding.wordpress.com");
......
......@@ -71,8 +71,8 @@ MinorFeedItem::MinorFeedItem(ASActivity *activity,
.arg(generator));
}
QString toField = activity->getToString();
QString ccField = activity->getCCString();
const QString toField = activity->getToString();
const QString ccField = activity->getCcString();
if (!toField.isEmpty() || !ccField.isEmpty())
{
timestampTooltip.append("<br>"); // Extra separation before To or Cc
......
This diff is collapsed.
......@@ -177,13 +177,13 @@ protected:
private:
QHBoxLayout *mainLayout;
QVBoxLayout *leftColumnLayout;
QVBoxLayout *rightColumnLayout;
QVBoxLayout *outerLayout;
QHBoxLayout *m_mainLayout;
QVBoxLayout *m_leftColumnLayout;
QVBoxLayout *m_rightColumnLayout;
QVBoxLayout *m_outerLayout;
QFrame *leftColumnFrame;
QFrame *rightColumnFrame;
QFrame *m_leftColumnFrame;
QFrame *m_rightColumnFrame;
QString activityId;
QString postId;
......@@ -194,14 +194,14 @@ private:
QString postSharedById;
QString postShareInfoString;
QString postSharedToCCString;
QString m_postSharedToCcString;
QString postShareTime;
bool postIsOwn;
bool postIsUnread;
bool postIsDeleted;
int highlightType;
QString unreadPostColor;
bool m_postIsOwn;
bool m_postIsUnread;
bool m_postIsDeleted;
int m_highlightType;
QString m_unreadPostColor;
AvatarButton *postAuthorAvatarButton;
QAction *openPostInBrowserAction;
......@@ -213,8 +213,8 @@ private:
HClabel *postCreatedAtLabel;
QLabel *postGeneratorLabel;
HClabel *postLocationLabel;
QLabel *postToLabel;
QLabel *postCCLabel;
QLabel *m_postToLabel;
QLabel *m_postCcLabel;
QLabel *postIsSharedLabel;
QLabel *shareHintLabel;
......@@ -224,8 +224,6 @@ private:
QPushButton *openParentPostButton;
//QPushButton *closeButton;
QLabel *postTitleLabel;
QLabel *postSummaryLabel;
QTextBrowser *postText;
......@@ -275,15 +273,15 @@ private:
QStringList pendingImagesList;
bool standalone;
bool m_standalone;
QString seeFullImageString;
QString downloadAttachmentString;
QTimer *resizeTimer;
PumpController *pController;
GlobalObject *globalObj;
PumpController *m_pumpController;
GlobalObject *m_globalObject;
CommenterBlock *commenter;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment