summaryrefslogtreecommitdiffstats
path: root/konq-plugins/webarchiver
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:22:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:22:56 +0000
commit7346aee26bf190a7e70333c40fab4caca847cd27 (patch)
tree4b019b434f88dcc3eeaafe1d3f26240b4c4718e8 /konq-plugins/webarchiver
parent23a3d3aa5b44cbdf305495919866d9dbf4f6da54 (diff)
downloadtdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.tar.gz
tdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konq-plugins/webarchiver')
-rw-r--r--konq-plugins/webarchiver/archivedialog.cpp106
-rw-r--r--konq-plugins/webarchiver/archivedialog.h32
-rw-r--r--konq-plugins/webarchiver/plugin_webarchiver.cpp24
-rw-r--r--konq-plugins/webarchiver/plugin_webarchiver.h4
-rw-r--r--konq-plugins/webarchiver/webarchivecreator.cpp22
-rw-r--r--konq-plugins/webarchiver/webarchivecreator.h6
6 files changed, 97 insertions, 97 deletions
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 71390c2..a28da2c 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -19,7 +19,7 @@
*/
#include "archivedialog.h"
-#include <qwidget.h>
+#include <tqwidget.h>
#include <khtml_part.h>
#include "archiveviewbase.h"
#include <kinstance.h>
@@ -35,21 +35,21 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kactivelabel.h>
-#include <qstylesheet.h>
-#include <qiodevice.h>
+#include <tqstylesheet.h>
+#include <tqiodevice.h>
#include <klistview.h>
#include <kio/job.h>
#include <kapplication.h>
#include <kurllabel.h>
#include <kprogress.h>
#include <kstringhandler.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
#undef DEBUG_WAR
#define CONTENT_TYPE "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">"
-ArchiveDialog::ArchiveDialog(QWidget *parent, const QString &filename,
+ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename,
KHTMLPart *part) :
KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"),
KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ),
@@ -59,8 +59,8 @@ ArchiveDialog::ArchiveDialog(QWidget *parent, const QString &filename,
setMainWidget(m_widget);
setWFlags(getWFlags() | WDestructiveClose);
- m_widget->urlLabel->setText(QString("<a href=\"")+m_url.url()+"\">"+KStringHandler::csqueeze( m_url.url(), 80 )+"</a>");
- m_widget->targetLabel->setText(QString("<a href=\"")+filename+"\">"+KStringHandler::csqueeze( filename, 80 )+"</a>");
+ m_widget->urlLabel->setText(TQString("<a href=\"")+m_url.url()+"\">"+KStringHandler::csqueeze( m_url.url(), 80 )+"</a>");
+ m_widget->targetLabel->setText(TQString("<a href=\"")+filename+"\">"+KStringHandler::csqueeze( filename, 80 )+"</a>");
if(part->document().ownerDocument().isNull())
m_document = part->document();
@@ -83,12 +83,12 @@ void ArchiveDialog::archive()
kdDebug(90110) << "Web Archive opened " << endl;
#endif
- m_linkDict.insert(QString("index.html"), QString(""));
+ m_linkDict.insert(TQString("index.html"), TQString(""));
saveFile("index.html");
} else {
- const QString title = i18n( "Unable to Open Web-Archive" );
- const QString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName());
+ const TQString title = i18n( "Unable to Open Web-Archive" );
+ const TQString text = i18n( "Unable to open \n %1 \n for writing." ).arg(m_tarBall->fileName());
KMessageBox::sorry( 0L, text, title );
}
}
@@ -100,15 +100,15 @@ ArchiveDialog::~ArchiveDialog()
/* Store the HTMLized DOM-Tree to a temporary file and add it to the Tar-Ball */
-void ArchiveDialog::saveFile( const QString&)
+void ArchiveDialog::saveFile( const TQString&)
{
KTempFile tmpFile;
if (!(tmpFile.status())) {
- QString temp;
+ TQString temp;
m_state=Retrieving;
- QTextStream *tempStream = new QTextStream(&temp, IO_ReadOnly);
+ TQTextStream *tempStream = new TQTextStream(&temp, IO_ReadOnly);
saveToArchive(tempStream);
@@ -122,8 +122,8 @@ void ArchiveDialog::saveFile( const QString&)
downloadNext();
} else {
- const QString title = i18n( "Could Not Open Temporary File" );
- const QString text = i18n( "Could not open a temporary file" );
+ const TQString title = i18n( "Could Not Open Temporary File" );
+ const TQString text = i18n( "Could not open a temporary file" );
KMessageBox::sorry( 0, text, title );
}
}
@@ -131,8 +131,8 @@ void ArchiveDialog::saveFile( const QString&)
void ArchiveDialog::setSavingState()
{
KTempFile tmpFile;
- QTextStream* textStream = tmpFile.textStream();
- textStream->setEncoding(QTextStream::UnicodeUTF8);
+ TQTextStream* textStream = tmpFile.textStream();
+ textStream->setEncoding(TQTextStream::UnicodeUTF8);
m_widget->progressBar->setProgress(m_widget->progressBar->totalSteps());
@@ -141,10 +141,10 @@ void ArchiveDialog::setSavingState()
tmpFile.close();
- QString fileName="index.html";
- QFile file(tmpFile.name());
+ TQString fileName="index.html";
+ TQFile file(tmpFile.name());
file.open(IO_ReadOnly);
- m_tarBall->writeFile(fileName, QString::null, QString::null, file.size(), file.readAll());
+ m_tarBall->writeFile(fileName, TQString::null, TQString::null, file.size(), file.readAll());
#ifdef DEBUG_WAR
kdDebug(90110) << "HTML-file written: " << fileName << endl;
#endif
@@ -164,7 +164,7 @@ void ArchiveDialog::setSavingState()
/* Recursively travers the DOM-Tree */
-void ArchiveDialog::saveToArchive(QTextStream* _textStream)
+void ArchiveDialog::saveToArchive(TQTextStream* _textStream)
{
if (!_textStream) return;
@@ -182,7 +182,7 @@ void ArchiveDialog::saveToArchive(QTextStream* _textStream)
}
}
-static bool hasAttribute(const DOM::Node &pNode, const QString &attrName, const QString &attrValue)
+static bool hasAttribute(const DOM::Node &pNode, const TQString &attrName, const TQString &attrValue)
{
const DOM::Element element = (const DOM::Element) pNode;
DOM::Attr attr;
@@ -197,7 +197,7 @@ static bool hasAttribute(const DOM::Node &pNode, const QString &attrName, const
return false;
}
-static bool hasChildNode(const DOM::Node &pNode, const QString &nodeName)
+static bool hasChildNode(const DOM::Node &pNode, const TQString &nodeName)
{
DOM::Node child;
try
@@ -222,12 +222,12 @@ static bool hasChildNode(const DOM::Node &pNode, const QString &nodeName)
/* Transform DOM-Tree to HTML */
void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& baseURL,
- QTextStream* _textStream, int indent)
+ TQTextStream* _textStream, int indent)
{
- const QString nodeNameOrig(pNode.nodeName().string());
- const QString nodeName(pNode.nodeName().string().upper());
- QString text;
- QString strIndent;
+ const TQString nodeNameOrig(pNode.nodeName().string());
+ const TQString nodeName(pNode.nodeName().string().upper());
+ TQString text;
+ TQString strIndent;
strIndent.fill(' ', indent);
const DOM::Element element = (const DOM::Element) pNode;
DOM::Node child;
@@ -253,8 +253,8 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
text = strIndent;
}
text += "<" + nodeNameOrig;
- QString attributes;
- QString attrNameOrig, attrName, attrValue;
+ TQString attributes;
+ TQString attrNameOrig, attrName, attrValue;
DOM::Attr attr;
DOM::NamedNodeMap attrs = element.attributes();
unsigned long lmap = attrs.length();
@@ -284,7 +284,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
((nodeName == "IMG" || nodeName == "INPUT" || nodeName == "SCRIPT") && attrName == "SRC") ||
((nodeName == "BODY" || nodeName == "TABLE" || nodeName == "TH" || nodeName == "TD") && attrName == "BACKGROUND")) {
// Some people use carriage return in file names and browsers support that!
- attrValue = handleLink(baseURL, attrValue.replace(QRegExp("\\s"), ""));
+ attrValue = handleLink(baseURL, attrValue.replace(TQRegExp("\\s"), ""));
}
/*
* ## Make recursion level configurable
@@ -313,18 +313,18 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
}
}
} else {
- const QString& nodeValue(pNode.nodeValue().string());
+ const TQString& nodeValue(pNode.nodeValue().string());
if (!(nodeValue.isEmpty())) {
// Don't escape < > in JS or CSS
- QString parentNodeName = pNode.parentNode().nodeName().string().upper();
+ TQString parentNodeName = pNode.parentNode().nodeName().string().upper();
if (parentNodeName == "STYLE") {
text = analyzeInternalCSS(baseURL, pNode.nodeValue().string());
} else if (m_bPreserveWS) {
- text = QStyleSheet::escape(pNode.nodeValue().string());
+ text = TQStyleSheet::escape(pNode.nodeValue().string());
} else if (parentNodeName == "SCRIPT") {
text = pNode.nodeValue().string();
} else {
- text = strIndent + QStyleSheet::escape(pNode.nodeValue().string());
+ text = strIndent + TQStyleSheet::escape(pNode.nodeValue().string());
}
}
}
@@ -392,11 +392,11 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas
/* Extract the URL, download it's content and return an unique name for the link */
-QString ArchiveDialog::handleLink(const KURL& _url, const QString& _link)
+TQString ArchiveDialog::handleLink(const KURL& _url, const TQString& _link)
{
KURL url(getAbsoluteURL(_url, _link));
- QString tarFileName;
+ TQString tarFileName;
if (kapp->authorizeURLAction("redirect", _url, url))
{
if (m_state==Retrieving)
@@ -422,7 +422,7 @@ void ArchiveDialog::downloadNext()
#ifdef DEBUG_WAR
kdDebug(90110) << "URL : " << url.url() << endl;
#endif
- QString tarFileName;
+ TQString tarFileName;
// Only download file once
if (m_downloadedURLDict.contains(url.url())) {
@@ -440,15 +440,15 @@ void ArchiveDialog::downloadNext()
delete m_tmpFile;
m_tmpFile=new KTempFile();
m_tmpFile->close();
- QFile::remove(m_tmpFile->name());
+ TQFile::remove(m_tmpFile->name());
kdDebug(90110) << "downloading: " << url.url() << " to: " << m_tmpFile->name() << endl;
KURL dsturl;
dsturl.setPath(m_tmpFile->name());
KIO::Job *job=KIO::file_copy(url, dsturl, -1, false, false, false);
job->addMetaData("cache", "cache"); // Use entry from cache if available.
- connect(job, SIGNAL(result( KIO::Job *)), this, SLOT(finishedDownloadingURL( KIO::Job *)) );
+ connect(job, TQT_SIGNAL(result( KIO::Job *)), this, TQT_SLOT(finishedDownloadingURL( KIO::Job *)) );
- m_currentLVI=new QListViewItem(m_widget->listView, url.prettyURL());
+ m_currentLVI=new TQListViewItem(m_widget->listView, url.prettyURL());
m_widget->listView->insertItem( m_currentLVI );
m_currentLVI->setText(1,i18n("Downloading"));
}
@@ -461,7 +461,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job )
{
if ( job->error() )
{
-// QString s=job->errorString();
+// TQString s=job->errorString();
m_currentLVI->setText(1,i18n("Error"));
}
else
@@ -472,12 +472,12 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job )
KURL url=m_urlsToDownload[m_iterator];
- QString tarFileName = getUniqueFileName(url.fileName());
+ TQString tarFileName = getUniqueFileName(url.fileName());
// Add file to Tar-Ball
- QFile file(m_tmpFile->name());
+ TQFile file(m_tmpFile->name());
file.open(IO_ReadOnly);
- m_tarBall->writeFile(tarFileName, QString::null, QString::null, file.size(), file.readAll());
+ m_tarBall->writeFile(tarFileName, TQString::null, TQString::null, file.size(), file.readAll());
file.close();
m_tmpFile->unlink();
delete m_tmpFile;
@@ -486,7 +486,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job )
// Add URL to downloaded URLs
m_downloadedURLDict.insert(url.url(), tarFileName);
- m_linkDict.insert(tarFileName, QString(""));
+ m_linkDict.insert(tarFileName, TQString(""));
m_iterator++;
downloadNext();
@@ -494,7 +494,7 @@ void ArchiveDialog::finishedDownloadingURL( KIO::Job *job )
/* Create an absolute URL for download */
-KURL ArchiveDialog::getAbsoluteURL(const KURL& _url, const QString& _link)
+KURL ArchiveDialog::getAbsoluteURL(const KURL& _url, const TQString& _link)
{
// Does all the magic for me
return KURL(_url, _link);
@@ -502,31 +502,31 @@ KURL ArchiveDialog::getAbsoluteURL(const KURL& _url, const QString& _link)
/* Adds an id to a fileName to make it unique relative to the Tar-Ball */
-QString ArchiveDialog::getUniqueFileName(const QString& fileName)
+TQString ArchiveDialog::getUniqueFileName(const TQString& fileName)
{
// Name clash -> add unique id
static int id=2;
- QString uniqueFileName(fileName);
+ TQString uniqueFileName(fileName);
#ifdef DEBUG_WAR
kdDebug(90110) << "getUniqueFileName(..): [" << fileName << "]" << endl;
#endif
while (uniqueFileName.isEmpty() || m_linkDict.contains(uniqueFileName))
- uniqueFileName = QString::number(id++) + fileName;
+ uniqueFileName = TQString::number(id++) + fileName;
return uniqueFileName;
}
/* Search for Images in CSS, extract them and adjust CSS */
-QString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const QString& string)
+TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& string)
{
#ifdef DEBUG_WAR
kdDebug () << "analyzeInternalCSS" << endl;
#endif
- QString str(string);
+ TQString str(string);
int pos = 0;
int startUrl = 0;
int endUrl = 0;
@@ -543,7 +543,7 @@ QString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const QString& strin
endUrl = pos;
if (str[pos-1]=='"' || str[pos-1]=='\'') // CSS 'feature'
endUrl--;
- QString url = str.mid(startUrl, endUrl-startUrl);
+ TQString url = str.mid(startUrl, endUrl-startUrl);
#ifdef DEBUG_WAR
kdDebug () << "url: " << url << endl;
diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h
index 1dc5ff8..fd007b6 100644
--- a/konq-plugins/webarchiver/archivedialog.h
+++ b/konq-plugins/webarchiver/archivedialog.h
@@ -27,9 +27,9 @@
#include <ktempfile.h>
#include <kio/job.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqmap.h>
+#include <tqvaluelist.h>
class QWidget;
class KHTMLPart;
@@ -43,7 +43,7 @@ class ArchiveDialog : public KDialogBase
{
Q_OBJECT
public:
- ArchiveDialog(QWidget *parent, const QString &targetFilename, KHTMLPart *part);
+ ArchiveDialog(TQWidget *parent, const TQString &targetFilename, KHTMLPart *part);
~ArchiveDialog();
void archive();
@@ -52,27 +52,27 @@ public slots:
void finishedDownloadingURL( KIO::Job *job );
void setSavingState();
protected:
- void saveFile( const QString& fileName);
- void saveToArchive(QTextStream* _textStream);
+ void saveFile( const TQString& fileName);
+ void saveToArchive(TQTextStream* _textStream);
void saveArchiveRecursive(const DOM::Node &node, const KURL& baseURL,
- QTextStream* _textStream, int ident);
- QString handleLink(const KURL& _url, const QString & _link);
- KURL getAbsoluteURL(const KURL& _url, const QString& _link);
- QString getUniqueFileName(const QString& fileName);
- QString stringToHTML(const QString& string);
- QString analyzeInternalCSS(const KURL& _url, const QString& string);
+ TQTextStream* _textStream, int ident);
+ TQString handleLink(const KURL& _url, const TQString & _link);
+ KURL getAbsoluteURL(const KURL& _url, const TQString& _link);
+ TQString getUniqueFileName(const TQString& fileName);
+ TQString stringToHTML(const TQString& string);
+ TQString analyzeInternalCSS(const KURL& _url, const TQString& string);
void downloadNext();
ArchiveViewBase *m_widget;
- QMap<QString, QString> m_downloadedURLDict;
- QMap<QString, QString> m_linkDict;
+ TQMap<TQString, TQString> m_downloadedURLDict;
+ TQMap<TQString, TQString> m_linkDict;
KTar* m_tarBall;
bool m_bPreserveWS;
- QListViewItem *m_currentLVI;
+ TQListViewItem *m_currentLVI;
unsigned int m_iterator;
enum State { Retrieving=0, Downloading, Saving };
State m_state;
- QValueList <KURL>m_urlsToDownload;
+ TQValueList <KURL>m_urlsToDownload;
KTempFile *m_tmpFile;
KURL m_url;
DOM::Document m_document;
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index 81dc9ba..c76f56c 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -29,8 +29,8 @@
//#define DEBUG_WAR
-#include <qdir.h>
-#include <qfile.h>
+#include <tqdir.h>
+#include <tqfile.h>
#include <kaction.h>
#include <kinstance.h>
@@ -50,13 +50,13 @@ typedef KGenericFactory<PluginWebArchiver> PluginWebArchiverFactory;
K_EXPORT_COMPONENT_FACTORY( libwebarchiverplugin,
PluginWebArchiverFactory( "webarchiver" ) )
-PluginWebArchiver::PluginWebArchiver( QObject* parent, const char* name,
- const QStringList & )
+PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name,
+ const TQStringList & )
: Plugin( parent, name )
{
(void) new KAction( i18n("Archive &Web Page..."),
"webarchiver", 0,
- this, SLOT(slotSaveToArchive()),
+ this, TQT_SLOT(slotSaveToArchive()),
actionCollection(), "archivepage" );
}
@@ -71,7 +71,7 @@ void PluginWebArchiver::slotSaveToArchive()
return;
KHTMLPart *part = static_cast<KHTMLPart *>( parent() );
- QString archiveName = QString::fromUtf8(part->htmlDocument().title().string().utf8());
+ TQString archiveName = TQString::fromUtf8(part->htmlDocument().title().string().utf8());
if (archiveName.isEmpty())
archiveName = i18n("Untitled");
@@ -83,7 +83,7 @@ void PluginWebArchiver::slotSaveToArchive()
archiveName.replace( "?", "");
archiveName.replace( ":", "");
archiveName.replace( "/", "");
- archiveName = archiveName.replace( QRegExp("\\s+"), "_");
+ archiveName = archiveName.replace( TQRegExp("\\s+"), "_");
archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ;
@@ -93,16 +93,16 @@ void PluginWebArchiver::slotSaveToArchive()
if (url.isEmpty()) { return; }
if (!(url.isValid())) {
- const QString title = i18n( "Invalid URL" );
- const QString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL());
+ const TQString title = i18n( "Invalid URL" );
+ const TQString text = i18n( "The URL\n%1\nis not valid." ).arg(url.prettyURL());
KMessageBox::sorry(part->widget(), text, title );
return;
}
- const QFile file(url.path());
+ const TQFile file(url.path());
if (file.exists()) {
- const QString title = i18n( "File Exists" );
- const QString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL());
+ const TQString title = i18n( "File Exists" );
+ const TQString text = i18n( "Do you really want to overwrite:\n%1?" ).arg(url.prettyURL());
if (KMessageBox::Continue != KMessageBox::warningContinueCancel( part->widget(), text, title, i18n("Overwrite") ) ) {
return;
}
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.h b/konq-plugins/webarchiver/plugin_webarchiver.h
index 2353fe1..530e15b 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.h
+++ b/konq-plugins/webarchiver/plugin_webarchiver.h
@@ -30,8 +30,8 @@ class PluginWebArchiver : public KParts::Plugin
Q_OBJECT
public:
- PluginWebArchiver( QObject* parent, const char* name,
- const QStringList & );
+ PluginWebArchiver( TQObject* parent, const char* name,
+ const TQStringList & );
virtual ~PluginWebArchiver();
public slots:
diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp
index cba7f18..1ffd242 100644
--- a/konq-plugins/webarchiver/webarchivecreator.cpp
+++ b/konq-plugins/webarchiver/webarchivecreator.cpp
@@ -21,9 +21,9 @@
#include <time.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qpainter.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqpainter.h>
#include <kapplication.h>
#include <khtml_part.h>
@@ -48,12 +48,12 @@ WebArchiveCreator::~WebArchiveCreator()
delete m_html;
}
-bool WebArchiveCreator::create(const QString &path, int width, int height, QImage &img)
+bool WebArchiveCreator::create(const TQString &path, int width, int height, TQImage &img)
{
if (!m_html)
{
m_html = new KHTMLPart;
- connect(m_html, SIGNAL(completed()), SLOT(slotCompleted()));
+ connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
m_html->setJScriptEnabled(false);
m_html->setJavaEnabled(false);
m_html->setPluginsEnabled(false);
@@ -70,8 +70,8 @@ bool WebArchiveCreator::create(const QString &path, int width, int height, QImag
killTimers();
// render the HTML page on a bigger pixmap and use smoothScale,
- // looks better than directly scaling with the QPainter (malte)
- QPixmap pix;
+ // looks better than directly scaling with the TQPainter (malte)
+ TQPixmap pix;
if (width > 400 || height > 600)
{
if (height * 3 > width * 4)
@@ -82,14 +82,14 @@ bool WebArchiveCreator::create(const QString &path, int width, int height, QImag
else
pix.resize(400, 600);
// light-grey background, in case loadind the page failed
- pix.fill( QColor( 245, 245, 245 ) );
+ pix.fill( TQColor( 245, 245, 245 ) );
int borderX = pix.width() / width,
borderY = pix.height() / height;
- QRect rc(borderX, borderY, pix.width() - borderX * 2, pix.height() - borderY *
+ TQRect rc(borderX, borderY, pix.width() - borderX * 2, pix.height() - borderY *
2);
- QPainter p;
+ TQPainter p;
p.begin(&pix);
m_html->paint(&p, rc);
p.end();
@@ -98,7 +98,7 @@ bool WebArchiveCreator::create(const QString &path, int width, int height, QImag
return true;
}
-void WebArchiveCreator::timerEvent(QTimerEvent *)
+void WebArchiveCreator::timerEvent(TQTimerEvent *)
{
m_html->closeURL();
m_completed = true;
diff --git a/konq-plugins/webarchiver/webarchivecreator.h b/konq-plugins/webarchiver/webarchivecreator.h
index eae653b..8806390 100644
--- a/konq-plugins/webarchiver/webarchivecreator.h
+++ b/konq-plugins/webarchiver/webarchivecreator.h
@@ -26,17 +26,17 @@
class KHTMLPart;
-class WebArchiveCreator : public QObject, public ThumbCreator
+class WebArchiveCreator : public TQObject, public ThumbCreator
{
Q_OBJECT
public:
WebArchiveCreator();
virtual ~WebArchiveCreator();
- virtual bool create(const QString &path, int width, int height, QImage &img);
+ virtual bool create(const TQString &path, int width, int height, TQImage &img);
virtual Flags flags() const;
protected:
- virtual void timerEvent(QTimerEvent *);
+ virtual void timerEvent(TQTimerEvent *);
private slots:
void slotCompleted();