From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 138 ++++++++++----------- kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 14 +-- .../kfontinst/kcmfontinst/KFileFontIconView.cpp | 16 +-- kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h | 10 +- kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 136 ++++++++++---------- kcontrol/kfontinst/kcmfontinst/KFileFontView.h | 60 ++++----- kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp | 24 ++-- kcontrol/kfontinst/kcmfontinst/PrintDialog.h | 6 +- kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp | 26 ++-- kcontrol/kfontinst/kcmfontinst/SettingsDialog.h | 4 +- 10 files changed, 217 insertions(+), 217 deletions(-) (limited to 'kcontrol/kfontinst/kcmfontinst') diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index 4a6b0b3ee..c525cd337 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -34,11 +34,11 @@ #include "KfiPrint.h" #include "FcEngine.h" #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include #define CFG_GROUP "Main Settings" #define CFG_LISTVIEW "ListView" @@ -68,13 +68,13 @@ #define CFG_SHOW_BITMAP "ShowBitmap" #define CFG_FONT_SIZE "FontSize" -typedef KGenericFactory FontInstallFactory; +typedef KGenericFactory FontInstallFactory; K_EXPORT_COMPONENT_FACTORY(kcm_fontinst, FontInstallFactory("kcmfontinst")) namespace KFI { -CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) +CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) : KCModule(parent, "kfontinst"), #ifdef HAVE_XFT itsPreview(NULL), @@ -97,25 +97,25 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) && KCmdLineArgs::parsedArgs()->isSet("embed")); - itsStatusLabel = new QLabel(this); - itsStatusLabel->setFrameShape(QFrame::Panel); - itsStatusLabel->setFrameShadow(QFrame::Sunken); + itsStatusLabel = new TQLabel(this); + itsStatusLabel->setFrameShape(TQFrame::Panel); + itsStatusLabel->setFrameShadow(TQFrame::Sunken); itsStatusLabel->setLineWidth(1); itsConfig.setGroup(CFG_GROUP); - QFrame *fontsFrame; + TQFrame *fontsFrame; #ifdef HAVE_XFT KLibFactory *factory=KLibLoader::self()->factory("libkfontviewpart"); if(factory) { - itsSplitter=new QSplitter(this); - fontsFrame=new QFrame(itsSplitter), + itsSplitter=new TQSplitter(this); + fontsFrame=new TQFrame(itsSplitter), itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart"); - itsSplitter->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); - QValueList sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); + TQValueList sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); if(2!=sizes.count()) { @@ -128,37 +128,37 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) else { #endif - fontsFrame=new QFrame(this); - fontsFrame->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + fontsFrame=new TQFrame(this); + fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifdef HAVE_XFT } #endif - QGridLayout *fontsLayout=new QGridLayout(fontsFrame, 1, 1, 0, 1); - QVBoxLayout *layout=new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1); + 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->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); + toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); toolbar->setMovingEnabled(false); - QString previousPath=itsConfig.readEntry(CFG_PATH); + TQString previousPath=itsConfig.readEntry(CFG_PATH); - itsDirOp = new KDirOperator(Misc::root() ? QString("fonts:/") : QString("fonts:/")+i18n(KFI_KIO_FONTS_USER), + itsDirOp = new KDirOperator(Misc::root() ? TQString("fonts:/") : TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER), fontsFrame); itsDirOp->setViewConfig(&itsConfig, "ListView Settings"); - itsDirOp->setMinimumSize(QSize(96, 64)); + itsDirOp->setMinimumSize(TQSize(96, 64)); setMimeTypes(showBitmap); itsDirOp->dirLister()->setMainWindow(this); - itsDirOp->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::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, SIGNAL(clicked()), SLOT(addFonts())); - button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); + button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); - fontsLayout->addItem(new QSpacerItem(4, 4, QSizePolicy::Expanding, QSizePolicy::Minimum)); + fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); layout->addWidget(toolbar); #ifdef HAVE_XFT @@ -181,15 +181,15 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) itsViewMenuAct=dynamic_cast(itsDirOp->actionCollection()->action("view menu")); topMnu->popupMenu()->clear(); - connect(topMnu->popupMenu(), SIGNAL(aboutToShow()), SLOT(setupMenu())); + connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu())); if((act=itsDirOp->actionCollection()->action("up"))) - act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(cdUp())); + act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp())); if((act=itsDirOp->actionCollection()->action("home"))) - act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(home())); + act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home())); if((act=itsDirOp->actionCollection()->action("back"))) - act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(back())); + act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back())); if((act=itsDirOp->actionCollection()->action("forward"))) - act->disconnect(SIGNAL(activated()), itsDirOp, SLOT(forward())); + act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward())); if((act=itsDirOp->actionCollection()->action("reload"))) act->plug(toolbar); @@ -198,26 +198,26 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) if((itsIconAct=dynamic_cast(itsDirOp->actionCollection()->action("short view")))) { - disconnect(itsIconAct, SIGNAL(activated()), itsDirOp, SLOT(slotSimpleView())); - connect(itsIconAct, SIGNAL(activated()), SLOT(iconView())); + disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView())); + connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView())); itsIconAct->plug(toolbar); } if((itsListAct=dynamic_cast(itsDirOp->actionCollection()->action("detailed view")))) { - disconnect(itsListAct, SIGNAL(activated()), itsDirOp, SLOT(slotDetailedView())); - connect(itsListAct, SIGNAL(activated()), SLOT(listView())); + disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView())); + connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView())); itsListAct->plug(toolbar); } - itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, this, SLOT(filterFonts()), + itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, this, TQT_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); toolbar->insertLineSeparator(); - act=new KAction(i18n("Add Fonts..."), "newfont", 0, this, SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); + act=new KAction(i18n("Add Fonts..."), "newfont", 0, this, TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); act->plug(toolbar); topMnu->insert(act); @@ -226,24 +226,24 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) itsDeleteAct->plug(toolbar); itsDeleteAct->setEnabled(false); topMnu->insert(itsDeleteAct); - disconnect(itsDeleteAct, SIGNAL(activated()), itsDirOp, SLOT(deleteSelected())); - connect(itsDeleteAct, SIGNAL(activated()), this, SLOT(removeFonts())); + disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected())); + connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts())); } toolbar->insertLineSeparator(); - act=new KAction(i18n("Configure..."), "configure", 0, this, SLOT(configure()), itsDirOp->actionCollection(), "configure"); + act=new KAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); act->plug(toolbar); #ifdef HAVE_XFT toolbar->insertLineSeparator(); - act=new KAction(i18n("Print..."), "fileprint", 0, this, SLOT(print()), itsDirOp->actionCollection(), "print"); + act=new KAction(i18n("Print..."), "fileprint", 0, this, TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); act->plug(toolbar); #endif if( (itsSepDirsAct=itsDirOp->actionCollection()->action("separate dirs")) && (itsShowHiddenAct=itsDirOp->actionCollection()->action("show hidden"))) { - //disconnect(itsViewMenuAct->popupMenu(), SIGNAL(aboutToShow()), itsDirOp, SLOT(insertViewDependentActions())); - connect(itsViewMenuAct->popupMenu(), SIGNAL(aboutToShow()), SLOT(setupViewMenu())); + //disconnect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions())); + connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu())); setupViewMenu(); } @@ -266,12 +266,12 @@ CKCmFontInst::CKCmFontInst(QWidget *parent, const char *, const QStringList&) itsDirOp->dirLister()->setShowingDotFiles(true); - connect(itsDirOp, SIGNAL(fileHighlighted(const KFileItem *)), SLOT(fileHighlighted(const KFileItem *))); - connect(itsDirOp, SIGNAL(finishedLoading()), SLOT(loadingFinished())); - connect(itsDirOp, SIGNAL(dropped(const KFileItem *, QDropEvent *, const KURL::List &)), - SLOT(dropped(const KFileItem *, QDropEvent *, const KURL::List &))); - connect(itsDirOp->dirLister(), SIGNAL(infoMessage(const QString &)), SLOT(infoMessage(const QString &))); - connect(itsDirOp, SIGNAL(updateInformation(int, int)), SLOT(updateInformation(int, int))); + connect(itsDirOp, TQT_SIGNAL(fileHighlighted(const KFileItem *)), TQT_SLOT(fileHighlighted(const KFileItem *))); + connect(itsDirOp, TQT_SIGNAL(finishedLoading()), TQT_SLOT(loadingFinished())); + connect(itsDirOp, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)), + TQT_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &))); + connect(itsDirOp->dirLister(), TQT_SIGNAL(infoMessage(const TQString &)), TQT_SLOT(infoMessage(const TQString &))); + connect(itsDirOp, TQT_SIGNAL(updateInformation(int, int)), TQT_SLOT(updateInformation(int, int))); } CKCmFontInst::~CKCmFontInst() @@ -288,7 +288,7 @@ CKCmFontInst::~CKCmFontInst() void CKCmFontInst::setMimeTypes(bool showBitmap) { - QStringList mimeTypes; + TQStringList mimeTypes; mimeTypes << "application/x-font-ttf" << "application/x-font-otf" @@ -311,7 +311,7 @@ void CKCmFontInst::filterFonts() itsConfig.sync(); } -QString CKCmFontInst::quickHelp() const +TQString CKCmFontInst::quickHelp() const { return Misc::root() ? i18n("

