summaryrefslogtreecommitdiffstats
path: root/kalarm/fontcolour.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/fontcolour.cpp')
-rw-r--r--kalarm/fontcolour.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index 936cc4c8d..94497b969 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -24,7 +24,7 @@
#include <tqpushbutton.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <kglobal.h>
@@ -57,8 +57,8 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
topLayout = new TQVBoxLayout(page, KDialog::marginHint(), KDialog::spacingHint());
topLayout->addSpacing(fontMetrics().height() - KDialog::marginHint() + KDialog::spacingHint());
}
- TQHBoxLayout* hlayout = new TQHBoxLayout(topLayout);
- TQVBoxLayout* colourLayout = new TQVBoxLayout(hlayout);
+ TQHBoxLayout* htqlayout = new TQHBoxLayout(topLayout);
+ TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout);
if (fg)
{
TQHBox* box = new TQHBox(page); // to group widgets for TQWhatsThis text
@@ -83,35 +83,35 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour()));
label->setBuddy(mBgColourButton);
TQWhatsThis::add(box, i18n("Select the alarm message background color"));
- hlayout->addStretch();
+ htqlayout->addStretch();
if (editColours)
{
- TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
+ TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page);
- button->setFixedSize(button->sizeHint());
+ button->setFixedSize(button->tqsizeHint());
connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour()));
TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list."));
- layout->addWidget(button);
+ tqlayout->addWidget(button);
mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page);
- mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint());
+ mRemoveColourButton->setFixedSize(mRemoveColourButton->tqsizeHint());
connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour()));
TQWhatsThis::add(mRemoveColourButton,
i18n("Remove the color currently shown in the background color chooser, from the color selection list."));
- layout->addWidget(mRemoveColourButton);
+ tqlayout->addWidget(mRemoveColourButton);
}
if (defaultFont)
{
- TQHBoxLayout* layout = new TQHBoxLayout(topLayout);
+ TQHBoxLayout* tqlayout = new TQHBoxLayout(topLayout);
mDefaultFont = new CheckBox(i18n("Use &default font"), page);
- mDefaultFont->setMinimumSize(mDefaultFont->sizeHint());
+ mDefaultFont->setMinimumSize(mDefaultFont->tqsizeHint());
connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool)));
TQWhatsThis::add(mDefaultFont,
i18n("Check to use the default font current at the time the alarm is displayed."));
- layout->addWidget(mDefaultFont);
- layout->addWidget(new TQWidget(page)); // left adjust the widget
+ tqlayout->addWidget(mDefaultFont);
+ tqlayout->addWidget(new TQWidget(page)); // left adjust the widget
}
else
mDefaultFont = 0;