summaryrefslogtreecommitdiffstats
path: root/kcontrol/kfontinst
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/kfontinst')
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp28
-rw-r--r--kcontrol/kfontinst/kcmfontinst/KFileFontView.h2
-rw-r--r--kcontrol/kfontinst/kfile-plugin/KFileFont.cpp68
-rw-r--r--kcontrol/kfontinst/kfontinst/FontEngine.cpp4
-rw-r--r--kcontrol/kfontinst/kfontinst/Fontmap.cpp20
-rw-r--r--kcontrol/kfontinst/kfontinst/Main.cpp4
-rw-r--r--kcontrol/kfontinst/kfontinst/XConfig.cpp4
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.cpp64
-rw-r--r--kcontrol/kfontinst/kio/KioFonts.h4
-rw-r--r--kcontrol/kfontinst/lib/FcEngine.cpp58
-rw-r--r--kcontrol/kfontinst/lib/Misc.cpp14
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.cpp6
-rw-r--r--kcontrol/kfontinst/viewpart/FontPreview.h6
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewPart.cpp16
-rw-r--r--kcontrol/kfontinst/viewpart/FontViewerApp.cpp6
15 files changed, 152 insertions, 152 deletions
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index c525cd337..044b2a38d 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -112,8 +112,8 @@ 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->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart");
+ itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
@@ -129,7 +129,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
{
#endif
fontsFrame=new TQFrame(this);
- fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
#ifdef HAVE_XFT
}
#endif
@@ -140,7 +140,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
fontsFrame->setLineWidth(0);
- toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+ toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
toolbar->setMovingEnabled(false);
TQString previousPath=itsConfig.readEntry(CFG_PATH);
@@ -151,14 +151,14 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsDirOp->setMinimumSize(TQSize(96, 64));
setMimeTypes(showBitmap);
itsDirOp->dirLister()->setMainWindow(this);
- itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ itsDirOp->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+ button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
fontsLayout->addWidget(button, 1, 0);
- fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
layout->addWidget(toolbar);
#ifdef HAVE_XFT
@@ -210,14 +210,14 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsListAct->plug(toolbar);
}
- itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, this, TQT_SLOT(filterFonts()),
+ itsShowBitmapAct=new KToggleAction(i18n("Show Bitmap Fonts"), "font_bitmap", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()),
itsDirOp->actionCollection(), "showbitmap");
itsShowBitmapAct->setChecked(showBitmap);
itsShowBitmapAct->plug(toolbar);
toolbar->insertLineSeparator();
- act=new KAction(i18n("Add Fonts..."), "newfont", 0, this, TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
+ act=new KAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
act->plug(toolbar);
topMnu->insert(act);
@@ -231,11 +231,11 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
}
toolbar->insertLineSeparator();
- act=new KAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
+ act=new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
act->plug(toolbar);
#ifdef HAVE_XFT
toolbar->insertLineSeparator();
- act=new KAction(i18n("Print..."), "fileprint", 0, this, TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
+ act=new KAction(i18n("Print..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
act->plug(toolbar);
#endif
@@ -390,7 +390,7 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item)
? list->getFirst()
: NULL;
- if(previewItem && list && list->contains(previewItem)) // OK, check its been selected - not deselected!!!
+ if(previewItem && list && list->tqcontains(previewItem)) // OK, check its been selected - not deselected!!!
itsPreview->openURL(previewItem->url());
}
#endif
@@ -550,7 +550,7 @@ void CKCmFontInst::infoMessage(const TQString &msg)
static TQString family(const TQString &name)
{
- int commaPos=name.find(',');
+ int commaPos=name.tqfind(',');
return -1==commaPos ? name : name.left(commaPos);
}
@@ -570,7 +570,7 @@ void CKCmFontInst::updateInformation(int, int fonts)
TQString fam(family(item->text()));
size+=item->size();
- if(-1==families.findIndex(fam))
+ if(-1==families.tqfindIndex(fam))
families+=fam;
}
}
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index b4766c5c4..b1bb35e88 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()->itemRect(this);
+ TQRect r = listView()->tqitemRect(this);
return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height()));
}
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index 112e3562b..430e9c8b8 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -44,35 +44,35 @@ static int strToWeight(const TQString &str)
{
if(NULL==str)
return FC_WEIGHT_MEDIUM;
- else if(str.contains("Bold", false))
+ else if(str.tqcontains("Bold", false))
return FC_WEIGHT_BOLD;
- else if(str.contains("Heavy", false))
+ else if(str.tqcontains("Heavy", false))
return FC_WEIGHT_HEAVY;
- else if(str.contains("Black", false))
+ else if(str.tqcontains("Black", false))
return FC_WEIGHT_BLACK;
- else if(str.contains("ExtraBold", false))
+ else if(str.tqcontains("ExtraBold", false))
return FC_WEIGHT_EXTRABOLD;
- else if(str.contains("UltraBold", false))
+ else if(str.tqcontains("UltraBold", false))
return FC_WEIGHT_ULTRABOLD;
- else if(str.contains("ExtraLight", false))
+ else if(str.tqcontains("ExtraLight", false))
return FC_WEIGHT_EXTRALIGHT;
- else if(str.contains("UltraLight", false))
+ else if(str.tqcontains("UltraLight", false))
return FC_WEIGHT_ULTRALIGHT;
- else if(str.contains("Light", false))
+ else if(str.tqcontains("Light", false))
return FC_WEIGHT_LIGHT;
- else if(str.contains("Medium", false) || str.contains("Normal", false) || str.contains("Roman", false))
+ else if(str.tqcontains("Medium", false) || str.tqcontains("Normal", false) || str.tqcontains("Roman", false))
return FC_WEIGHT_MEDIUM;
- else if(str.contains("Regular", false))
+ else if(str.tqcontains("Regular", false))
return FC_WEIGHT_REGULAR;
- else if(str.contains("SemiBold", false))
+ else if(str.tqcontains("SemiBold", false))
return FC_WEIGHT_SEMIBOLD;
- else if(str.contains("DemiBold", false))
+ else if(str.tqcontains("DemiBold", false))
return FC_WEIGHT_DEMIBOLD;
- else if(str.contains("Thin", false))
+ else if(str.tqcontains("Thin", false))
return FC_WEIGHT_THIN;
- else if(str.contains("Book", false))
+ else if(str.tqcontains("Book", false))
return FC_WEIGHT_NORMAL;
- else if(str.contains("Demi", false))
+ else if(str.tqcontains("Demi", false))
return FC_WEIGHT_NORMAL;
else
return FC_WEIGHT_MEDIUM;
@@ -83,21 +83,21 @@ static int strToWidth(const TQString &str)
{
if(str.isEmpty())
return FC_WIDTH_NORMAL;
- else if(str.contains("UltraCondensed", false))
+ else if(str.tqcontains("UltraCondensed", false))
return FC_WIDTH_ULTRACONDENSED;
- else if(str.contains("ExtraCondensed", false))
+ else if(str.tqcontains("ExtraCondensed", false))
return FC_WIDTH_EXTRACONDENSED;
- else if(str.contains("SemiCondensed", false))
+ else if(str.tqcontains("SemiCondensed", false))
return FC_WIDTH_SEMICONDENSED;
- else if(str.contains("Condensed", false))
+ else if(str.tqcontains("Condensed", false))
return FC_WIDTH_CONDENSED;
- else if(str.contains("SemiExpanded", false))
+ else if(str.tqcontains("SemiExpanded", false))
return FC_WIDTH_SEMIEXPANDED;
- else if(str.contains("UltraExpanded", false))
+ else if(str.tqcontains("UltraExpanded", false))
return FC_WIDTH_ULTRAEXPANDED;
- else if(str.contains("ExtraExpanded", false))
+ else if(str.tqcontains("ExtraExpanded", false))
return FC_WIDTH_EXTRAEXPANDED;
- else if(str.contains("Expanded", false))
+ else if(str.tqcontains("Expanded", false))
return FC_WIDTH_EXPANDED;
else
return FC_WIDTH_NORMAL;
@@ -201,7 +201,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt
if(inMetrics)
{
- if(0==line.find("FullName "))
+ if(0==line.tqfind("FullName "))
{
full=line.mid(9);
#ifndef KFI_FC_NO_WIDTHS
@@ -209,24 +209,24 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt
#endif
foundName=true;
}
- else if(0==line.find("FamilyName "))
+ else if(0==line.tqfind("FamilyName "))
{
family=line.mid(11);
foundFamily=true;
}
- else if(0==line.find("Weight "))
+ else if(0==line.tqfind("Weight "))
intWeight=strToWeight(line.mid(7));
- else if(0==line.find("ItalicAngle "))
+ else if(0==line.tqfind("ItalicAngle "))
intSlant=0.0f==line.mid(12).toFloat() ? FC_SLANT_ROMAN : FC_SLANT_ITALIC;
- else if(0==line.find("IsFixedPitch "))
- intSpacing=0==line.mid(13).find("false", 0, false) ? FC_PROPORTIONAL : FC_MONO;
- else if(0==line.find("Notice "))
+ else if(0==line.tqfind("IsFixedPitch "))
+ intSpacing=0==line.mid(13).tqfind("false", 0, false) ? FC_PROPORTIONAL : FC_MONO;
+ else if(0==line.tqfind("Notice "))
foundry=getFoundry(line.mid(7).latin1());
- else if(0==line.find("StartCharMetrics"))
+ else if(0==line.tqfind("StartCharMetrics"))
break;
}
else
- if(0==line.find("StartFontMetrics"))
+ if(0==line.tqfind("StartFontMetrics"))
inMetrics=true;
};
f.close();
@@ -237,7 +237,7 @@ static bool readAfm(const TQString &file, TQString &full, TQString &family, TQSt
foundFamily=true;
}
- if(foundName && FC_SLANT_ITALIC==intItalic && (-1!=full.find("Oblique") || -1!=full.find("Slanted")))
+ if(foundName && FC_SLANT_ITALIC==intItalic && (-1!=full.tqfind("Oblique") || -1!=full.tqfind("Slanted")))
intItalic=FC_SLANT_OBLIQUE;
}
@@ -372,7 +372,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
const FoundryMap *entry;
for(entry=map; NULL!=entry->foundry; entry++)
- if(foundryAll.length()==entry->len && foundryAll.contains(entry->foundry, false))
+ if(foundryAll.length()==entry->len && foundryAll.tqcontains(entry->foundry, false))
{
foundryAll=entry->foundry;
break;
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
index 4fe823c23..7f14d556f 100644
--- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp
+++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
@@ -157,13 +157,13 @@ CFontEngine::EWeight CFontEngine::strToWeight(const char *str)
static void removeSymbols(TQString &str)
{
- str.replace(TQRegExp("[\\-\\[\\]()]"), " ");
+ str.tqreplace(TQRegExp("[\\-\\[\\]()]"), " ");
int len=str.length();
TQChar space(' ');
for(int c=0; c<len; ++c)
- if(str[c].unicode()<0x20 || str[c].unicode()>0x7E)
+ if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E)
str[c]=space;
str=str.simplifyWhiteSpace();
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
index 476b422bd..c8e63c403 100644
--- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp
+++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
@@ -113,7 +113,7 @@ static TQString createX11PsName(const TQString &font)
unsigned int ch;
bool newWord=true;
- newName.replace(TQRegExp("\\-"), "_");
+ newName.tqreplace(TQRegExp("\\-"), "_");
for(ch=0; ch<newName.length(); ++ch)
{
@@ -136,7 +136,7 @@ static TQString createX11PsName(const TQString &font)
}
}
- newName.replace(" ", TQString::null);
+ newName.tqreplace(" ", TQString());
return newName;
}
@@ -180,7 +180,7 @@ static TQString getEntry(TQStringList &list, const TQString &name)
end(list.end());
for( ; it!=end; ++it)
- if(0==(*it).find('/'+name+' '))
+ if(0==(*it).tqfind('/'+name+' '))
return *it;
return TQString::null;
@@ -188,7 +188,7 @@ static TQString getEntry(TQStringList &list, const TQString &name)
inline bool isAlias(const TQString &entry)
{
- return -1==entry.findRev(TQRegExp(")\\s*;\\s*$"));
+ return -1==entry.tqfindRev(TQRegExp(")\\s*;\\s*$"));
}
static void addEntry(TQStringList &list, const TQString &name, const TQString &file, const TQString &fmapDir)
@@ -209,7 +209,7 @@ static void addEntry(TQStringList &list, const TQString &name, const TQString &f
str << '/' << name << " (";
- if(0==file.find(fmapDir))
+ if(0==file.tqfind(fmapDir))
str << file.mid(fmapDir.length());
else
str << file;
@@ -244,11 +244,11 @@ static TQString locateFile(const char *dir, const char *file, int level=0)
if(d.isReadable())
{
- const QFileInfoList *fList=d.entryInfoList();
+ const TQFileInfoList *fList=d.entryInfoList();
if(fList)
{
- QFileInfoListIterator it(*fList);
+ TQFileInfoListIterator it(*fList);
TQFileInfo *fInfo;
TQString str;
@@ -266,7 +266,7 @@ static TQString locateFile(const char *dir, const char *file, int level=0)
}
}
- return TQString::null;
+ return TQString();
}
static TQString locateFile(const char *file, const char **dirs)
@@ -309,7 +309,7 @@ bool create(const TQString &dir, CFontEngine &fe)
TQString fName(Misc::fileSyntax(CFcEngine::getFcString(fs->fonts[i], FC_FILE)));
FcBool scalable=FcFalse;
- if(!fName.isEmpty() && (root || dir.isEmpty() || 0==fName.find(dir)) &&
+ if(!fName.isEmpty() && (root || dir.isEmpty() || 0==fName.tqfind(dir)) &&
FcResultMatch==FcPatternGetBool(fs->fonts[i], FC_SCALABLE, 0, &scalable) && scalable)
{
const TQStringList *existing=old.getEntries(fName);
@@ -552,7 +552,7 @@ CFile::CFile(const TQString &dir)
const TQStringList * CFile::getEntries(const TQString &fname)
{
- TEntry *entry=findEntry(0==fname.find(itsDir) ? fname.mid(itsDir.length()) : fname, false);
+ TEntry *entry=findEntry(0==fname.tqfind(itsDir) ? fname.mid(itsDir.length()) : fname, false);
return entry ? &entry->entries : NULL;
}
diff --git a/kcontrol/kfontinst/kfontinst/Main.cpp b/kcontrol/kfontinst/kfontinst/Main.cpp
index a2aa5766b..f0e6d3152 100644
--- a/kcontrol/kfontinst/kfontinst/Main.cpp
+++ b/kcontrol/kfontinst/kfontinst/Main.cpp
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
if(folderRequired && !KFI::Misc::dExists(folder))
{
- std::cerr << "ERROR: " << TQFile::encodeName(folder) << " does not exist!" << std::endl;
+ std::cerr << "ERROR: " << static_cast<const char *>(TQFile::encodeName(folder)) << " does not exist!" << std::endl;
rv=-2;
}
else
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
bool found=false;
while((dir=FcStrListNext(list)))
- if(0==KFI::Misc::dirSyntax((const char *)dir).find(folder))
+ if(0==KFI::Misc::dirSyntax((const char *)dir).tqfind(folder))
found=true;
if(!found)
diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/kfontinst/kfontinst/XConfig.cpp
index 112ab3d3c..36bd153df 100644
--- a/kcontrol/kfontinst/kfontinst/XConfig.cpp
+++ b/kcontrol/kfontinst/kfontinst/XConfig.cpp
@@ -748,9 +748,9 @@ CXConfig::TPath::EType CXConfig::TPath::getType(const TQString &d)
{
TQString str(d);
- str.replace(TQRegExp("\\s*"), "");
+ str.tqreplace(TQRegExp("\\s*"), "");
- return 0==str.find("unix/:")
+ return 0==str.tqfind("unix/:")
? FONT_SERVER
: "fontconfig"==str
? FONT_CONFIG
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index ee1d2dc3c..cefa5188d 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -136,7 +136,7 @@ static TQString removeMultipleExtension(const KURL &url)
TQString fname(url.fileName());
int pos;
- if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension))))
+ if(-1!=(pos=fname.tqfindRev(TQString::tqfromLatin1(constMultipleExtension))))
fname=fname.left(pos);
return fname;
@@ -147,7 +147,7 @@ static TQString modifyName(const TQString &fname)
static const char constSymbols[]={ '-', ' ', ':', 0 };
TQString rv(fname);
- int dotPos=rv.findRev('.');
+ int dotPos=rv.tqfindRev('.');
if(-1!=dotPos)
{
@@ -158,7 +158,7 @@ static TQString modifyName(const TQString &fname)
}
for(int s=0; constSymbols[s]; ++s)
- rv=rv.replace(constSymbols[s], '_');
+ rv=rv.tqreplace(constSymbols[s], '_');
return rv;
}
@@ -292,7 +292,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
? KFI_KIO_FONTS_PROTOCOL"/system-folder"
: KFI_KIO_FONTS_PROTOCOL"/folder");
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
- TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
+ TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
return true;
}
else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet!
@@ -393,15 +393,15 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
- TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
+ TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
if(!Misc::root())
{
url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
- url+=TQString::fromLatin1("/");
+ url+=TQString::tqfromLatin1("/");
}
if(multiple)
- url+=name+TQString::fromLatin1(constMultipleExtension);
+ url+=name+TQString::tqfromLatin1(constMultipleExtension);
else
url+=Misc::getFile(path);
addAtom(entry, KIO::UDS_URL, 0, url);
@@ -427,7 +427,7 @@ static KURL getRedirect(const KURL &u)
sect(CKioFonts::getSect(path));
path.remove(sect);
- path.replace("//", "/");
+ path.tqreplace("//", "/");
redirect.setPath(path);
KFI_DBUG << "Redirect from " << u.path() << " to " << redirect.path() << endl;
@@ -441,7 +441,7 @@ static bool nonRootSys(const KURL &u)
static TQString getFontFolder(const TQString &defaultDir, const TQString &root, TQStringList &dirs)
{
- if(dirs.contains(defaultDir))
+ if(dirs.tqcontains(defaultDir))
return defaultDir;
else
{
@@ -450,7 +450,7 @@ static TQString getFontFolder(const TQString &defaultDir, const TQString &root,
bool found=false;
for(it=dirs.begin(); it!=end && !found; ++it)
- if(0==(*it).find(root))
+ if(0==(*it).tqfind(root))
return *it;
}
@@ -494,7 +494,7 @@ static bool isAAfm(const TQString &fname)
{
line=stream.readLine();
- if(line.contains("StartFontMetrics"))
+ if(line.tqcontains("StartFontMetrics"))
{
file.close();
return true;
@@ -646,11 +646,11 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
{
TQString name(Misc::getFile(*it)),
path(Misc::getDir(*it));
- TQValueList<FontList>::Iterator entry=list.find(FontList(name));
+ TQValueList<FontList>::Iterator entry=list.tqfind(FontList(name));
if(entry!=list.end())
{
- if(!(*entry).paths.contains(path))
+ if(!(*entry).paths.tqcontains(path))
(*entry).paths.append(path);
}
else
@@ -682,17 +682,17 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
for(; pIt!=pEnd; ++pIt)
{
- unsigned int len=QMIN((*pIt).orig.length(), beginLen);
+ unsigned int len=TQMIN((*pIt).orig.length(), beginLen);
for(unsigned int i=0; i<len; ++i)
if((*pIt).orig[i]!=(*pBegin).orig[i])
{
(*pIt).modified=(*pIt).orig.mid(i);
- (*pIt).modified=(*pIt).modified.replace('/', '_');
+ (*pIt).modified=(*pIt).modified.tqreplace('/', '_');
if((*pBegin).modified.isEmpty())
{
(*pBegin).modified=(*pBegin).orig.mid(i);
- (*pBegin).modified=(*pBegin).modified.replace('/', '_');
+ (*pBegin).modified=(*pBegin).modified.tqreplace('/', '_');
}
break;
}
@@ -806,9 +806,9 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
{
TQString str(paths[path]);
- str.replace(TQRegExp("\\s*"), "");
+ str.tqreplace(TQRegExp("\\s*"), "");
- if(0==str.find("unix/:"))
+ if(0==str.tqfind("unix/:"))
itsUsingXfsFpe=true;
else if("fontconfig"==str)
itsUsingFcFpe=true;
@@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
if (markPartial)
{
- TQString destPart(destOrig+TQString::fromLatin1(".part"));
+ TQString destPart(destOrig+TQString::tqfromLatin1(".part"));
TQCString destPartC(TQFile::encodeName(destPart));
dest = destPart;
@@ -1751,9 +1751,9 @@ void CKioFonts::special(const TQByteArray &a)
finished();
break;
case SPECIAL_RECONFIG: // Only itended to be called from kcmfontinst - when a user has re-enabled doX or doGs
- if(itsRoot && !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
+ if(itsRoot && !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
itsFolders[FOLDER_SYS].modified.add(itsFolders[FOLDER_SYS].location);
- else if(!itsRoot && !itsFolders[FOLDER_USER].modified.contains(itsFolders[FOLDER_USER].location))
+ else if(!itsRoot && !itsFolders[FOLDER_USER].modified.tqcontains(itsFolders[FOLDER_USER].location))
itsFolders[FOLDER_USER].modified.add(itsFolders[FOLDER_USER].location);
doModified();
@@ -1831,7 +1831,7 @@ void CKioFonts::doModified()
//
// If a non-default folder has been modified, always configure X
if(NULL==strchr(itsKfiParams, 'x') &&
- (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)))
+ (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)))
{
if(0==itsKfiParams[0])
strcpy(itsKfiParams, "-x");
@@ -1850,7 +1850,7 @@ void CKioFonts::doModified()
KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl;
}
- if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
+ if(itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
{
itsHasSys=true;
itsAddToSysFc=false;
@@ -1862,7 +1862,7 @@ void CKioFonts::doModified()
TQCString cmd;
createRootRefreshCmd(cmd, itsFolders[FOLDER_SYS].modified, false);
- if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
+ if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
{
itsHasSys=true;
itsAddToSysFc=false;
@@ -2039,7 +2039,7 @@ bool CKioFonts::updateFontList()
if(!file.isEmpty())
{
- if(!itsRoot && 0==file.find(home))
+ if(!itsRoot && 0==file.tqfind(home))
folder=FOLDER_USER;
TQValueList<FcPattern *> &patterns=
@@ -2079,14 +2079,14 @@ CKioFonts::EFolder CKioFonts::getFolder(const KURL &url)
TQMap<TQString, TQValueList<FcPattern *> >::Iterator CKioFonts::getMap(const KURL &url)
{
EFolder folder(getFolder(url));
- TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.find(removeMultipleExtension(url));
+ TQMap<TQString, TQValueList<FcPattern *> >::Iterator it=itsFolders[folder].fontMap.tqfind(removeMultipleExtension(url));
if(it==itsFolders[folder].fontMap.end()) // Perhaps it was fonts:/System/times.ttf ???
{
FcPattern *pat=getEntry(folder, url.fileName(), false);
if(pat)
- it=itsFolders[folder].fontMap.find(CFcEngine::createName(pat));
+ it=itsFolders[folder].fontMap.tqfind(CFcEngine::createName(pat));
}
return it;
@@ -2180,7 +2180,7 @@ bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files)
uEnd=urls.end();
for(uIt=urls.begin(); uIt!=uEnd; ++uIt)
- if(-1==files.findIndex((*uIt).path()))
+ if(-1==files.tqfindIndex((*uIt).path()))
files.append((*uIt).path());
}
}
@@ -2290,7 +2290,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol
{
TQString name(CFcEngine::createName(pat));
- if(-1==fonts.findIndex(name))
+ if(-1==fonts.tqfindIndex(name))
fonts.append(name);
}
}
@@ -2356,7 +2356,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk)
if(itsRoot)
{
if((isSysFolder(sect) || isUserFolder(sect)) &&
- (itsFolders[FOLDER_SYS].fontMap.end()==itsFolders[FOLDER_SYS].fontMap.find(sect)))
+ (itsFolders[FOLDER_SYS].fontMap.end()==itsFolders[FOLDER_SYS].fontMap.tqfind(sect)))
//CPD: TODO: || it has a font specified! e.g. fonts:/System/Times -> even in have a fonts:/System font, redirect
//should still happen
{
@@ -2385,8 +2385,8 @@ bool CKioFonts::checkAllowed(const KURL &u)
if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
- ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
- ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
+ ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
+ ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
{
error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
.arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h
index 57dc8516a..32d5a384e 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/kio/KioFonts.h
@@ -75,14 +75,14 @@ class CKioFonts : public KIO::SlaveBase
OP_DELETE
};
- class CDirList : public QStringList
+ class CDirList : public TQStringList
{
public:
CDirList() { }
CDirList(const TQString &str) : TQStringList(str) { }
- void add(const TQString &d) { if (!contains(d)) append(d); }
+ void add(const TQString &d) { if ( tqcontains(d)) append(d); }
};
struct TFolder
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 44d180fd2..ec4f833a3 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -185,72 +185,72 @@ static int fcSpacing(int spacing)
static int strToWeight(const TQString &str, TQString &newStr)
{
- if(0==str.find(i18n(KFI_WEIGHT_THIN), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_THIN), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_THIN).length());
return FC_WEIGHT_THIN;
}
- if(0==str.find(i18n(KFI_WEIGHT_EXTRALIGHT), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_EXTRALIGHT), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_EXTRALIGHT).length());
return FC_WEIGHT_EXTRALIGHT;
}
- if(0==str.find(i18n(KFI_WEIGHT_ULTRALIGHT), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_ULTRALIGHT), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_ULTRALIGHT).length());
return FC_WEIGHT_ULTRALIGHT;
}
- if(0==str.find(i18n(KFI_WEIGHT_LIGHT), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_LIGHT), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_LIGHT).length());
return FC_WEIGHT_LIGHT;
}
- if(0==str.find(i18n(KFI_WEIGHT_REGULAR), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_REGULAR), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_REGULAR).length());
return FC_WEIGHT_REGULAR;
}
- if(0==str.find(i18n(KFI_WEIGHT_NORMAL), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_NORMAL), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_NORMAL).length());
return FC_WEIGHT_NORMAL;
}
- if(0==str.find(i18n(KFI_WEIGHT_MEDIUM), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_MEDIUM), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_MEDIUM).length());
return FC_WEIGHT_MEDIUM;
}
- if(0==str.find(i18n(KFI_WEIGHT_DEMIBOLD), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_DEMIBOLD), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_DEMIBOLD).length());
return FC_WEIGHT_SEMIBOLD;
}
- if(0==str.find(i18n(KFI_WEIGHT_SEMIBOLD), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_SEMIBOLD), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_SEMIBOLD).length());
return FC_WEIGHT_SEMIBOLD;
}
- if(0==str.find(i18n(KFI_WEIGHT_BOLD), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_BOLD), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_BOLD).length());
return FC_WEIGHT_BOLD;
}
- if(0==str.find(i18n(KFI_WEIGHT_EXTRABOLD), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_EXTRABOLD), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_EXTRABOLD).length());
return FC_WEIGHT_EXTRABOLD;
}
- if(0==str.find(i18n(KFI_WEIGHT_ULTRABOLD), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_ULTRABOLD), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_ULTRABOLD).length());
return FC_WEIGHT_ULTRABOLD;
}
- if(0==str.find(i18n(KFI_WEIGHT_BLACK), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_BLACK), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_BLACK).length());
return FC_WEIGHT_BLACK;
}
- if(0==str.find(i18n(KFI_WEIGHT_HEAVY), 0, false))
+ if(0==str.tqfind(i18n(KFI_WEIGHT_HEAVY), 0, false))
{
newStr=str.mid(i18n(KFI_WEIGHT_HEAVY).length());
return FC_WEIGHT_HEAVY;
@@ -263,47 +263,47 @@ static int strToWeight(const TQString &str, TQString &newStr)
#ifndef KFI_FC_NO_WIDTHS
static int strToWidth(const TQString &str, TQString &newStr)
{
- if(0==str.find(i18n(KFI_WIDTH_ULTRACONDENSED), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_ULTRACONDENSED), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_ULTRACONDENSED).length());
return FC_WIDTH_ULTRACONDENSED;
}
- if(0==str.find(i18n(KFI_WIDTH_EXTRACONDENSED), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_EXTRACONDENSED), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_EXTRACONDENSED).length());
return FC_WIDTH_EXTRACONDENSED;
}
- if(0==str.find(i18n(KFI_WIDTH_CONDENSED), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_CONDENSED), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_CONDENSED).length());
return FC_WIDTH_CONDENSED;
}
- if(0==str.find(i18n(KFI_WIDTH_SEMICONDENSED), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_SEMICONDENSED), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_SEMICONDENSED).length());
return FC_WIDTH_SEMICONDENSED;
}
- if(0==str.find(i18n(KFI_WIDTH_NORMAL), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_NORMAL), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_NORMAL).length());
return FC_WIDTH_NORMAL;
}
- if(0==str.find(i18n(KFI_WIDTH_SEMIEXPANDED), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_SEMIEXPANDED), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_SEMIEXPANDED).length());
return FC_WIDTH_SEMIEXPANDED;
}
- if(0==str.find(i18n(KFI_WIDTH_EXPANDED), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_EXPANDED), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_EXPANDED).length());
return FC_WIDTH_EXPANDED;
}
- if(0==str.find(i18n(KFI_WIDTH_EXTRAEXPANDED), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_EXTRAEXPANDED), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_EXTRAEXPANDED).length());
return FC_WIDTH_EXTRAEXPANDED;
}
- if(0==str.find(i18n(KFI_WIDTH_ULTRAEXPANDED), 0, false))
+ if(0==str.tqfind(i18n(KFI_WIDTH_ULTRAEXPANDED), 0, false))
{
newStr=str.mid(i18n(KFI_WIDTH_ULTRAEXPANDED).length());
return FC_WIDTH_ULTRAEXPANDED;
@@ -316,9 +316,9 @@ static int strToWidth(const TQString &str, TQString &newStr)
static int strToSlant(const TQString &str)
{
- if(-1!=str.find(i18n(KFI_SLANT_ITALIC)))
+ if(-1!=str.tqfind(i18n(KFI_SLANT_ITALIC)))
return FC_SLANT_ITALIC;
- if(-1!=str.find(i18n(KFI_SLANT_OBLIQUE)))
+ if(-1!=str.tqfind(i18n(KFI_SLANT_OBLIQUE)))
return FC_SLANT_OBLIQUE;
return FC_SLANT_ROMAN;
}
@@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str)
ch;
for(ch=0; ch<slen; ++ch)
- if(!FcCharSetHasChar(font->charset, str[ch].unicode()))
+ if(!FcCharSetHasChar(font->charset, str[ch].tqunicode()))
return false;
return true;
}
@@ -867,7 +867,7 @@ bool CFcEngine::getInfo(const KURL &url, int faceNo, TQString &full, TQString &f
{
int pos;
- if(-1==(pos=itsDescriptiveName.find(", "))) // No style information...
+ if(-1==(pos=itsDescriptiveName.tqfind(", "))) // No style information...
family=itsDescriptiveName;
else
family=itsDescriptiveName.left(pos);
@@ -948,7 +948,7 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all)
TQTextStream stream(&file);
thumbUrl=stream.readLine();
- isThumbnailUrl=0==thumbUrl.find(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
+ isThumbnailUrl=0==thumbUrl.tqfind(KFI_KIO_FONTS_PROTOCOL) && parseUrl(KURL(thumbUrl), faceNo, all);
file.close();
}
@@ -1003,7 +1003,7 @@ void CFcEngine::parseName(const TQString &name, int faceNo, bool all)
itsDescriptiveName=name;
itsSpacing=FC_PROPORTIONAL;
- if(-1==(pos=name.find(", "))) // No style information...
+ if(-1==(pos=name.tqfind(", "))) // No style information...
{
itsWeight=FC_WEIGHT_NORMAL;
#ifndef KFI_FC_NO_WIDTHS
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index 1e779b514..6e87c9b02 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -65,9 +65,9 @@ TQString dirSyntax(const TQString &d)
{
TQString ds(d);
- ds.replace("//", "/");
+ ds.tqreplace("//", "/");
- int slashPos=ds.findRev('/');
+ int slashPos=ds.tqfindRev('/');
if(slashPos!=(((int)ds.length())-1))
ds.append('/');
@@ -84,9 +84,9 @@ TQString xDirSyntax(const TQString &d)
{
TQString ds(d);
- ds.replace("//", "/");
+ ds.tqreplace("//", "/");
- int slashPos=ds.findRev('/');
+ int slashPos=ds.tqfindRev('/');
if(slashPos==(((int)ds.length())-1))
ds.remove(slashPos, 1);
@@ -100,7 +100,7 @@ TQString getDir(const TQString &f)
{
TQString d(f);
- int slashPos=d.findRev('/');
+ int slashPos=d.tqfindRev('/');
if(slashPos!=-1)
d.remove(slashPos+1, d.length());
@@ -112,7 +112,7 @@ TQString getFile(const TQString &f)
{
TQString d(f);
- int slashPos=d.findRev('/');
+ int slashPos=d.tqfindRev('/');
if(slashPos!=-1)
d.remove(0, slashPos+1);
@@ -152,7 +152,7 @@ bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQ
TQString changeExt(const TQString &f, const TQString &newExt)
{
TQString newStr(f);
- int dotPos=newStr.findRev('.');
+ int dotPos=newStr.tqfindRev('.');
if(-1==dotPos)
newStr+=TQChar('.')+newExt;
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp
index 3679be252..4382f5feb 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@@ -88,7 +88,7 @@ void CFontPreview::paintEvent(TQPaintEvent *)
{
if(!itsCurrentUrl.isEmpty())
{
- paint.setPen(kapp->palette().active().text());
+ paint.setPen(kapp->tqpalette().active().text());
paint.drawText(rect(), AlignCenter, i18n(" No preview available"));
}
}
@@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *)
}
}
-TQSize CFontPreview::sizeHint() const
+TQSize CFontPreview::tqsizeHint() const
{
return TQSize(132, 132);
}
-TQSize CFontPreview::minimumSizeHint() const
+TQSize CFontPreview::tqminimumSizeHint() const
{
return TQSize(32, 32);
}
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h
index a57e9b9c9..f8f922b62 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.h
+++ b/kcontrol/kfontinst/viewpart/FontPreview.h
@@ -40,7 +40,7 @@
namespace KFI
{
-class CFontPreview : public QWidget
+class CFontPreview : public TQWidget
{
Q_OBJECT
@@ -50,8 +50,8 @@ class CFontPreview : public QWidget
virtual ~CFontPreview() {}
void paintEvent(TQPaintEvent *);
- TQSize sizeHint() const;
- TQSize minimumSizeHint() const;
+ TQSize tqsizeHint() const;
+ TQSize tqminimumSizeHint() const;
void showFont(const KURL &url);
void showFont();
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index 14bda4024..deaf5587e 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -81,14 +81,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
itsFrame->setFrameShape(TQFrame::NoFrame);
- itsFrame->setFocusPolicy(TQWidget::ClickFocus);
+ itsFrame->setFocusPolicy(TQ_ClickFocus);
itsToolsFrame->setFrameShape(TQFrame::NoFrame);
previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
previewFrame->setFrameShape(TQFrame::Panel);
setInstance(new KInstance("kfontview"));
itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
- itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame);
itsFaceSelector=new KIntNumInput(1, itsToolsFrame);
itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button");
@@ -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->parentWidget());
+ itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
}
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
- if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
+ if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()))
itsShowInstallButton=false;
else
{
destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
- itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
+ itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
}
}
}
@@ -220,7 +220,7 @@ void CFontViewPart::install()
{
KURL destUrl(getDest(m_url, KMessageBox::No==resp));
- if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
+ if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget()))
{
//
// 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->parentWidget());
+ KIO::NetAccess::copy(*it, destUrl, itsFrame->tqparentWidget());
}
}
@@ -274,7 +274,7 @@ void CFontViewPart::print()
items.append(itsPreview->engine().getName(m_url));
- Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine());
+ Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine());
}
}
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index 56540171e..09617ade8 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
if(factory)
{
- KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+ KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
- itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
+ itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart");
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
KURL openURL;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 16:16:11 +0000