summaryrefslogtreecommitdiffstats
path: root/tdenewstuff
diff options
context:
space:
mode:
Diffstat (limited to 'tdenewstuff')
-rw-r--r--tdenewstuff/Mainpage.dox1
-rw-r--r--tdenewstuff/downloaddialog.cpp60
-rw-r--r--tdenewstuff/downloaddialog.h6
-rw-r--r--tdenewstuff/engine.cpp40
-rw-r--r--tdenewstuff/engine.h4
-rw-r--r--tdenewstuff/entry.cpp4
-rw-r--r--tdenewstuff/entry.h2
-rw-r--r--tdenewstuff/ghns.cpp6
-rw-r--r--tdenewstuff/ghns.h2
-rw-r--r--tdenewstuff/knewstuff.cpp10
-rw-r--r--tdenewstuff/knewstuff.h6
-rw-r--r--tdenewstuff/knewstuffbutton.cpp2
-rw-r--r--tdenewstuff/knewstuffbutton.h2
-rw-r--r--tdenewstuff/knewstuffgeneric.cpp4
-rw-r--r--tdenewstuff/knewstuffgeneric.h2
-rw-r--r--tdenewstuff/knewstuffsecure.cpp14
-rw-r--r--tdenewstuff/knewstuffsecure.h4
-rw-r--r--tdenewstuff/provider.cpp28
-rw-r--r--tdenewstuff/provider.h8
-rw-r--r--tdenewstuff/providerdialog.h2
-rw-r--r--tdenewstuff/security.cpp40
-rw-r--r--tdenewstuff/security.h6
-rw-r--r--tdenewstuff/testnewstuff.cpp8
-rw-r--r--tdenewstuff/testnewstuff.h2
-rw-r--r--tdenewstuff/uploaddialog.cpp4
-rw-r--r--tdenewstuff/uploaddialog.h2
26 files changed, 136 insertions, 133 deletions
diff --git a/tdenewstuff/Mainpage.dox b/tdenewstuff/Mainpage.dox
index d7f1c4da5..74c0281cb 100644
--- a/tdenewstuff/Mainpage.dox
+++ b/tdenewstuff/Mainpage.dox
@@ -32,4 +32,3 @@ Jeremy Whiting \<jeremy@scitools.com\>
// DOXYGEN_REFERENCES = tdecore tdeui tdeio
// DOXYGEN_SET_PROJECT_NAME = TDENewStuff
-// vim:ts=4:sw=4:expandtab:filetype=doxygen
diff --git a/tdenewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp
index 81450fd68..fa2f7277a 100644
--- a/tdenewstuff/downloaddialog.cpp
+++ b/tdenewstuff/downloaddialog.cpp
@@ -156,12 +156,12 @@ void DownloadDialog::init(Engine *engine)
box->add(d->m_loadingLabel);
box->addItem(new TQSpacerItem(0, 0, TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
- connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_SLOT(slotPage(TQWidget*)));
+ connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), TQ_SLOT(slotPage(TQWidget*)));
if(!engine)
{
m_loader = new ProviderLoader(this);
- connect(m_loader, TQT_SIGNAL(providersLoaded(Provider::List*)), TQT_SLOT(slotProviders(Provider::List*)));
+ connect(m_loader, TQ_SIGNAL(providersLoaded(Provider::List*)), TQ_SLOT(slotProviders(Provider::List*)));
}
m_entries.setAutoDelete(true);
@@ -273,7 +273,7 @@ void DownloadDialog::addProvider(Provider *p)
ctl->addTab(w_l, i18n("Latest"));
m_curtab = 0;
- connect(ctl, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(slotTab()));
+ connect(ctl, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(slotTab()));
TQHBoxLayout *box = new TQHBoxLayout(frame);
box->add(ctl);
@@ -296,9 +296,9 @@ void DownloadDialog::addProvider(Provider *p)
d->m_lvtmp_l->addColumn(i18n("Release Date"));
d->m_lvtmp_l->setSorting(2, false);
- connect(d->m_lvtmp_r, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
- connect(d->m_lvtmp_d, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
- connect(d->m_lvtmp_l, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
+ connect(d->m_lvtmp_r, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
+ connect(d->m_lvtmp_d, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
+ connect(d->m_lvtmp_l, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
rt = new TQTextBrowser(frame);
rt->setMinimumWidth(150);
@@ -315,10 +315,10 @@ void DownloadDialog::addProvider(Provider *p)
vbox->add(de);
vbox->add(in);
- connect(rt, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotEmail(const TQString&)));
+ connect(rt, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotEmail(const TQString&)));
- connect(in, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall()));
- connect(de, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()));
+ connect(in, TQ_SIGNAL(clicked()), TQ_SLOT(slotInstall()));
+ connect(de, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails()));
TQVBoxLayout *box2 = new TQVBoxLayout(w_r);
box2->add(d->m_lvtmp_r);
@@ -340,7 +340,7 @@ void DownloadDialog::addProvider(Provider *p)
if(m_engine) slotPage(frame);
- TQTimer::singleShot(100, this, TQT_SLOT(slotFinish()));
+ TQTimer::singleShot(100, this, TQ_SLOT(slotFinish()));
}
void DownloadDialog::slotResult(TDEIO::Job *job)
@@ -351,7 +351,7 @@ void DownloadDialog::slotResult(TDEIO::Job *job)
kdDebug() << "got data: " << m_data[job] << endl;
- kapp->config()->setGroup("TDENewStuffStatus");
+ tdeApp->config()->setGroup("TDENewStuffStatus");
dom.setContent(m_data[job]);
knewstuff = dom.documentElement();
@@ -434,12 +434,12 @@ int DownloadDialog::installStatus(Entry *entry)
TQString lang = TDEGlobal::locale()->language();
- kapp->config()->setGroup("TDENewStuffStatus");
- datestring = kapp->config()->readEntry(entry->name(lang));
+ tdeApp->config()->setGroup("TDENewStuffStatus");
+ datestring = tdeApp->config()->readEntry(entry->name(lang));
if(datestring.isNull()) installed = 0;
else
{
- date = TQT_TQDATE_OBJECT(TQDate::fromString(datestring, Qt::ISODate));
+ date = TQDate::fromString(datestring, TQt::ISODate);
if(!date.isValid()) installed = 0;
else if(date < entry->releaseDate()) installed = -1;
else installed = 1;
@@ -583,10 +583,10 @@ void DownloadDialog::slotInstall()
// in the direct download ability for this to even be considered.
if (e->payload().url().contains(OPENDESKTOP_REDIRECT_URL)) {
TDEIO::TransferJob *job = TDEIO::get( KURL( e->payload() ), false, false );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
}
else {
slotInstallPhase2();
@@ -616,7 +616,7 @@ void DownloadDialog::slotInstallPhase2()
KURL dest = KURL(m_s->downloadDestination(e));
TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true);
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotInstalled(TDEIO::Job*)));
}
}
@@ -667,9 +667,9 @@ void DownloadDialog::slotJobResult( TDEIO::Job *job )
void DownloadDialog::install(Entry *e)
{
- kapp->config()->setGroup("TDENewStuffStatus");
- kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate)));
- kapp->config()->sync();
+ tdeApp->config()->setGroup("TDENewStuffStatus");
+ tdeApp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(TQt::ISODate)));
+ tdeApp->config()->sync();
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);
@@ -713,7 +713,7 @@ void DownloadDialog::slotInstalled(TDEIO::Job *job)
bool ret = job && (job->error() == 0);
if(ret)
{
- TDEIO::FileCopyJob *cjob = ::tqqt_cast<TDEIO::FileCopyJob*>(job);
+ TDEIO::FileCopyJob *cjob = ::tqt_cast<TDEIO::FileCopyJob*>(job);
if(cjob)
{
ret = m_s->install(cjob->destURL().path());
@@ -843,7 +843,7 @@ void DownloadDialog::slotSelected()
void DownloadDialog::slotEmail(const TQString& link)
{
kdDebug() << "EMAIL: " << link << endl;
- kapp->invokeMailer(link);
+ tdeApp->invokeMailer(link);
slotSelected(); // TQTextBrowser oddity workaround as it cannot handle mailto: URLs
}
@@ -944,9 +944,9 @@ void DownloadDialog::loadProvider(Provider *p)
d->m_variants[variantjob] = urlvariants;
m_data[variantjob] = "";
- connect(variantjob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
- connect(variantjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
- TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
+ connect(variantjob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
+ connect(variantjob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+ TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
}
if(variants.count() == 0) return;
@@ -963,9 +963,9 @@ void DownloadDialog::loadProvider(Provider *p)
//m_jobs[job] = p; // not used anymore due to variants
m_data[job] = "";
- connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
- connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
- TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
+ connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+ TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
}
void DownloadDialog::setType(TQString type)
diff --git a/tdenewstuff/downloaddialog.h b/tdenewstuff/downloaddialog.h
index 5756a4e6e..8646e5a4e 100644
--- a/tdenewstuff/downloaddialog.h
+++ b/tdenewstuff/downloaddialog.h
@@ -54,9 +54,9 @@ class Engine;
* \par Maintainer:
* Josef Spillner (spillner@kde.org)
*/
-class KDE_EXPORT DownloadDialog : public KDialogBase
+class TDE_EXPORT DownloadDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
struct Private;
public:
/**
@@ -188,7 +188,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
@param type a data type such as "korganizer/calendar"
@deprecated use open( const TQString& type, const TQString& caption );
*/
- static void open(TQString type) KDE_DEPRECATED; // ### KDE 4.0: remove and make caption/parent argument optional
+ static void open(TQString type) TDE_DEPRECATED; // ### KDE 4.0: remove and make caption/parent argument optional
/**
Returns the list of installed data entries.
diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp
index 1427f7eb7..5f54af9bd 100644
--- a/tdenewstuff/engine.cpp
+++ b/tdenewstuff/engine.cpp
@@ -28,7 +28,7 @@
#include <tdeio/job.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "knewstuff.h"
#include "downloaddialog.h"
@@ -84,8 +84,8 @@ void Engine::download()
kdDebug() << "Engine::download()" << endl;
connect( mProviderLoader,
- TQT_SIGNAL( providersLoaded( Provider::List * ) ),
- TQT_SLOT( getMetaInformation( Provider::List * ) ) );
+ TQ_SIGNAL( providersLoaded( Provider::List * ) ),
+ TQ_SLOT( getMetaInformation( Provider::List * ) ) );
mProviderLoader->load( mType, mProviderList );
}
@@ -106,10 +106,10 @@ void Engine::getMetaInformation( Provider::List *providers )
if ( p->downloadUrl().isEmpty() ) continue;
TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl(), false, false );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) );
mNewStuffJobData.insert( job, "" );
mProviderJobs[ job ] = p;
@@ -218,8 +218,8 @@ void Engine::download( Entry *entry )
kdDebug() << " DESTINATION: " << destination.url() << endl;
TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) );
}
void Engine::slotDownloadJobResult( TDEIO::Job *job )
@@ -248,8 +248,8 @@ void Engine::upload(const TQString &fileName, const TQString &previewName )
mPreviewFile = previewName;
connect( mProviderLoader,
- TQT_SIGNAL( providersLoaded( Provider::List * ) ),
- TQT_SLOT( selectUploadProvider( Provider::List * ) ) );
+ TQ_SIGNAL( providersLoaded( Provider::List * ) ),
+ TQ_SLOT( selectUploadProvider( Provider::List * ) ) );
mProviderLoader->load( mType );
}
@@ -290,7 +290,7 @@ void Engine::upload( Entry *entry )
{
if ( mUploadFile.isNull()) {
mUploadFile = entry->fullName();
- mUploadFile = locateLocal( "data", TQString(kapp->instanceName()) + "/upload/" + mUploadFile );
+ mUploadFile = locateLocal( "data", TQString(tdeApp->instanceName()) + "/upload/" + mUploadFile );
if ( !d->mNewStuff->createUploadFile( mUploadFile ) ) {
KMessageBox::error( mParentWidget, i18n("Unable to create file to upload.") );
@@ -329,7 +329,7 @@ void Engine::upload( Entry *entry )
i18n("Upload Info"),
KStdGuiItem::close() );
if ( result == KMessageBox::Yes ) {
- kapp->invokeBrowser( noUploadUrl.url() );
+ tdeApp->invokeBrowser( noUploadUrl.url() );
}
}
} else {
@@ -340,8 +340,8 @@ void Engine::upload( Entry *entry )
destination.setFileName( fi.fileName() );
TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) );
} else {
emit uploadFinished( false );
}
@@ -364,7 +364,7 @@ bool Engine::createMetaFile( Entry *entry )
if ( mUploadMetaFile.isNull() ) {
mUploadMetaFile = entry->fullName() + ".meta";
- mUploadMetaFile = locateLocal( "data", TQString(kapp->instanceName()) + "/upload/" + mUploadMetaFile );
+ mUploadMetaFile = locateLocal( "data", TQString(tdeApp->instanceName()) + "/upload/" + mUploadMetaFile );
}
TQFile f( mUploadMetaFile );
@@ -402,8 +402,8 @@ void Engine::slotUploadPayloadJobResult( TDEIO::Job *job )
previewDestination.setFileName( fi.fileName() );
TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination );
- connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) );
+ connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) );
}
void Engine::slotUploadPreviewJobResult( TDEIO::Job *job )
@@ -421,8 +421,8 @@ void Engine::slotUploadPreviewJobResult( TDEIO::Job *job )
metaDestination.setFileName( fi.fileName() );
TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination );
- connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) );
+ connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) );
}
void Engine::slotUploadMetaJobResult( TDEIO::Job *job )
diff --git a/tdenewstuff/engine.h b/tdenewstuff/engine.h
index 432f3b04c..51da4eef6 100644
--- a/tdenewstuff/engine.h
+++ b/tdenewstuff/engine.h
@@ -49,9 +49,9 @@ class ProviderDialog;
* \par Maintainer:
* Josef Spillner (spillner@kde.org)
*/
-class KDE_EXPORT Engine : public TQObject
+class TDE_EXPORT Engine : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
struct Private;
public:
/**
diff --git a/tdenewstuff/entry.cpp b/tdenewstuff/entry.cpp
index 7539bb679..a1a00b723 100644
--- a/tdenewstuff/entry.cpp
+++ b/tdenewstuff/entry.cpp
@@ -332,7 +332,7 @@ void Entry::parseDomElement( const TQDomElement &element )
if ( e.tagName() == "version" ) setVersion( e.text().stripWhiteSpace() );
// if ( e.tagName() == "release" ) setRelease( e.text().toInt() );
if ( e.tagName() == "created" ) {
- TQDate date = TQT_TQDATE_OBJECT(TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate ));
+ TQDate date = TQDate::fromString( e.text().stripWhiteSpace(), TQt::ISODate );
setReleaseDate( date );
}
if ( e.tagName() == "smallpreviewpic1" ) {
@@ -366,7 +366,7 @@ TQDomElement Entry::createDomElement( TQDomDocument &doc,
addElement( doc, entry, "downloads", TQString::number( downloads() ) );
addElement( doc, entry, "created",
- releaseDate().toString( Qt::ISODate ) );
+ releaseDate().toString( TQt::ISODate ) );
addElement( doc, entry, "description", summary() );
addElement( doc, entry, "preview", preview().url() );
diff --git a/tdenewstuff/entry.h b/tdenewstuff/entry.h
index e04822e39..033f54113 100644
--- a/tdenewstuff/entry.h
+++ b/tdenewstuff/entry.h
@@ -42,7 +42,7 @@ namespace KNS {
* \par Maintainer:
* Josef Spillner (spillner@kde.org)
*/
-class KDE_EXPORT Entry
+class TDE_EXPORT Entry
{
public:
Entry();
diff --git a/tdenewstuff/ghns.cpp b/tdenewstuff/ghns.cpp
index 3217de80e..ed9540098 100644
--- a/tdenewstuff/ghns.cpp
+++ b/tdenewstuff/ghns.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kdialog.h>
#include "knewstuffgeneric.h"
@@ -51,7 +51,7 @@ GhnsWidget::GhnsWidget()
TQPushButton *button = new TQPushButton( "Wallpapers", this );
topLayout->addWidget( button );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( downloadWallpapers() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( downloadWallpapers() ) );
topLayout->addSpacing( 5 );
@@ -61,7 +61,7 @@ GhnsWidget::GhnsWidget()
TQPushButton *closeButton = new TQPushButton( "Close", this );
buttonLayout->addWidget( closeButton );
- connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
+ connect( closeButton, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) );
}
GhnsWidget::~GhnsWidget()
diff --git a/tdenewstuff/ghns.h b/tdenewstuff/ghns.h
index 7eea0c489..3cb70da65 100644
--- a/tdenewstuff/ghns.h
+++ b/tdenewstuff/ghns.h
@@ -32,7 +32,7 @@
class GhnsWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GhnsWidget();
~GhnsWidget();
diff --git a/tdenewstuff/knewstuff.cpp b/tdenewstuff/knewstuff.cpp
index ad4f0fb98..fe3358698 100644
--- a/tdenewstuff/knewstuff.cpp
+++ b/tdenewstuff/knewstuff.cpp
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "engine.h"
@@ -69,10 +69,14 @@ void TDENewStuff::download()
mEngine->download();
}
-TQString TDENewStuff::downloadDestination( Entry * )
+TQString TDENewStuff::downloadDestination( Entry *entry )
{
+ // Respect downloaded file's extension
+ TQString ext = entry->payload().fileName().section('.', 1);
+ if ( ! ext.isEmpty() ) ext = "." + ext;
+
return TDEGlobal::dirs()->saveLocation( "tmp" ) +
- TDEApplication::randomString( 10 );
+ TDEApplication::randomString( 10 ) + ext;
}
void TDENewStuff::upload()
diff --git a/tdenewstuff/knewstuff.h b/tdenewstuff/knewstuff.h
index 55d6db9b4..9477a593d 100644
--- a/tdenewstuff/knewstuff.h
+++ b/tdenewstuff/knewstuff.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class TQObject;
class TQWidget;
@@ -33,7 +33,7 @@ namespace KNS {
class Engine;
class Entry;
-KDE_EXPORT TDEAction* standardAction(const TQString& what,
+TDE_EXPORT TDEAction* standardAction(const TQString& what,
const TQObject *recvr,
const char *slot,
TDEActionCollection* parent,
@@ -66,7 +66,7 @@ KDE_EXPORT TDEAction* standardAction(const TQString& what,
*
* @since 3.3
*/
-class KDE_EXPORT TDENewStuff
+class TDE_EXPORT TDENewStuff
{
public:
/**
diff --git a/tdenewstuff/knewstuffbutton.cpp b/tdenewstuff/knewstuffbutton.cpp
index 3baa83397..529573547 100644
--- a/tdenewstuff/knewstuffbutton.cpp
+++ b/tdenewstuff/knewstuffbutton.cpp
@@ -53,7 +53,7 @@ Button::Button(TQWidget* parent, const char* name)
void Button::init()
{
setIconSet(SmallIconSet("knewstuff"));
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(showDialog()));
}
void Button::setButtonText(const TQString& what)
diff --git a/tdenewstuff/knewstuffbutton.h b/tdenewstuff/knewstuffbutton.h
index e4a98ae3a..7cad1b0a8 100644
--- a/tdenewstuff/knewstuffbutton.h
+++ b/tdenewstuff/knewstuffbutton.h
@@ -36,7 +36,7 @@ class DownloadDialog;
*/
class Button : public KPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/tdenewstuff/knewstuffgeneric.cpp b/tdenewstuff/knewstuffgeneric.cpp
index 757971268..2bc7ac788 100644
--- a/tdenewstuff/knewstuffgeneric.cpp
+++ b/tdenewstuff/knewstuffgeneric.cpp
@@ -25,9 +25,9 @@
#include <kdebug.h>
#include <tdelocale.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdemessagebox.h>
#include <kmimemagic.h>
#include <ktar.h>
diff --git a/tdenewstuff/knewstuffgeneric.h b/tdenewstuff/knewstuffgeneric.h
index 36feb1a77..2fa6af58c 100644
--- a/tdenewstuff/knewstuffgeneric.h
+++ b/tdenewstuff/knewstuffgeneric.h
@@ -39,7 +39,7 @@ class TDEConfig;
* \par Maintainer:
* Josef Spillner (spillner@kde.org)
*/
-class KDE_EXPORT TDENewStuffGeneric : public TDENewStuff
+class TDE_EXPORT TDENewStuffGeneric : public TDENewStuff
{
public:
/**
diff --git a/tdenewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp
index 0f95c8c0c..27e7f2989 100644
--- a/tdenewstuff/knewstuffsecure.cpp
+++ b/tdenewstuff/knewstuffsecure.cpp
@@ -22,7 +22,7 @@
#include <tdeio/netaccess.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <ktar.h>
#include <ktempdir.h>
@@ -37,7 +37,7 @@ TDENewStuffSecure::TDENewStuffSecure(const TQString &type, TQWidget *parentWidg
: TDENewStuff(type, parentWidget)
{
m_tempDir = 0L;
- connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool)));
+ connect(engine(), TQ_SIGNAL(uploadFinished(bool)), TQ_SLOT(slotUploadFinished(bool)));
}
@@ -74,7 +74,7 @@ bool TDENewStuffSecure::install(const TQString &fileName)
else
{
m_tarName.prepend(m_tempDir->name());
- connect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int)));
+ connect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int)));
Security::ref()->checkValidity(m_tarName);
}
} else
@@ -154,7 +154,7 @@ void TDENewStuffSecure::slotValidated(int result)
cfg->sync();
}
removeTempDirectory();
- disconnect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int)));
+ disconnect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int)));
}
void TDENewStuffSecure::downloadResource()
@@ -173,7 +173,7 @@ bool TDENewStuffSecure::createUploadFile(const TQString &fileName)
void TDENewStuffSecure::uploadResource(const TQString& fileName)
{
- connect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+ connect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
removeTempDirectory();
m_tempDir = new KTempDir();
m_tempDir->setAutoDelete(true);
@@ -194,7 +194,7 @@ void TDENewStuffSecure::slotFileSigned(int result)
{
if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
{
- disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+ disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
removeTempDirectory();
return;
}
@@ -217,7 +217,7 @@ void TDENewStuffSecure::slotFileSigned(int result)
tar.close();
TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true);
TDENewStuff::upload(m_signedFileName, TQString::null);
- disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+ disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
}
}
diff --git a/tdenewstuff/knewstuffsecure.h b/tdenewstuff/knewstuffsecure.h
index 1c292a9a8..2c8172888 100644
--- a/tdenewstuff/knewstuffsecure.h
+++ b/tdenewstuff/knewstuffsecure.h
@@ -37,9 +37,9 @@ to the standard TDENewStuff class.
@author Andras Mantia <amantia@kde.org>
*/
-class KDE_EXPORT TDENewStuffSecure : public TQObject, public TDENewStuff
+class TDE_EXPORT TDENewStuffSecure : public TQObject, public TDENewStuff
{
- Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor.
diff --git a/tdenewstuff/provider.cpp b/tdenewstuff/provider.cpp
index 022570b01..8247aa40f 100644
--- a/tdenewstuff/provider.cpp
+++ b/tdenewstuff/provider.cpp
@@ -213,10 +213,10 @@ void Provider::parseDomElement( const TQDomElement &element )
kdDebug() << "Provider::parseDomElement(): contentTypeUrl: " << contentTypeUrl << endl;
TDEIO::TransferJob *job = TDEIO::get( KURL( contentTypeUrl ), false, false );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
}
}
@@ -365,12 +365,12 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl;
TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ), false, false );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( job, TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ),
- TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ),
+ TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ) );
// job->dumpObjectInfo();
}
@@ -389,7 +389,7 @@ void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data )
void ProviderLoader::slotJobResult( TDEIO::Job *job )
{
if ( job->error() ) {
- job->showErrorDialog( TQT_TQWIDGET(parent()) );
+ job->showErrorDialog( static_cast<TQWidget*>(parent()) );
emit error();
return;
}
@@ -399,7 +399,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
TQDomDocument doc;
if ( !doc.setContent( mJobData ) ) {
- KMessageBox::error( TQT_TQWIDGET(parent()), i18n("Error parsing providers list.") );
+ KMessageBox::error( static_cast<TQWidget*>(parent()), i18n("Error parsing providers list.") );
emit error();
return;
}
@@ -417,9 +417,9 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
TQDomElement p = n.toElement();
if ( p.tagName() == "provider" ) {
- Provider* prov = new Provider( p, mContentType, TQT_TQWIDGET(parent()) );
+ Provider* prov = new Provider( p, mContentType, static_cast<TQWidget*>(parent()) );
mProviders.append( prov );
- connect( prov, TQT_SIGNAL( providerLoaded() ), this, TQT_SLOT( providerLoaded() ) );
+ connect( prov, TQ_SIGNAL( providerLoaded() ), this, TQ_SLOT( providerLoaded() ) );
}
}
}
diff --git a/tdenewstuff/provider.h b/tdenewstuff/provider.h
index 0a65d64fc..be8a777f9 100644
--- a/tdenewstuff/provider.h
+++ b/tdenewstuff/provider.h
@@ -44,9 +44,9 @@ namespace KNS {
* \par Maintainer:
* Timothy Pearson (kb9vqf@pearsoncomputing.net)
*/
-class KDE_EXPORT Provider : public TQObject
+class TDE_EXPORT Provider : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
typedef TQPtrList<Provider> List;
@@ -188,9 +188,9 @@ class KDE_EXPORT Provider : public TQObject
* the main provider database for this specific application.
* It should probably not be used directly by the application.
*/
-class KDE_EXPORT ProviderLoader : public TQObject
+class TDE_EXPORT ProviderLoader : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructor.
diff --git a/tdenewstuff/providerdialog.h b/tdenewstuff/providerdialog.h
index fe7652f14..d951801bd 100644
--- a/tdenewstuff/providerdialog.h
+++ b/tdenewstuff/providerdialog.h
@@ -42,7 +42,7 @@ class Engine;
*/
class ProviderDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
Constructor.
diff --git a/tdenewstuff/security.cpp b/tdenewstuff/security.cpp
index 3bca16166..07cb798c0 100644
--- a/tdenewstuff/security.cpp
+++ b/tdenewstuff/security.cpp
@@ -26,7 +26,7 @@
#include <kmdcodec.h>
#include <tdemessagebox.h>
#include <kpassdlg.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
//app includes
#include "security.h"
@@ -50,15 +50,15 @@ void Security::readKeys()
{
if (m_gpgRunning)
{
- TQTimer::singleShot(5, this, TQT_SLOT(readKeys()));
+ TQTimer::singleShot(5, this, TQ_SLOT(readKeys()));
return;
}
m_runMode = List;
m_keys.clear();
- KProcIO *readProcess=new KProcIO();
+ TDEProcIO *readProcess=new TDEProcIO();
*readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
- connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
- connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
+ connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+ connect(readProcess, TQ_SIGNAL(readReady(TDEProcIO *)) ,this, TQ_SLOT(slotDataArrived(TDEProcIO *)));
if (!readProcess->start(TDEProcess::NotifyOnExit, true))
KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>"));
else
@@ -69,14 +69,14 @@ void Security::readSecretKeys()
{
if (m_gpgRunning)
{
- TQTimer::singleShot(5, this, TQT_SLOT(readSecretKeys()));
+ TQTimer::singleShot(5, this, TQ_SLOT(readSecretKeys()));
return;
}
m_runMode = ListSecret;
- KProcIO *readProcess=new KProcIO();
+ TDEProcIO *readProcess=new TDEProcIO();
*readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys";
- connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
- connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
+ connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+ connect(readProcess, TQ_SIGNAL(readReady(TDEProcIO *)) ,this, TQ_SLOT(slotDataArrived(TDEProcIO *)));
if (readProcess->start(TDEProcess::NotifyOnExit, true))
m_gpgRunning = true;
}
@@ -98,7 +98,7 @@ void Security::slotProcessExited(TDEProcess *process)
delete process;
}
-void Security::slotDataArrived(KProcIO *procIO)
+void Security::slotDataArrived(TDEProcIO *procIO)
{
TQString data;
while (procIO->readln(data, true) != -1)
@@ -206,7 +206,7 @@ void Security::slotCheckValidity()
{
if (!m_keysRead || m_gpgRunning)
{
- TQTimer::singleShot(5, this, TQT_SLOT(slotCheckValidity()));
+ TQTimer::singleShot(5, this, TQ_SLOT(slotCheckValidity()));
return;
}
if (m_keys.count() == 0)
@@ -226,7 +226,7 @@ void Security::slotCheckValidity()
if (file.open(IO_ReadOnly))
{
context.reset();
- context.update(TQT_TQIODEVICE_OBJECT(file));
+ context.update(file);
md5sum = context.hexDigest();
file.close();
}
@@ -246,10 +246,10 @@ void Security::slotCheckValidity()
m_signatureKey.trusted = false;
//verify the signature
- KProcIO *verifyProcess=new KProcIO();
+ TDEProcIO *verifyProcess=new TDEProcIO();
*verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName;
- connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
- connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
+ connect(verifyProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+ connect(verifyProcess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotDataArrived(TDEProcIO *)));
if (verifyProcess->start(TDEProcess::NotifyOnExit,true))
m_gpgRunning = true;
else
@@ -270,7 +270,7 @@ void Security::slotSignFile()
{
if (!m_keysRead || m_gpgRunning)
{
- TQTimer::singleShot(5, this, TQT_SLOT(slotSignFile()));
+ TQTimer::singleShot(5, this, TQ_SLOT(slotSignFile()));
return;
}
@@ -298,7 +298,7 @@ void Security::slotSignFile()
if (file.open(IO_ReadOnly))
{
context.reset();
- context.update(TQT_TQIODEVICE_OBJECT(file));
+ context.update(file);
md5sum = context.hexDigest();
file.close();
}
@@ -326,10 +326,10 @@ void Security::slotSignFile()
m_secretKey = secretKeys[0];
//verify the signature
- KProcIO *signProcess=new KProcIO();
+ TDEProcIO *signProcess=new TDEProcIO();
*signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName;
- connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
- connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
+ connect(signProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+ connect(signProcess, TQ_SIGNAL(readReady(TDEProcIO *)),this, TQ_SLOT(slotDataArrived(TDEProcIO *)));
m_runMode = Sign;
if (signProcess->start(TDEProcess::NotifyOnExit,true))
m_gpgRunning = true;
diff --git a/tdenewstuff/security.h b/tdenewstuff/security.h
index 230821e7e..fc3e298c6 100644
--- a/tdenewstuff/security.h
+++ b/tdenewstuff/security.h
@@ -21,7 +21,7 @@
#include <tqmap.h>
#include <tqobject.h>
-class KProcIO;
+class TDEProcIO;
class TDEProcess;
struct KeyStruct {
@@ -43,7 +43,7 @@ namespace KNS {
class Security : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
static Security* const ref()
{
@@ -121,7 +121,7 @@ private:
private slots:
void slotProcessExited(TDEProcess *process);
- void slotDataArrived(KProcIO *process);
+ void slotDataArrived(TDEProcIO *process);
signals:
/** Sent when the validity check is done.
diff --git a/tdenewstuff/testnewstuff.cpp b/tdenewstuff/testnewstuff.cpp
index f9fc7269f..ad77d68d6 100644
--- a/tdenewstuff/testnewstuff.cpp
+++ b/tdenewstuff/testnewstuff.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <kdialog.h>
#include "testnewstuff.h"
@@ -72,17 +72,17 @@ MyWidget::MyWidget()
TQPushButton *downloadButton = new TQPushButton( "Download", this );
topLayout->addWidget( downloadButton );
- connect( downloadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( download() ) );
+ connect( downloadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( download() ) );
TQPushButton *uploadButton = new TQPushButton( "Upload", this );
topLayout->addWidget( uploadButton );
- connect( uploadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( upload() ) );
+ connect( uploadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( upload() ) );
topLayout->addSpacing( 5 );
TQPushButton *closeButton = new TQPushButton( "Close", this );
topLayout->addWidget( closeButton );
- connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
+ connect( closeButton, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) );
}
MyWidget::~MyWidget()
diff --git a/tdenewstuff/testnewstuff.h b/tdenewstuff/testnewstuff.h
index acd9aece4..9d4f71274 100644
--- a/tdenewstuff/testnewstuff.h
+++ b/tdenewstuff/testnewstuff.h
@@ -42,7 +42,7 @@ class TestNewStuff : public TDENewStuff
class MyWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
MyWidget();
~MyWidget();
diff --git a/tdenewstuff/uploaddialog.cpp b/tdenewstuff/uploaddialog.cpp
index a8e13a493..c6a52d1e7 100644
--- a/tdenewstuff/uploaddialog.cpp
+++ b/tdenewstuff/uploaddialog.cpp
@@ -136,7 +136,7 @@ void UploadDialog::slotOk()
entry->setSummary( mSummaryEdit->text(), mLanguageCombo->currentText() );
if ( mPayloadUrl.isValid() ) {
- TDEConfig *conf = kapp->config();
+ TDEConfig *conf = tdeApp->config();
conf->setGroup( TQString("TDENewStuffUpload:%1").arg(mPayloadUrl.fileName()) );
conf->writeEntry("name", mNameEdit->text());
conf->writeEntry("author", mAuthorEdit->text());
@@ -164,7 +164,7 @@ void UploadDialog::setPayloadFile( const TQString &payloadFile )
{
mPayloadUrl = payloadFile;
- TDEConfig *conf = kapp->config();
+ TDEConfig *conf = tdeApp->config();
conf->setGroup( TQString("TDENewStuffUpload:%1").arg(mPayloadUrl.fileName()) );
TQString name = conf->readEntry("name");
TQString author = conf->readEntry("author");
diff --git a/tdenewstuff/uploaddialog.h b/tdenewstuff/uploaddialog.h
index 3fc068e3a..906f2ea9f 100644
--- a/tdenewstuff/uploaddialog.h
+++ b/tdenewstuff/uploaddialog.h
@@ -46,7 +46,7 @@ class Entry;
*/
class UploadDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
Constructor.
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 11:13:58 +0000