summaryrefslogtreecommitdiffstats
path: root/kcontrol/kfontinst/kcmfontinst
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kcontrol/kfontinst/kcmfontinst
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/kfontinst/kcmfontinst')
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp34
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.h2
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.h2
-rw-r--r--kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp12
4 files changed, 25 insertions, 25 deletions
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 3e7c699e2..c525cd337 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -97,10 +97,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) &&
KCmdLineArgs::parsedArgs()->isSet("embed"));
- itstqStatusLabel = new TQLabel(this);
- itstqStatusLabel->setFrameShape(TQFrame::Panel);
- itstqStatusLabel->setFrameShadow(TQFrame::Sunken);
- itstqStatusLabel->setLineWidth(1);
+ itsStatusLabel = new TQLabel(this);
+ itsStatusLabel->setFrameShape(TQFrame::Panel);
+ itsStatusLabel->setFrameShadow(TQFrame::Sunken);
+ itsStatusLabel->setLineWidth(1);
itsConfig.setGroup(CFG_GROUP);
@@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsSplitter=new TQSplitter(this);
fontsFrame=new TQFrame(itsSplitter),
itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart");
- itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
@@ -129,18 +129,18 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
{
#endif
fontsFrame=new TQFrame(this);
- fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
#ifdef HAVE_XFT
}
#endif
TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1);
- TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
KToolBar *toolbar=new KToolBar(this);
bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
fontsFrame->setLineWidth(0);
- toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+ toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
toolbar->setMovingEnabled(false);
TQString previousPath=itsConfig.readEntry(CFG_PATH);
@@ -151,22 +151,22 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsDirOp->setMinimumSize(TQSize(96, 64));
setMimeTypes(showBitmap);
itsDirOp->dirLister()->setMainWindow(this);
- itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1);
KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame);
connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts()));
- button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
fontsLayout->addWidget(button, 1, 0);
fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
- tqlayout->addWidget(toolbar);
+ layout->addWidget(toolbar);
#ifdef HAVE_XFT
- tqlayout->addWidget(itsPreview ? itsSplitter : fontsFrame);
+ layout->addWidget(itsPreview ? itsSplitter : fontsFrame);
#else
- tqlayout->addWidget(fontsFrame);
+ layout->addWidget(fontsFrame);
#endif
- tqlayout->addWidget(itstqStatusLabel);
+ layout->addWidget(itsStatusLabel);
setButtons(0);
setRootOnlyMsg(i18n("<b>The fonts shown are your personal fonts.</b><br>To see (and install) "
@@ -390,7 +390,7 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item)
? list->getFirst()
: NULL;
- if(previewItem && list && list->tqcontains(previewItem)) // OK, check its been selected - not deselected!!!
+ if(previewItem && list && list->contains(previewItem)) // OK, check its been selected - not deselected!!!
itsPreview->openURL(previewItem->url());
}
#endif
@@ -545,7 +545,7 @@ void CKCmFontInst::dropped(const KFileItem *i, TQDropEvent *, const KURL::List &
void CKCmFontInst::infoMessage(const TQString &msg)
{
- itstqStatusLabel->setText(msg);
+ itsStatusLabel->setText(msg);
}
static TQString family(const TQString &name)
@@ -582,7 +582,7 @@ void CKCmFontInst::updateInformation(int, int fonts)
}
text+=" - ";
text+=i18n("One Family", "%n Families", families.count());
- itstqStatusLabel->setText(text);
+ itsStatusLabel->setText(text);
}
void CKCmFontInst::delResult(KIO::Job *job)
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index 8f655f2a4..b304e0a1a 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -108,7 +108,7 @@ class CKCmFontInst : public KCModule
TQSplitter *itsSplitter;
KConfig itsConfig;
bool itsEmbeddedAdmin;
- TQLabel *itstqStatusLabel;
+ TQLabel *itsStatusLabel;
};
}
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index b1bb35e88..b4766c5c4 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -88,7 +88,7 @@ class CFontListViewItem : public KListViewItem
TQRect rect() const
{
- TQRect r = listView()->tqitemRect(this);
+ TQRect r = listView()->itemRect(this);
return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height()));
}
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
index 11f1cdebe..afd9fa204 100644
--- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
@@ -39,14 +39,14 @@ CPrintDialog::CPrintDialog(TQWidget *parent)
: KDialogBase(Plain, i18n("Print Font Samples"), Ok|Cancel, Ok, parent, NULL, true, false)
{
TQFrame *page=plainPage();
- TQGridLayout *tqlayout=new TQGridLayout(page, 1, 1, 0, spacingHint());
+ TQGridLayout *layout=new TQGridLayout(page, 1, 1, 0, spacingHint());
- tqlayout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0);
+ layout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0);
itsOutput=new TQComboBox(page);
itsOutput->insertItem(i18n("All Fonts"), 0);
itsOutput->insertItem(i18n("Selected Fonts"), 1);
- tqlayout->addWidget(itsOutput, 0, 1);
- tqlayout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0);
+ layout->addWidget(itsOutput, 0, 1);
+ layout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0);
itsSize=new TQComboBox(page);
itsSize->insertItem(i18n("Waterfall"), 0);
itsSize->insertItem(i18n("12pt"), 1);
@@ -54,8 +54,8 @@ CPrintDialog::CPrintDialog(TQWidget *parent)
itsSize->insertItem(i18n("24pt"), 3);
itsSize->insertItem(i18n("36pt"), 4);
itsSize->insertItem(i18n("48pt"), 5);
- tqlayout->addWidget(itsSize, 1, 1);
- tqlayout->addItem(new TQSpacerItem(2, 2), 2, 1);
+ layout->addWidget(itsSize, 1, 1);
+ layout->addItem(new TQSpacerItem(2, 2), 2, 1);
}
bool CPrintDialog::exec(bool select, int size)