From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: TQt4 port koffice This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kexi/main/kexistatusbar.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'kexi/main/kexistatusbar.cpp') diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index c05f0eeb..2d51cad5 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -22,11 +22,11 @@ #include "kexistatusbar.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -38,8 +38,8 @@ #include #endif -KexiStatusBar::KexiStatusBar(QWidget *parent, const char *name) - : KStatusBar(parent, name) +KexiStatusBar::KexiStatusBar(TQWidget *tqparent, const char *name) + : KStatusBar(tqparent, name) #if KexiStatusBar_KTEXTEDITOR_USED , m_cursorIface(0) #endif @@ -54,8 +54,8 @@ KexiStatusBar::KexiStatusBar(QWidget *parent, const char *name) setReadOnlyFlag(false); // @todo -// connect(PartController::getInstance(), SIGNAL(activePartChanged(KParts::Part*)), -// this, SLOT(activePartChanged(KParts::Part*))); +// connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), +// this, TQT_SLOT(activePartChanged(KParts::Part*))); /// @todo remove parts from the map on PartRemoved() ? } @@ -77,8 +77,8 @@ void KexiStatusBar::activePartChanged(KParts::Part *part) // @todo if (part && part->widget()) { if ((m_viewmsgIface = dynamic_cast(part->widget()))) { - connect( part->widget(), SIGNAL( viewStatusMsg( const QString & ) ), - this, SLOT( setStatus( const QString & ) ) ); + connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), + this, TQT_SLOT( settqStatus( const TQString & ) ) ); # if KDE_VERSION < KDE_MAKE_VERSION(3,1,90) changeItem(m_map[ m_activePart ], m_msgID); @@ -86,7 +86,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part) # endif } else if ((m_cursorIface = dynamic_cast(part->widget()))) { - connect(part->widget(), SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChanged())); + connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); cursorPositionChanged(); } else { @@ -110,9 +110,9 @@ void KexiStatusBar::cursorPositionChanged() #endif } -void KexiStatusBar::setStatus(const QString &str) +void KexiStatusBar::settqStatus(const TQString &str) { - kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl; + kdDebug() << "KexiStatusBar::settqStatus(" << str << ")" << endl; // m_status->setText(str); changeItem(str, m_msgID); @@ -125,21 +125,21 @@ void KexiStatusBar::setStatus(const QString &str) void KexiStatusBar::setCursorPosition(int line, int col) { -// m_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col)); - changeItem(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col), m_msgID); +// m_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col)); + changeItem(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col), m_msgID); } -/*void KexiStatusBar::addWidget ( QWidget *widget, int stretch, bool permanent) +/*void KexiStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) { KStatusBar::addWidget(widget,stretch,permanent); - if(widget->sizeHint().height() + 4 > height()) - setFixedHeight(widget->sizeHint().height() + 4); + if(widget->tqsizeHint().height() + 4 > height()) + setFixedHeight(widget->tqsizeHint().height() + 4); }*/ void KexiStatusBar::setReadOnlyFlag(bool readOnly) { - changeItem(readOnly ? i18n("Read only") : QString::null, m_readOnlyID); + changeItem(readOnly ? i18n("Read only") : TQString(), m_readOnlyID); } #include "kexistatusbar.moc" -- cgit v1.2.1