summaryrefslogtreecommitdiffstats
path: root/kcontrol/kfontinst/viewpart
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/viewpart
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/viewpart')
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.cpp4
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.h4
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.cpp24
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.h2
4 files changed, 17 insertions, 17 deletions
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp
index bded4fad4..3679be252 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *)
}
}
-TQSize CFontPreview::tqsizeHint() const
+TQSize CFontPreview::sizeHint() const
{
return TQSize(132, 132);
}
-TQSize CFontPreview::tqminimumSizeHint() const
+TQSize CFontPreview::minimumSizeHint() const
{
return TQSize(32, 32);
}
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h
index 6ef34f5bc..a57e9b9c9 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.h
+++ b/kcontrol/kfontinst/viewpart/FontPreview.h
@@ -50,8 +50,8 @@ class CFontPreview : public QWidget
virtual ~CFontPreview() {}
void paintEvent(TQPaintEvent *);
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
void showFont(const KURL &url);
void showFont();
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index a560d2968..14bda4024 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -76,7 +76,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
itsToolsFrame=new TQFrame(itsFrame);
- TQVBoxLayout *tqlayout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint());
+ TQVBoxLayout *layout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint());
TQGridLayout *previewLayout=new TQGridLayout(previewFrame, 1, 1, 1, 1);
TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
@@ -88,14 +88,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
setInstance(new KInstance("kfontview"));
itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
- itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame);
itsFaceSelector=new KIntNumInput(1, itsToolsFrame);
itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button");
itsInstallButton->hide();
previewLayout->addWidget(itsPreview, 0, 0);
- tqlayout->addWidget(previewFrame);
- tqlayout->addWidget(itsToolsFrame);
+ layout->addWidget(previewFrame);
+ layout->addWidget(itsToolsFrame);
toolsLayout->addWidget(itsFaceLabel);
toolsLayout->addWidget(itsFaceSelector);
itsFaceLabel->hide();
@@ -103,7 +103,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
toolsLayout->addWidget(itsInstallButton);
itsToolsFrame->hide();
- connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewtqStatus(bool)));
+ connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool)));
connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
@@ -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->tqparentWidget());
+ itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
- if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()))
+ if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
itsShowInstallButton=false;
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
- itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
+ itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
}
}
}
@@ -193,7 +193,7 @@ void CFontViewPart::timeout()
itsToolsFrame->hide();
}
-void CFontViewPart::previewtqStatus(bool st)
+void CFontViewPart::previewStatus(bool st)
{
itsInstallButton->setShown(st && itsShowInstallButton);
itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown());
@@ -220,7 +220,7 @@ void CFontViewPart::install()
{
KURL destUrl(getDest(m_url, KMessageBox::No==resp));
- if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget()))
+ if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
{
//
// 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->tqparentWidget());
+ KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
}
}
@@ -274,7 +274,7 @@ void CFontViewPart::print()
items.append(itsPreview->engine().getName(m_url));
- Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine());
+ Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine());
}
}
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 79d5c4743..21de2e074 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -60,7 +60,7 @@ class CFontViewPart : public KParts::ReadOnlyPart
private slots:
- void previewtqStatus(bool st);
+ void previewStatus(bool st);
void timeout();
void install();
void changeText();