From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/kfontinst/viewpart/FontPreview.cpp | 6 +++--- kcontrol/kfontinst/viewpart/FontPreview.h | 6 +++--- kcontrol/kfontinst/viewpart/FontViewPart.cpp | 16 ++++++++-------- kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kcontrol/kfontinst/viewpart') diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp index 3679be252..4382f5feb 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.cpp +++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp @@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *) { if(!itsCurrentUrl.isEmpty()) { - paint.setPen(kapp->palette().active().text()); + paint.setPen(kapp->tqpalette().active().text()); paint.drawText(rect(), AlignCenter, i18n(" No preview available")); } } @@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *) } } -TQSize CFontPreview::sizeHint() const +TQSize CFontPreview::tqsizeHint() const { return TQSize(132, 132); } -TQSize CFontPreview::minimumSizeHint() const +TQSize CFontPreview::tqminimumSizeHint() const { return TQSize(32, 32); } diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h index a57e9b9c9..f8f922b62 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.h +++ b/kcontrol/kfontinst/viewpart/FontPreview.h @@ -40,7 +40,7 @@ namespace KFI { -class CFontPreview : public QWidget +class CFontPreview : public TQWidget { Q_OBJECT @@ -50,8 +50,8 @@ class CFontPreview : public QWidget virtual ~CFontPreview() {} void paintEvent(TQPaintEvent *); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; void showFont(const KURL &url); void showFont(); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 14bda4024..deaf5587e 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -81,14 +81,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); itsFrame->setFrameShape(TQFrame::NoFrame); - itsFrame->setFocusPolicy(TQWidget::ClickFocus); + itsFrame->setFocusPolicy(TQ_ClickFocus); itsToolsFrame->setFrameShape(TQFrame::NoFrame); previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); previewFrame->setFrameShape(TQFrame::Panel); setInstance(new KInstance("kfontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); - itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame); itsFaceSelector=new KIntNumInput(1, itsToolsFrame); itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button"); @@ -165,17 +165,17 @@ void CFontViewPart::timeout() if(Misc::root()) { destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); + itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()); } else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); - if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget())) + if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget())) itsShowInstallButton=false; else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); + itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()); } } } @@ -220,7 +220,7 @@ void CFontViewPart::install() { KURL destUrl(getDest(m_url, KMessageBox::No==resp)); - if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget())) + if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget())) { // // OK file copied, now look for any AFM or PFM file... @@ -236,7 +236,7 @@ void CFontViewPart::install() for(it=urls.begin(); it!=end; ++it) { destUrl=getDest(*it, KMessageBox::No==resp); - KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget()); + KIO::NetAccess::copy(*it, destUrl, itsFrame->tqparentWidget()); } } @@ -274,7 +274,7 @@ void CFontViewPart::print() items.append(itsPreview->engine().getName(m_url)); - Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine()); + Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine()); } } diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index 56540171e..09617ade8 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() if(factory) { - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); - itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart"); + itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart"); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); KURL openURL; -- cgit v1.2.1