fixed constructors in button-on-text widget (Patch from Phenom)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8070 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-03-22 12:55:59 +00:00
parent 0cd3f3868e
commit 78604a831a

View File

@ -10,50 +10,67 @@
RSButtonOnText::RSButtonOnText(QWidget *parent) RSButtonOnText::RSButtonOnText(QWidget *parent)
: QPushButton(parent) : QPushButton(parent)
{ {
_uuid = QUuid::createUuid(); _uuid = QUuid::createUuid().toString();
_lenght = -1; _lenght = -1;
_mouseOver = false; _mouseOver = false;
_pressed = false; _pressed = false;
} }
RSButtonOnText::RSButtonOnText(const QString &text, QWidget *parent) RSButtonOnText::RSButtonOnText(const QString &text, QWidget *parent)
: QPushButton(parent) : QPushButton(parent)
//: RSButtonOnText(parent)//delegating constructors only available with -std=c++11 or -std=gnu++11
{ {
_uuid = QUuid::createUuid().toString();
_lenght = -1;
_mouseOver = false;
_pressed = false;
setText(text); setText(text);
} }
RSButtonOnText::RSButtonOnText(const QIcon& icon, const QString &text, QWidget *parent) RSButtonOnText::RSButtonOnText(const QIcon& icon, const QString &text, QWidget *parent)
: QPushButton(text, parent) : QPushButton(parent)
//: RSButtonOnText(text, parent)//delegating constructors only available with -std=c++11 or -std=gnu++11
{ {
_uuid = QUuid::createUuid().toString();
_lenght = -1;
_mouseOver = false;
_pressed = false;
setIcon(icon); setIcon(icon);
setText(text);
} }
RSButtonOnText::RSButtonOnText(QTextEdit *textEdit, QWidget *parent) RSButtonOnText::RSButtonOnText(QTextEdit *textEdit, QWidget *parent)
: QPushButton(parent) : QPushButton(parent)
//: RSButtonOnText(parent)//delegating constructors only available with -std=c++11 or -std=gnu++11
{ {
appendToText(textEdit); _uuid = QUuid::createUuid().toString();
}
/*RSButtonOnText::RSButtonOnText(QTextEdit *textEdit, QWidget *parent)
: QPushButton(parent)
{
_uuid = QUuid::createUuid();
_lenght = -1; _lenght = -1;
_mouseOver = false; _mouseOver = false;
_pressed = false; _pressed = false;
appendToText(textEdit); appendToText(textEdit);
}*/ }
RSButtonOnText::RSButtonOnText(const QString &text, QTextEdit *textEdit, QWidget *parent) RSButtonOnText::RSButtonOnText(const QString &text, QTextEdit *textEdit, QWidget *parent)
: QPushButton(parent) : QPushButton(parent)
//: RSButtonOnText(parent)//delegating constructors only available with -std=c++11 or -std=gnu++11
{ {
_uuid = QUuid::createUuid().toString();
_lenght = -1;
_mouseOver = false;
_pressed = false;
setText(text); setText(text);
appendToText(textEdit); appendToText(textEdit);
} }
RSButtonOnText::RSButtonOnText(const QIcon& icon, const QString &text, QTextEdit *textEdit, QWidget *parent) RSButtonOnText::RSButtonOnText(const QIcon& icon, const QString &text, QTextEdit *textEdit, QWidget *parent)
: QPushButton(parent) : QPushButton(parent)
//: RSButtonOnText(parent)//delegating constructors only available with -std=c++11 or -std=gnu++11
{ {
setText(text); _uuid = QUuid::createUuid().toString();
_lenght = -1;
_mouseOver = false;
_pressed = false;
setIcon(icon); setIcon(icon);
setText(text);
appendToText(textEdit); appendToText(textEdit);
} }