Font Installer

This module allows you to" @@ -398,13 +398,13 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item) void CKCmFontInst::loadingFinished() { - QListView *lView=dynamic_cast(itsDirOp->view()); + TQListView *lView=dynamic_cast(itsDirOp->view()); if(lView) lView->sort(); else { - QIconView *iView=dynamic_cast(itsDirOp->view()); + TQIconView *iView=dynamic_cast(itsDirOp->view()); if(iView) iView->sort(); @@ -414,7 +414,7 @@ void CKCmFontInst::loadingFinished() void CKCmFontInst::addFonts() { - KURL::List list=KFileDialog::getOpenURLs(QString::null, "application/x-font-ttf application/x-font-otf " + KURL::List list=KFileDialog::getOpenURLs(TQString::null, "application/x-font-ttf application/x-font-otf " "application/x-font-ttc application/x-font-type1 " "application/x-font-pcf application/x-font-bdf", //"application/x-font-snf application/x-font-speedo", @@ -431,7 +431,7 @@ void CKCmFontInst::removeFonts() else { KURL::List urls; - QStringList files; + TQStringList files; KFileItemListIterator it(*(itsDirOp->selectedItems())); for(; it.current(); ++it) @@ -464,7 +464,7 @@ void CKCmFontInst::removeFonts() if(doIt) { KIO::DeleteJob *job = KIO::del(urls, false, true); - connect(job, SIGNAL(result(KIO::Job *)), this, SLOT(delResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(delResult(KIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } @@ -508,8 +508,8 @@ void CKCmFontInst::print() { static const int constSizes[]={0, 12, 18, 24, 36, 48}; - QStringList items; - QValueVector sizes; + TQStringList items; + TQValueVector sizes; CFcEngine engine; if(dlg.outputAll()) @@ -537,18 +537,18 @@ void CKCmFontInst::print() #endif } -void CKCmFontInst::dropped(const KFileItem *i, QDropEvent *, const KURL::List &urls) +void CKCmFontInst::dropped(const KFileItem *i, TQDropEvent *, const KURL::List &urls) { if(urls.count()) addFonts(urls, i && i->isDir() ? i->url() : itsDirOp->url()); } -void CKCmFontInst::infoMessage(const QString &msg) +void CKCmFontInst::infoMessage(const TQString &msg) { itsStatusLabel->setText(msg); } -static QString family(const QString &name) +static TQString family(const TQString &name) { int commaPos=name.find(','); @@ -558,8 +558,8 @@ static QString family(const QString &name) void CKCmFontInst::updateInformation(int, int fonts) { KIO::filesize_t size=0; - QString text(i18n("One Font", "%n Fonts", fonts)); - QStringList families; + TQString text(i18n("One Font", "%n Fonts", fonts)); + TQStringList families; if(fonts>0) { @@ -567,7 +567,7 @@ void CKCmFontInst::updateInformation(int, int fonts) for (item=itsDirOp->view()->firstFileItem(); item; item=itsDirOp->view()->nextItem(item)) { - QString fam(family(item->text())); + TQString fam(family(item->text())); size+=item->size(); if(-1==families.findIndex(fam)) @@ -590,8 +590,8 @@ void CKCmFontInst::delResult(KIO::Job *job) // // To speed up font deletion, we dont rescan font list each time - so after this has completed, we need // to refresh font list before updating the directory listing... - QByteArray packedArgs; - QDataStream stream(packedArgs, IO_WriteOnly); + TQByteArray packedArgs; + TQDataStream stream(packedArgs, IO_WriteOnly); stream << KFI::SPECIAL_RESCAN; @@ -636,7 +636,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest) } KIO::CopyJob *job=KIO::copy(copy, dest, true); - connect(job, SIGNAL(result(KIO::Job *)), this, SLOT(jobResult(KIO::Job *))); + connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(jobResult(KIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index add6c4c36..bbb072a2a 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -33,7 +33,7 @@ #include "config.h" #endif -#include +#include #include #include #include @@ -62,7 +62,7 @@ class CKCmFontInst : public KCModule public: - CKCmFontInst(QWidget *parent=NULL, const char *name=NULL, const QStringList &list=QStringList()); + CKCmFontInst(TQWidget *parent=NULL, const char *name=NULL, const TQStringList &list=TQStringList()); virtual ~CKCmFontInst(); void setMimeTypes(bool showBitmap); @@ -70,7 +70,7 @@ class CKCmFontInst : public KCModule public slots: void filterFonts(); - QString quickHelp() const; + TQString quickHelp() const; void listView(); void iconView(); void setupMenu(); @@ -81,8 +81,8 @@ class CKCmFontInst : public KCModule void removeFonts(); void configure(); void print(); - void dropped(const KFileItem *i, QDropEvent *e, const KURL::List &urls); - void infoMessage(const QString &msg); + void dropped(const KFileItem *i, TQDropEvent *e, const KURL::List &urls); + void infoMessage(const TQString &msg); void updateInformation(int dirs, int fonts); void delResult(KIO::Job *job); void jobResult(KIO::Job *job); @@ -105,10 +105,10 @@ class CKCmFontInst : public KCModule #ifdef HAVE_XFT KParts::ReadOnlyPart *itsPreview; #endif - QSplitter *itsSplitter; + TQSplitter *itsSplitter; KConfig itsConfig; bool itsEmbeddedAdmin; - QLabel *itsStatusLabel; + TQLabel *itsStatusLabel; }; } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp index d814d0c6b..241ac88bf 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp @@ -26,7 +26,7 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include +#include #include #include #include "KFileFontIconView.h" @@ -35,7 +35,7 @@ namespace KFI { // CPD: KDE4 should make acceptDrag() virtual there fore can get rid of all these ::contentsX functions... -void CKFileFontIconView::contentsDragEnterEvent(QDragEnterEvent *e) +void CKFileFontIconView::contentsDragEnterEvent(TQDragEnterEvent *e) { if(acceptDrag(e)) KFileIconView::contentsDragEnterEvent(e); @@ -43,7 +43,7 @@ void CKFileFontIconView::contentsDragEnterEvent(QDragEnterEvent *e) e->ignore(); } -void CKFileFontIconView::contentsDragMoveEvent(QDragMoveEvent *e) +void CKFileFontIconView::contentsDragMoveEvent(TQDragMoveEvent *e) { if(acceptDrag(e)) KFileIconView::contentsDragMoveEvent(e); @@ -51,7 +51,7 @@ void CKFileFontIconView::contentsDragMoveEvent(QDragMoveEvent *e) e->ignore(); } -void CKFileFontIconView::contentsDropEvent(QDropEvent *e) +void CKFileFontIconView::contentsDropEvent(TQDropEvent *e) { contentsDragLeaveEvent(NULL); @@ -61,28 +61,28 @@ void CKFileFontIconView::contentsDropEvent(QDropEvent *e) e->ignore(); } -bool CKFileFontIconView::acceptDrag(QDropEvent *e) const +bool CKFileFontIconView::acceptDrag(TQDropEvent *e) const { #if 0 // Crashes - seems to be called to quick??? bool ok=false; KURL::List urls; if(KURLDrag::canDecode(e) && (e->source()!=const_cast(this)) && - (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()) && + (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()) && KURLDrag::decode(e, urls) && !urls.isEmpty()) { KURL::List::Iterator it; ok=true; for(it=urls.begin(); ok && it!=urls.end(); ++it) - if(!CFontEngine::isAFontOrAfm(QFile::encodeName((*it).path()))) + if(!CFontEngine::isAFontOrAfm(TQFile::encodeName((*it).path()))) ok=false; } return ok; #endif return KURLDrag::canDecode(e) && (e->source()!= const_cast(this)) && - (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()); + (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()); } } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h index 936bb5bca..bb5ccfa5a 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h @@ -38,16 +38,16 @@ class CKFileFontIconView : public KFileIconView { public: - CKFileFontIconView(QWidget *parent, const char *name) : KFileIconView(parent, name) {} + CKFileFontIconView(TQWidget *parent, const char *name) : KFileIconView(parent, name) {} virtual ~CKFileFontIconView() {} protected: // DND support - void contentsDragEnterEvent(QDragEnterEvent *e); - void contentsDragMoveEvent(QDragMoveEvent *e); - void contentsDropEvent(QDropEvent *e); - bool acceptDrag(QDropEvent *e) const; + void contentsDragEnterEvent(TQDragEnterEvent *e); + void contentsDragMoveEvent(TQDragMoveEvent *e); + void contentsDropEvent(TQDropEvent *e); + bool acceptDrag(TQDropEvent *e) const; }; } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index 7346ca6c8..1ba7822ec 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -33,11 +33,11 @@ // 2000, 2001 Carsten Pfeiffer // -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -60,10 +60,10 @@ class CKFileFontView::CKFileFontViewPrivate CKFileFontViewPrivate() : itsDropItem(0) {} CFontListViewItem *itsDropItem; - QTimer itsAutoOpenTimer; + TQTimer itsAutoOpenTimer; }; -CKFileFontView::CKFileFontView(QWidget *parent, const char *name) +CKFileFontView::CKFileFontView(TQWidget *parent, const char *name) : KListView(parent, name), KFileView(), d(new CKFileFontViewPrivate()) @@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(QWidget *parent, const char *name) setAllColumnsShowFocus(true); setDragEnabled(false); - connect(header(), SIGNAL(sectionClicked(int)), SLOT(slotSortingChanged(int))); - connect(this, SIGNAL(returnPressed(QListViewItem *)), SLOT(slotActivate(QListViewItem *))); - connect(this, SIGNAL(clicked(QListViewItem *, const QPoint&, int)), SLOT(selected( QListViewItem *))); - connect(this, SIGNAL(doubleClicked(QListViewItem *, const QPoint &, int)), SLOT(slotActivate(QListViewItem *))); - connect(this, SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)), - this, SLOT(slotActivateMenu(QListViewItem *, const QPoint &))); + connect(header(), TQT_SIGNAL(sectionClicked(int)), TQT_SLOT(slotSortingChanged(int))); + connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(selected( TQListViewItem *))); + connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQT_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &))); // DND - connect(&(d->itsAutoOpenTimer), SIGNAL(timeout()), this, SLOT(slotAutoOpen())); + connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen())); setSelectionMode(KFileView::selectionMode()); itsResolver = new KMimeTypeResolver(this); } @@ -144,7 +144,7 @@ void CKFileFontView::invertSelection() KListView::invertSelection(); } -void CKFileFontView::slotActivateMenu(QListViewItem *item,const QPoint& pos) +void CKFileFontView::slotActivateMenu(TQListViewItem *item,const TQPoint& pos) { if (!item) sig->activateMenu(0, pos); @@ -165,7 +165,7 @@ void CKFileFontView::insertItem(KFileItem *i) { KFileView::insertItem(i); - CFontListViewItem *item = new CFontListViewItem((QListView*) this, i); + CFontListViewItem *item = new CFontListViewItem((TQListView*) this, i); setSortingKey(item, i); @@ -175,7 +175,7 @@ void CKFileFontView::insertItem(KFileItem *i) itsResolver->m_lstPendingMimeIconItems.append(item); } -void CKFileFontView::slotActivate(QListViewItem *item) +void CKFileFontView::slotActivate(TQListViewItem *item) { if (item) { @@ -186,7 +186,7 @@ void CKFileFontView::slotActivate(QListViewItem *item) } } -void CKFileFontView::selected(QListViewItem *item) +void CKFileFontView::selected(TQListViewItem *item) { if (item && !(KApplication::keyboardMouseState() & (ShiftButton|ControlButton)) && KGlobalSettings::singleClick()) @@ -198,7 +198,7 @@ void CKFileFontView::selected(QListViewItem *item) } } -void CKFileFontView::highlighted( QListViewItem *item ) +void CKFileFontView::highlighted( TQListViewItem *item ) { if (item) { @@ -211,31 +211,31 @@ void CKFileFontView::highlighted( QListViewItem *item ) void CKFileFontView::setSelectionMode(KFile::SelectionMode sm) { - disconnect(SIGNAL(selectionChanged()), this); - disconnect(SIGNAL(selectionChanged(QListViewItem *)), this); + disconnect(TQT_SIGNAL(selectionChanged()), this); + disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this); switch (sm) { case KFile::Multi: - QListView::setSelectionMode(QListView::Multi); + TQListView::setSelectionMode(TQListView::Multi); break; case KFile::Extended: - QListView::setSelectionMode(QListView::Extended); + TQListView::setSelectionMode(TQListView::Extended); break; case KFile::NoSelection: - QListView::setSelectionMode(QListView::NoSelection); + TQListView::setSelectionMode(TQListView::NoSelection); break; default: // fall through case KFile::Single: - QListView::setSelectionMode(QListView::Single); + TQListView::setSelectionMode(TQListView::Single); break; } // for highlighting if (KFile::Multi==sm || KFile::Extended==sm) - connect(this, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged())); + connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); else - connect(this, SIGNAL(selectionChanged(QListViewItem *)), SLOT(highlighted(QListViewItem * ))); + connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * ))); } bool CKFileFontView::isSelected(const KFileItem *i) const @@ -254,7 +254,7 @@ void CKFileFontView::updateView(bool b) { if (b) { - QListViewItemIterator it((QListView*)this); + TQListViewItemIterator it((TQListView*)this); for (; it.current(); ++it) { @@ -281,9 +281,9 @@ void CKFileFontView::updateView(const KFileItem *i) void CKFileFontView::setSortingKey(CFontListViewItem *item, const KFileItem *i) { - QDir::SortSpec spec = KFileView::sorting(); + TQDir::SortSpec spec = KFileView::sorting(); - if (spec&QDir::Size) + if (spec&TQDir::Size) item->setKey(sortingKey(i->size(), i->isDir(), spec)); else item->setKey(sortingKey(i->text(), i->isDir(), spec)); @@ -304,44 +304,44 @@ void CKFileFontView::removeItem(const KFileItem *i) void CKFileFontView::slotSortingChanged(int col) { - QDir::SortSpec sort = sorting(); + TQDir::SortSpec sort = sorting(); int sortSpec = -1; - bool reversed = col == itsSortingCol && (sort & QDir::Reversed) == 0; + bool reversed = col == itsSortingCol && (sort & TQDir::Reversed) == 0; itsSortingCol = col; switch(col) { case COL_NAME: - sortSpec = (sort & ~QDir::SortByMask | QDir::Name); + sortSpec = (sort & ~TQDir::SortByMask | TQDir::Name); break; case COL_SIZE: - sortSpec = (sort & ~QDir::SortByMask | QDir::Size); + sortSpec = (sort & ~TQDir::SortByMask | TQDir::Size); break; - // the following columns have no equivalent in QDir, so we set it - // to QDir::Unsorted and remember the column (itsSortingCol) + // the following columns have no equivalent in TQDir, so we set it + // to TQDir::Unsorted and remember the column (itsSortingCol) case COL_TYPE: - sortSpec = (sort & ~QDir::SortByMask | QDir::Time); + sortSpec = (sort & ~TQDir::SortByMask | TQDir::Time); break; default: break; } if (reversed) - sortSpec|=QDir::Reversed; + sortSpec|=TQDir::Reversed; else - sortSpec&=~QDir::Reversed; + sortSpec&=~TQDir::Reversed; - if (sort & QDir::IgnoreCase) - sortSpec|=QDir::IgnoreCase; + if (sort & TQDir::IgnoreCase) + sortSpec|=TQDir::IgnoreCase; else - sortSpec&=~QDir::IgnoreCase; + sortSpec&=~TQDir::IgnoreCase; - KFileView::setSorting(static_cast(sortSpec)); + KFileView::setSorting(static_cast(sortSpec)); KFileItem *item; KFileItemListIterator it(*items()); - if ( sortSpec & QDir::Size ) + if ( sortSpec & TQDir::Size ) { for (; (item = it.current()); ++it ) { @@ -361,23 +361,23 @@ void CKFileFontView::slotSortingChanged(int col) KListView::sort(); if (!itsBlockSortingSignal) - sig->changeSorting( static_cast( sortSpec ) ); + sig->changeSorting( static_cast( sortSpec ) ); } -void CKFileFontView::setSorting(QDir::SortSpec spec) +void CKFileFontView::setSorting(TQDir::SortSpec spec) { - if (spec & QDir::Size) + if (spec & TQDir::Size) itsSortingCol=COL_SIZE; else itsSortingCol=COL_NAME; // inversed, because slotSortingChanged will reverse it - if (spec & QDir::Reversed) - spec = (QDir::SortSpec) (spec & ~QDir::Reversed); + if (spec & TQDir::Reversed) + spec = (TQDir::SortSpec) (spec & ~TQDir::Reversed); else - spec = (QDir::SortSpec) (spec | QDir::Reversed); + spec = (TQDir::SortSpec) (spec | TQDir::Reversed); - KFileView::setSorting((QDir::SortSpec) spec); + KFileView::setSorting((TQDir::SortSpec) spec); // don't emit sortingChanged() when called via setSorting() itsBlockSortingSignal = true; // can't use blockSignals() @@ -433,7 +433,7 @@ KFileItem * CKFileFontView::prevItem(const KFileItem *fileItem) const return firstFileItem(); } -void CKFileFontView::keyPressEvent(QKeyEvent *e) +void CKFileFontView::keyPressEvent(TQKeyEvent *e) { KListView::keyPressEvent(e); @@ -463,13 +463,13 @@ void CKFileFontView::listingCompleted() itsResolver->start(); } -QDragObject *CKFileFontView::dragObject() +TQDragObject *CKFileFontView::dragObject() { // create a list of the URL:s that we want to drag KURL::List urls; KFileItemListIterator it(* KFileView::selectedItems()); - QPixmap pixmap; - QPoint hotspot; + TQPixmap pixmap; + TQPoint hotspot; for ( ; it.current(); ++it ) urls.append( (*it)->url() ); @@ -482,7 +482,7 @@ QDragObject *CKFileFontView::dragObject() hotspot.setX(pixmap.width() / 2); hotspot.setY(pixmap.height() / 2); - QDragObject *dragObject=new KURLDrag(urls, widget()); + TQDragObject *dragObject=new KURLDrag(urls, widget()); if(dragObject) dragObject->setPixmap(pixmap, hotspot); @@ -503,7 +503,7 @@ void CKFileFontView::slotAutoOpen() } } -bool CKFileFontView::acceptDrag(QDropEvent *e) const +bool CKFileFontView::acceptDrag(TQDropEvent *e) const { #if 0 // Following doesn't seem to work, why??? bool ok=false; @@ -511,14 +511,14 @@ bool CKFileFontView::acceptDrag(QDropEvent *e) const if((e->source()!=const_cast(this)) && - (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()) && + (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()) && KURLDrag::decode(e, urls) && !urls.isEmpty()) { KURL::List::Iterator it; ok=true; for(it=urls.begin(); ok && it!=urls.end(); ++it) - if(!CFontEngine::isAFontOrAfm(QFile::encodeName((*it).path()))) + if(!CFontEngine::isAFontOrAfm(TQFile::encodeName((*it).path()))) ok=false; } @@ -526,10 +526,10 @@ bool CKFileFontView::acceptDrag(QDropEvent *e) const #endif return KURLDrag::canDecode(e) && (e->source()!= const_cast(this)) && - (QDropEvent::Copy==e->action() || QDropEvent::Move==e->action()); + (TQDropEvent::Copy==e->action() || TQDropEvent::Move==e->action()); } -void CKFileFontView::contentsDragEnterEvent(QDragEnterEvent *e) +void CKFileFontView::contentsDragEnterEvent(TQDragEnterEvent *e) { if (!acceptDrag(e)) // can we decode this ? e->ignore(); // No @@ -554,7 +554,7 @@ void CKFileFontView::contentsDragEnterEvent(QDragEnterEvent *e) } } -void CKFileFontView::contentsDragMoveEvent(QDragMoveEvent *e) +void CKFileFontView::contentsDragMoveEvent(TQDragMoveEvent *e) { if (!acceptDrag(e)) // can we decode this ? e->ignore(); // No @@ -583,13 +583,13 @@ void CKFileFontView::contentsDragMoveEvent(QDragMoveEvent *e) } } -void CKFileFontView::contentsDragLeaveEvent(QDragLeaveEvent *) +void CKFileFontView::contentsDragLeaveEvent(TQDragLeaveEvent *) { d->itsDropItem = 0; d->itsAutoOpenTimer.stop(); } -void CKFileFontView::contentsDropEvent(QDropEvent *e) +void CKFileFontView::contentsDropEvent(TQDropEvent *e) { d->itsDropItem = 0; d->itsAutoOpenTimer.stop(); @@ -614,15 +614,15 @@ void CKFileFontView::contentsDropEvent(QDropEvent *e) } } -void CKFileFontView::readConfig(KConfig *kc, const QString &group) +void CKFileFontView::readConfig(KConfig *kc, const TQString &group) { - restoreLayout(kc, group.isEmpty() ? QString("CFileFontView") : group); + restoreLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group); slotSortingChanged(sortColumn()); } -void CKFileFontView::writeConfig(KConfig *kc, const QString &group) +void CKFileFontView::writeConfig(KConfig *kc, const TQString &group) { - saveLayout(kc, group.isEmpty() ? QString("CFileFontView") : group); + saveLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group); } ///////////////////////////////////////////////////////////////// diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index a58f9d908..295be9106 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -52,7 +52,7 @@ class CFontListViewItem : public KListViewItem { public: - CFontListViewItem(QListView *parent, const QString &text, const QPixmap &icon, KFileItem *fi) + CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi) : KListViewItem(parent, text), itsInf(fi) { @@ -60,14 +60,14 @@ class CFontListViewItem : public KListViewItem setText(0, text); } - CFontListViewItem(QListView *parent, KFileItem *fi) + CFontListViewItem(TQListView *parent, KFileItem *fi) : KListViewItem(parent), itsInf(fi) { init(); } - CFontListViewItem(QListView *parent, const QString &text, const QPixmap &icon, KFileItem *fi, QListViewItem *after) + CFontListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi, TQListViewItem *after) : KListViewItem(parent, after), itsInf(fi) { @@ -82,15 +82,15 @@ class CFontListViewItem : public KListViewItem */ KFileItem *fileInfo() const { return itsInf; } - virtual QString key( int /*column*/, bool /*ascending*/ ) const { return itsKey; } + virtual TQString key( int /*column*/, bool /*ascending*/ ) const { return itsKey; } - void setKey( const QString& key ) { itsKey = key; } + void setKey( const TQString& key ) { itsKey = key; } - QRect rect() const + TQRect rect() const { - QRect r = listView()->itemRect(this); + TQRect r = listView()->itemRect(this); - return QRect(listView()->viewportToContents(r.topLeft()), QSize(r.width(), r.height())); + return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height())); } void init(); @@ -98,7 +98,7 @@ class CFontListViewItem : public KListViewItem private: KFileItem *itsInf; - QString itsKey; + TQString itsKey; class CFontListViewItemPrivate; @@ -119,10 +119,10 @@ class CKFileFontView : public KListView, public KFileView public: - CKFileFontView(QWidget *parent, const char *name); + CKFileFontView(TQWidget *parent, const char *name); virtual ~CKFileFontView(); - virtual QWidget * widget() { return this; } + virtual TQWidget * widget() { return this; } virtual void clearView(); virtual void setAutoUpdate(bool) {} // ### unused. remove in KDE4 virtual void setSelectionMode( KFile::SelectionMode sm ); @@ -142,38 +142,38 @@ class CKFileFontView : public KListView, public KFileView virtual KFileItem * prevItem(const KFileItem *i) const; virtual void insertItem( KFileItem *i); - void readConfig(KConfig *kc, const QString &group); - void writeConfig(KConfig *kc, const QString &group); + void readConfig(KConfig *kc, const TQString &group); + void writeConfig(KConfig *kc, const TQString &group); // implemented to get noticed about sorting changes (for sortingIndicator) - virtual void setSorting(QDir::SortSpec s); + virtual void setSorting(TQDir::SortSpec s); void ensureItemVisible(const KFileItem *i); // for KMimeTypeResolver void mimeTypeDeterminationFinished(); void determineIcon(CFontListViewItem *item); - QScrollView * scrollWidget() const { return (QScrollView*) this; } + TQScrollView * scrollWidget() const { return (TQScrollView*) this; } signals: // The user dropped something. // fileItem points to the item dropped on or can be 0 if the // user dropped on empty space. - void dropped(QDropEvent *event, KFileItem *fileItem); + void dropped(TQDropEvent *event, KFileItem *fileItem); // The user dropped the URLs urls. // url points to the item dropped on or can be empty if the // user dropped on empty space. - void dropped(QDropEvent *event, const KURL::List &urls, const KURL &url); + void dropped(TQDropEvent *event, const KURL::List &urls, const KURL &url); protected: - virtual void keyPressEvent(QKeyEvent *e); + virtual void keyPressEvent(TQKeyEvent *e); // DND support - QDragObject * dragObject(); - void contentsDragEnterEvent(QDragEnterEvent *e); - void contentsDragMoveEvent(QDragMoveEvent *e); - void contentsDragLeaveEvent(QDragLeaveEvent *e); - void contentsDropEvent(QDropEvent *e); - bool acceptDrag(QDropEvent *e) const; + TQDragObject * dragObject(); + void contentsDragEnterEvent(TQDragEnterEvent *e); + void contentsDragMoveEvent(TQDragMoveEvent *e); + void contentsDragLeaveEvent(TQDragLeaveEvent *e); + void contentsDropEvent(TQDropEvent *e); + bool acceptDrag(TQDropEvent *e) const; int itsSortingCol; @@ -184,17 +184,17 @@ class CKFileFontView : public KListView, public KFileView private slots: void slotSortingChanged(int c); - void selected(QListViewItem *item); - void slotActivate(QListViewItem *item); - void highlighted(QListViewItem *item); - void slotActivateMenu(QListViewItem *item, const QPoint& pos); + void selected(TQListViewItem *item); + void slotActivate(TQListViewItem *item); + void highlighted(TQListViewItem *item); + void slotActivateMenu(TQListViewItem *item, const TQPoint& pos); void slotAutoOpen(); private: - virtual void insertItem(QListViewItem *i) { KListView::insertItem(i); } + virtual void insertItem(TQListViewItem *i) { KListView::insertItem(i); } virtual void setSorting(int i, bool b) { KListView::setSorting(i, b); } - virtual void setSelected(QListViewItem *i, bool b) { KListView::setSelected(i, b); } + virtual void setSelected(TQListViewItem *i, bool b) { KListView::setSelected(i, b); } inline CFontListViewItem * viewItem( const KFileItem *item ) const { diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp index e902fa1e1..afd9fa204 100644 --- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp @@ -27,27 +27,27 @@ //////////////////////////////////////////////////////////////////////////////// #include "PrintDialog.h" -#include -#include -#include +#include +#include +#include #include namespace KFI { -CPrintDialog::CPrintDialog(QWidget *parent) +CPrintDialog::CPrintDialog(TQWidget *parent) : KDialogBase(Plain, i18n("Print Font Samples"), Ok|Cancel, Ok, parent, NULL, true, false) { - QFrame *page=plainPage(); - QGridLayout *layout=new QGridLayout(page, 1, 1, 0, spacingHint()); + TQFrame *page=plainPage(); + TQGridLayout *layout=new TQGridLayout(page, 1, 1, 0, spacingHint()); - layout->addWidget(new QLabel(i18n("Output:"), page), 0, 0); - itsOutput=new QComboBox(page); + 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); layout->addWidget(itsOutput, 0, 1); - layout->addWidget(new QLabel(i18n("Font size:"), page), 1, 0); - itsSize=new QComboBox(page); + layout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0); + itsSize=new TQComboBox(page); itsSize->insertItem(i18n("Waterfall"), 0); itsSize->insertItem(i18n("12pt"), 1); itsSize->insertItem(i18n("18pt"), 2); @@ -55,7 +55,7 @@ CPrintDialog::CPrintDialog(QWidget *parent) itsSize->insertItem(i18n("36pt"), 4); itsSize->insertItem(i18n("48pt"), 5); layout->addWidget(itsSize, 1, 1); - layout->addItem(new QSpacerItem(2, 2), 2, 1); + layout->addItem(new TQSpacerItem(2, 2), 2, 1); } bool CPrintDialog::exec(bool select, int size) @@ -68,7 +68,7 @@ bool CPrintDialog::exec(bool select, int size) else itsOutput->setCurrentItem(1); itsSize->setCurrentItem(size); - return QDialog::Accepted==QDialog::exec(); + return TQDialog::Accepted==TQDialog::exec(); } } diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h b/kcontrol/kfontinst/kcmfontinst/PrintDialog.h index 9be67f6d4..f63118d66 100644 --- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.h +++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.h @@ -30,7 +30,7 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include +#include namespace KFI { @@ -39,7 +39,7 @@ class CPrintDialog : public KDialogBase { public: - CPrintDialog(QWidget *parent); + CPrintDialog(TQWidget *parent); bool exec(bool select, int size); int chosenSize() { return itsSize->currentItem(); } @@ -47,7 +47,7 @@ class CPrintDialog : public KDialogBase private: - QComboBox *itsOutput, + TQComboBox *itsOutput, *itsSize; }; diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp index 255fca709..8b8a88167 100644 --- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp @@ -29,10 +29,10 @@ #include "SettingsDialog.h" #include "KfiConstants.h" #include "Misc.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -42,20 +42,20 @@ namespace KFI { -CSettingsDialog::CSettingsDialog(QWidget *parent) +CSettingsDialog::CSettingsDialog(TQWidget *parent) : KDialogBase(parent, "settingsdialog", true, i18n("Settings"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true) { - QVBox *page = makeVBoxMainWidget(); + TQVBox *page = makeVBoxMainWidget(); - itsDoX=new QCheckBox(i18n("Configure fonts for legacy X applications"), page); - QWhatsThis::add(itsDoX, i18n("

Modern applications use a system called \"FontConfig\" to obtain the list of fonts. " + itsDoX=new TQCheckBox(i18n("Configure fonts for legacy X applications"), page); + TQWhatsThis::add(itsDoX, i18n("

Modern applications use a system called \"FontConfig\" to obtain the list of fonts. " "Older applications, such as OpenOffice 1.x, GIMP 1.x, etc. use the previous \"core X fonts\" mechanism for " "this.

Selecting this option will inform the installer to create the necessary files so that these " "older applications can use the fonts you install.

Please note, however, that this will slow down " "the installation process.

")); - itsDoGs=new QCheckBox(i18n("Configure fonts for Ghostscript"), page); - QWhatsThis::add(itsDoGs, i18n("

When printing, most applications create what is know as PostScript. This is then sent to a special " + itsDoGs=new TQCheckBox(i18n("Configure fonts for Ghostscript"), page); + TQWhatsThis::add(itsDoGs, i18n("

When printing, most applications create what is know as PostScript. This is then sent to a special " "application, named Ghostscript, which can interpret the PostScript and send the appropriate instructions " "to your printer. If your application does not embed whatever fonts it uses into the PostScript, then " "Ghostscript needs to be informed as to which fonts you have installed, and where they are located.

" @@ -83,10 +83,10 @@ void CSettingsDialog::slotOk() if( ((!oldDoX && itsDoX->isChecked()) || (!oldDoGs && itsDoGs->isChecked())) && KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("You have enabled a previously disabled option. Would you like the config " "files updated now? (Normally they are only updated upon installing, or " - "removing, a font.)"), QString::null, i18n("Update"),i18n("Do Not Update"))) + "removing, a font.)"), TQString::null, i18n("Update"),i18n("Do Not Update"))) { - QByteArray packedArgs; - QDataStream stream(packedArgs, IO_WriteOnly); + TQByteArray packedArgs; + TQDataStream stream(packedArgs, IO_WriteOnly); stream << KFI::SPECIAL_RECONFIG; diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h index b41820e38..0edac64dd 100644 --- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h +++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.h @@ -40,7 +40,7 @@ class CSettingsDialog : public KDialogBase { public: - CSettingsDialog(QWidget *parent); + CSettingsDialog(TQWidget *parent); private slots: @@ -48,7 +48,7 @@ class CSettingsDialog : public KDialogBase private: - QCheckBox *itsDoX, + TQCheckBox *itsDoX, *itsDoGs; }; -- cgit v1.2.1