Branch: r14.0.x

fb32c453 2015-03-04 22:35:05 Slávek Banko 
Fix incorrectly renamed strings
(cherry picked from commit fbf46a0913feeefd94e62b99cc12de4062e86954)
M src/noteedit.cpp
 
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 89ddb21..f048a96 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -237,7 +237,7 @@
 	connect( textEdit,  TQT_SIGNAL(cursorPositionChanged(int, int)),  this, TQT_SLOT(cursorPositionChanged())   );
 	connect( textEdit,  TQT_SIGNAL(clicked(int, int)),                this, TQT_SLOT(cursorPositionChanged())   );
 	connect( textEdit,  TQT_SIGNAL(currentFontChanged(const TQFont&)), this, TQT_SLOT(fontChanged(const TQFont&)) );
-//	connect( textEdit,  TQT_SIGNAL(currentVerticalAlignmentChangedQt::VerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged()) );
+//	connect( textEdit,  TQT_SIGNAL(currentVerticalAlignmentChangedVerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged()) );
 
 	connect( InlineEditors::instance()->richTextBold,      TQT_SIGNAL(toggled(bool)),    textEdit, TQT_SLOT(setBold(bool)) );
 	connect( InlineEditors::instance()->richTextItalic,    TQT_SIGNAL(toggled(bool)),    textEdit, TQT_SLOT(setItalic(bool)) );
8de6c039 2015-03-04 22:35:11 Slávek Banko 
Fix prior commit
(cherry picked from commit 0f89b9dcd8030398a3980670d9b48dac7707beac)
M src/noteedit.cpp
 
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index f048a96..b6f3190 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -237,7 +237,7 @@
 	connect( textEdit,  TQT_SIGNAL(cursorPositionChanged(int, int)),  this, TQT_SLOT(cursorPositionChanged())   );
 	connect( textEdit,  TQT_SIGNAL(clicked(int, int)),                this, TQT_SLOT(cursorPositionChanged())   );
 	connect( textEdit,  TQT_SIGNAL(currentFontChanged(const TQFont&)), this, TQT_SLOT(fontChanged(const TQFont&)) );
-//	connect( textEdit,  TQT_SIGNAL(currentVerticalAlignmentChangedVerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged()) );
+//	connect( textEdit,  TQT_SIGNAL(currentVerticalAlignmentChanged(TQTextEdit::VerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged()) );
 
 	connect( InlineEditors::instance()->richTextBold,      TQT_SIGNAL(toggled(bool)),    textEdit, TQT_SLOT(setBold(bool)) );
 	connect( InlineEditors::instance()->richTextItalic,    TQT_SIGNAL(toggled(bool)),    textEdit, TQT_SLOT(setItalic(bool)) );