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 --- lib/kopalette/kopalette.cc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'lib/kopalette/kopalette.cc') diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 67fcf474..1c6fb960 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -15,18 +15,18 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -39,23 +39,23 @@ #include "kopalette.h" -KoPalette::KoPalette(QWidget * parent, const char * name) - : QDockWindow(parent, name) +KoPalette::KoPalette(TQWidget * tqparent, const char * name) + : TQDockWindow(tqparent, name) { #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,90) KAcceleratorManager::setNoAccel(this); #endif - setCloseMode( QDockWindow::Never); + setCloseMode( TQDockWindow::Never); setResizeEnabled(true); setOpaqueMoving(true); - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); setVerticallyStretchable(false); setHorizontallyStretchable(false); setNewLine(true); - layout() -> setSpacing(0); - layout() -> setMargin(0); + tqlayout() -> setSpacing(0); + tqlayout() -> setMargin(0); resetFont(); } @@ -67,7 +67,7 @@ void KoPalette::resetFont() Q_ASSERT(cfg); cfg->setGroup(""); m_font = KGlobalSettings::generalFont(); - float ps = QMIN(9, KGlobalSettings::generalFont().pointSize() * 0.8); + float ps = TQMIN(9, KGlobalSettings::generalFont().pointSize() * 0.8); ps = cfg->readNumEntry("palettefontsize", (int)ps); if (ps < 6) ps = 6; m_font.setPointSize((int)ps); @@ -79,10 +79,10 @@ KoPalette::~KoPalette() { } -void KoPalette::setMainWidget(QWidget * widget) +void KoPalette::setMainWidget(TQWidget * widget) { setWidget(widget); - resize( QSize(285, 233).expandedTo(minimumSizeHint()) ); + resize( TQSize(285, 233).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); widget->setFont(m_font); m_page = widget; -- cgit v1.2.1