From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/fontcolourbutton.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kalarm/fontcolourbutton.cpp') diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index 48d0f9220..62888d462 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -43,26 +43,26 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) mReadOnly(false) { setFrameStyle(NoFrame); - TQHBoxLayout* layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout* tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); mButton = new PushButton(i18n("Font && Co&lor..."), this); - mButton->setFixedSize(mButton->sizeHint()); + mButton->setFixedSize(mButton->tqsizeHint()); connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed())); TQWhatsThis::add(mButton, i18n("Choose the font, and foreground and background color, for the alarm message.")); - layout->addWidget(mButton); + tqlayout->addWidget(mButton); // Font and colour sample display mSample = new TQLineEdit(this); mSample->setMinimumHeight(QMAX(mSample->fontMetrics().lineSpacing(), mButton->height()*3/2)); - mSample->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding); + mSample->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding); mSample->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); mSample->setCursorPosition(0); - mSample->setAlignment(Qt::AlignCenter); + mSample->tqsetAlignment(Qt::AlignCenter); TQWhatsThis::add(mSample, i18n("This sample text illustrates the current font and color settings. " "You may edit it to test special characters.")); - layout->addWidget(mSample); + tqlayout->addWidget(mSample); } void FontColourButton::setDefaultFont() @@ -125,7 +125,7 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c { TQWidget* page = new TQWidget(this); setMainWidget(page); - TQVBoxLayout* layout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString::null, false, true, true); mChooser->setBgColour(bgColour); mChooser->setFgColour(fgColour); @@ -133,8 +133,8 @@ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, c mChooser->setDefaultFont(); else mChooser->setFont(font); - layout->addWidget(mChooser); - layout->addSpacing(KDialog::spacingHint()); + tqlayout->addWidget(mChooser); + tqlayout->addSpacing(KDialog::spacingHint()); } /****************************************************************************** -- cgit v1.2.1