diff options
Diffstat (limited to 'kcontrol/css')
-rw-r--r-- | kcontrol/css/cssconfig.ui | 10 | ||||
-rw-r--r-- | kcontrol/css/csscustom.ui | 4 | ||||
-rw-r--r-- | kcontrol/css/kcmcss.cpp | 88 | ||||
-rw-r--r-- | kcontrol/css/kcmcss.h | 2 | ||||
-rw-r--r-- | kcontrol/css/preview.ui | 3 |
5 files changed, 48 insertions, 59 deletions
diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui index f0baacb79..4566ba5c0 100644 --- a/kcontrol/css/cssconfig.ui +++ b/kcontrol/css/cssconfig.ui @@ -229,16 +229,12 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<includes> - <include location="global" impldecl="in implementation">kdialog.h</include> -</includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui index 5074b8bab..cc69769b7 100644 --- a/kcontrol/css/csscustom.ui +++ b/kcontrol/css/csscustom.ui @@ -547,8 +547,4 @@ </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> </UI> diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index e2e043f76..d22c90e3e 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -50,46 +50,46 @@ CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &) TDEFontChooser::getFontList(fonts, 0); customDialog->fontFamily->insertStringList(fonts); - connect(configDialog->useDefault, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->useAccess, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->useUser, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->urlRequester, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(configDialog->customize, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCustomize())); - connect(customDialog->basefontsize, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(changed())); - connect(customDialog->basefontsize, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(customDialog->dontScale, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->blackOnWhite, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->whiteOnBlack, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->customColor, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->foregroundColor, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(changed())); - connect(customDialog->backgroundColor, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(changed())); - connect(customDialog->fontFamily, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(changed())); - connect(customDialog->fontFamily, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(customDialog->sameFamily, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->preview, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPreview())); - connect(customDialog->sameColor, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->hideImages, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->hideBackground, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); + connect(configDialog->useDefault, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->useAccess, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->useUser, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->urlRequester, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(configDialog->customize, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCustomize())); + connect(customDialog->basefontsize, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(changed())); + connect(customDialog->basefontsize, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(customDialog->dontScale, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->blackOnWhite, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->whiteOnBlack, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->customColor, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->foregroundColor, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(changed())); + connect(customDialog->backgroundColor, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(changed())); + connect(customDialog->fontFamily, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(changed())); + connect(customDialog->fontFamily, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(customDialog->sameFamily, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->preview, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPreview())); + connect(customDialog->sameColor, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->hideImages, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->hideBackground, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 0); vbox->addWidget(configDialog); @@ -342,13 +342,13 @@ void CSSConfig::slotPreview() if (customDialog->blackOnWhite->isChecked()) { - back = Qt::white; - fore = Qt::black; + back = TQt::white; + fore = TQt::black; } else if (customDialog->whiteOnBlack->isChecked()) { - back = Qt::black; - fore = Qt::white; + back = TQt::black; + fore = TQt::white; } else { diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h index da93fcdf5..b1b944416 100644 --- a/kcontrol/css/kcmcss.h +++ b/kcontrol/css/kcmcss.h @@ -31,7 +31,7 @@ class KDialogBase; class CSSConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui index 51bd26ad1..a4557c845 100644 --- a/kcontrol/css/preview.ui +++ b/kcontrol/css/preview.ui @@ -89,7 +89,4 @@ people.</p> </includes> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> -<includehints> - <includehint>kseparator.h</includehint> -</includehints> </UI> |