summaryrefslogtreecommitdiffstats
path: root/lib/kofficeui/KoCommandHistory.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:56:31 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:56:31 -0600
commitc9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch)
tree1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /lib/kofficeui/KoCommandHistory.cpp
parent94844816550ad672ccfcdc25659c625546239998 (diff)
downloadkoffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz
koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'lib/kofficeui/KoCommandHistory.cpp')
-rw-r--r--lib/kofficeui/KoCommandHistory.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 8d4284da..27c51e79 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlistbox.h>
#include <kaction.h>
@@ -53,7 +53,7 @@ void KoListBox::contentsMouseMoveEvent ( TQMouseEvent * e)
}
}
-TQSize KoListBox::sizeHint() const
+TQSize KoListBox::tqsizeHint() const
{
return TQSize(TQMIN(maxItemWidth() + verticalScrollBar()->width() + 4, 400),
TQMIN(count() * itemHeight() + horizontalScrollBar()->height() + 4,300));
@@ -188,7 +188,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
m_first=false;
if (m_undo != 0) {
m_undo->setEnabled(true);
- m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
+ m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
}
if((m_redo != 0) && m_redo->isEnabled()) {
m_redo->setEnabled(false);
@@ -203,7 +203,7 @@ void KoCommandHistory::addCommand(KCommand *command, bool execute) {
d->m_present=command;
if (m_undo != 0) {
m_undo->setEnabled(true);
- m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
+ m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
}
if (m_redo != 0) {
m_redo->setEnabled(false);
@@ -229,7 +229,7 @@ void KoCommandHistory::undo() {
if (m_redo != 0) {
m_redo->setEnabled(true);
- m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name()));
+ m_redo->setText(i18n("&Redo: %1").tqarg(d->m_present->name()));
}
int index;
if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()!=0) {
@@ -238,7 +238,7 @@ void KoCommandHistory::undo() {
emit commandExecuted(commandUndone);
if (m_undo != 0) {
m_undo->setEnabled(true);
- m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
+ m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
}
--index;
if(index==d->m_savedAt)
@@ -282,13 +282,13 @@ void KoCommandHistory::redo() {
if (m_undo != 0) {
m_undo->setEnabled(true);
- m_undo->setText(i18n("&Undo: %1").arg(d->m_present->name()));
+ m_undo->setText(i18n("&Undo: %1").tqarg(d->m_present->name()));
}
if(m_commands.next()!=0) {
if (m_redo != 0) {
m_redo->setEnabled(true);
- m_redo->setText(i18n("&Redo: %1").arg(m_commands.current()->name()));
+ m_redo->setText(i18n("&Redo: %1").tqarg(m_commands.current()->name()));
}
}
else {
@@ -365,7 +365,7 @@ void KoCommandHistory::slotUndoAboutToShow()
if (m_commands.findRef(d->m_present)!=-1)
while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
{
- lst.append(i18n("Undo: %1").arg(m_commands.current()->name()));
+ lst.append(i18n("Undo: %1").tqarg(m_commands.current()->name()));
m_commands.prev();
}
d->m_undoListBox->insertStringList( lst );
@@ -411,12 +411,12 @@ void KoCommandHistory::slotRedoAboutToShow()
if (m_first)
{
d->m_present = m_commands.first();
- lst.append(i18n("Redo: %1").arg(d->m_present->name()));
+ lst.append(i18n("Redo: %1").tqarg(d->m_present->name()));
}
if (m_commands.findRef(d->m_present)!=-1 && m_commands.next())
while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
{
- lst.append(i18n("Redo: %1").arg(m_commands.current()->name()));
+ lst.append(i18n("Redo: %1").tqarg(m_commands.current()->name()));
m_commands.next();
}
d->m_redoListBox->insertStringList( lst );