summaryrefslogtreecommitdiffstats
path: root/kcontrol/tdefontinst
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/tdefontinst')
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp56
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h2
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp22
-rw-r--r--kcontrol/tdefontinst/kcmfontinst/KFileFontView.h2
-rw-r--r--kcontrol/tdefontinst/lib/FcEngine.cpp4
-rw-r--r--kcontrol/tdefontinst/lib/FcEngine.h2
-rw-r--r--kcontrol/tdefontinst/lib/Misc.h38
-rw-r--r--kcontrol/tdefontinst/tdeio/KioFonts.cpp2
-rw-r--r--kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp2
-rw-r--r--kcontrol/tdefontinst/viewpart/FontPreview.cpp2
-rw-r--r--kcontrol/tdefontinst/viewpart/FontPreview.h2
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewPart.cpp14
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewPart.h2
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp2
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewPartFactory.h4
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewerApp.cpp6
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewerApp.h2
17 files changed, 82 insertions, 82 deletions
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index 920326f0a..1298677b6 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -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(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart");
+ itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart");
itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
@@ -156,10 +156,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
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()));
+ connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addFonts()));
button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
fontsLayout->addWidget(button, 1, 0);
- TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+ fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
layout->addWidget(toolbar);
#ifdef HAVE_XFT
@@ -182,15 +182,15 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu"));
topMnu->popupMenu()->clear();
- connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu()));
+ connect(topMnu->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupMenu()));
if((act=itsDirOp->actionCollection()->action("up")))
- act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp()));
+ act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(cdUp()));
if((act=itsDirOp->actionCollection()->action("home")))
- act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home()));
+ act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(home()));
if((act=itsDirOp->actionCollection()->action("back")))
- act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back()));
+ act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(back()));
if((act=itsDirOp->actionCollection()->action("forward")))
- act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward()));
+ act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(forward()));
if((act=itsDirOp->actionCollection()->action("reload")))
act->plug(toolbar);
@@ -199,26 +199,26 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view"))))
{
- disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView()));
- connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView()));
+ disconnect(itsIconAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotSimpleView()));
+ connect(itsIconAct, TQ_SIGNAL(activated()), TQ_SLOT(iconView()));
itsIconAct->plug(toolbar);
}
if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view"))))
{
- disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView()));
- connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView()));
+ disconnect(itsListAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotDetailedView()));
+ connect(itsListAct, TQ_SIGNAL(activated()), TQ_SLOT(listView()));
itsListAct->plug(toolbar);
}
- itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()),
+ itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQ_SLOT(filterFonts()),
itsDirOp->actionCollection(), "showbitmap");
itsShowBitmapAct->setChecked(showBitmap);
itsShowBitmapAct->plug(toolbar);
toolbar->insertLineSeparator();
- act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
+ act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQ_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts");
act->plug(toolbar);
topMnu->insert(act);
@@ -227,24 +227,24 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsDeleteAct->plug(toolbar);
itsDeleteAct->setEnabled(false);
topMnu->insert(itsDeleteAct);
- disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected()));
- connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts()));
+ disconnect(itsDeleteAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(deleteSelected()));
+ connect(itsDeleteAct, TQ_SIGNAL(activated()), this, TQ_SLOT(removeFonts()));
}
toolbar->insertLineSeparator();
- act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure");
+ act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQ_SLOT(configure()), itsDirOp->actionCollection(), "configure");
act->plug(toolbar);
#ifdef HAVE_XFT
toolbar->insertLineSeparator();
- act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print");
+ act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQ_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(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions()));
- connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu()));
+ //disconnect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), itsDirOp, TQ_SLOT(insertViewDependentActions()));
+ connect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupViewMenu()));
setupViewMenu();
}
@@ -267,12 +267,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsDirOp->dirLister()->setShowingDotFiles(true);
- 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)));
+ connect(itsDirOp, TQ_SIGNAL(fileHighlighted(const KFileItem *)), TQ_SLOT(fileHighlighted(const KFileItem *)));
+ connect(itsDirOp, TQ_SIGNAL(finishedLoading()), TQ_SLOT(loadingFinished()));
+ connect(itsDirOp, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)),
+ TQ_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)));
+ connect(itsDirOp->dirLister(), TQ_SIGNAL(infoMessage(const TQString &)), TQ_SLOT(infoMessage(const TQString &)));
+ connect(itsDirOp, TQ_SIGNAL(updateInformation(int, int)), TQ_SLOT(updateInformation(int, int)));
}
CKCmFontInst::~CKCmFontInst()
@@ -465,7 +465,7 @@ void CKCmFontInst::removeFonts()
if(doIt)
{
TDEIO::DeleteJob *job = TDEIO::del(urls, false, true);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(delResult(TDEIO::Job *)));
job->setWindow(this);
job->setAutoErrorHandlingEnabled(true, this);
}
@@ -637,7 +637,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest)
}
TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true);
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(jobResult(TDEIO::Job *)));
job->setWindow(this);
job->setAutoErrorHandlingEnabled(true, this);
}
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
index a5dccb161..8708ef1c0 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
@@ -58,7 +58,7 @@ namespace KFI
class CKCmFontInst : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
index 559c8c4c5..e9f5b7dae 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
@@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(TQWidget *parent, const char *name)
setAllColumnsShowFocus(true);
setDragEnabled(false);
- 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 &)));
+ connect(header(), TQ_SIGNAL(sectionClicked(int)), TQ_SLOT(slotSortingChanged(int)));
+ connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(slotActivate(TQListViewItem *)));
+ connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(selected( TQListViewItem *)));
+ connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(slotActivate(TQListViewItem *)));
+ connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &)));
// DND
- connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen()));
+ connect(&(d->itsAutoOpenTimer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoOpen()));
setSelectionMode(KFileView::selectionMode());
itsResolver = new KMimeTypeResolver<CFontListViewItem, CKFileFontView>(this);
}
@@ -211,8 +211,8 @@ void CKFileFontView::highlighted( TQListViewItem *item )
void CKFileFontView::setSelectionMode(KFile::SelectionMode sm)
{
- disconnect(TQT_SIGNAL(selectionChanged()), this);
- disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this);
+ disconnect(TQ_SIGNAL(selectionChanged()), this);
+ disconnect(TQ_SIGNAL(selectionChanged(TQListViewItem *)), this);
switch (sm)
{
@@ -233,9 +233,9 @@ void CKFileFontView::setSelectionMode(KFile::SelectionMode sm)
// for highlighting
if (KFile::Multi==sm || KFile::Extended==sm)
- connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+ connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
else
- connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * )));
+ connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), TQ_SLOT(highlighted(TQListViewItem * )));
}
bool CKFileFontView::isSelected(const KFileItem *i) const
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
index 646359280..a741fead8 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
@@ -115,7 +115,7 @@ class CFontListViewItem : public TDEListViewItem
*/
class CKFileFontView : public TDEListView, public KFileView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 1956a34a6..987a44174 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -491,7 +491,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
x=offset, y=offset;
pix.resize(w, h);
- pix.fill(Qt::white);
+ pix.fill(TQt::white);
TQPainter painter(&pix);
@@ -580,7 +580,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title);
painter.setFont(TDEGlobalSettings::generalFont());
- painter.setPen(Qt::black);
+ painter.setPen(TQt::black);
y=painter.fontMetrics().height();
drawText(painter, x, y, w-offset, title);
y+=4;
diff --git a/kcontrol/tdefontinst/lib/FcEngine.h b/kcontrol/tdefontinst/lib/FcEngine.h
index 535baa6e1..5db48b0c3 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.h
+++ b/kcontrol/tdefontinst/lib/FcEngine.h
@@ -45,7 +45,7 @@ typedef struct _XftFont XftFont;
namespace KFI
{
-class KDE_EXPORT CFcEngine
+class TDE_EXPORT CFcEngine
{
public:
diff --git a/kcontrol/tdefontinst/lib/Misc.h b/kcontrol/tdefontinst/lib/Misc.h
index ee8de5445..3fd49d34a 100644
--- a/kcontrol/tdefontinst/lib/Misc.h
+++ b/kcontrol/tdefontinst/lib/Misc.h
@@ -50,25 +50,25 @@ namespace Misc
DIR_PERMS = 0755
};
- extern KDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false);
- inline KDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); }
- inline KDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); }
- inline KDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); }
- inline KDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); }
- inline KDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); }
- extern KDE_EXPORT TQString linkedTo(const TQString &i);
- extern KDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/
- extern KDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path
- inline KDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); }
- extern KDE_EXPORT TQString getDir(const TQString &f);
- extern KDE_EXPORT TQString getFile(const TQString &f);
- extern KDE_EXPORT bool createDir(const TQString &dir);
- extern KDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt);
- extern KDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null);
- inline KDE_EXPORT bool root() { return 0==getuid(); }
- extern KDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL);
- extern KDE_EXPORT void createBackup(const TQString &f);
- extern KDE_EXPORT time_t getTimeStamp(const TQString &item);
+ extern TDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false);
+ inline TDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); }
+ inline TDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); }
+ inline TDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); }
+ inline TDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); }
+ inline TDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); }
+ extern TDE_EXPORT TQString linkedTo(const TQString &i);
+ extern TDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/
+ extern TDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path
+ inline TDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); }
+ extern TDE_EXPORT TQString getDir(const TQString &f);
+ extern TDE_EXPORT TQString getFile(const TQString &f);
+ extern TDE_EXPORT bool createDir(const TQString &dir);
+ extern TDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt);
+ extern TDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null);
+ inline TDE_EXPORT bool root() { return 0==getuid(); }
+ extern TDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL);
+ extern TDE_EXPORT void createBackup(const TQString &f);
+ extern TDE_EXPORT time_t getTimeStamp(const TQString &item);
}
}
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index 54de7bdcf..0dccc06a3 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -97,7 +97,7 @@ static const int constMaxFcCheckTime=10;
extern "C"
{
- KDE_EXPORT int kdemain(int argc, char **argv);
+ TDE_EXPORT int kdemain(int argc, char **argv);
}
int kdemain(int argc, char **argv)
diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
index a053393f4..c7c00ef0f 100644
--- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
@@ -38,7 +38,7 @@
extern "C"
{
- KDE_EXPORT ThumbCreator *new_creator()
+ TDE_EXPORT ThumbCreator *new_creator()
{
return new KFI::CFontThumbnail;
}
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index 41367d586..ff2eaae77 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -65,7 +65,7 @@ void CFontPreview::showFont()
if(!itsCurrentUrl.isEmpty() &&
itsEngine.draw(itsCurrentUrl, itsLastWidth, itsLastHeight, itsPixmap, itsCurrentFace-1, false))
{
- setEraseColor(Qt::white);
+ setEraseColor(TQt::white);
update();
emit status(true);
}
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.h b/kcontrol/tdefontinst/viewpart/FontPreview.h
index 71916479e..f6ebd8dbd 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.h
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.h
@@ -42,7 +42,7 @@ namespace KFI
class CFontPreview : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index e31510ad3..c2437ef1a 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -81,7 +81,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
itsFrame->setFrameShape(TQFrame::NoFrame);
- itsFrame->setFocusPolicy(TQ_ClickFocus);
+ itsFrame->setFocusPolicy(TQWidget::ClickFocus);
itsToolsFrame->setFrameShape(TQFrame::NoFrame);
previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
previewFrame->setFrameShape(TQFrame::Panel);
@@ -103,14 +103,14 @@ 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(previewStatus(bool)));
- connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
- connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
+ connect(itsPreview, TQ_SIGNAL(status(bool)), TQ_SLOT(previewStatus(bool)));
+ connect(itsInstallButton, TQ_SIGNAL(clicked()), TQ_SLOT(install()));
+ connect(itsFaceSelector, TQ_SIGNAL(valueChanged(int)), itsPreview, TQ_SLOT(showFace(int)));
itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(),
- this, TQT_SLOT(changeText()), actionCollection(), "changeText");
+ this, TQ_SLOT(changeText()), actionCollection(), "changeText");
itsChangeTextAction->setEnabled(false);
- itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print");
+ itsPrintAction=KStdAction::print(this, TQ_SLOT(print()), actionCollection(), "print");
itsPrintAction->setEnabled(false);
setXMLFile("tdefontviewpart.rc");
@@ -143,7 +143,7 @@ bool CFontViewPart::openFile()
{
// NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up.
// Bug report 111535 indicates that calling "konqueror <font>" crashes.
- TQTimer::singleShot(0, this, TQT_SLOT(timeout()));
+ TQTimer::singleShot(0, this, TQ_SLOT(timeout()));
return true;
}
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h
index 24f6d8d8b..62a380f85 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h
@@ -45,7 +45,7 @@ class CFontPreview;
class CFontViewPart : public KParts::ReadOnlyPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
index a43f9d1d2..90b65eebf 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp
@@ -35,7 +35,7 @@
extern "C"
{
- KDE_EXPORT void* init_libtdefontviewpart()
+ TDE_EXPORT void* init_libtdefontviewpart()
{
TDEGlobal::locale()->insertCatalogue("tdefontinst");
return new KFI::CFontViewPartFactory;
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
index 7ac96e9c8..a584d0888 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
@@ -39,13 +39,13 @@ namespace KFI
class CFontViewPartFactory : public KLibFactory
{
- Q_OBJECT
+ TQ_OBJECT
public:
CFontViewPartFactory();
virtual ~CFontViewPartFactory();
- virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+ virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList());
static TDEInstance * instance();
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index df1fa92d2..d5ca2eba5 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow()
if(factory)
{
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
- itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart");
+ itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KURL openURL;
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
index cc9a5981b..3b297a197 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
@@ -38,7 +38,7 @@ namespace KFI
class CFontViewerAppMainWindow : public KParts::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-18 10:00:54 +0000