diff options
Diffstat (limited to 'konq-plugins')
131 files changed, 2964 insertions, 2964 deletions
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 30878fd..c18c061 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -49,14 +49,14 @@ #include <dom/dom_node.h> using namespace DOM; -#include <qpixmap.h> -#include <qcursor.h> -#include <qregexp.h> +#include <tqpixmap.h> +#include <tqcursor.h> +#include <tqregexp.h> typedef KGenericFactory<AdBlock> AdBlockFactory; K_EXPORT_COMPONENT_FACTORY( libadblock, AdBlockFactory( "adblock" ) ) -AdBlock::AdBlock(QObject *parent, const char *name, const QStringList &) : +AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), m_label(0), m_menu(0) { @@ -65,10 +65,10 @@ AdBlock::AdBlock(QObject *parent, const char *name, const QStringList &) : m_menu = new KPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Adblock")); - m_menu->insertItem(i18n("Configure"), this, SLOT(showKCModule())); - m_menu->insertItem(i18n("Show Elements"), this, SLOT(showDialogue())); + m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showKCModule())); + m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue())); - connect(m_part, SIGNAL(completed()), this, SLOT(initLabel())); + connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(initLabel())); } AdBlock::~AdBlock() @@ -95,14 +95,14 @@ void AdBlock::initLabel() KIconLoader *loader = instance()->iconLoader(); m_label->setFixedHeight(loader->currentSize(KIcon::Small)); - m_label->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_label->setUseCursor(false); m_label->setPixmap(loader->loadIcon("filter", KIcon::Small)); statusBarEx->addStatusBarItem(m_label, 0, false); - connect(m_label, SIGNAL(leftClickedURL()), this, SLOT(showDialogue())); - connect(m_label, SIGNAL(rightClickedURL()), this, SLOT(contextMenu())); + connect(m_label, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(showDialogue())); + connect(m_label, TQT_SIGNAL(rightClickedURL()), this, TQT_SLOT(contextMenu())); } void AdBlock::showDialogue() @@ -120,9 +120,9 @@ void AdBlock::showDialogue() fillBlockableElements(elements); AdBlockDlg *dialogue = new AdBlockDlg(m_part->widget(), elements); - connect(dialogue, SIGNAL( notEmptyFilter(const QString&) ), this, SLOT( addAdFilter(const QString&) )); - connect(dialogue, SIGNAL( cancelClicked() ), dialogue, SLOT( delayedDestruct() )); - connect(dialogue, SIGNAL( closeClicked() ), dialogue, SLOT( delayedDestruct() )); + connect(dialogue, TQT_SIGNAL( notEmptyFilter(const TQString&) ), this, TQT_SLOT( addAdFilter(const TQString&) )); + connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); + connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); dialogue->show(); } @@ -130,14 +130,14 @@ void AdBlock::showKCModule() { KCMultiDialog* dialogue = new KCMultiDialog(m_part->widget()); dialogue->addModule("khtml_filter"); - connect(dialogue, SIGNAL( cancelClicked() ), dialogue, SLOT( delayedDestruct() )); - connect(dialogue, SIGNAL( closeClicked() ), dialogue, SLOT( delayedDestruct() )); + connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); + connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); dialogue->show(); } void AdBlock::contextMenu() { - m_menu->popup(QCursor::pos()); + m_menu->popup(TQCursor::pos()); } void AdBlock::fillBlockableElements(AdElementList &elements) @@ -172,7 +172,7 @@ void AdBlock::fillWithImages(AdElementList &elements) DOMString src = image.src(); - QString url = htmlDoc.completeURL(src).string(); + TQString url = htmlDoc.completeURL(src).string(); if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, "image", "IMG", false); @@ -185,7 +185,7 @@ void AdBlock::fillWithImages(AdElementList &elements) void AdBlock::fillWithHtmlTag(AdElementList &elements, const DOMString &tagName, const DOMString &attrName, - const QString &category) + const TQString &category) { Document doc = m_part->document(); @@ -199,7 +199,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements, DOMString src = attr.nodeValue(); if (src.isNull()) continue; - QString url = doc.completeURL(src).string(); + TQString url = doc.completeURL(src).string(); if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, tagName.string(), category, false); @@ -209,7 +209,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements, } } -void AdBlock::addAdFilter(const QString &url) +void AdBlock::addAdFilter(const TQString &url) { //FIXME hackish KHTMLSettings *settings = const_cast<KHTMLSettings *>(m_part->settings()); @@ -221,8 +221,8 @@ void AdBlock::addAdFilter(const QString &url) AdElement::AdElement() : m_url(0), m_category(0), m_type(0), m_blocked(false) {} -AdElement::AdElement(const QString &url, const QString &category, - const QString &type, bool blocked) : +AdElement::AdElement(const TQString &url, const TQString &category, + const TQString &type, bool blocked) : m_url(url), m_category(category), m_type(type), m_blocked(blocked) {} AdElement &AdElement::operator=(const AdElement &obj) @@ -250,17 +250,17 @@ void AdElement::setBlocked(bool blocked) m_blocked = blocked; } -const QString &AdElement::url() const +const TQString &AdElement::url() const { return m_url; } -const QString &AdElement::category() const +const TQString &AdElement::category() const { return m_category; } -const QString &AdElement::type() const +const TQString &AdElement::type() const { return m_type; } diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h index 4b6154e..0a9b15b 100644 --- a/konq-plugins/adblock/adblock.h +++ b/konq-plugins/adblock/adblock.h @@ -21,8 +21,8 @@ #ifndef KONQ_ADBLOCK_H #define KONQ_ADBLOCK_H -#include <qguardedptr.h> -#include <qvaluelist.h> +#include <tqguardedptr.h> +#include <tqvaluelist.h> #include <kparts/plugin.h> class KHTMLPart; @@ -41,18 +41,18 @@ namespace DOM class DOMString; } -typedef QValueList<AdElement> AdElementList; +typedef TQValueList<AdElement> AdElementList; class AdBlock : public KParts::Plugin { Q_OBJECT public: - AdBlock(QObject *parent, const char *name, const QStringList &); + AdBlock(TQObject *parent, const char *name, const TQStringList &); ~AdBlock(); private: - QGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<KHTMLPart> m_part; KURLLabel *m_label; KPopupMenu *m_menu; @@ -61,12 +61,12 @@ private: void fillWithHtmlTag(AdElementList &elements, const DOM::DOMString &tagName, const DOM::DOMString &attrName, - const QString &category); + const TQString &category); private slots: void initLabel(); void showDialogue(); - void addAdFilter(const QString &url); + void addAdFilter(const TQString &url); void contextMenu(); void showKCModule(); }; @@ -76,24 +76,24 @@ private slots: class AdElement { private: - QString m_url; - QString m_category; - QString m_type; + TQString m_url; + TQString m_category; + TQString m_type; bool m_blocked; public: AdElement(); - AdElement(const QString &url, const QString &category, - const QString &type, bool blocked); + AdElement(const TQString &url, const TQString &category, + const TQString &type, bool blocked); AdElement &operator=(const AdElement &); bool operator==(const AdElement &e1); bool isBlocked() const; void setBlocked(bool blocked); - const QString &url() const; - const QString &category() const; - const QString &type() const; + const TQString &url() const; + const TQString &category() const; + const TQString &type() const; }; #endif diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index 5de6efa..1aff0f6 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -24,30 +24,30 @@ #include <kpopupmenu.h> #include <klocale.h> -#include <qcursor.h> -#include <qlabel.h> -#include <qvbox.h> -#include <qlineedit.h> -#include <qcolor.h> -#include <qfont.h> -#include <qpainter.h> - -AdBlockDlg::AdBlockDlg(QWidget *parent, AdElementList &elements) : +#include <tqcursor.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqlineedit.h> +#include <tqcolor.h> +#include <tqfont.h> +#include <tqpainter.h> + +AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) : KDialogBase( parent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true ) { - QVBox *page = makeVBoxMainWidget(); - m_label1 = new QLabel( i18n("All blockable items in this page:"), page, "label1" ); + TQVBox *page = makeVBoxMainWidget(); + m_label1 = new TQLabel( i18n("All blockable items in this page:"), page, "label1" ); - m_list = new QListView(page); + m_list = new TQListView(page); m_list->setAllColumnsShowFocus( true ); m_list->addColumn( i18n("Source") ); m_list->addColumn( i18n("Category") ); m_list->addColumn( i18n("Node Name") ); - m_list->setColumnWidthMode(0, QListView::Manual); - m_list->setColumnWidthMode(1, QListView::Manual); - m_list->setColumnWidthMode(2, QListView::Manual); + m_list->setColumnWidthMode(0, TQListView::Manual); + m_list->setColumnWidthMode(1, TQListView::Manual); + m_list->setColumnWidthMode(2, TQListView::Manual); m_list->setColumnWidth(0, 600); m_list->setColumnWidth(1, 90); @@ -58,30 +58,30 @@ AdBlockDlg::AdBlockDlg(QWidget *parent, AdElementList &elements) : { AdElement &element = (*it); - QString url = element.url(); + TQString url = element.url(); ListViewItem *item = new ListViewItem( m_list, url, element.category(), element.type() ); item->setBlocked(element.isBlocked()); } - m_label2 = new QLabel( i18n("New filter (use * as a wildcard):"), page, "label2" ); + m_label2 = new TQLabel( i18n("New filter (use * as a wildcard):"), page, "label2" ); - m_filter = new QLineEdit( "", page, "lineedit" ); + m_filter = new TQLineEdit( "", page, "lineedit" ); - connect(this, SIGNAL( okClicked() ), this, SLOT( validateFilter() )); - connect(m_list, SIGNAL( doubleClicked(QListViewItem *, const QPoint &, int) ), this, SLOT(updateFilter(QListViewItem *)) ); + connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validateFilter() )); + connect(m_list, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(updateFilter(TQListViewItem *)) ); m_menu = new KPopupMenu(this); - m_menu->insertItem(i18n("Filter this item"), this, SLOT(filterItem())); - m_menu->insertItem(i18n("Filter all items at same path"), this, SLOT(filterPath())); + m_menu->insertItem(i18n("Filter this item"), this, TQT_SLOT(filterItem())); + m_menu->insertItem(i18n("Filter all items at same path"), this, TQT_SLOT(filterPath())); connect(m_list, - SIGNAL( contextMenuRequested( QListViewItem *, const QPoint& , int ) ), + TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), this, - SLOT( showContextMenu(QListViewItem *, const QPoint &) ) ); + TQT_SLOT( showContextMenu(TQListViewItem *, const TQPoint &) ) ); } -void AdBlockDlg::updateFilter(QListViewItem *selected) +void AdBlockDlg::updateFilter(TQListViewItem *selected) { ListViewItem *item = dynamic_cast<ListViewItem *>(selected); @@ -96,7 +96,7 @@ void AdBlockDlg::updateFilter(QListViewItem *selected) void AdBlockDlg::validateFilter() { - const QString text = m_filter->text().stripWhiteSpace(); + const TQString text = m_filter->text().stripWhiteSpace(); if (!text.isEmpty()) emit notEmptyFilter(text); @@ -104,7 +104,7 @@ void AdBlockDlg::validateFilter() delayedDestruct(); } -void AdBlockDlg::showContextMenu(QListViewItem *item, const QPoint &point) +void AdBlockDlg::showContextMenu(TQListViewItem *item, const TQPoint &point) { if (!item) return; m_menu->popup(point); @@ -112,14 +112,14 @@ void AdBlockDlg::showContextMenu(QListViewItem *item, const QPoint &point) void AdBlockDlg::filterItem() { - QListViewItem* item = m_list->selectedItem(); + TQListViewItem* item = m_list->selectedItem(); m_filter->setText( item->text(0) ); } void AdBlockDlg::filterPath() { - QListViewItem* item = m_list->selectedItem(); - QString value = item->text(0); + TQListViewItem* item = m_list->selectedItem(); + TQString value = item->text(0); m_filter->setText( value.section( '/', 0, -2 ).append("/*") ); } @@ -133,20 +133,20 @@ AdBlockDlg::~AdBlockDlg() // ---------------------------------------------------------------------------- -void ListViewItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align) +void ListViewItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align) { p->save(); - QColorGroup g( cg ); + TQColorGroup g( cg ); if ( isBlocked() ) { - g.setColor(QColorGroup::Text, red); - QFont font; + g.setColor(TQColorGroup::Text, red); + TQFont font; font.setItalic(true); p->setFont(font); } - QListViewItem::paintCell(p, g, column, width, align); + TQListViewItem::paintCell(p, g, column, width, align); p->restore(); } diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h index ab41bc2..8645d65 100644 --- a/konq-plugins/adblock/adblockdialogue.h +++ b/konq-plugins/adblock/adblockdialogue.h @@ -21,7 +21,7 @@ #define KONQ_ADBLOCKDLG_H #include <kdialogbase.h> -#include <qlistview.h> +#include <tqlistview.h> class QLabel; class QLineEdit; @@ -32,25 +32,25 @@ class AdBlockDlg : public KDialogBase Q_OBJECT private: - QLineEdit *m_filter; - QListView *m_list; - QLabel *m_label1; - QLabel *m_label2; + TQLineEdit *m_filter; + TQListView *m_list; + TQLabel *m_label1; + TQLabel *m_label2; KPopupMenu *m_menu; public: - AdBlockDlg(QWidget *parent, AdElementList &elements); + AdBlockDlg(TQWidget *parent, AdElementList &elements); ~AdBlockDlg(); private slots: void validateFilter (); - void updateFilter(QListViewItem *item); - void showContextMenu(QListViewItem *item, const QPoint &point); + void updateFilter(TQListViewItem *item); + void showContextMenu(TQListViewItem *item, const TQPoint &point); void filterPath(); void filterItem(); signals: - void notEmptyFilter (const QString &url); + void notEmptyFilter (const TQString &url); }; // ---------------------------------------------------------------------------- @@ -61,13 +61,13 @@ private: bool m_blocked; public: - ListViewItem(QListView *listView, - const QString &label1, - const QString &label2, - const QString &label3) : QListViewItem(listView, label1, label2, label3), + ListViewItem(TQListView *listView, + const TQString &label1, + const TQString &label2, + const TQString &label3) : TQListViewItem(listView, label1, label2, label3), m_blocked(false){}; - void paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align); + void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align); bool isBlocked(); void setBlocked(bool blocked); diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index a2a82f2..2f59adc 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -38,21 +38,21 @@ #include <khtmlview.h> #include <kmessagebox.h> -#include <qdir.h> -#include <qcstring.h> -#include <qobject.h> -#include <qstringlist.h> +#include <tqdir.h> +#include <tqcstring.h> +#include <tqobject.h> +#include <tqstringlist.h> using namespace Akregator; typedef KGenericFactory<AkregatorMenu, KonqPopupMenu> AkregatorMenuFactory; K_EXPORT_COMPONENT_FACTORY( libakregatorkonqplugin, AkregatorMenuFactory("akregatorkonqplugin") ) -AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList& /* list */ ) +AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringList& /* list */ ) : KonqPopupMenuPlugin( popupmenu, name), PluginBase(), m_conf(0), m_part(0) { kdDebug() << "AkregatorMenu::AkregatorMenu()" << endl; - if ( QCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) + if ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) return; // Do nothing if user has turned us off. @@ -84,7 +84,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const if (isFeedUrl(it)) { kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl; - KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); + KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); addAction( action ); addSeparator(); m_feedURL = it->url().url(); @@ -101,7 +101,7 @@ AkregatorMenu::~AkregatorMenu() delete m_conf; } -bool AkregatorMenu::isFeedUrl(const QString &url) +bool AkregatorMenu::isFeedUrl(const TQString &url) { if (url.contains(".htm", false) != 0) return false; if (url.contains("rss", false) != 0) return true; @@ -116,7 +116,7 @@ bool AkregatorMenu::isFeedUrl(const KFileItem * item) return true; else { - QString url = item->url().url(); + TQString url = item->url().url(); // If URL ends in .htm or .html, it is not a feed url. return isFeedUrl(url); } @@ -125,9 +125,9 @@ bool AkregatorMenu::isFeedUrl(const KFileItem * item) void AkregatorMenu::slotAddFeed() { - QString url = m_part ? fixRelativeURL(m_feedURL, m_part->baseURL()) : m_feedURL; + TQString url = m_part ? fixRelativeURL(m_feedURL, m_part->baseURL()) : m_feedURL; if(akregatorRunning()) - addFeedsViaDCOP(QStringList(url)); + addFeedsViaDCOP(TQStringList(url)); else addFeedViaCmdLine(url); } diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h index 8074f2f..9fb6787 100644 --- a/konq-plugins/akregator/akregatorplugin.h +++ b/konq-plugins/akregator/akregatorplugin.h @@ -37,21 +37,21 @@ class AkregatorMenu : public KonqPopupMenuPlugin, PluginBase { Q_OBJECT public: - AkregatorMenu( KonqPopupMenu *, const char *name, const QStringList &list ); + AkregatorMenu( KonqPopupMenu *, const char *name, const TQStringList &list ); virtual ~AkregatorMenu(); public slots: void slotAddFeed(); protected: - bool isFeedUrl(const QString &s); + bool isFeedUrl(const TQString &s); bool isFeedUrl(const KFileItem *item); private: - QStringList m_feedMimeTypes; + TQStringList m_feedMimeTypes; KConfig *m_conf; KHTMLPart *m_part; - QString m_feedURL; + TQString m_feedURL; }; } diff --git a/konq-plugins/akregator/feeddetector.cpp b/konq-plugins/akregator/feeddetector.cpp index 928a282..57a333c 100644 --- a/konq-plugins/akregator/feeddetector.cpp +++ b/konq-plugins/akregator/feeddetector.cpp @@ -22,10 +22,10 @@ without including the source code for Qt in the source distribution. */ -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqvaluelist.h> #include <kcharsets.h> #include "feeddetector.h" @@ -33,26 +33,26 @@ using namespace Akregator; -FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) +FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s) { //reduce all sequences of spaces, newlines etc. to one space: - QString str = s.simplifyWhiteSpace(); + TQString str = s.simplifyWhiteSpace(); // extracts <link> tags - QRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false); + TQRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false); // extracts the URL (href="url") - QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); // extracts type attribute - QRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); // extracts the title (title="title") - QRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); int pos = 0; int matchpos = 0; // get all <link> tags - QStringList linkTags; + TQStringList linkTags; //int strlength = str.length(); while ( matchpos != -1 ) { @@ -66,9 +66,9 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) FeedDetectorEntryList list; - for ( QStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it ) + for ( TQStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it ) { - QString type; + TQString type; int pos = reType.search(*it, 0); if (pos != -1) type = reType.cap(1).lower(); @@ -78,14 +78,14 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) && type != "application/atom+xml" && type != "text/xml" ) continue; - QString title; + TQString title; pos = reTitle.search(*it, 0); if (pos != -1) title = reTitle.cap(1); title = KCharsets::resolveEntities(title); - QString url; + TQString url; pos = reHref.search(*it, 0); if (pos != -1) url = reHref.cap(1); @@ -104,33 +104,33 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s) return list; } -QStringList FeedDetector::extractBruteForce(const QString& s) +TQStringList FeedDetector::extractBruteForce(const TQString& s) { - QString str = s.simplifyWhiteSpace(); + TQString str = s.simplifyWhiteSpace(); - QRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false); + TQRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false); // extracts the URL (href="url") - QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); + TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false); - QRegExp rssrdfxml(".*(RSS|RDF|XML)", false); + TQRegExp rssrdfxml(".*(RSS|RDF|XML)", false); int pos = 0; int matchpos = 0; // get all <a href> tags and capture url - QStringList list; + TQStringList list; //int strlength = str.length(); while ( matchpos != -1 ) { matchpos = reAhrefTag.search(str, pos); if ( matchpos != -1 ) { - QString ahref = str.mid(matchpos, reAhrefTag.matchedLength()); + TQString ahref = str.mid(matchpos, reAhrefTag.matchedLength()); int hrefpos = reHref.search(ahref, 0); if ( hrefpos != -1 ) { - QString url = reHref.cap(1); + TQString url = reHref.cap(1); url = KCharsets::resolveEntities(url); diff --git a/konq-plugins/akregator/feeddetector.h b/konq-plugins/akregator/feeddetector.h index b557e33..8002d42 100644 --- a/konq-plugins/akregator/feeddetector.h +++ b/konq-plugins/akregator/feeddetector.h @@ -25,8 +25,8 @@ #ifndef AKREGATORFEEDDETECTOR_H #define AKREGATORFEEDDETECTOR_H -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> class QStringList; @@ -37,18 +37,18 @@ namespace Akregator { public: FeedDetectorEntry() {} - FeedDetectorEntry(const QString& url, const QString& title) + FeedDetectorEntry(const TQString& url, const TQString& title) : m_url(url), m_title(title) {} - const QString& url() const { return m_url; } - const QString& title() const { return m_title; } + const TQString& url() const { return m_url; } + const TQString& title() const { return m_title; } private: - const QString m_url; - const QString m_title; + const TQString m_url; + const TQString m_title; }; - typedef QValueList<FeedDetectorEntry> FeedDetectorEntryList; + typedef TQValueList<FeedDetectorEntry> FeedDetectorEntryList; /** a class providing functions to detect linked feeds in HTML sources */ class FeedDetector @@ -60,14 +60,14 @@ namespace Akregator @param s the html source to scan (the actual source, no URI) @return a list containing the detected feeds */ - static FeedDetectorEntryList extractFromLinkTags(const QString& s); + static FeedDetectorEntryList extractFromLinkTags(const TQString& s); /** \brief searches an HTML page for slightly feed-like looking links and catches everything not running away quickly enough. Extracts links from @c <a @c href> tags which end with @c xml, @c rss or @c rdf @param s the html source to scan (the actual source, no URI) @return a list containing the detected feeds */ - static QStringList extractBruteForce(const QString& s); + static TQStringList extractBruteForce(const TQString& s); private: FeedDetector() {} diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 436a4be..ce6f89e 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -41,13 +41,13 @@ #include <kurllabel.h> #include <kurl.h> -#include <qcursor.h> -#include <qobjectlist.h> -#include <qpixmap.h> -#include <qstringlist.h> -#include <qstylesheet.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqcursor.h> +#include <tqobjectlist.h> +#include <tqpixmap.h> +#include <tqstringlist.h> +#include <tqstylesheet.h> +#include <tqtimer.h> +#include <tqtooltip.h> using namespace Akregator; @@ -55,7 +55,7 @@ typedef KGenericFactory<KonqFeedIcon> KonqFeedIconFactory; K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIconFactory("akregatorkonqfeedicon")) -KonqFeedIcon::KonqFeedIcon(QObject *parent, const char *name, const QStringList &) +KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("akregator_konqplugin"); @@ -63,15 +63,15 @@ KonqFeedIcon::KonqFeedIcon(QObject *parent, const char *name, const QStringList m_part = dynamic_cast<KHTMLPart*>(parent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } // FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?) - //connect(m_part->view(), SIGNAL(finishedLayout()), this, SLOT(addFeedIcon())); - QTimer::singleShot(0, this, SLOT(waitPartToLoad())); + //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); + TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad())); } void KonqFeedIcon::waitPartToLoad() { - connect(m_part, SIGNAL(completed()), this, SLOT(addFeedIcon())); - connect(m_part, SIGNAL(completed(bool)), this, SLOT(addFeedIcon())); // to make pages with metarefresh to work - connect(m_part, SIGNAL(started(KIO::Job *)), this, SLOT(removeFeedIcon())); + connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addFeedIcon())); + connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addFeedIcon())); // to make pages with metarefresh to work + connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeFeedIcon())); addFeedIcon(); } @@ -101,7 +101,7 @@ bool KonqFeedIcon::feedFound() return false; unsigned int i; - QString doc = ""; + TQString doc = ""; for (i = 0; i < linkNodes.length(); i++) { @@ -110,7 +110,7 @@ bool KonqFeedIcon::feedFound() for (unsigned int j = 0; j < node.attributes().length(); j++) { doc += node.attributes().item(j).nodeName().string() + "=\""; - doc += QStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", """); + doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", """); doc += "\" "; } doc += "/>"; @@ -126,21 +126,21 @@ void KonqFeedIcon::contextMenu() m_menu = new KPopupMenu(m_part->widget()); if(m_feedList.count() == 1) { m_menu->insertTitle(m_feedList.first().title()); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, SLOT(addFeeds()) ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQT_SLOT(addFeeds()) ); } else { m_menu->insertTitle(i18n("Add Feeds to Akregator")); - connect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int))); + connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int))); int id = 0; for(FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).title(), id); id++; } - //disconnect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int))); + //disconnect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int))); m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, SLOT(addFeeds()), 0, 50000 ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, TQT_SLOT(addFeeds()), 0, 50000 ); } - m_menu->popup(QCursor::pos()); + m_menu->popup(TQCursor::pos()); } void KonqFeedIcon::addFeedIcon() @@ -156,17 +156,17 @@ void KonqFeedIcon::addFeedIcon() // from khtmlpart's ualabel m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_feedIcon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_feedIcon->setUseCursor(false); //FIXME hackish - m_feedIcon->setPixmap(QPixmap(locate("data", "akregator/pics/rss.png"))); + m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png"))); - QToolTip::remove(m_feedIcon); - QToolTip::add(m_feedIcon, i18n("Monitor this site for updates (using news feed)")); + TQToolTip::remove(m_feedIcon); + TQToolTip::add(m_feedIcon, i18n("Monitor this site for updates (using news feed)")); m_statusBarEx->addStatusBarItem(m_feedIcon, 0, true); - connect(m_feedIcon, SIGNAL(leftClickedURL()), this, SLOT(contextMenu())); + connect(m_feedIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu())); } void KonqFeedIcon::removeFeedIcon() @@ -188,7 +188,7 @@ void KonqFeedIcon::addFeed(int id) { if(id == 50000) return; if(akregatorRunning()) - addFeedsViaDCOP(QStringList(fixRelativeURL(m_feedList[id].url(), m_part->baseURL()))); + addFeedsViaDCOP(TQStringList(fixRelativeURL(m_feedList[id].url(), m_part->baseURL()))); else addFeedViaCmdLine(fixRelativeURL(m_feedList[id].url(), m_part->baseURL())); } @@ -198,7 +198,7 @@ void KonqFeedIcon::addFeeds() { if(akregatorRunning()) { - QStringList list; + TQStringList list; for ( FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it ) list.append(fixRelativeURL((*it).url(), m_part->baseURL())); addFeedsViaDCOP(list); diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index ba3bb8c..2fccffb 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -25,7 +25,7 @@ #ifndef KONQFEEDICON_H #define KONQFEEDICON_H -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kparts/plugin.h> #include <kpopupmenu.h> #include "feeddetector.h" @@ -47,7 +47,7 @@ class KonqFeedIcon : public KParts::Plugin, PluginBase { Q_OBJECT public: - KonqFeedIcon(QObject *parent, const char *name, const QStringList &); + KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &); ~KonqFeedIcon(); @@ -58,11 +58,11 @@ private: */ bool feedFound(); - QGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<KHTMLPart> m_part; KURLLabel *m_feedIcon; KParts::StatusBarExtension *m_statusBarEx; FeedDetectorEntryList m_feedList; - QGuardedPtr<KPopupMenu> m_menu; + TQGuardedPtr<KPopupMenu> m_menu; private slots: void waitPartToLoad(); diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp index 4c6b5b1..f837426 100644 --- a/konq-plugins/akregator/pluginbase.cpp +++ b/konq-plugins/akregator/pluginbase.cpp @@ -30,7 +30,7 @@ #include "feeddetector.h" #include "pluginbase.h" -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdebug.h> @@ -49,7 +49,7 @@ bool PluginBase::akregatorRunning() return reply.isValid(); } -void PluginBase::addFeedsViaDCOP(const QStringList& urls) +void PluginBase::addFeedsViaDCOP(const TQStringList& urls) { kdDebug() << "PluginBase::addFeedsViaDCOP" << endl; DCOPRef akr("akregator", "AkregatorIface"); @@ -60,7 +60,7 @@ void PluginBase::addFeedsViaDCOP(const QStringList& urls) }*/ } -void PluginBase::addFeedViaCmdLine(QString url) +void PluginBase::addFeedViaCmdLine(TQString url) { KProcess *proc = new KProcess; *proc << "akregator" << "-g" << i18n("Imported Feeds"); @@ -70,9 +70,9 @@ void PluginBase::addFeedViaCmdLine(QString url) } // handle all the wild stuff that KURL doesn't handle -QString PluginBase::fixRelativeURL(const QString &s, const KURL &baseurl) +TQString PluginBase::fixRelativeURL(const TQString &s, const KURL &baseurl) { - QString s2=s; + TQString s2=s; KURL u; if (KURL::isRelativeURL(s2)) { @@ -84,8 +84,8 @@ QString PluginBase::fixRelativeURL(const QString &s, const KURL &baseurl) else if (s2.startsWith("/")) { KURL b2(baseurl); - b2.setPath(QString()); // delete path and query, so that only protocol://host remains - b2.setQuery(QString()); + b2.setPath(TQString()); // delete path and query, so that only protocol://host remains + b2.setQuery(TQString()); u = KURL(b2, s2.remove(0,1)); // remove leading "/" } else diff --git a/konq-plugins/akregator/pluginbase.h b/konq-plugins/akregator/pluginbase.h index 8dcecf5..0bb24b9 100644 --- a/konq-plugins/akregator/pluginbase.h +++ b/konq-plugins/akregator/pluginbase.h @@ -48,12 +48,12 @@ class PluginBase /** * Adds feed to aKregator via DCOP. */ - void addFeedsViaDCOP(const QStringList& urls); + void addFeedsViaDCOP(const TQStringList& urls); /** * Adds feed to aKregator via command line. */ - void addFeedViaCmdLine(QString url); - QString fixRelativeURL(const QString &s, const KURL &baseurl); + void addFeedViaCmdLine(TQString url); + TQString fixRelativeURL(const TQString &s, const KURL &baseurl); }; } diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 35e610e..9d5e0f8 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -33,19 +33,19 @@ #include <kurl.h> #include <kio/netaccess.h> -#include <qdir.h> -#include <qcstring.h> -#include <qsignalmapper.h> -#include <qobject.h> +#include <tqdir.h> +#include <tqcstring.h> +#include <tqsignalmapper.h> +#include <tqobject.h> typedef KGenericFactory<ArkMenu, KonqPopupMenu> ArkMenuFactory; K_EXPORT_COMPONENT_FACTORY( libarkplugin, ArkMenuFactory("arkplugin") ) -ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList& /* list */ ) +ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringList& /* list */ ) : KonqPopupMenuPlugin( popupmenu, name), m_compAsMapper( 0 ), m_addToMapper( 0 ), m_conf( 0 ) { - if ( ( QCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) + if ( ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) ) || ( KStandardDirs::findExe( "ark" ).isNull() ) ) return; @@ -86,7 +86,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList break; } - QString ext; + TQString ext; KActionMenu * actionMenu; KAction * action; if ( hasOther && itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() ) // don't try to compress if we right click on a folder without files selected @@ -99,13 +99,13 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList item = itemList.first(); m_name = itemList.first()->name(); action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this, - SLOT( slotCompressAsDefault() ), actionCollection() ); + TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); } else { action = new KAction( KMimeType::mimeType( m_conf->readEntry( "LastMimeType", "application/x-tgz" ) )->comment(), - 0, this, SLOT( slotCompressAsDefault() ), actionCollection() ); + 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); } actionMenu->insert( action ); @@ -117,14 +117,14 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList if ( itemList.first()->url().isLocalFile() ) actionMenu->insert( m_addToMenu ); - connect( m_compAsMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotPrepareCompAsMenu() ) ); - connect( m_addToMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotPrepareAddToMenu() ) ); + connect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPrepareCompAsMenu() ) ); + connect( m_addToMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPrepareAddToMenu() ) ); action = new KAction( i18n( "Add to Archive..." ), 0, this, - SLOT( slotAdd() ), actionCollection() ); + TQT_SLOT( slotAdd() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } @@ -136,30 +136,30 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList actionMenu = new KActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" ); action = new KAction( i18n( "Extract Here" ), 0, this, - SLOT( slotExtractHere() ), actionCollection() ); + TQT_SLOT( slotExtractHere() ), actionCollection() ); actionMenu->insert( action ); // stolen from arkwidget.cpp if ( itemCount == 1 ) { - QString targetName = itemList.first()->name(); + TQString targetName = itemList.first()->name(); stripExtension( targetName ); action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this, - SLOT( slotExtractToSubfolders() ), actionCollection() ); + TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); } else { action = new KAction( i18n( "Extract to Subfolders" ), 0, this, - SLOT( slotExtractToSubfolders() ), actionCollection() ); + TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); } actionMenu->insert( action ); action = new KAction( i18n( "Extract To..." ), 0 , this, - SLOT( slotExtractTo() ), actionCollection() ); + TQT_SLOT( slotExtractTo() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } else { - action = new KAction( i18n( "Extract To..." ), "ark", 0, this, SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); + action = new KAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); addAction( action ); } } @@ -173,17 +173,17 @@ ArkMenu::~ArkMenu() void ArkMenu::slotPrepareCompAsMenu() { - disconnect( m_compAsMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotPrepareCompAsMenu() ) ); + disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPrepareCompAsMenu() ) ); KAction * action; - m_compAsMapper = new QSignalMapper( this, "compAsMapper" ); - QString ext; - QStringList newExt; + m_compAsMapper = new TQSignalMapper( this, "compAsMapper" ); + TQString ext; + TQStringList newExt; unsigned int counter = 0; - QCString actionName; - QStringList::Iterator eit; - QStringList::Iterator mit; + TQCString actionName; + TQStringList::Iterator eit; + TQStringList::Iterator mit; mit = m_archiveMimeTypes.begin(); for ( ; mit != m_archiveMimeTypes.end(); ++mit ) { @@ -195,13 +195,13 @@ void ArkMenu::slotPrepareCompAsMenu() if ( m_urlList.count() == 1 ) { action = new KAction( m_name + (*eit), 0, m_compAsMapper, - SLOT( map() ), actionCollection() ); + TQT_SLOT( map() ), actionCollection() ); } else { ext = KMimeType::mimeType(*mit)->comment(); action = new KAction( ext, 0, m_compAsMapper, - SLOT( map() ), actionCollection() ); + TQT_SLOT( map() ), actionCollection() ); } m_compAsMenu->insert( action ); @@ -218,13 +218,13 @@ void ArkMenu::slotPrepareCompAsMenu() m_extensionList += newExt; } - connect( m_compAsMapper, SIGNAL( mapped( int ) ), SLOT( slotCompressAs( int ) ) ); + connect( m_compAsMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( slotCompressAs( int ) ) ); } void ArkMenu::slotPrepareAddToMenu() { - disconnect( m_addToMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotPrepareAddToMenu() ) ); + disconnect( m_addToMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotPrepareAddToMenu() ) ); if ( m_extensionList.isEmpty() ) // is filled in slotPrepareCompAsMenu @@ -232,20 +232,20 @@ void ArkMenu::slotPrepareAddToMenu() unsigned int counter = 0; KAction * action; - m_addToMapper = new QSignalMapper( this, "addToMapper" ); - QCString actionName; - QStringList::Iterator mit; + m_addToMapper = new TQSignalMapper( this, "addToMapper" ); + TQCString actionName; + TQStringList::Iterator mit; KURL archive; - QDir dir( m_urlList.first().directory() ); - QStringList entries = dir.entryList(); - QStringList::Iterator uit = entries.begin(); + TQDir dir( m_urlList.first().directory() ); + TQStringList entries = dir.entryList(); + TQStringList::Iterator uit = entries.begin(); for ( ; uit != entries.end(); ++uit ) { for ( mit = m_extensionList.begin(); mit != m_extensionList.end(); ++mit ) if ( (*uit).endsWith(*mit) ) { action = new KAction( *uit, 0, m_addToMapper, - SLOT( map() ), actionCollection() ); + TQT_SLOT( map() ), actionCollection() ); m_addToMenu->insert( action ); m_addToMapper->setMapping( action, counter ); archive.setPath( *uit ); @@ -254,7 +254,7 @@ void ArkMenu::slotPrepareAddToMenu() break; } } - connect( m_addToMapper, SIGNAL( mapped( int ) ), SLOT( slotAddTo( int ) ) ); + connect( m_addToMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( slotAddTo( int ) ) ); } void ArkMenu::compMimeTypes() @@ -395,11 +395,11 @@ void ArkMenu::extMimeTypes() m_extractMimeTypes << "application/x-archive"; } -void ArkMenu::stripExtension( QString & name ) +void ArkMenu::stripExtension( TQString & name ) { - QStringList patternList = KMimeType::findByPath( name )->patterns(); - QStringList::Iterator it = patternList.begin(); - QString ext; + TQStringList patternList = KMimeType::findByPath( name )->patterns(); + TQStringList::Iterator it = patternList.begin(); + TQString ext; for ( ; it != patternList.end(); ++it ) { ext = (*it).remove( '*' ); @@ -413,10 +413,10 @@ void ArkMenu::stripExtension( QString & name ) void ArkMenu::slotCompressAs( int pos ) { - QCString name; - QString extension, mimeType; + TQCString name; + TQString extension, mimeType; KURL target; - QStringList filelist( m_urlStringList ); + TQStringList filelist( m_urlStringList ); //if KMimeType returns .ZIP, .7Z or .RAR. convert them to lowercase if ( m_extensionList[ pos ].contains ( ".ZIP" ) ) @@ -446,9 +446,9 @@ void ArkMenu::slotCompressAs( int pos ) m_conf->setGroup( "ArkPlugin" ); m_conf->writeEntry( "LastExtension", extension ); - QStringList extensions; - QStringList::Iterator eit; - QStringList::Iterator mit = m_archiveMimeTypes.begin(); + TQStringList extensions; + TQStringList::Iterator eit; + TQStringList::Iterator mit = m_archiveMimeTypes.begin(); bool done = false; for ( ; mit != m_archiveMimeTypes.end() && !done; ++mit ) { @@ -488,9 +488,9 @@ void ArkMenu::slotCompressAsDefault() } // make work for URLs -void ArkMenu::compressAs( const QStringList &name, const KURL & compressed ) +void ArkMenu::compressAs( const TQStringList &name, const KURL & compressed ) { - QStringList args; + TQStringList args; args << "--add-to"; args += name; args << compressed.url(); @@ -499,7 +499,7 @@ void ArkMenu::compressAs( const QStringList &name, const KURL & compressed ) void ArkMenu::slotAddTo( int pos ) { - QStringList args( m_urlStringList ); + TQStringList args( m_urlStringList ); args.prepend( "--add-to" ); KURL archive( m_urlStringList.first() ); @@ -512,7 +512,7 @@ void ArkMenu::slotAddTo( int pos ) void ArkMenu::slotAdd() { - QStringList args( m_urlStringList ); + TQStringList args( m_urlStringList ); args.prepend( "--add" ); kapp->kdeinitExec( "ark", args ); @@ -520,11 +520,11 @@ void ArkMenu::slotAdd() void ArkMenu::slotExtractHere() { - for ( QValueList<KURL>::ConstIterator it = m_urlList.constBegin(); + for ( TQValueList<KURL>::ConstIterator it = m_urlList.constBegin(); it != m_urlList.constEnd(); ++it ) { - QStringList args; + TQStringList args; KURL targetDirectory = ( *it ).url(); targetDirectory.setPath( targetDirectory.directory() ); args << "--extract-to" << targetDirectory.url() << ( *it ).url(); @@ -534,13 +534,13 @@ void ArkMenu::slotExtractHere() void ArkMenu::slotExtractToSubfolders() { - for ( QStringList::ConstIterator it = m_urlStringList.constBegin(); + for ( TQStringList::ConstIterator it = m_urlStringList.constBegin(); it != m_urlStringList.constEnd(); ++it ) { KURL targetDir; - QString dirName; - QStringList args; + TQString dirName; + TQStringList args; targetDir = *it; dirName = targetDir.path(); @@ -553,11 +553,11 @@ void ArkMenu::slotExtractToSubfolders() void ArkMenu::slotExtractTo() { - for ( QStringList::ConstIterator it = m_urlStringList.constBegin(); + for ( TQStringList::ConstIterator it = m_urlStringList.constBegin(); it != m_urlStringList.constEnd(); ++it ) { - QStringList args; + TQStringList args; args << "--extract" << *it; kapp->kdeinitExec( "ark", args ); } diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h index 8732294..6b9a6fe 100644 --- a/konq-plugins/arkplugin/arkplugin.h +++ b/konq-plugins/arkplugin/arkplugin.h @@ -31,7 +31,7 @@ class QSignalMapper; class ArkMenu : public KonqPopupMenuPlugin { Q_OBJECT public: - ArkMenu( KonqPopupMenu *, const char *name, const QStringList & list ); + ArkMenu( KonqPopupMenu *, const char *name, const TQStringList & list ); virtual ~ArkMenu(); public slots: @@ -48,24 +48,24 @@ public slots: protected: void extMimeTypes(); void compMimeTypes(); - void compressAs( const QStringList &name, const KURL & compressed ); + void compressAs( const TQStringList &name, const KURL & compressed ); - void stripExtension( QString & name ); + void stripExtension( TQString & name ); private: - QString m_name, m_ext; - QValueList<KURL> m_urlList; - QStringList m_urlStringList; + TQString m_name, m_ext; + TQValueList<KURL> m_urlList; + TQStringList m_urlStringList; KURL::List m_archiveList; - QStringList m_archiveMimeTypes; - QStringList m_extractMimeTypes; - QStringList m_extensionList; + TQStringList m_archiveMimeTypes; + TQStringList m_extractMimeTypes; + TQStringList m_extensionList; KActionMenu * m_compAsMenu; KActionMenu * m_addToMenu; - QSignalMapper * m_compAsMapper; - QSignalMapper * m_addToMapper; + TQSignalMapper * m_compAsMapper; + TQSignalMapper * m_addToMapper; KConfig * m_conf; - QString m_dir; //contains the currect directory + TQString m_dir; //contains the currect directory }; #endif diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index 6d06ea0..64be883 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -11,22 +11,22 @@ #include <kaction.h> #include <kinstance.h> #include <kiconloader.h> -#include <qmessagebox.h> +#include <tqmessagebox.h> #include <klocale.h> -#include <qtimer.h> +#include <tqtimer.h> #include <kgenericfactory.h> -AutoRefresh::AutoRefresh( QObject* parent, const char* name, const QStringList & /*args*/ ) +AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList & /*args*/ ) : Plugin( parent, name ) { - timer = new QTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( slotRefresh() ) ); + timer = new TQTimer( this ); + connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); refresher = new KSelectAction( i18n("&Auto Refresh"), "reload", 0, - this, SLOT(slotIntervalChanged()), + this, TQT_SLOT(slotIntervalChanged()), actionCollection(), "autorefresh" ); - QStringList sl; + TQStringList sl; sl << i18n("None"); sl << i18n("Every 15 Seconds"); sl << i18n("Every 30 Seconds"); @@ -86,10 +86,10 @@ void AutoRefresh::slotIntervalChanged() void AutoRefresh::slotRefresh() { if ( !parent()->inherits("KParts::ReadOnlyPart") ) { - QString title = i18n( "Cannot Refresh Source" ); - QString text = i18n( "<qt>This plugin cannot auto-refresh the current part.</qt>" ); + TQString title = i18n( "Cannot Refresh Source" ); + TQString text = i18n( "<qt>This plugin cannot auto-refresh the current part.</qt>" ); - QMessageBox::warning( 0, title, text ); + TQMessageBox::warning( 0, title, text ); } else { diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h index 370e42b..7616382 100644 --- a/konq-plugins/autorefresh/autorefresh.h +++ b/konq-plugins/autorefresh/autorefresh.h @@ -36,7 +36,7 @@ public: /** * Construct a new KParts plugin. */ - AutoRefresh( QObject* parent = 0, const char* name = 0, const QStringList &args = QStringList() ); + AutoRefresh( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); /** * Destructor. @@ -49,7 +49,7 @@ public slots: private: KSelectAction *refresher; - QTimer *timer; + TQTimer *timer; }; #endif diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index 302b71a..fc7a80e 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -34,8 +34,8 @@ typedef KGenericFactory<PluginBabelFish> BabelFishFactory; static const KAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( &aboutdata ) ) -PluginBabelFish::PluginBabelFish( QObject* parent, const char* name, - const QStringList & ) +PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, + const TQStringList & ) : Plugin( parent, name ) { setInstance(BabelFishFactory::instance()); @@ -60,104 +60,104 @@ PluginBabelFish::PluginBabelFish( QObject* parent, const char* name, actionCollection(), "translatewebpage_nl" ); m_en->insert( new KAction( i18n("&Chinese (Simplified)"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_zh") ); m_en->insert( new KAction( i18n("Chinese (&Traditional)"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_zhTW") ); m_en->insert( new KAction( i18n("&Dutch"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_nl") ); m_en->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_fr") ); m_en->insert( new KAction( i18n("&German"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_de") ); m_en->insert( new KAction( i18n("&Italian"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_it") ); m_en->insert( new KAction( i18n("&Japanese"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_ja") ); m_en->insert( new KAction( i18n("&Korean"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_ko") ); m_en->insert( new KAction( i18n("&Norwegian"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_no") ); m_en->insert( new KAction( i18n("&Portuguese"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_pt") ); m_en->insert( new KAction( i18n("&Russian"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_ru") ); m_en->insert( new KAction( i18n("&Spanish"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_es") ); m_en->insert( new KAction( i18n("T&hai"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "en_th") ); m_fr->insert( new KAction( i18n("&Dutch"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_nl") ); m_fr->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_en") ); m_fr->insert( new KAction( i18n("&German"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_de") ); m_fr->insert( new KAction( i18n("&Italian"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_it") ); m_fr->insert( new KAction( i18n("&Portuguese"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_pt") ); m_fr->insert( new KAction( i18n("&Spanish"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "fr_es") ); m_de->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "de_en") ); m_de->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "de_fr") ); m_es->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "es_en") ); m_es->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "es_fr") ); m_pt->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "pt_en") ); m_pt->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "pt_fr") ); m_it->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "it_en") ); m_it->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "it_fr") ); m_nl->insert( new KAction( i18n("&English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "nl_en") ); m_nl->insert( new KAction( i18n("&French"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "nl_fr") ); m_menu->insert( new KAction( i18n("&Chinese (Simplified) to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "zh_en") ); m_menu->insert( new KAction( i18n("Chinese (&Traditional) to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "zhTW_en") ); m_menu->insert( m_nl ); m_menu->insert( m_en ); @@ -165,14 +165,14 @@ PluginBabelFish::PluginBabelFish( QObject* parent, const char* name, m_menu->insert( m_de ); m_menu->insert( m_it ); m_menu->insert( new KAction( i18n("&Japanese to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "ja_en") ); m_menu->insert( new KAction( i18n("&Korean to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "ko_en") ); m_menu->insert( m_pt ); m_menu->insert( new KAction( i18n("&Russian to English"), 0, - this, SLOT(translateURL()), + this, TQT_SLOT(translateURL()), actionCollection(), "ru_en") ); m_menu->insert( m_es ); m_menu->setEnabled( true ); @@ -181,8 +181,8 @@ PluginBabelFish::PluginBabelFish( QObject* parent, const char* name, if ( parent && parent->inherits( "KHTMLPart" ) ) { KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent); - connect( part, SIGNAL(started(KIO::Job*)), this, - SLOT(slotStarted(KIO::Job*)) ); + connect( part, TQT_SIGNAL(started(KIO::Job*)), this, + TQT_SLOT(slotStarted(KIO::Job*)) ); } } @@ -214,8 +214,8 @@ void PluginBabelFish::translateURL() // The parent is assumed to be a KHTMLPart if ( !parent()->inherits("KHTMLPart") ) { - QString title = i18n( "Cannot Translate Source" ); - QString text = i18n( "Only web pages can be translated using " + TQString title = i18n( "Cannot Translate Source" ); + TQString text = i18n( "Only web pages can be translated using " "this plugin." ); KMessageBox::sorry( 0L, text, title ); @@ -224,7 +224,7 @@ void PluginBabelFish::translateURL() // Select engine KConfig cfg( "translaterc", true ); - QString engine = cfg.readEntry( sender()->name(), "babelfish" ); + TQString engine = cfg.readEntry( sender()->name(), "babelfish" ); // Get URL KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); @@ -233,7 +233,7 @@ void PluginBabelFish::translateURL() // we check if we have text selected. if so, we translate that. If // not, we translate the url - QString totrans; + TQString totrans; if ( part->hasSelection() ) { if( engine == "reverso" || engine == "tsail" ) @@ -248,8 +248,8 @@ void PluginBabelFish::translateURL() // Check syntax if ( !url.isValid() ) { - QString title = i18n( "Malformed URL" ); - QString text = i18n( "The URL you entered is not valid, please " + TQString title = i18n( "Malformed URL" ); + TQString text = i18n( "The URL you entered is not valid, please " "correct it and try again." ); KMessageBox::sorry( 0L, text, title ); return; @@ -259,36 +259,36 @@ void PluginBabelFish::translateURL() // Create URL KURL result; - QString query; + TQString query; if( engine == "freetranslation" ) { query = "sequence=core&Submit=FREE Translation&language="; - if( sender()->name() == QString( "en_es" ) ) + if( sender()->name() == TQString( "en_es" ) ) query += "English/Spanish"; - else if( sender()->name() == QString( "en_de" ) ) + else if( sender()->name() == TQString( "en_de" ) ) query += "English/German"; - else if( sender()->name() == QString( "en_it" ) ) + else if( sender()->name() == TQString( "en_it" ) ) query += "English/Italian"; - else if( sender()->name() == QString( "en_nl" ) ) + else if( sender()->name() == TQString( "en_nl" ) ) query += "English/Dutch"; - else if( sender()->name() == QString( "en_pt" ) ) + else if( sender()->name() == TQString( "en_pt" ) ) query += "English/Portuguese"; - else if( sender()->name() == QString( "en_no" ) ) + else if( sender()->name() == TQString( "en_no" ) ) query += "English/Norwegian"; - else if( sender()->name() == QString( "en_zh" ) ) + else if( sender()->name() == TQString( "en_zh" ) ) query += "English/SimplifiedChinese"; - else if( sender()->name() == QString( "en_zhTW" ) ) + else if( sender()->name() == TQString( "en_zhTW" ) ) query += "English/TraditionalChinese"; - else if( sender()->name() == QString( "es_en" ) ) + else if( sender()->name() == TQString( "es_en" ) ) query += "Spanish/English"; - else if( sender()->name() == QString( "fr_en" ) ) + else if( sender()->name() == TQString( "fr_en" ) ) query += "French/English"; - else if( sender()->name() == QString( "de_en" ) ) + else if( sender()->name() == TQString( "de_en" ) ) query += "German/English"; - else if( sender()->name() == QString( "it_en" ) ) + else if( sender()->name() == TQString( "it_en" ) ) query += "Italian/English"; - else if( sender()->name() == QString( "nl_en" ) ) + else if( sender()->name() == TQString( "nl_en" ) ) query += "Dutch/English"; - else if( sender()->name() == QString( "pt_en" ) ) + else if( sender()->name() == TQString( "pt_en" ) ) query += "Portuguese/English"; else // Should be en_fr query += "English/French"; @@ -313,21 +313,21 @@ void PluginBabelFish::translateURL() } else if( engine == "reverso" ) { result = KURL( "http://www.reverso.net/url/frame.asp" ); query = "autotranslate=on&templates=0&x=0&y=0&directions="; - if( sender()->name() == QString( "de_fr" ) ) + if( sender()->name() == TQString( "de_fr" ) ) query += "524292"; - else if( sender()->name() == QString( "fr_en" ) ) + else if( sender()->name() == TQString( "fr_en" ) ) query += "65544"; - else if( sender()->name() == QString( "fr_de" ) ) + else if( sender()->name() == TQString( "fr_de" ) ) query += "262152"; - else if( sender()->name() == QString( "de_en" ) ) + else if( sender()->name() == TQString( "de_en" ) ) query += "65540"; - else if( sender()->name() == QString( "en_de" ) ) + else if( sender()->name() == TQString( "en_de" ) ) query += "262145"; - else if( sender()->name() == QString( "en_es" ) ) + else if( sender()->name() == TQString( "en_es" ) ) query += "2097153"; - else if( sender()->name() == QString( "es_en" ) ) + else if( sender()->name() == TQString( "es_en" ) ) query += "65568"; - else if( sender()->name() == QString( "fr_es" ) ) + else if( sender()->name() == TQString( "fr_es" ) ) query += "2097160"; else // "en_fr" query += "524289"; @@ -336,9 +336,9 @@ void PluginBabelFish::translateURL() } else if( engine == "tsail" ) { result = KURL( "http://www.t-mail.com/cgi-bin/tsail" ); query = "sail=full&lp="; - if( sender()->name() == QString( "zhTW_en" ) ) + if( sender()->name() == TQString( "zhTW_en" ) ) query += "tw-en"; - else if( sender()->name() == QString( "en_zhTW" ) ) + else if( sender()->name() == TQString( "en_zhTW" ) ) query += "en-tw"; else { diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h index d4e8b01..1844ce1 100644 --- a/konq-plugins/babelfish/plugin_babelfish.h +++ b/konq-plugins/babelfish/plugin_babelfish.h @@ -29,8 +29,8 @@ class PluginBabelFish : public KParts::Plugin { Q_OBJECT public: - PluginBabelFish( QObject* parent, const char* name, - const QStringList & ); + PluginBabelFish( TQObject* parent, const char* name, + const TQStringList & ); virtual ~PluginBabelFish(); public slots: diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index 8d01553..b1e1f6f 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -37,7 +37,7 @@ typedef KGenericFactory<CrashesPlugin> CrashesPluginFactory; K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplugin" ) ) -CrashesPlugin::CrashesPlugin( QObject* parent, const char* name, const QStringList & ) +CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ) : KParts::Plugin( parent, name ) { m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; @@ -48,8 +48,8 @@ CrashesPlugin::CrashesPlugin( QObject* parent, const char* name, const QStringLi m_pCrashesMenu->setDelayed( false ); m_pCrashesMenu->setEnabled( true ); - connect( m_pCrashesMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotAboutToShow() ) ); + connect( m_pCrashesMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotAboutToShow() ) ); } CrashesPlugin::~CrashesPlugin() @@ -62,10 +62,10 @@ void CrashesPlugin::slotAboutToShow() KCrashBookmarkImporter importer(KCrashBookmarkImporter::crashBookmarksDir()); - connect( &importer, SIGNAL( newBookmark( const QString &, const QCString &, const QString &) ), - SLOT( newBookmarkCallback( const QString &, const QCString &, const QString & ) ) ); + connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), + TQT_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) ) ); - connect( &importer, SIGNAL( endFolder() ), SLOT( endFolderCallback() ) ); + connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolderCallback() ) ); int count = m_pCrashesMenu->popupMenu()->count(); @@ -89,7 +89,7 @@ void CrashesPlugin::slotAboutToShow() m_crashRangesList.append( CrashRange(firstItem, count) ); m_pCrashesMenu->popupMenu()->insertItem( i18n("All Pages of This Crash"), this, - SLOT(slotGroupSelected(int)), + TQT_SLOT(slotGroupSelected(int)), 0, crashGroup--); } m_pCrashesMenu->popupMenu()->insertSeparator(); @@ -97,14 +97,14 @@ void CrashesPlugin::slotAboutToShow() gotSep = true; firstItem = ++count; } else { - QString str = (*e).first; + TQString str = (*e).first; if (str.length() > 48) { str.truncate(48); str.append("..."); } m_pCrashesMenu->popupMenu()->insertItem( str, this, - SLOT(slotItemSelected(int)), + TQT_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; } @@ -113,13 +113,13 @@ void CrashesPlugin::slotAboutToShow() m_crashRangesList.append( CrashRange(firstItem, count) ); m_pCrashesMenu->popupMenu()->insertItem( i18n("All Pages of This Crash"), this, - SLOT(slotGroupSelected(int)), + TQT_SLOT(slotGroupSelected(int)), 0, crashGroup--); } } else { m_pCrashesMenu->popupMenu()->insertItem( i18n("No Recovered Crashes"), this, - SLOT(slotItemSelected(int)), + TQT_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; enable = false; @@ -131,20 +131,20 @@ void CrashesPlugin::slotAboutToShow() } int id =m_pCrashesMenu->popupMenu()->insertItem( i18n("&Clear List of Crashes"), this, - SLOT(slotClearCrashes()), + TQT_SLOT(slotClearCrashes()), 0, ++count ); m_pCrashesMenu->popupMenu()->setItemEnabled( id, enable); } -void CrashesPlugin::newBookmarkCallback( const QString & text, const QCString & url, - const QString & ) +void CrashesPlugin::newBookmarkCallback( const TQString & text, const TQCString & url, + const TQString & ) { m_crashesList.prepend(qMakePair(text,url)); } void CrashesPlugin::endFolderCallback( ) { - m_crashesList.prepend(qMakePair(QString("-"),QCString("-"))); + m_crashesList.prepend(qMakePair(TQString("-"),TQCString("-"))); } void CrashesPlugin::slotClearCrashes() { diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h index cff0831..3c6a402 100644 --- a/konq-plugins/crashes/crashesplugin.h +++ b/konq-plugins/crashes/crashesplugin.h @@ -21,9 +21,9 @@ #ifndef __CRASHES_PLUGIN_H #define __CRASHES_PLUGIN_H -#include <qmap.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <kurl.h> #include <klibloader.h> @@ -37,8 +37,8 @@ class CrashesPlugin : public KParts::Plugin Q_OBJECT public: - CrashesPlugin( QObject* parent, const char* name, - const QStringList & ); + CrashesPlugin( TQObject* parent, const char* name, + const TQStringList & ); ~CrashesPlugin(); protected slots: @@ -46,7 +46,7 @@ protected slots: void slotClearCrashes(); void slotItemSelected(int); void slotGroupSelected(int); - void newBookmarkCallback( const QString &, const QCString &, const QString & ); + void newBookmarkCallback( const TQString &, const TQCString &, const TQString & ); void endFolderCallback( ); private: @@ -55,13 +55,13 @@ private: KHTMLPart* m_part; KActionMenu* m_pCrashesMenu; - typedef QPair<QString,QCString> Crash; - typedef QValueList<Crash> CrashesList; + typedef QPair<TQString,TQCString> Crash; + typedef TQValueList<Crash> CrashesList; CrashesList m_crashesList; typedef QPair<int, int> CrashRange; - typedef QValueList<CrashRange> CrashRangesList; + typedef TQValueList<CrashRange> CrashRangesList; CrashRangesList m_crashRangesList; diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index 8401238..ff2eecd 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -19,13 +19,13 @@ #include <unistd.h> #include <sys/types.h> -#include <qtimer.h> -#include <qapplication.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qwhatsthis.h> -#include <qiconview.h> +#include <tqtimer.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> +#include <tqiconview.h> #include <klistview.h> #include <kdebug.h> @@ -71,9 +71,9 @@ SessionManager::~SessionManager() m_self = 0; } -QString SessionManager::generateKey (const KURL& url) const +TQString SessionManager::generateKey (const KURL& url) const { - QString key; + TQString key; key = url.protocol (); key += ':'; @@ -86,32 +86,32 @@ QString SessionManager::generateKey (const KURL& url) const key += url.path (); key += ':'; - key += QString::number (m_pid); + key += TQString::number (m_pid); return key; } -QStringList SessionManager::restoreMimeFilters (const KURL& url) const +TQStringList SessionManager::restoreMimeFilters (const KURL& url) const { - QString key(generateKey(url)); + TQString key(generateKey(url)); return m_filters[key]; } -QString SessionManager::restoreTypedFilter (const KURL& url) const +TQString SessionManager::restoreTypedFilter (const KURL& url) const { - QString key(generateKey(url)); + TQString key(generateKey(url)); return m_typedFilter[key]; } -void SessionManager::save (const KURL& url, const QStringList& filters) +void SessionManager::save (const KURL& url, const TQStringList& filters) { - QString key = generateKey(url); + TQString key = generateKey(url); m_filters[key] = filters; } -void SessionManager::save (const KURL& url, const QString& typedFilter) +void SessionManager::save (const KURL& url, const TQString& typedFilter) { - QString key = generateKey(url); + TQString key = generateKey(url); m_typedFilter[key] = typedFilter; } @@ -141,8 +141,8 @@ void SessionManager::loadSettings() -DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name, - const QStringList&) +DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, + const TQStringList&) :KParts::Plugin (parent, name), m_pFilterMenu(0), m_searchWidget(0), @@ -158,23 +158,23 @@ DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name, m_pFilterMenu->setDelayed (false); m_pFilterMenu->setWhatsThis(i18n("Allow to filter the currently displayed items by filetype.")); - connect (m_pFilterMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowPopup())); + connect (m_pFilterMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowPopup())); - connect (m_part, SIGNAL (itemRemoved(const KFileItem*)), - SLOT( slotItemRemoved (const KFileItem*))); - connect (m_part, SIGNAL (itemsAdded(const KFileItemList&)), - SLOT (slotItemsAdded(const KFileItemList&))); - connect (m_part, SIGNAL (itemsFilteredByMime(const KFileItemList&)), - SLOT (slotItemsAdded(const KFileItemList&))); - connect (m_part, SIGNAL(aboutToOpenURL()), SLOT(slotOpenURL())); + connect (m_part, TQT_SIGNAL (itemRemoved(const KFileItem*)), + TQT_SLOT( slotItemRemoved (const KFileItem*))); + connect (m_part, TQT_SIGNAL (itemsAdded(const KFileItemList&)), + TQT_SLOT (slotItemsAdded(const KFileItemList&))); + connect (m_part, TQT_SIGNAL (itemsFilteredByMime(const KFileItemList&)), + TQT_SLOT (slotItemsAdded(const KFileItemList&))); + connect (m_part, TQT_SIGNAL(aboutToOpenURL()), TQT_SLOT(slotOpenURL())); // add a searchline filter for konqis icons/list views - QHBox *hbox = new QHBox(m_part->widget()); + TQHBox *hbox = new TQHBox(m_part->widget()); hbox->hide(); KAction *clear = new KAction(i18n("Clear Filter Field"), - QApplication::reverseLayout() ? "clear_left" : "locationbar_erase", + TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, 0, 0, actionCollection(), "clear_filter"); clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field.")); @@ -184,18 +184,18 @@ DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name, m_searchWidget = new KListViewSearchLine(hbox); static_cast<KListViewSearchLine*>(m_searchWidget)->setListView(static_cast<KListView*>(m_part->scrollWidget())); } - else if ( ::qt_cast<QIconView*>(m_part->scrollWidget()) ) + else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { m_searchWidget = new KIconViewSearchLine(hbox); - static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<QIconView*>(m_part->scrollWidget())); + static_cast<KIconViewSearchLine*>(m_searchWidget)->setIconView(static_cast<TQIconView*>(m_part->scrollWidget())); } if ( m_searchWidget ) { - QWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown.")); - connect(clear, SIGNAL(activated()), m_searchWidget, SLOT(clear())); - connect(m_searchWidget, SIGNAL(textChanged(const QString&)), this, SLOT(searchTextChanged(const QString&))); + TQWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown.")); + connect(clear, TQT_SIGNAL(activated()), m_searchWidget, TQT_SLOT(clear())); + connect(m_searchWidget, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(searchTextChanged(const TQString&))); } KWidgetAction *filterAction = new KWidgetAction(hbox, i18n("Filter Field"), @@ -205,11 +205,11 @@ DirFilterPlugin::DirFilterPlugin (QObject* parent, const char* name, // FIXME: This causes crashes for an unknown reason on certain systems // Probably the iconview onchange event handler should tempoarily stop this timer before doing anything else // Really the broken Qt3 iconview should just be modified to include a hidden list; it would make things *so* much easier! - m_refreshTimer = new QTimer( this ); - m_reactivateRefreshTimer = new QTimer( this ); - connect( m_refreshTimer, SIGNAL(timeout()), this, SLOT(activateSearch()) ); + m_refreshTimer = new TQTimer( this ); + m_reactivateRefreshTimer = new TQTimer( this ); + connect( m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(activateSearch()) ); m_refreshTimer->start( 200, FALSE ); // 200 millisecond continuous timer - connect( m_reactivateRefreshTimer, SIGNAL(timeout()), this, SLOT(reactivateRefreshTimer()) ); + connect( m_reactivateRefreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reactivateRefreshTimer()) ); } @@ -222,7 +222,7 @@ DirFilterPlugin::~DirFilterPlugin() delete m_reactivateRefreshTimer; } -void DirFilterPlugin::searchTextChanged(const QString& newtext) +void DirFilterPlugin::searchTextChanged(const TQString& newtext) { m_refreshTimer->stop(); m_reactivateRefreshTimer->stop(); @@ -249,7 +249,7 @@ void DirFilterPlugin::slotOpenURL () SessionManager::self()->save(m_pURL, m_searchWidget->text()); m_searchWidget->clear(); - QString typedFilter(SessionManager::self()->restoreTypedFilter(url)); + TQString typedFilter(SessionManager::self()->restoreTypedFilter(url)); m_searchWidget->completionObject()->addItem(typedFilter); m_searchWidget->setText(typedFilter); } @@ -271,8 +271,8 @@ void DirFilterPlugin::slotShowPopup() int id = 0; uint enableReset = 0; - QString label; - QStringList inodes; + TQString label; + TQStringList inodes; m_pFilterMenu->popupMenu()->clear(); m_pFilterMenu->popupMenu()->insertTitle (i18n("Only Show Items of Type")); @@ -293,13 +293,13 @@ void DirFilterPlugin::slotShowPopup() { label = it.data().mimeComment; label += " ("; - label += QString::number (it.data().filenames.size ()); + label += TQString::number (it.data().filenames.size ()); label += ")"; } m_pMimeInfo[it.key()].id = m_pFilterMenu->popupMenu()->insertItem ( SmallIconSet(it.data().iconName), label, - this, SLOT(slotItemSelected(int)), 0, ++id); + this, TQT_SLOT(slotItemSelected(int)), 0, ++id); if (it.data().useAsFilter) { @@ -313,8 +313,8 @@ void DirFilterPlugin::slotShowPopup() { m_pFilterMenu->popupMenu()->insertSeparator (); - QStringList::Iterator it = inodes.begin(); - QStringList::Iterator end = inodes.end(); + TQStringList::Iterator it = inodes.begin(); + TQStringList::Iterator end = inodes.end(); for (; it != end; ++it) { @@ -324,13 +324,13 @@ void DirFilterPlugin::slotShowPopup() { label = m_pMimeInfo[(*it)].mimeComment; label += " ("; - label += QString::number (m_pMimeInfo[(*it)].filenames.size ()); + label += TQString::number (m_pMimeInfo[(*it)].filenames.size ()); label += ")"; } m_pMimeInfo[(*it)].id = m_pFilterMenu->popupMenu()->insertItem ( SmallIconSet(m_pMimeInfo[(*it)].iconName), label, - this, SLOT(slotItemSelected(int)), 0, ++id); + this, TQT_SLOT(slotItemSelected(int)), 0, ++id); if (m_pMimeInfo[(*it)].useAsFilter) { @@ -342,16 +342,16 @@ void DirFilterPlugin::slotShowPopup() m_pFilterMenu->popupMenu()->insertSeparator (); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Use Multiple Filters"), - this, SLOT(slotMultipleFilters())); + this, TQT_SLOT(slotMultipleFilters())); m_pFilterMenu->popupMenu()->setItemEnabled (id, enableReset <= 1); m_pFilterMenu->popupMenu()->setItemChecked (id, SessionManager::self()->useMultipleFilters); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Show Count"), this, - SLOT(slotShowCount())); + TQT_SLOT(slotShowCount())); m_pFilterMenu->popupMenu()->setItemChecked (id, SessionManager::self()->showCount); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Reset"), this, - SLOT(slotReset())); + TQT_SLOT(slotReset())); m_pFilterMenu->popupMenu()->setItemEnabled (id, enableReset); } @@ -367,7 +367,7 @@ void DirFilterPlugin::slotItemSelected (int id) if (it != m_pMimeInfo.end()) { - QStringList filters; + TQStringList filters; if (it.data().useAsFilter) { @@ -420,7 +420,7 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) { static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); } - else if ( ::qt_cast<QIconView*>(m_part->scrollWidget()) ) + else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch(); } @@ -432,16 +432,16 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) for (KFileItemListIterator it (list); it.current (); ++it) { - QString name = it.current()->name(); + TQString name = it.current()->name(); KMimeType::Ptr mime = it.current()->mimeTypePtr(); // don't resolve mimetype if unknown if (!mime) continue; - QString mimeType = mime->name(); + TQString mimeType = mime->name(); if (!m_pMimeInfo.contains (mimeType)) { MimeInfo& mimeInfo = m_pMimeInfo[mimeType]; - QStringList filters = m_part->mimeFilter (); + TQStringList filters = m_part->mimeFilter (); mimeInfo.useAsFilter = (!filters.isEmpty () && filters.contains (mimeType)); mimeInfo.mimeComment = mime->comment(); mimeInfo.iconName = mime->icon(KURL(), false); @@ -468,11 +468,11 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item) // NOTE: This bug is NOT present in qlistviewitem // HACK around it here... - if ( ::qt_cast<QIconView*>(m_part->scrollWidget()) ) { + if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->iconDeleted(item->name()); } - QString mimeType = item->mimetype().stripWhiteSpace(); + TQString mimeType = item->mimetype().stripWhiteSpace(); if (m_pMimeInfo.contains (mimeType)) { MimeInfo info = m_pMimeInfo [mimeType]; @@ -481,11 +481,11 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item) m_pMimeInfo [mimeType].filenames.remove (item->name ()); else { if (info.useAsFilter) { - QStringList filters = m_part->mimeFilter (); + TQStringList filters = m_part->mimeFilter (); filters.remove (mimeType); m_part->setMimeFilter (filters); SessionManager::self()->save (m_part->url(), filters); - QTimer::singleShot( 0, this, SLOT(slotTimeout()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotTimeout()) ); } m_pMimeInfo.remove (mimeType); } @@ -509,7 +509,7 @@ void DirFilterPlugin::activateSearch() if ( ::qt_cast<KListView*>(m_part->scrollWidget()) ) { static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); } - else if ( ::qt_cast<QIconView*>(m_part->scrollWidget()) ) { + else if ( ::qt_cast<TQIconView*>(m_part->scrollWidget()) ) { static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch(); } } @@ -523,7 +523,7 @@ void DirFilterPlugin::slotReset() for (; it != m_pMimeInfo.end(); ++it) it.data().useAsFilter = false; - QStringList filters; + TQStringList filters; KURL url = m_part->url(); m_part->setMimeFilter (filters); diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h index c1313be..ff3497e 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.h +++ b/konq-plugins/dirfilter/dirfilterplugin.h @@ -19,9 +19,9 @@ #ifndef __DIR_FILTER_PLUGIN_H #define __DIR_FILTER_PLUGIN_H -#include <qmap.h> -#include <qtimer.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqtimer.h> +#include <tqstringlist.h> #include <kurl.h> @@ -50,17 +50,17 @@ public: ~SessionManager (); static SessionManager* self (); - QStringList restoreMimeFilters (const KURL& url) const; - QString restoreTypedFilter(const KURL& url) const; - void save (const KURL& url, const QStringList& filters); - void save (const KURL& url, const QString& typedFilter); + TQStringList restoreMimeFilters (const KURL& url) const; + TQString restoreTypedFilter(const KURL& url) const; + void save (const KURL& url, const TQStringList& filters); + void save (const KURL& url, const TQString& typedFilter); bool showCount; bool useMultipleFilters; protected: - QString generateKey (const KURL& url) const; + TQString generateKey (const KURL& url) const; void loadSettings (); void saveSettings (); @@ -73,8 +73,8 @@ private: int m_pid; bool m_bSettingsLoaded; static SessionManager* m_self; - QMap<QString,QStringList> m_filters; - QMap<QString,QString> m_typedFilter; + TQMap<TQString,TQStringList> m_filters; + TQMap<TQString,TQString> m_typedFilter; }; @@ -84,7 +84,7 @@ class DirFilterPlugin : public KParts::Plugin public: - DirFilterPlugin (QObject* parent, const char* name, const QStringList &); + DirFilterPlugin (TQObject* parent, const char* name, const TQStringList &); ~DirFilterPlugin (); protected: @@ -100,11 +100,11 @@ protected: int id; bool useAsFilter; - QString mimeType; - QString iconName; - QString mimeComment; + TQString mimeType; + TQString iconName; + TQString mimeComment; - QMap<QString, bool> filenames; + TQMap<TQString, bool> filenames; }; void loadSettings(); @@ -121,19 +121,19 @@ private slots: void slotItemRemoved(const KFileItem *); void slotItemsAdded(const KFileItemList &); void activateSearch(); - void searchTextChanged(const QString& newtext); + void searchTextChanged(const TQString& newtext); void reactivateRefreshTimer(); private: KURL m_pURL; KonqDirPart* m_part; - QTimer *m_refreshTimer; - QTimer *m_reactivateRefreshTimer; + TQTimer *m_refreshTimer; + TQTimer *m_reactivateRefreshTimer; KActionMenu* m_pFilterMenu; - QString m_oldFilterString; + TQString m_oldFilterString; KLineEdit *m_searchWidget; - QMap<QString,MimeInfo> m_pMimeInfo; - typedef QMap<QString,MimeInfo>::Iterator MimeInfoIterator; + TQMap<TQString,MimeInfo> m_pMimeInfo; + typedef TQMap<TQString,MimeInfo>::Iterator MimeInfoIterator; }; #endif diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp index c24df96..7ab20b4 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.cpp +++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp @@ -17,32 +17,32 @@ #include "domlistviewitem.h" -#include <qpainter.h> -#include <qlistview.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqlistview.h> +#include <tqapplication.h> #include <kglobalsettings.h> -DOMListViewItem::DOMListViewItem( const DOM::Node &node, QListView *parent ) - : QListViewItem( parent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent ) + : TQListViewItem( parent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, QListView *parent, QListViewItem *after) - : QListViewItem( parent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent, TQListViewItem *after) + : TQListViewItem( parent, after ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, QListViewItem *parent ) - : QListViewItem( parent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent ) + : TQListViewItem( parent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, QListViewItem *parent, QListViewItem *after) - : QListViewItem( parent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent, TQListViewItem *after) + : TQListViewItem( parent, after ), m_node(node) { init(); } @@ -54,20 +54,20 @@ DOMListViewItem::~DOMListViewItem() void DOMListViewItem::init() { - m_color = QApplication::palette().color( QPalette::Active, QColorGroup::Text ); + m_color = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Text ); m_font = KGlobalSettings::generalFont(); clos = false; } -void DOMListViewItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment ) +void DOMListViewItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { - QColorGroup _cg( cg ); - QColor c = _cg.text(); + TQColorGroup _cg( cg ); + TQColor c = _cg.text(); p->setFont(m_font); - _cg.setColor( QColorGroup::Text, m_color ); - QListViewItem::paintCell( p, _cg, column, width, alignment ); - _cg.setColor( QColorGroup::Text, c ); + _cg.setColor( TQColorGroup::Text, m_color ); + TQListViewItem::paintCell( p, _cg, column, width, alignment ); + _cg.setColor( TQColorGroup::Text, c ); } diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h index 22f34b2..9a85fbf 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.h +++ b/konq-plugins/domtreeviewer/domlistviewitem.h @@ -18,26 +18,26 @@ #include <dom/dom_node.h> -#include <qlistview.h> -#include <qcolor.h> -#include <qfont.h> +#include <tqlistview.h> +#include <tqcolor.h> +#include <tqfont.h> class DOMListViewItem : public QListViewItem { public: - DOMListViewItem( const DOM::Node &, QListView *parent ); - DOMListViewItem( const DOM::Node &, QListView *parent, QListViewItem *after ); - DOMListViewItem( const DOM::Node &, QListViewItem *parent ); - DOMListViewItem( const DOM::Node &, QListViewItem *parent, QListViewItem *after ); + DOMListViewItem( const DOM::Node &, TQListView *parent ); + DOMListViewItem( const DOM::Node &, TQListView *parent, TQListViewItem *after ); + DOMListViewItem( const DOM::Node &, TQListViewItem *parent ); + DOMListViewItem( const DOM::Node &, TQListViewItem *parent, TQListViewItem *after ); virtual ~DOMListViewItem(); - virtual void paintCell( QPainter *p, const QColorGroup &cg, + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ); - void setColor( const QColor &color) { m_color = color; } + void setColor( const TQColor &color) { m_color = color; } - void setFont( const QFont &font) { m_font = font;} + void setFont( const TQFont &font) { m_font = font;} void setItalic( bool b) {m_font.setItalic(b);} void setBold( bool b) {m_font.setBold(b);} void setUnderline(bool b) {m_font.setUnderline(b);} @@ -49,8 +49,8 @@ class DOMListViewItem : public QListViewItem private: void init(); - QColor m_color; - QFont m_font; + TQColor m_color; + TQFont m_font; DOM::Node m_node; bool clos; }; diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index 1f91cf1..0bbb918 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.cpp +++ b/konq-plugins/domtreeviewer/domtreecommands.cpp @@ -25,7 +25,7 @@ #include <klocale.h> -#include <qmap.h> +#include <tqmap.h> using namespace domtreeviewer; @@ -50,7 +50,7 @@ static const char * const dom_error_msgs[] = { // == global functions ============================================== -QString domtreeviewer::domErrorMessage(int dom_err) +TQString domtreeviewer::domErrorMessage(int dom_err) { if ((unsigned)dom_err > sizeof dom_error_msgs/sizeof dom_error_msgs[0]) return i18n("Unknown Exception %1").arg(dom_err); @@ -87,7 +87,7 @@ inline static bool operator <(const DOM::Node &n1, const DOM::Node &n2) return (long)n1.handle() - (long)n2.handle() < 0; } -class ChangedNodeSet : public QMap<DOM::Node, bool> +class ChangedNodeSet : public TQMap<DOM::Node, bool> { }; @@ -104,15 +104,15 @@ ManipulationCommand::~ManipulationCommand() { } -void ManipulationCommand::connect(const char *signal, QObject *recv, const char *slot) +void ManipulationCommand::connect(const char *signal, TQObject *recv, const char *slot) { - QObject::connect(mcse(), signal, recv, slot); + TQObject::connect(mcse(), signal, recv, slot); } void ManipulationCommand::handleException(DOM::DOMException &ex) { _exception = ex; - QString msg = name() + ": " + domErrorMessage(ex.code); + TQString msg = name() + ": " + domErrorMessage(ex.code); emit mcse()->error(ex.code, msg); } @@ -178,7 +178,7 @@ void ManipulationCommand::reapply() // == MultiCommand =========================================== -MultiCommand::MultiCommand(const QString &desc) +MultiCommand::MultiCommand(const TQString &desc) : _name(desc) { cmds.setAutoDelete(true); @@ -197,7 +197,7 @@ void MultiCommand::addCommand(ManipulationCommand *cmd) void MultiCommand::apply() { // apply in forward order - for (QPtrListIterator<ManipulationCommand> it = cmds; *it; ++it) { + for (TQPtrListIterator<ManipulationCommand> it = cmds; *it; ++it) { try { if (shouldReapply()) (*it)->reapply(); else (*it)->apply(); @@ -223,7 +223,7 @@ void MultiCommand::apply() void MultiCommand::unapply() { // unapply in reverse order - QPtrListIterator<ManipulationCommand> it = cmds; + TQPtrListIterator<ManipulationCommand> it = cmds; for (it.toLast(); *it; --it) { try { (*it)->unapply(); @@ -258,14 +258,14 @@ void MultiCommand::mergeChangedNodesFrom(ManipulationCommand *cmd) cmd->changedNodes->clear(); } -QString MultiCommand::name() const +TQString MultiCommand::name() const { return _name; } // == AddAttributeCommand =========================================== -AddAttributeCommand::AddAttributeCommand(const DOM::Element &element, const QString &attrName, const QString &attrValue) +AddAttributeCommand::AddAttributeCommand(const DOM::Element &element, const TQString &attrName, const TQString &attrValue) : _element(element), attrName(attrName), attrValue(attrValue) { if (attrValue.isEmpty()) this->attrValue = "<dummy>"; @@ -287,7 +287,7 @@ void AddAttributeCommand::unapply() addChangedNode(_element); } -QString AddAttributeCommand::name() const +TQString AddAttributeCommand::name() const { return i18n("Add attribute"); } @@ -295,7 +295,7 @@ QString AddAttributeCommand::name() const // == ChangeAttributeValueCommand ==================================== ChangeAttributeValueCommand::ChangeAttributeValueCommand( -const DOM::Element &element, const QString &attr, const QString &value) +const DOM::Element &element, const TQString &attr, const TQString &value) : _element(element), _attr(attr), new_value(value) { } @@ -317,14 +317,14 @@ void ChangeAttributeValueCommand::unapply() addChangedNode(_element); } -QString ChangeAttributeValueCommand::name() const +TQString ChangeAttributeValueCommand::name() const { return i18n("Change attribute value"); } // == RemoveAttributeCommand ======================================== -RemoveAttributeCommand::RemoveAttributeCommand(const DOM::Element &element, const QString &attrName) +RemoveAttributeCommand::RemoveAttributeCommand(const DOM::Element &element, const TQString &attrName) : _element(element), attrName(attrName) { } @@ -348,14 +348,14 @@ void RemoveAttributeCommand::unapply() addChangedNode(_element); } -QString RemoveAttributeCommand::name() const +TQString RemoveAttributeCommand::name() const { return i18n("Remove attribute"); } // == RenameAttributeCommand ======================================== -RenameAttributeCommand::RenameAttributeCommand(const DOM::Element &element, const QString &attrOldName, const QString &attrNewName) +RenameAttributeCommand::RenameAttributeCommand(const DOM::Element &element, const TQString &attrOldName, const TQString &attrNewName) : _element(element), attrOldName(attrOldName), attrNewName(attrNewName) { } @@ -380,14 +380,14 @@ void RenameAttributeCommand::unapply() addChangedNode(_element); } -QString RenameAttributeCommand::name() const +TQString RenameAttributeCommand::name() const { return i18n("Rename attribute"); } // == ChangeCDataCommand ======================================== -ChangeCDataCommand::ChangeCDataCommand(const DOM::CharacterData &cdata, const QString &value) +ChangeCDataCommand::ChangeCDataCommand(const DOM::CharacterData &cdata, const TQString &value) : cdata(cdata), value(value), has_newlines(false) { } @@ -401,8 +401,8 @@ void ChangeCDataCommand::apply() if (!shouldReapply()) { oldValue = cdata.data(); has_newlines = - QConstString(value.unicode(), value.length()).string().contains('\n') - || QConstString(oldValue.unicode(), oldValue.length()).string().contains('\n'); + TQConstString(value.unicode(), value.length()).string().contains('\n') + || TQConstString(oldValue.unicode(), oldValue.length()).string().contains('\n'); } cdata.setData(value); addChangedNode(cdata); @@ -416,7 +416,7 @@ void ChangeCDataCommand::unapply() struc_changed = has_newlines; } -QString ChangeCDataCommand::name() const +TQString ChangeCDataCommand::name() const { return i18n("Change textual content"); } @@ -478,7 +478,7 @@ void InsertNodeCommand::unapply() struc_changed = true; } -QString InsertNodeCommand::name() const +TQString InsertNodeCommand::name() const { return i18n("Insert node"); } @@ -506,7 +506,7 @@ void RemoveNodeCommand::unapply() struc_changed = true; } -QString RemoveNodeCommand::name() const +TQString RemoveNodeCommand::name() const { return i18n("Remove node"); } @@ -552,7 +552,7 @@ void MoveNodeCommand::unapply() struc_changed = true; } -QString MoveNodeCommand::name() const +TQString MoveNodeCommand::name() const { return i18n("Move node"); } diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h index bf893dc..f068426 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.h +++ b/konq-plugins/domtreeviewer/domtreecommands.h @@ -32,8 +32,8 @@ #include <kcommand.h> -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> class DOMTreeView; class KPrinter; @@ -45,7 +45,7 @@ class ManipulationCommandSignalEmitter; class ChangedNodeSet; /** returns a localized string for the given dom exception code */ -QString domErrorMessage(int exception_code); +TQString domErrorMessage(int exception_code); /** * Internal class for emitting signals. @@ -71,7 +71,7 @@ signals: * @param err_id DOM error id * @param msg error message */ - void error(int err_id, const QString &msg); + void error(int err_id, const TQString &msg); private: // make moc not complain friend class ManipulationCommand; @@ -97,7 +97,7 @@ public: bool allowSignals() const { return allow_signals; } /** connects the given signal to a slot */ - static void connect(const char *signal, QObject *recv, const char *slot); + static void connect(const char *signal, TQObject *recv, const char *slot); /** does grunt work and calls apply()/reapply() */ virtual void execute(); @@ -136,13 +136,13 @@ private: class MultiCommand : public ManipulationCommand { public: - MultiCommand(const QString &name); + MultiCommand(const TQString &name); virtual ~MultiCommand(); /** Adds a new command. Will take ownership of \c cmd */ void addCommand(ManipulationCommand *cmd); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -151,8 +151,8 @@ protected: void mergeChangedNodesFrom(ManipulationCommand *cmd); protected: - QPtrList<ManipulationCommand> cmds; - QString _name; + TQPtrList<ManipulationCommand> cmds; + TQString _name; }; /** @@ -162,10 +162,10 @@ protected: class AddAttributeCommand : public ManipulationCommand { public: - AddAttributeCommand(const DOM::Element &element, const QString &attrName, const QString &attrValue); + AddAttributeCommand(const DOM::Element &element, const TQString &attrName, const TQString &attrValue); virtual ~AddAttributeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -184,10 +184,10 @@ protected: class ChangeAttributeValueCommand : public ManipulationCommand { public: - ChangeAttributeValueCommand(const DOM::Element &element, const QString &attr, const QString &value); + ChangeAttributeValueCommand(const DOM::Element &element, const TQString &attr, const TQString &value); virtual ~ChangeAttributeValueCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -207,10 +207,10 @@ protected: class RemoveAttributeCommand : public ManipulationCommand { public: - RemoveAttributeCommand(const DOM::Element &element, const QString &attrName); + RemoveAttributeCommand(const DOM::Element &element, const TQString &attrName); virtual ~RemoveAttributeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -229,10 +229,10 @@ protected: class RenameAttributeCommand : public ManipulationCommand { public: - RenameAttributeCommand(const DOM::Element &element, const QString &attrOldName, const QString &attrNewName); + RenameAttributeCommand(const DOM::Element &element, const TQString &attrOldName, const TQString &attrNewName); virtual ~RenameAttributeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -252,10 +252,10 @@ protected: class ChangeCDataCommand : public ManipulationCommand { public: - ChangeCDataCommand(const DOM::CharacterData &, const QString &value); + ChangeCDataCommand(const DOM::CharacterData &, const TQString &value); virtual ~ChangeCDataCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -309,7 +309,7 @@ public: InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~InsertNodeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -335,7 +335,7 @@ public: RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~RemoveNodeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); @@ -358,7 +358,7 @@ public: MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~MoveNodeCommand(); - virtual QString name() const; + virtual TQString name() const; protected: virtual void apply(); diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 167d85a..d26dbfc 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -30,17 +30,17 @@ #include <assert.h> -#include <qapplication.h> -#include <qcheckbox.h> -#include <qevent.h> -#include <qfont.h> -#include <qfile.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpopupmenu.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qwidgetstack.h> +#include <tqapplication.h> +#include <tqcheckbox.h> +#include <tqevent.h> +#include <tqfont.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpopupmenu.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqwidgetstack.h> #include <dom/dom_core.h> #include <dom/html_base.h> @@ -64,45 +64,45 @@ using namespace domtreeviewer; -DOMTreeView::DOMTreeView(QWidget *parent, const char* name, bool /*allowSaving*/) +DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*/) : DOMTreeViewBase(parent, name), m_expansionDepth(5), m_maxDepth(0), m_bPure(true), m_bShowAttributes(true), m_bHighlightHTML(true), m_findDialog(0), focused_child(0) { part = 0; - const QFont font(KGlobalSettings::generalFont()); + const TQFont font(KGlobalSettings::generalFont()); m_listView->setFont( font ); m_listView->setSorting(-1); m_rootListView = m_listView; m_pureCheckBox->setChecked(m_bPure); - connect(m_pureCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotPureToggled(bool))); + connect(m_pureCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPureToggled(bool))); m_showAttributesCheckBox->setChecked(m_bShowAttributes); - connect(m_showAttributesCheckBox, SIGNAL(toggled(bool)), this, - SLOT(slotShowAttributesToggled(bool))); + connect(m_showAttributesCheckBox, TQT_SIGNAL(toggled(bool)), this, + TQT_SLOT(slotShowAttributesToggled(bool))); m_highlightHTMLCheckBox->setChecked(m_bHighlightHTML); - connect(m_highlightHTMLCheckBox, SIGNAL(toggled(bool)), this, - SLOT(slotHighlightHTMLToggled(bool))); + connect(m_highlightHTMLCheckBox, TQT_SIGNAL(toggled(bool)), this, + TQT_SLOT(slotHighlightHTMLToggled(bool))); - connect(m_listView, SIGNAL(clicked(QListViewItem *)), this, - SLOT(slotItemClicked(QListViewItem *))); - connect(m_listView, SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)), - SLOT(showDOMTreeContextMenu(QListViewItem *, const QPoint &, int))); - connect(m_listView, SIGNAL(moved(QPtrList<QListViewItem> &, QPtrList<QListViewItem> &, QPtrList<QListViewItem> &)), - SLOT(slotMovedItems(QPtrList<QListViewItem> &, QPtrList<QListViewItem> &, QPtrList<QListViewItem> &))); + connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)), this, + TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(m_listView, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQT_SLOT(showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int))); + connect(m_listView, TQT_SIGNAL(moved(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)), + TQT_SLOT(slotMovedItems(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &))); // set up message line messageLinePane->hide(); - connect(messageHideBtn, SIGNAL(clicked()), SLOT(hideMessageLine())); - connect(messageListBtn, SIGNAL(clicked()), mainWindow(), SLOT(showMessageLog())); + connect(messageHideBtn, TQT_SIGNAL(clicked()), TQT_SLOT(hideMessageLine())); + connect(messageListBtn, TQT_SIGNAL(clicked()), mainWindow(), TQT_SLOT(showMessageLog())); installEventFilter(m_listView); - ManipulationCommand::connect(SIGNAL(nodeChanged(const DOM::Node &)), this, SLOT(slotRefreshNode(const DOM::Node &))); - ManipulationCommand::connect(SIGNAL(structureChanged()), this, SLOT(refresh())); + ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &))); + ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh())); initDOMNodeInfo(); @@ -126,7 +126,7 @@ void DOMTreeView::setHtmlPart(KHTMLPart *_part) parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") ); - QTimer::singleShot(0, this, SLOT(slotSetHtmlPartDelayed())); + TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed())); } DOMTreeWindow *DOMTreeView::mainWindow() const @@ -134,10 +134,10 @@ DOMTreeWindow *DOMTreeView::mainWindow() const return static_cast<DOMTreeWindow *>(parentWidget()); } -bool DOMTreeView::eventFilter(QObject *o, QEvent *e) +bool DOMTreeView::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() == QEvent::AccelOverride) { - QKeyEvent *ke = static_cast<QKeyEvent *>(e); + if (e->type() == TQEvent::AccelOverride) { + TQKeyEvent *ke = static_cast<TQKeyEvent *>(e); kdDebug(90180) << " acceloverride " << ke->key() << " o " << o->name() << endl; if (o == m_listView) { // DOM tree @@ -152,14 +152,14 @@ bool DOMTreeView::eventFilter(QObject *o, QEvent *e) } - } else if (e->type() == QEvent::FocusIn) { + } else if (e->type() == TQEvent::FocusIn) { kdDebug(90180) << " focusin o " << o->name() << endl; if (o != this) { focused_child = o; } - } else if (e->type() == QEvent::FocusOut) { + } else if (e->type() == TQEvent::FocusOut) { kdDebug(90180) << " focusout o " << o->name() << endl; if (o != this) { @@ -180,7 +180,7 @@ void DOMTreeView::activateNode(const DOM::Node &node) void DOMTreeView::slotShowNode(const DOM::Node &pNode) { - if (QListViewItem *item = m_itemdict[pNode.handle()]) { + if (TQListViewItem *item = m_itemdict[pNode.handle()]) { m_listView->setCurrentItem(item); m_listView->ensureItemVisible(item); } @@ -265,8 +265,8 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item { cur_item->setClosing(isLast); - const QString nodeName(node.nodeName().string()); - QString text; + const TQString nodeName(node.nodeName().string()); + TQString text; const DOM::Element element = node; if (!element.isNull()) { if (!m_bPure) { @@ -281,7 +281,7 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item } if (m_bShowAttributes && !isLast) { - QString attributes; + TQString attributes; DOM::Attr attr; DOM::NamedNodeMap attrs = element.attributes(); unsigned long lmap = attrs.length(); @@ -307,10 +307,10 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item text = "`" + node.nodeValue().string() + "'"; // Hacks to deal with PRE - QTextStream ts( text, IO_ReadOnly ); + TQTextStream ts( text, IO_ReadOnly ); while (!ts.eof()) { - const QString txt(ts.readLine()); - const QFont font(KGlobalSettings::fixedFont()); + const TQString txt(ts.readLine()); + const TQFont font(KGlobalSettings::fixedFont()); cur_item->setFont( font ); cur_item->setText(0, txt); @@ -337,14 +337,14 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item } } -void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const QString &nodeName) +void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeName) { /* This is slow. I could make it O(1) be using the tokenizer of khtml but I don't * think it's worth it. */ - QColor namedColor(palette().active().text()); - QString tagName = nodeName.upper(); + TQColor namedColor(palette().active().text()); + TQString tagName = nodeName.upper(); if ( tagName == "HTML" ) { namedColor = "#0000ff"; cur_item->setBold(true); @@ -421,7 +421,7 @@ void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const QString &nodeNa cur_item->setColor(namedColor); } -void DOMTreeView::slotItemClicked(QListViewItem *cur_item) +void DOMTreeView::slotItemClicked(TQListViewItem *cur_item) { DOMListViewItem *cur = static_cast<DOMListViewItem *>(cur_item); if (!cur) return; @@ -436,7 +436,7 @@ void DOMTreeView::slotFindClicked() { if (m_findDialog == 0) { m_findDialog = new KEdFind(this); - connect(m_findDialog, SIGNAL(search()), this, SLOT(slotSearch())); + connect(m_findDialog, TQT_SIGNAL(search()), this, TQT_SLOT(slotSearch())); } m_findDialog->show(); } @@ -459,20 +459,20 @@ void DOMTreeView::slotPrepareMove() current_node = item->node(); } -void DOMTreeView::slotMovedItems(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &/*afterFirst*/, QPtrList<QListViewItem> &afterNow) +void DOMTreeView::slotMovedItems(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &/*afterFirst*/, TQPtrList<TQListViewItem> &afterNow) { MultiCommand *cmd = new MultiCommand(i18n("Move Nodes")); _refreshed = false; - QPtrList<QListViewItem>::Iterator it = items.begin(); - QPtrList<QListViewItem>::Iterator anit = afterNow.begin(); + TQPtrList<TQListViewItem>::Iterator it = items.begin(); + TQPtrList<TQListViewItem>::Iterator anit = afterNow.begin(); for (; it != items.end(); ++it, ++anit) { DOMListViewItem *item = static_cast<DOMListViewItem *>(*it); DOMListViewItem *anitem = static_cast<DOMListViewItem *>(*anit); DOM::Node parent = static_cast<DOMListViewItem *>(item->parent())->node(); Q_ASSERT(!parent.isNull()); -// kdDebug(90180) << " afternow " << anitem << " node " << (anitem ? anitem->node().nodeName().string() : QString()) << "=" << (anitem ? anitem->node().nodeValue().string() : QString()) << endl; +// kdDebug(90180) << " afternow " << anitem << " node " << (anitem ? anitem->node().nodeName().string() : TQString()) << "=" << (anitem ? anitem->node().nodeValue().string() : TQString()) << endl; cmd->addCommand(new MoveNodeCommand(item->node(), parent, anitem ? anitem->node().nextSibling() : parent.firstChild()) @@ -490,7 +490,7 @@ void DOMTreeView::slotMovedItems(QPtrList<QListViewItem> &items, QPtrList<QListV void DOMTreeView::slotSearch() { assert(m_findDialog); - const QString& searchText = m_findDialog->getText(); + const TQString& searchText = m_findDialog->getText(); bool caseSensitive = m_findDialog->case_sensitive(); searchRecursive(static_cast<DOMListViewItem*>(m_rootListView->firstChild()), @@ -499,10 +499,10 @@ void DOMTreeView::slotSearch() m_findDialog->hide(); } -void DOMTreeView::searchRecursive(DOMListViewItem* cur_item, const QString& searchText, +void DOMTreeView::searchRecursive(DOMListViewItem* cur_item, const TQString& searchText, bool caseSensitive) { - const QString text(cur_item->text(0)); + const TQString text(cur_item->text(0)); if (text.contains(searchText, caseSensitive) > 0) { cur_item->setUnderline(true); cur_item->setItalic(true); @@ -526,11 +526,11 @@ void DOMTreeView::slotSaveClicked() KURL url = KFileDialog::getSaveFileName( part->url().url(), "*.html", this, i18n("Save DOM Tree as HTML") ); if (!(url.isEmpty()) && url.isValid()) { - QFile file(url.path()); + 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.url()); + const TQString title = i18n( "File Exists" ); + const TQString text = i18n( "Do you really want to overwrite: \n%1?" ).arg(url.url()); if (KMessageBox::Continue != KMessageBox::warningContinueCancel(this, text, title, i18n("Overwrite") ) ) { return; } @@ -538,19 +538,19 @@ void DOMTreeView::slotSaveClicked() if (file.open(IO_WriteOnly) ) { kdDebug(90180) << "Opened File: " << url.url() << endl; - m_textStream = new QTextStream(&file); //(stdOut) + m_textStream = new TQTextStream(&file); //(stdOut) saveTreeAsHTML(part->document()); file.close(); kdDebug(90180) << "File closed " << endl; delete m_textStream; } else { - const QString title = i18n( "Unable to Open File" ); - const QString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path()); + const TQString title = i18n( "Unable to Open File" ); + const TQString text = i18n( "Unable to open \n %1 \n for writing" ).arg(url.path()); KMessageBox::sorry( this, text, title ); } } else { - const QString title = i18n( "Invalid URL" ); - const QString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url()); + const TQString title = i18n( "Invalid URL" ); + const TQString text = i18n( "This URL \n %1 \n is not valid." ).arg(url.url()); KMessageBox::sorry( this, text, title ); } } @@ -571,9 +571,9 @@ void DOMTreeView::saveTreeAsHTML(const DOM::Node &pNode) void DOMTreeView::saveRecursive(const DOM::Node &pNode, int indent) { - const QString nodeName(pNode.nodeName().string()); - QString text; - QString strIndent; + const TQString nodeName(pNode.nodeName().string()); + TQString text; + TQString strIndent; strIndent.fill(' ', indent); const DOM::Element element = static_cast<const DOM::Element>(pNode); @@ -588,7 +588,7 @@ void DOMTreeView::saveRecursive(const DOM::Node &pNode, int indent) } else { text += "<" + nodeName; - QString attributes; + TQString attributes; DOM::Attr attr; const DOM::NamedNodeMap attrs = element.attributes(); unsigned long lmap = attrs.length(); @@ -652,7 +652,7 @@ void DOMTreeView::refresh() m_listView->setUpdatesEnabled(false); slotShowTree(part->document()); - QTimer::singleShot(0, this, SLOT(slotRestoreScrollOffset())); + TQTimer::singleShot(0, this, TQT_SLOT(slotRestoreScrollOffset())); _refreshed = true; } @@ -664,7 +664,7 @@ void DOMTreeView::increaseExpansionDepth() adjustDepth(); updateIncrDecreaseButton(); } else { - QApplication::beep(); + TQApplication::beep(); } } @@ -676,7 +676,7 @@ void DOMTreeView::decreaseExpansionDepth() adjustDepth(); updateIncrDecreaseButton(); } else { - QApplication::beep(); + TQApplication::beep(); } } @@ -695,7 +695,7 @@ void DOMTreeView::adjustDepth() } -void DOMTreeView::adjustDepthRecursively(QListViewItem *cur_item, uint currDepth) +void DOMTreeView::adjustDepthRecursively(TQListViewItem *cur_item, uint currDepth) { if (!(cur_item == 0)) { while( cur_item ) { @@ -706,7 +706,7 @@ void DOMTreeView::adjustDepthRecursively(QListViewItem *cur_item, uint currDept } } -void DOMTreeView::setMessage(const QString &msg) +void DOMTreeView::setMessage(const TQString &msg) { messageLine->setText(msg); messageLinePane->show(); @@ -733,9 +733,9 @@ void DOMTreeView::moveToParent() activateNode(cur); } -void DOMTreeView::showDOMTreeContextMenu(QListViewItem */*lvi*/, const QPoint &pos, int /*col*/) +void DOMTreeView::showDOMTreeContextMenu(TQListViewItem */*lvi*/, const TQPoint &pos, int /*col*/) { - QPopupMenu *ctx = mainWindow()->domTreeViewContextMenu(); + TQPopupMenu *ctx = mainWindow()->domTreeViewContextMenu(); Q_ASSERT(ctx); ctx->popup(pos); } @@ -764,7 +764,7 @@ void DOMTreeView::deleteNodes() DOM::Node last; MultiCommand *cmd = new MultiCommand(i18n("Delete Nodes")); - QListViewItemIterator it(m_listView, QListViewItemIterator::Selected); + TQListViewItemIterator it(m_listView, TQListViewItemIterator::Selected); for (; *it; ++it) { DOMListViewItem *item = static_cast<DOMListViewItem *>(*it); // kdDebug(90180) << " item->node " << item->node().nodeName().string() << " clos " << item->isClosing() << endl; @@ -775,7 +775,7 @@ void DOMTreeView::deleteNodes() // check for selected parent bool has_selected_parent = false; - for (QListViewItem *p = item->parent(); p; p = p->parent()) { + for (TQListViewItem *p = item->parent(); p; p = p->parent()) { if (p->isSelected()) { has_selected_parent = true; break; } } if (has_selected_parent) continue; @@ -805,9 +805,9 @@ void DOMTreeView::disconnectFromTornDownPart() void DOMTreeView::connectToPart() { if (part) { - connect(part, SIGNAL(nodeActivated(const DOM::Node &)), this, - SLOT(activateNode(const DOM::Node &))); - connect(part, SIGNAL(completed()), this, SLOT(refresh())); + connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, + TQT_SLOT(activateNode(const DOM::Node &))); + connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(refresh())); // insert a style rule to indicate activated nodes try { @@ -865,18 +865,18 @@ void DOMTreeView::slotAddElementDlg() DOMListViewItem *item = static_cast<DOMListViewItem *>(m_listView->currentItem()); if (!item) return; - QString qname; - QString namespc; + TQString qname; + TQString namespc; SignalReceiver addBefore; { ElementEditDialog dlg(this, "ElementEditDialog", true); - connect(dlg.insBeforeBtn, SIGNAL(clicked()), &addBefore, SLOT(slot())); + connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot())); // ### activate when namespaces are supported dlg.elemNamespace->setEnabled(false); - if (dlg.exec() != QDialog::Accepted) return; + if (dlg.exec() != TQDialog::Accepted) return; qname = dlg.elemName->text(); namespc = dlg.elemNamespace->currentText(); @@ -906,14 +906,14 @@ void DOMTreeView::slotAddTextDlg() DOMListViewItem *item = static_cast<DOMListViewItem *>(m_listView->currentItem()); if (!item) return; - QString text; + TQString text; SignalReceiver addBefore; { TextEditDialog dlg(this, "TextEditDialog", true); - connect(dlg.insBeforeBtn, SIGNAL(clicked()), &addBefore, SLOT(slot())); + connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot())); - if (dlg.exec() != QDialog::Accepted) return; + if (dlg.exec() != TQDialog::Accepted) return; text = dlg.textPane->text(); } @@ -938,25 +938,25 @@ void DOMTreeView::slotAddTextDlg() // == DOM Node info panel ============================================= -static QString *clickToAdd; +static TQString *clickToAdd; /** * List view item for attribute list. */ class AttributeListItem : public QListViewItem { - typedef QListViewItem super; + typedef TQListViewItem super; bool _new; public: - AttributeListItem(QListView *parent, QListViewItem *prev) + AttributeListItem(TQListView *parent, TQListViewItem *prev) : super(parent, prev), _new(true) { } - AttributeListItem(const QString &attrName, const QString &attrValue, - QListView *parent, QListViewItem *prev) + AttributeListItem(const TQString &attrName, const TQString &attrValue, + TQListView *parent, TQListViewItem *prev) : super(parent, prev), _new(false) { setText(0, attrName); @@ -966,33 +966,33 @@ public: bool isNew() const { return _new; } void setNew(bool s) { _new = s; } - virtual int compare(QListViewItem *item, int column, bool ascend) const + virtual int compare(TQListViewItem *item, int column, bool ascend) const { return _new ? 1 : super::compare(item, column, ascend); } protected: - virtual void paintCell( QPainter *p, const QColorGroup &cg, + virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment ) { bool updates_enabled = listView()->isUpdatesEnabled(); listView()->setUpdatesEnabled(false); - QColor c = cg.text(); + TQColor c = cg.text(); bool text_changed = false; - QString oldText; + TQString oldText; if (_new) { - c = QApplication::palette().color( QPalette::Disabled, QColorGroup::Text ); + c = TQApplication::palette().color( TQPalette::Disabled, TQColorGroup::Text ); - if (!clickToAdd) clickToAdd = new QString(i18n("<Click to add>")); + if (!clickToAdd) clickToAdd = new TQString(i18n("<Click to add>")); oldText = text(column); text_changed = true; - if (column == 0) setText(0, *clickToAdd); else setText(1, QString()); + if (column == 0) setText(0, *clickToAdd); else setText(1, TQString()); } - QColorGroup _cg( cg ); - _cg.setColor( QColorGroup::Text, c ); + TQColorGroup _cg( cg ); + _cg.setColor( TQColorGroup::Text, c ); super::paintCell( p, _cg, column, width, alignment ); if (text_changed) setText(column, oldText); @@ -1003,19 +1003,19 @@ protected: void DOMTreeView::initDOMNodeInfo() { - connect(m_listView, SIGNAL(clicked(QListViewItem *)), - SLOT(initializeOptionsFromListItem(QListViewItem *))); + connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)), + TQT_SLOT(initializeOptionsFromListItem(TQListViewItem *))); - connect(nodeAttributes, SIGNAL(itemRenamed(QListViewItem *, const QString &, int)), - SLOT(slotItemRenamed(QListViewItem *, const QString &, int))); - connect(nodeAttributes, SIGNAL(executed(QListViewItem *, const QPoint &, int)), - SLOT(slotEditAttribute(QListViewItem *, const QPoint &, int))); - connect(nodeAttributes, SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)), - SLOT(showInfoPanelContextMenu(QListViewItem *, const QPoint &, int))); + connect(nodeAttributes, TQT_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), + TQT_SLOT(slotItemRenamed(TQListViewItem *, const TQString &, int))); + connect(nodeAttributes, TQT_SIGNAL(executed(TQListViewItem *, const TQPoint &, int)), + TQT_SLOT(slotEditAttribute(TQListViewItem *, const TQPoint &, int))); + connect(nodeAttributes, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQT_SLOT(showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int))); - connect(applyContent, SIGNAL(clicked()), SLOT(slotApplyContent())); + connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent())); - ManipulationCommand::connect(SIGNAL(nodeChanged(const DOM::Node &)), this, SLOT(initializeOptionsFromNode(const DOM::Node &))); + ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(initializeOptionsFromNode(const DOM::Node &))); nodeAttributes->setRenameable(0, true); nodeAttributes->setRenameable(1, true); @@ -1040,7 +1040,7 @@ void DOMTreeView::initializeOptionsFromNode(const DOM::Node &node) } nodeName->setText(node.nodeName().string()); - nodeType->setText(QString::number(node.nodeType())); + nodeType->setText(TQString::number(node.nodeType())); nodeNamespace->setText(node.namespaceURI().string()); // nodeValue->setText(node.value().string()); @@ -1060,7 +1060,7 @@ void DOMTreeView::initializeOptionsFromNode(const DOM::Node &node) nodeInfoStack->raiseWidget(EmptyPanel); } -void DOMTreeView::initializeOptionsFromListItem(QListViewItem *item) +void DOMTreeView::initializeOptionsFromListItem(TQListViewItem *item) { const DOMListViewItem *cur_item = static_cast<const DOMListViewItem *>(item); @@ -1070,7 +1070,7 @@ void DOMTreeView::initializeOptionsFromListItem(QListViewItem *item) void DOMTreeView::initializeOptionsFromElement(const DOM::Element &element) { - QListViewItem *last = 0; + TQListViewItem *last = 0; nodeAttributes->clear(); DOM::NamedNodeMap attrs = element.attributes(); @@ -1078,7 +1078,7 @@ void DOMTreeView::initializeOptionsFromElement(const DOM::Element &element) for (unsigned int j = 0; j < lmap; j++) { DOM::Attr attr = attrs.item(j); // kdDebug(90180) << attr.name().string() << "=" << attr.value().string() << endl; - QListViewItem *item = new AttributeListItem(attr.name().string(), + TQListViewItem *item = new AttributeListItem(attr.name().string(), attr.value().string(), nodeAttributes, last); last = item; } @@ -1099,7 +1099,7 @@ void DOMTreeView::initializeOptionsFromCData(const DOM::CharacterData &cdata) nodeInfoStack->raiseWidget(CDataPanel); } -void DOMTreeView::slotItemRenamed(QListViewItem *lvi, const QString &str, int col) +void DOMTreeView::slotItemRenamed(TQListViewItem *lvi, const TQString &str, int col) { AttributeListItem *item = static_cast<AttributeListItem *>(lvi); @@ -1120,7 +1120,7 @@ void DOMTreeView::slotItemRenamed(QListViewItem *lvi, const QString &str, int co break; } case 1: { - if (item->isNew()) { lvi->setText(1, QString()); break; } + if (item->isNew()) { lvi->setText(1, TQString()); break; } ChangeAttributeValueCommand *cmd = new ChangeAttributeValueCommand( element, item->text(0), str); @@ -1130,12 +1130,12 @@ void DOMTreeView::slotItemRenamed(QListViewItem *lvi, const QString &str, int co } } -void DOMTreeView::slotEditAttribute(QListViewItem *lvi, const QPoint &, int col) +void DOMTreeView::slotEditAttribute(TQListViewItem *lvi, const TQPoint &, int col) { if (!lvi) return; - QString attrName = lvi->text(0); - QString attrValue = lvi->text(1); + TQString attrName = lvi->text(0); + TQString attrValue = lvi->text(1); int res = 0; { @@ -1159,7 +1159,7 @@ void DOMTreeView::slotEditAttribute(QListViewItem *lvi, const QPoint &, int col) // kdDebug(90180) << "name=" << attrName << " value=" << attrValue << endl; - if (res == QDialog::Accepted) do { + if (res == TQDialog::Accepted) do { if (attrName.isEmpty()) break; if (lvi->text(0) != attrName) { @@ -1188,9 +1188,9 @@ void DOMTreeView::slotApplyContent() mainWindow()->executeAndAddCommand(cmd); } -void DOMTreeView::showInfoPanelContextMenu(QListViewItem */*lvi*/, const QPoint &pos, int /*col*/) +void DOMTreeView::showInfoPanelContextMenu(TQListViewItem */*lvi*/, const TQPoint &pos, int /*col*/) { - QPopupMenu *ctx = mainWindow()->infoPanelAttrContextMenu(); + TQPopupMenu *ctx = mainWindow()->infoPanelAttrContextMenu(); Q_ASSERT(ctx); ctx->popup(pos); } @@ -1213,7 +1213,7 @@ void DOMTreeView::pasteAttributes() void DOMTreeView::deleteAttributes() { MultiCommand *cmd = new MultiCommand(i18n("Delete Attributes")); - QListViewItemIterator it(nodeAttributes, QListViewItemIterator::Selected); + TQListViewItemIterator it(nodeAttributes, TQListViewItemIterator::Selected); for (; *it; ++it) { AttributeListItem *item = static_cast<AttributeListItem *>(*it); if (item->isNew()) continue; diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h index 0e9977d..80c4c10 100644 --- a/konq-plugins/domtreeviewer/domtreeview.h +++ b/konq-plugins/domtreeviewer/domtreeview.h @@ -22,8 +22,8 @@ #ifndef DOMTREEVIEW_H #define DOMTREEVIEW_H -#include <qptrdict.h> -#include <qptrlist.h> +#include <tqptrdict.h> +#include <tqptrlist.h> #include <dom/css_stylesheet.h> #include <dom/css_rule.h> #include <dom/dom_node.h> @@ -49,7 +49,7 @@ class DOMTreeView : public DOMTreeViewBase Q_OBJECT public: - DOMTreeView(QWidget *parent, const char* name, bool allowSaving = true); + DOMTreeView(TQWidget *parent, const char* name, bool allowSaving = true); ~DOMTreeView(); KHTMLPart *htmlPart() const { return part; } @@ -62,7 +62,7 @@ class DOMTreeView : public DOMTreeViewBase /* void saveTreeAsHTML(const DOM::Node &pNode); */ - virtual bool eventFilter(QObject *o, QEvent *e); + virtual bool eventFilter(TQObject *o, TQEvent *e); signals: /** emitted when the part has been changed. */ @@ -72,7 +72,7 @@ class DOMTreeView : public DOMTreeViewBase void refresh(); void increaseExpansionDepth(); void decreaseExpansionDepth(); - void setMessage(const QString &msg); + void setMessage(const TQString &msg); void hideMessageLine(); void moveToParent(); @@ -104,9 +104,9 @@ class DOMTreeView : public DOMTreeViewBase protected slots: void slotShowNode(const DOM::Node &pNode); void slotShowTree(const DOM::Node &pNode); - void slotItemClicked(QListViewItem *); + void slotItemClicked(TQListViewItem *); void slotRefreshNode(const DOM::Node &pNode); - void slotMovedItems(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &afterFirst, QPtrList<QListViewItem> &afterNow); + void slotMovedItems(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &afterFirst, TQPtrList<TQListViewItem> &afterNow); void slotPrepareMove(); void slotSearch(); @@ -116,13 +116,13 @@ class DOMTreeView : public DOMTreeViewBase void slotShowAttributesToggled(bool); void slotHighlightHTMLToggled(bool); - void showDOMTreeContextMenu(QListViewItem *, const QPoint &, int); + void showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int); void slotSetHtmlPartDelayed(); void slotRestoreScrollOffset(); private: - QPtrDict<DOMListViewItem> m_itemdict; + TQPtrDict<DOMListViewItem> m_itemdict; DOM::Node m_document; uint m_expansionDepth, m_maxDepth; @@ -135,13 +135,13 @@ class DOMTreeView : public DOMTreeViewBase // void saveRecursive(const DOM::Node &node, int ident); void searchRecursive(DOMListViewItem *cur_item, - const QString &searchText, + const TQString &searchText, bool caseSensitive); void adjustDepth(); - void adjustDepthRecursively(QListViewItem *cur_item, uint currDepth); + void adjustDepthRecursively(TQListViewItem *cur_item, uint currDepth); void highlightHTML(DOMListViewItem *cur_item, - const QString &nodeName); + const TQString &nodeName); void addElement(const DOM::Node &node, DOMListViewItem *cur_item, bool isLast); @@ -151,12 +151,12 @@ class DOMTreeView : public DOMTreeViewBase KEdFind* m_findDialog; KHTMLPart *part; - QTextStream* m_textStream; + TQTextStream* m_textStream; const KListView* m_rootListView; KPushButton* m_saveButton; - QObject *focused_child; + TQObject *focused_child; DOM::Node current_node; DOM::CSSStyleSheet stylesheet; DOM::CSSRule active_node_rule; @@ -173,7 +173,7 @@ class DOMTreeView : public DOMTreeViewBase public slots: void initializeOptionsFromNode(const DOM::Node &); - void initializeOptionsFromListItem(QListViewItem *); + void initializeOptionsFromListItem(TQListViewItem *); void copyAttributes(); void cutAttributes(); @@ -187,11 +187,11 @@ class DOMTreeView : public DOMTreeViewBase void initializeOptionsFromCData(const DOM::CharacterData &); private slots: - void slotItemRenamed(QListViewItem *, const QString &str, int col); - void slotEditAttribute(QListViewItem *, const QPoint &, int col); + void slotItemRenamed(TQListViewItem *, const TQString &str, int col); + void slotEditAttribute(TQListViewItem *, const TQPoint &, int col); void slotApplyContent(); - void showInfoPanelContextMenu(QListViewItem *, const QPoint &, int); + void showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int); private: DOM::Node infoNode; // node these infos apply to diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index f8b9ed5..0dd6d7f 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -50,8 +50,8 @@ #include <kaction.h> #include <kstdaction.h> -#include <qdatetime.h> -#include <qtimer.h> +#include <tqdatetime.h> +#include <tqtimer.h> using domtreeviewer::ManipulationCommand; @@ -84,16 +84,16 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) // allow the view to change the statusbar and caption #if 0 - connect(m_view, SIGNAL(signalChangeStatusbar(const QString&)), - this, SLOT(changeStatusbar(const QString&))); - connect(m_view, SIGNAL(signalChangeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); #endif - connect(view(), SIGNAL(htmlPartChanged(KHTMLPart *)), - SLOT(slotHtmlPartChanged(KHTMLPart *))); + connect(view(), TQT_SIGNAL(htmlPartChanged(KHTMLPart *)), + TQT_SLOT(slotHtmlPartChanged(KHTMLPart *))); - ManipulationCommand::connect(SIGNAL(error(int, const QString &)), - this, SLOT(addMessage(int, const QString &))); + ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)), + this, TQT_SLOT(addMessage(int, const TQString &))); infopanel_ctx = createInfoPanelAttrContextMenu(); domtree_ctx = createDOMTreeViewContextMenu(); @@ -119,74 +119,74 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd) void DOMTreeWindow::setupActions() { - KStdAction::close(this, SLOT(close()), actionCollection()); + KStdAction::close(this, TQT_SLOT(close()), actionCollection()); - KStdAction::cut(this, SLOT(slotCut()), actionCollection())->setEnabled(false); - KStdAction::copy(this, SLOT(slotCopy()), actionCollection())->setEnabled(false); - KStdAction::paste(this, SLOT(slotPaste()), actionCollection())->setEnabled(false); + KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection())->setEnabled(false); + KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false); + KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false); m_commandHistory = new KCommandHistory(actionCollection()); - KStdAction::find(this, SLOT(slotFind()), actionCollection()); + KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection()); - KStdAction::redisplay(m_view, SLOT(refresh()), actionCollection()); + KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection()); // toggle manipulation dialog KAction *showMsgDlg = new KAction(i18n("Show Message Log"), CTRL+Key_E, actionCollection(), "show_msg_dlg"); - connect(showMsgDlg, SIGNAL(activated()), SLOT(showMessageLog())); + connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog())); // KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, -// this, SLOT(optionsPreferences()), +// this, TQT_SLOT(optionsPreferences()), // actionCollection(), "custom_action"); // actions for the dom tree list view toolbar - KStdAction::up(view(), SLOT(moveToParent()), actionCollection(), "tree_up"); + KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); KAction *tree_inc_level = new KAction(i18n("Expand"), "1rightarrow", CTRL+Key_Greater, view(), - SLOT(increaseExpansionDepth()), actionCollection(), + TQT_SLOT(increaseExpansionDepth()), actionCollection(), "tree_inc_level"); tree_inc_level->setToolTip(i18n("Increase expansion level")); KAction *tree_dec_level = new KAction(i18n("Collapse"), "1leftarrow", CTRL+Key_Less, view(), - SLOT(decreaseExpansionDepth()), actionCollection(), + TQT_SLOT(decreaseExpansionDepth()), actionCollection(), "tree_dec_level"); tree_dec_level->setToolTip(i18n("Decrease expansion level")); // actions for the dom tree list view context menu del_tree = new KAction(i18n("&Delete"), "editdelete", - Key_Delete, view(), SLOT(deleteNodes()), + Key_Delete, view(), TQT_SLOT(deleteNodes()), actionCollection(), "tree_delete"); del_tree->setToolTip(i18n("Delete nodes")); /*KAction *new_elem = */new KAction(i18n("New &Element ..."), "bookmark", KShortcut(), view(), - SLOT(slotAddElementDlg()), actionCollection(), + TQT_SLOT(slotAddElementDlg()), actionCollection(), "tree_add_element"); /*KAction *new_text = */new KAction(i18n("New &Text Node ..."), - "text", KShortcut(), view(), SLOT(slotAddTextDlg()), + "text", KShortcut(), view(), TQT_SLOT(slotAddTextDlg()), actionCollection(), "tree_add_text"); // actions for the info panel attribute list context menu del_attr = new KAction(i18n("&Delete"), "editdelete", - Key_Delete, view(), SLOT(deleteAttributes()), + Key_Delete, view(), TQT_SLOT(deleteAttributes()), actionCollection(), "attr_delete"); del_attr->setToolTip(i18n("Delete attributes")); } -QPopupMenu *DOMTreeWindow::createInfoPanelAttrContextMenu() +TQPopupMenu *DOMTreeWindow::createInfoPanelAttrContextMenu() { - QWidget *w = factory()->container("infopanelattr_context", this); + TQWidget *w = factory()->container("infopanelattr_context", this); Q_ASSERT(w); - return static_cast<QPopupMenu *>(w); + return static_cast<TQPopupMenu *>(w); } -QPopupMenu *DOMTreeWindow::createDOMTreeViewContextMenu() +TQPopupMenu *DOMTreeWindow::createDOMTreeViewContextMenu() { - QWidget *w = factory()->container("domtree_context", this); + TQWidget *w = factory()->container("domtree_context", this); Q_ASSERT(w); - return static_cast<QPopupMenu *>(w); + return static_cast<TQPopupMenu *>(w); } void DOMTreeWindow::saveProperties(KConfig *config) @@ -214,20 +214,20 @@ void DOMTreeWindow::readProperties(KConfig *config) // in 'saveProperties' #if 0 - QString url = config->readPathEntry("lastURL"); + TQString url = config->readPathEntry("lastURL"); if (!url.isEmpty()) m_view->openURL(KURL::fromPathOrURL(url)); #endif } -void DOMTreeWindow::dragEnterEvent(QDragEnterEvent *event) +void DOMTreeWindow::dragEnterEvent(TQDragEnterEvent *event) { // accept uri drops only event->accept(KURLDrag::canDecode(event)); } -void DOMTreeWindow::dropEvent(QDropEvent *event) +void DOMTreeWindow::dropEvent(TQDropEvent *event) { // this is a very simplistic implementation of a drop event. we // will only accept a dropped URL. the Qt dnd code can do *much* @@ -246,14 +246,14 @@ void DOMTreeWindow::dropEvent(QDropEvent *event) } } -void DOMTreeWindow::addMessage(int msg_id, const QString &msg) +void DOMTreeWindow::addMessage(int msg_id, const TQString &msg) { - QDateTime t(QDateTime::currentDateTime()); - QString fullmsg = t.toString(); + TQDateTime t(TQDateTime::currentDateTime()); + TQString fullmsg = t.toString(); fullmsg += ":"; if (msg_id != 0) - fullmsg += " (" + QString::number(msg_id) + ") "; + fullmsg += " (" + TQString::number(msg_id) + ") "; fullmsg += msg; if (msgdlg) msgdlg->addMessage(fullmsg); @@ -292,7 +292,7 @@ void DOMTreeWindow::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, SIGNAL(newToolbarConfig()), this, SLOT(newToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); dlg.exec(); } @@ -316,13 +316,13 @@ void DOMTreeWindow::optionsPreferences() #endif } -void DOMTreeWindow::changeStatusbar(const QString& text) +void DOMTreeWindow::changeStatusbar(const TQString& text) { // display the text on the statusbar statusBar()->message(text); } -void DOMTreeWindow::changeCaption(const QString& text) +void DOMTreeWindow::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); @@ -339,13 +339,13 @@ void DOMTreeWindow::slotHtmlPartChanged(KHTMLPart *p) part_manager = p->manager(); - connect(part_manager, SIGNAL(activePartChanged(KParts::Part *)), - SLOT(slotActivePartChanged(KParts::Part *))); - connect(part_manager, SIGNAL(partRemoved(KParts::Part *)), - SLOT(slotPartRemoved(KParts::Part *))); + connect(part_manager, TQT_SIGNAL(activePartChanged(KParts::Part *)), + TQT_SLOT(slotActivePartChanged(KParts::Part *))); + connect(part_manager, TQT_SIGNAL(partRemoved(KParts::Part *)), + TQT_SLOT(slotPartRemoved(KParts::Part *))); // set up browser extension connections - connect(p, SIGNAL(docCreated()), SLOT(slotClosePart())); + connect(p, TQT_SIGNAL(docCreated()), TQT_SLOT(slotClosePart())); } } diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h index f942798..e71a3c7 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.h +++ b/konq-plugins/domtreeviewer/domtreewindow.h @@ -27,7 +27,7 @@ #include <kmainwindow.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> namespace domtreeviewer { class ManipulationCommand; @@ -85,22 +85,22 @@ public: /** * creates and returns the context menu for the list info panel */ - QPopupMenu *createInfoPanelAttrContextMenu(); + TQPopupMenu *createInfoPanelAttrContextMenu(); /** * returns the context menu for the list info panel */ - QPopupMenu *infoPanelAttrContextMenu() { return infopanel_ctx; } + TQPopupMenu *infoPanelAttrContextMenu() { return infopanel_ctx; } /** * creates and returns the context menu for the DOM tree view */ - QPopupMenu *createDOMTreeViewContextMenu(); + TQPopupMenu *createDOMTreeViewContextMenu(); /** * returns the context menu for the DOM tree view */ - QPopupMenu *domTreeViewContextMenu() { return domtree_ctx; } + TQPopupMenu *domTreeViewContextMenu() { return domtree_ctx; } /** * Executes the given command and adds it to the history. @@ -125,7 +125,7 @@ public slots: * @param id message id * @param msg message text */ - void addMessage(int id, const QString &msg); + void addMessage(int id, const TQString &msg); /** * Displays the message log window. @@ -136,8 +136,8 @@ protected: /** * Overridden virtuals for Qt drag 'n drop (XDND) */ - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); protected: /** * This function is called when it is time for the app to save its @@ -164,8 +164,8 @@ private slots: void optionsPreferences(); void newToolbarConfig(); - void changeStatusbar(const QString& text); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text); + void changeCaption(const TQString& text); void slotHtmlPartChanged(KHTMLPart *); void slotActivePartChanged(KParts::Part *); @@ -182,13 +182,13 @@ private: MessageDialog *msgdlg; KCommandHistory *m_commandHistory; - QPopupMenu *infopanel_ctx; - QPopupMenu *domtree_ctx; + TQPopupMenu *infopanel_ctx; + TQPopupMenu *domtree_ctx; KConfig *_config; KAction *del_tree, *del_attr; - QGuardedPtr<KParts::PartManager> part_manager; + TQGuardedPtr<KParts::PartManager> part_manager; }; #endif // domtreewindow_H diff --git a/konq-plugins/domtreeviewer/messagedialog.ui.h b/konq-plugins/domtreeviewer/messagedialog.ui.h index dcb6609..33a2951 100644 --- a/konq-plugins/domtreeviewer/messagedialog.ui.h +++ b/konq-plugins/domtreeviewer/messagedialog.ui.h @@ -12,9 +12,9 @@ #include <kdebug.h> -#include <qdatetime.h> +#include <tqdatetime.h> -void MessageDialog::addMessage( const QString &msg ) +void MessageDialog::addMessage( const TQString &msg ) { messagePane->append(msg); } diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index 3555a84..c33f132 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -15,13 +15,13 @@ typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory; K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) ) -PluginDomtreeviewer::PluginDomtreeviewer( QObject* parent, const char* name, - const QStringList & ) +PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, + const TQStringList & ) : Plugin( parent, name ), m_dialog( 0 ) { (void) new KAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, - this, SLOT(slotShowDOMTree()), + this, TQT_SLOT(slotShowDOMTree()), actionCollection(), "viewdomtree" ); } @@ -41,7 +41,7 @@ void PluginDomtreeviewer::slotShowDOMTree() if (KHTMLPart *part = ::qt_cast<KHTMLPart *>(parent())) { m_dialog = new DOMTreeWindow(this); - connect( m_dialog, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) ); + connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); m_dialog->view()->setHtmlPart(part); m_dialog->show(); } diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h index ba380a9..c6d7320 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h @@ -13,8 +13,8 @@ class PluginDomtreeviewer : public KParts::Plugin { Q_OBJECT public: - PluginDomtreeviewer( QObject* parent, const char* name, - const QStringList & ); + PluginDomtreeviewer( TQObject* parent, const char* name, + const TQStringList & ); virtual ~PluginDomtreeviewer(); public slots: diff --git a/konq-plugins/domtreeviewer/signalreceiver.cpp b/konq-plugins/domtreeviewer/signalreceiver.cpp index f928036..a0c0b1b 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.cpp +++ b/konq-plugins/domtreeviewer/signalreceiver.cpp @@ -20,8 +20,8 @@ #include "signalreceiver.h" -SignalReceiver::SignalReceiver(QObject *parent, const char *name) -: QObject(parent, name), rcvd(false) +SignalReceiver::SignalReceiver(TQObject *parent, const char *name) +: TQObject(parent, name), rcvd(false) { } diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h index 8c0f5d9..cf67495 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.h +++ b/konq-plugins/domtreeviewer/signalreceiver.h @@ -21,7 +21,7 @@ #ifndef SIGNALCATCHER_H #define SIGNALCATCHER_H -#include <qobject.h> +#include <tqobject.h> /** * \brief Class for receiving signals. @@ -32,7 +32,7 @@ * Use as follows: * \code * SignalReceiver sr; - * sr.connect(some_obj, SIGNAL(someSignal()), SLOT(slot())); + * sr.connect(some_obj, TQT_SIGNAL(someSignal()), TQT_SLOT(slot())); * <do something with some_obj> ... * if (sr.receivedSignal()) { // yes, signal was received * } @@ -47,7 +47,7 @@ class SignalReceiver : public QObject Q_OBJECT public: - SignalReceiver(QObject *parent = 0, const char *name = 0); + SignalReceiver(TQObject *parent = 0, const char *name = 0); virtual ~SignalReceiver(); /** returns true if any signal has been received */ diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index b0c82d8..931c43f 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -21,9 +21,9 @@ */ -#include <qdir.h> -#include <qpopupmenu.h> -#include <qtimer.h> +#include <tqdir.h> +#include <tqpopupmenu.h> +#include <tqtimer.h> #include <kapplication.h> #include <kconfig.h> @@ -41,9 +41,9 @@ // FSView -QMap<QString, MetricEntry> FSView::_dirMetric; +TQMap<TQString, MetricEntry> FSView::_dirMetric; -FSView::FSView(Inode* base, QWidget* parent, const char* name) +FSView::FSView(Inode* base, TQWidget* parent, const char* name) : TreeMapWidget(base, parent, name) { setFieldType(0, i18n("Name")); @@ -81,25 +81,25 @@ FSView::FSView(Inode* base, QWidget* parent, const char* name) _config = new KConfig("fsviewrc"); // restore TreeMap visualization options of last execution - KConfigGroup tmconfig(_config, QCString("TreeMap")); + KConfigGroup tmconfig(_config, TQCString("TreeMap")); restoreOptions(&tmconfig); - QString str = tmconfig.readEntry("ColorMode"); + TQString str = tmconfig.readEntry("ColorMode"); if (!str.isEmpty()) setColorMode(str); if (_dirMetric.count() == 0) { // restore metric cache - KConfigGroup cconfig(_config, QCString("MetricCache")); + KConfigGroup cconfig(_config, TQCString("MetricCache")); int ccount = cconfig.readNumEntry("Count", 0); int i, f, d; double s; - QString str; + TQString str; for (i=1;i<=ccount;i++) { - str = QString("Dir%1").arg(i); + str = TQString("Dir%1").arg(i); if (!cconfig.hasKey(str)) continue; str = cconfig.readPathEntry(str); - s = cconfig.readDoubleNumEntry(QString("Size%1").arg(i), 0.0); - f = cconfig.readNumEntry(QString("Files%1").arg(i), 0); - d = cconfig.readNumEntry(QString("Dirs%1").arg(i), 0); + s = cconfig.readDoubleNumEntry(TQString("Size%1").arg(i), 0.0); + f = cconfig.readNumEntry(TQString("Files%1").arg(i), 0); + d = cconfig.readNumEntry(TQString("Dirs%1").arg(i), 0); if (s==0.0 || f==0 || d==0) continue; setDirMetric(str, s, f, d); } @@ -118,7 +118,7 @@ void FSView::stop() _sm.stopScan(); } -void FSView::setPath(QString p) +void FSView::setPath(TQString p) { Inode* b = (Inode*)base(); if (!b) return; @@ -128,7 +128,7 @@ void FSView::setPath(QString p) // stop any previous updating stop(); - QFileInfo fi(p); + TQFileInfo fi(p); _path = fi.absFilePath(); if (!fi.isDir()) { _path = fi.dirPath(true); @@ -139,7 +139,7 @@ void FSView::setPath(QString p) u.setPath(_path); if (!kapp->authorizeURLAction("list", KURL(), u)) { - QString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, u.prettyURL()); + TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, u.prettyURL()); KMessageBox::queuedMessageBox(this, KMessageBox::Sorry, msg); } @@ -147,7 +147,7 @@ void FSView::setPath(QString p) b->setPeer(d); - setCaption(QString("%1 - FSView").arg(_path)); + setCaption(TQString("%1 - FSView").arg(_path)); requestUpdate(b); } @@ -165,10 +165,10 @@ KURL::List FSView::selectedUrls() return urls; } -bool FSView::getDirMetric(const QString& k, +bool FSView::getDirMetric(const TQString& k, double& s, unsigned int& f, unsigned int& d) { - QMap<QString, MetricEntry>::iterator it; + TQMap<TQString, MetricEntry>::iterator it; it = _dirMetric.find(k); if (it == _dirMetric.end()) return false; @@ -183,7 +183,7 @@ bool FSView::getDirMetric(const QString& k, return true; } -void FSView::setDirMetric(const QString& k, +void FSView::setDirMetric(const TQString& k, double s, unsigned int f, unsigned int d) { if (0) kdDebug(90100) << "setDirMetric '" << k << "': size " @@ -203,8 +203,8 @@ void FSView::requestUpdate(Inode* i) i->clear(); if (!_sm.scanRunning()) { - QTimer::singleShot(0, this, SLOT(doUpdate())); - QTimer::singleShot(100, this, SLOT(doRedraw())); + TQTimer::singleShot(0, this, TQT_SLOT(doUpdate())); + TQTimer::singleShot(100, this, TQT_SLOT(doRedraw())); /* start new progress chunk */ _progressPhase = 1; @@ -266,14 +266,14 @@ void FSView::selected(TreeMapItem* i) setPath(((Inode*)i)->path()); } -void FSView::contextMenu(TreeMapItem* i, const QPoint& p) +void FSView::contextMenu(TreeMapItem* i, const TQPoint& p) { - QPopupMenu popup; + TQPopupMenu popup; - QPopupMenu* spopup = new QPopupMenu(); - QPopupMenu* dpopup = new QPopupMenu(); - QPopupMenu* apopup = new QPopupMenu(); - QPopupMenu* fpopup = new QPopupMenu(); + TQPopupMenu* spopup = new TQPopupMenu(); + TQPopupMenu* dpopup = new TQPopupMenu(); + TQPopupMenu* apopup = new TQPopupMenu(); + TQPopupMenu* fpopup = new TQPopupMenu(); // choosing from the selection menu will give a selectionChanged() signal addSelectionItems(spopup, 901, i); @@ -297,10 +297,10 @@ void FSView::contextMenu(TreeMapItem* i, const QPoint& p) popup.insertSeparator(); - QPopupMenu* cpopup = new QPopupMenu(); + TQPopupMenu* cpopup = new TQPopupMenu(); addColorItems(cpopup, 1401); popup.insertItem(i18n("Color Mode"), cpopup, 1400); - QPopupMenu* vpopup = new QPopupMenu(); + TQPopupMenu* vpopup = new TQPopupMenu(); addVisualizationItems(vpopup, 1301); popup.insertItem(i18n("Visualization"), vpopup, 1300); @@ -328,13 +328,13 @@ void FSView::contextMenu(TreeMapItem* i, const QPoint& p) void FSView::saveMetric(KConfigGroup* g) { - QMap<QString, MetricEntry>::iterator it; + TQMap<TQString, MetricEntry>::iterator it; int c = 1; for (it=_dirMetric.begin();it!=_dirMetric.end();++it) { - g->writePathEntry(QString("Dir%1").arg(c), it.key()); - g->writeEntry(QString("Size%1").arg(c), (*it).size); - g->writeEntry(QString("Files%1").arg(c), (*it).fileCount); - g->writeEntry(QString("Dirs%1").arg(c), (*it).dirCount); + g->writePathEntry(TQString("Dir%1").arg(c), it.key()); + g->writeEntry(TQString("Size%1").arg(c), (*it).size); + g->writeEntry(TQString("Files%1").arg(c), (*it).fileCount); + g->writeEntry(TQString("Dirs%1").arg(c), (*it).dirCount); c++; } g->writeEntry("Count", c-1); @@ -348,7 +348,7 @@ void FSView::setColorMode(FSView::ColorMode cm) redraw(); } -bool FSView::setColorMode(QString mode) +bool FSView::setColorMode(TQString mode) { if (mode == "None") setColorMode(None); else if (mode == "Depth") setColorMode(Depth); @@ -361,9 +361,9 @@ bool FSView::setColorMode(QString mode) return true; } -QString FSView::colorModeString() const +TQString FSView::colorModeString() const { - QString mode; + TQString mode; switch(_colorMode) { case None: mode = "None"; break; case Depth: mode = "Depth"; break; @@ -376,13 +376,13 @@ QString FSView::colorModeString() const return mode; } -void FSView::addColorItems(QPopupMenu* popup, int id) +void FSView::addColorItems(TQPopupMenu* popup, int id) { _colorID = id; popup->setCheckable(true); - connect(popup, SIGNAL(activated(int)), - this, SLOT(colorActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(colorActivated(int))); popup->insertItem(i18n("None"), id); popup->insertItem(i18n("Depth"), id+1); @@ -414,14 +414,14 @@ void FSView::colorActivated(int id) void FSView::saveFSOptions() { - KConfigGroup tmconfig(_config, QCString("TreeMap")); + KConfigGroup tmconfig(_config, TQCString("TreeMap")); saveOptions(&tmconfig); tmconfig.writeEntry("ColorMode", colorModeString()); - KConfigGroup gconfig(_config, QCString("General")); + KConfigGroup gconfig(_config, TQCString("General")); gconfig.writeEntry("Path", _path); - KConfigGroup cconfig(_config, QCString("MetricCache")); + KConfigGroup cconfig(_config, TQCString("MetricCache")); saveMetric(&cconfig); } @@ -458,7 +458,7 @@ void FSView::doRedraw() redo = true; if (redo) { - QTimer::singleShot(500, this, SLOT(doRedraw())); + TQTimer::singleShot(500, this, TQT_SLOT(doRedraw())); redrawCounter++; } } @@ -532,7 +532,7 @@ void FSView::doUpdate() } if (_sm.scanRunning()) - QTimer::singleShot(0, this, SLOT(doUpdate())); + TQTimer::singleShot(0, this, TQT_SLOT(doUpdate())); else emit completed(_dirsFinished); } diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h index 17d926f..2e12986 100644 --- a/konq-plugins/fsview/fsview.h +++ b/konq-plugins/fsview/fsview.h @@ -23,10 +23,10 @@ #ifndef FSVIEW_H #define FSVIEW_H -#include <qmap.h> -#include <qptrlist.h> -#include <qfileinfo.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqfileinfo.h> +#include <tqstring.h> #include <kmimetype.h> @@ -62,20 +62,20 @@ class FSView : public TreeMapWidget, public ScanListener public: enum ColorMode { None = 0, Depth, Name, Owner, Group, Mime }; - FSView(Inode*, QWidget* parent=0, const char* name=0); + FSView(Inode*, TQWidget* parent=0, const char* name=0); ~FSView(); KConfig* config() { return _config; } - void setPath(QString); - QString path() { return _path; } + void setPath(TQString); + TQString path() { return _path; } int pathDepth() { return _pathDepth; } void setColorMode(FSView::ColorMode cm); FSView::ColorMode colorMode() const { return _colorMode; } // returns true if string was recognized - bool setColorMode(QString); - QString colorModeString() const; + bool setColorMode(TQString); + TQString colorModeString() const; void requestUpdate(Inode*); @@ -85,19 +85,19 @@ public: void stop(); - static bool getDirMetric(const QString&, double&, unsigned int&, unsigned int&); - static void setDirMetric(const QString&, double, unsigned int, unsigned int); + static bool getDirMetric(const TQString&, double&, unsigned int&, unsigned int&); + static void setDirMetric(const TQString&, double, unsigned int, unsigned int); void saveMetric(KConfigGroup*); void saveFSOptions(); // for color mode - void addColorItems(QPopupMenu*, int); + void addColorItems(TQPopupMenu*, int); KURL::List selectedUrls(); public slots: void selected(TreeMapItem*); - void contextMenu(TreeMapItem*, const QPoint &); + void contextMenu(TreeMapItem*, const TQPoint &); void quit(); void doUpdate(); void doRedraw(); @@ -105,7 +105,7 @@ public slots: signals: void started(); - void progress(int percent, int dirs, const QString& lastDir); + void progress(int percent, int dirs, const TQString& lastDir); void completed(int dirs); private: @@ -115,11 +115,11 @@ public slots: // when a contextMenu is shown, we don't allow async. refreshs bool _allowRefresh; // a cache for directory sizes with long lasting updates - static QMap<QString, MetricEntry> _dirMetric; + static TQMap<TQString, MetricEntry> _dirMetric; // current root path int _pathDepth; - QString _path; + TQString _path; // for progress info int _progressPhase; diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 745cb63..02df4c6 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -20,9 +20,9 @@ * The KPart embedding the FSView widget */ -#include <qclipboard.h> -#include <qtimer.h> -#include <qwhatsthis.h> +#include <tqclipboard.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> #include <kinstance.h> #include <kfiledialog.h> @@ -57,8 +57,8 @@ FSJob::FSJob(FSView* v) : KIO::Job(false) { _view = v; - QObject::connect(v, SIGNAL(progress(int,int,const QString&)), - this, SLOT(progressSlot(int,int,const QString&))); + TQObject::connect(v, TQT_SIGNAL(progress(int,int,const TQString&)), + this, TQT_SLOT(progressSlot(int,int,const TQString&))); } void FSJob::kill(bool quietly) @@ -68,7 +68,7 @@ void FSJob::kill(bool quietly) Job::kill(quietly); } -void FSJob::progressSlot(int percent, int dirs, const QString& cDir) +void FSJob::progressSlot(int percent, int dirs, const TQString& cDir) { if (percent<100) { emitPercent(percent, 100); @@ -93,16 +93,16 @@ KAboutData* FSViewPart::createAboutData() return aboutData; } -FSViewPart::FSViewPart(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const QStringList& /* args */) +FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const TQStringList& /* args */) : KParts::ReadOnlyPart(parent, name) { // we need an instance setInstance( FSViewPartFactory::instance() ); _view = new FSView(new Inode(), parentWidget, widgetName); - QWhatsThis::add(_view, i18n("<p>This is the FSView plugin, a graphical " + TQWhatsThis::add(_view, i18n("<p>This is the FSView plugin, a graphical " "browsing mode showing filesystem utilization " "by using a tree map visualization.</p>" "<p>Note that in this mode, automatic updating " @@ -129,40 +129,40 @@ FSViewPart::FSViewPart(QWidget *parentWidget, const char *widgetName, KAction* action; action = new KAction( i18n( "&FSView Manual" ), "fsview", - KShortcut(), this, SLOT(showHelp()), + KShortcut(), this, TQT_SLOT(showHelp()), actionCollection(), "help_fsview" ); action->setToolTip(i18n("Show FSView manual")); action->setWhatsThis(i18n("Opens the help browser with the " "FSView documentation")); - QObject::connect (_visMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowVisMenu())); - QObject::connect (_areaMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowAreaMenu())); - QObject::connect (_depthMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowDepthMenu())); - QObject::connect (_colorMenu->popupMenu(), SIGNAL (aboutToShow()), - SLOT (slotShowColorMenu())); + TQObject::connect (_visMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowVisMenu())); + TQObject::connect (_areaMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowAreaMenu())); + TQObject::connect (_depthMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowDepthMenu())); + TQObject::connect (_colorMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), + TQT_SLOT (slotShowColorMenu())); slotSettingsChanged(KApplication::SETTINGS_MOUSE); if (kapp) - connect( kapp, SIGNAL( settingsChanged(int) ), - SLOT( slotSettingsChanged(int) ) ); - - QObject::connect(_view,SIGNAL(returnPressed(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); - QObject::connect(_view,SIGNAL(selectionChanged()), - _ext,SLOT(updateActions())); - QObject::connect(_view, - SIGNAL(contextMenuRequested(TreeMapItem*,const QPoint&)), + connect( kapp, TQT_SIGNAL( settingsChanged(int) ), + TQT_SLOT( slotSettingsChanged(int) ) ); + + TQObject::connect(_view,TQT_SIGNAL(returnPressed(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQT_SIGNAL(selectionChanged()), + _ext,TQT_SLOT(updateActions())); + TQObject::connect(_view, + TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), _ext, - SLOT(contextMenu(TreeMapItem*, const QPoint&))); + TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); - QObject::connect(_view, SIGNAL(started()), this, SLOT(startedSlot())); - QObject::connect(_view, SIGNAL(completed(int)), - this, SLOT(completedSlot(int))); + TQObject::connect(_view, TQT_SIGNAL(started()), this, TQT_SLOT(startedSlot())); + TQObject::connect(_view, TQT_SIGNAL(completed(int)), + this, TQT_SLOT(completedSlot(int))); - QTimer::singleShot(1, this, SLOT(showInfo())); + TQTimer::singleShot(1, this, TQT_SLOT(showInfo())); setXMLFile( "fsview_part.rc" ); } @@ -180,34 +180,34 @@ void FSViewPart::slotSettingsChanged(int category) { if (category != KApplication::SETTINGS_MOUSE) return; - QObject::disconnect(_view,SIGNAL(clicked(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); - QObject::disconnect(_view,SIGNAL(doubleClicked(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); + TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::disconnect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); if (KGlobalSettings::singleClick()) - QObject::connect(_view,SIGNAL(clicked(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); else - QObject::connect(_view,SIGNAL(doubleClicked(TreeMapItem*)), - _ext,SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), + _ext,TQT_SLOT(selected(TreeMapItem*))); } void FSViewPart::showInfo() { - QString info; + TQString info; info = i18n("FSView intentionally does not support automatic updates " "when changes are made to files or directories, " "currently visible in FSView, from the outside.\n" "For details, see the 'Help/FSView Manual'."); - KMessageBox::information( _view, info, QString::null, "ShowFSViewInfo"); + KMessageBox::information( _view, info, TQString::null, "ShowFSViewInfo"); } void FSViewPart::showHelp() { KApplication::startServiceByDesktopName("khelpcenter", - QString("help:/konq-plugins/fsview/index.html")); + TQString("help:/konq-plugins/fsview/index.html")); } void FSViewPart::startedSlot() @@ -219,12 +219,12 @@ void FSViewPart::startedSlot() void FSViewPart::completedSlot(int dirs) { if (_job) { - _job->progressSlot(100, dirs, QString::null); + _job->progressSlot(100, dirs, TQString::null); delete _job; _job = 0; } - KConfigGroup cconfig(_view->config(), QCString("MetricCache")); + KConfigGroup cconfig(_view->config(), TQCString("MetricCache")); _view->saveMetric(&cconfig); emit completed(); @@ -331,20 +331,20 @@ void FSViewBrowserExtension::del() // - search for the KonqOperations child of _view (name "KonqOperations") // - connect to destroyed signal KonqOperations* o = (KonqOperations*) _view->child("KonqOperations"); - if (o) connect(o, SIGNAL(destroyed()), SLOT(refresh())); + if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh())); } void FSViewBrowserExtension::trash() { KonqOperations::del(_view, KonqOperations::TRASH, _view->selectedUrls()); KonqOperations* o = (KonqOperations*) _view->child("KonqOperations"); - if (o) connect(o, SIGNAL(destroyed()), SLOT(refresh())); + if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh())); } void FSViewBrowserExtension::copySelection( bool move ) { KonqDrag *urlData = KonqDrag::newDrag( _view->selectedUrls(), move ); - QApplication::clipboard()->setData( urlData ); + TQApplication::clipboard()->setData( urlData ); } void FSViewBrowserExtension::editMimeType() @@ -386,7 +386,7 @@ void FSViewBrowserExtension::selected(TreeMapItem* i) emit openURLRequest(url); } -void FSViewBrowserExtension::contextMenu(TreeMapItem* /*item*/,const QPoint& p) +void FSViewBrowserExtension::contextMenu(TreeMapItem* /*item*/,const TQPoint& p) { TreeMapItemList s = _view->selection(); TreeMapItem* i; @@ -396,8 +396,8 @@ void FSViewBrowserExtension::contextMenu(TreeMapItem* /*item*/,const QPoint& p) for(i=s.first();i;i=s.next()) { KURL u; u.setPath( ((Inode*)i)->path() ); - QString mimetype = ((Inode*)i)->mimeType()->name(); - const QFileInfo& info = ((Inode*)i)->fileInfo(); + TQString mimetype = ((Inode*)i)->mimeType()->name(); + const TQFileInfo& info = ((Inode*)i)->fileInfo(); mode_t mode = info.isFile() ? S_IFREG : info.isDir() ? S_IFDIR : diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h index 4f2c734..ff0a17e 100644 --- a/konq-plugins/fsview/fsview_part.h +++ b/konq-plugins/fsview/fsview_part.h @@ -44,7 +44,7 @@ public: protected slots: void selected(TreeMapItem*); - void contextMenu(TreeMapItem*,const QPoint&); + void contextMenu(TreeMapItem*,const TQPoint&); void updateActions(); void refresh(); @@ -71,7 +71,7 @@ public: virtual void kill( bool quietly = true ); public slots: - void progressSlot(int percent, int dirs, const QString& lastDir); + void progressSlot(int percent, int dirs, const TQString& lastDir); private: FSView* _view; @@ -83,8 +83,8 @@ class FSViewPart : public KParts::ReadOnlyPart Q_OBJECT Q_PROPERTY( bool supportsUndo READ supportsUndo ) public: - FSViewPart(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, const QStringList &args); + FSViewPart(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList &args); virtual ~FSViewPart(); diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 0411d3a..6f5073c 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -43,7 +43,7 @@ Inode::Inode() Inode::Inode(ScanDir* d, Inode* parent) : TreeMapItem(parent) { - QString absPath; + TQString absPath; if (parent) { absPath = parent->path(); if (!absPath.endsWith("/")) absPath += "/"; @@ -59,7 +59,7 @@ Inode::Inode(ScanDir* d, Inode* parent) Inode::Inode(ScanFile* f, Inode* parent) : TreeMapItem(parent) { - QString absPath; + TQString absPath; if (parent) absPath = parent->path() + "/"; absPath += f->name(); @@ -95,17 +95,17 @@ void Inode::setPeer(ScanDir* d) init(d->name()); } -QString Inode::path() const +TQString Inode::path() const { return _info.absFilePath(); } -void Inode::init(const QString& path) +void Inode::init(const TQString& path) { if (0) kdDebug(90100) << "Inode::init [" << path << "]" << endl; - _info = QFileInfo(path); + _info = TQFileInfo(path); if (!FSView::getDirMetric(path, _sizeEstimation, _fileCountEstimation, @@ -260,16 +260,16 @@ unsigned int Inode::dirCount() const } -QColor Inode::backColor() const +TQColor Inode::backColor() const { - QString n; + TQString n; int id = 0; switch( ((FSView*)widget())->colorMode() ) { case FSView::Depth: { int d = ((FSView*)widget())->pathDepth() + depth(); - return QColor((100*d)%360, 192,128, QColor::Hsv); + return TQColor((100*d)%360, 192,128, TQColor::Hsv); } case FSView::Name: n = text(0); break; @@ -281,7 +281,7 @@ QColor Inode::backColor() const break; } - if (id>0) n = QString::number(id); + if (id>0) n = TQString::number(id); if (n.isEmpty()) return widget()->colorGroup().button(); @@ -293,7 +293,7 @@ QColor Inode::backColor() const s = (s * 17 + h* (unsigned)*str) % 192; str++; } - return QColor(h, 64+s, 192, QColor::Hsv); + return TQColor(h, 64+s, 192, TQColor::Hsv); } KMimeType::Ptr Inode::mimeType() const @@ -308,10 +308,10 @@ KMimeType::Ptr Inode::mimeType() const return _mimeType; } -QString Inode::text(int i) const +TQString Inode::text(int i) const { if (i==0) { - QString name; + TQString name; if (_dirPeer) { name = _dirPeer->name(); if (!name.endsWith("/")) name += "/"; @@ -321,25 +321,25 @@ QString Inode::text(int i) const return name; } if (i==1) { - QString text; + TQString text; double s = size(); if (s < 1000) - text = QString("%1 B").arg((int)(s+.5)); + text = TQString("%1 B").arg((int)(s+.5)); else if (s < 10 * 1024) - text = QString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); + text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); else if (s < 100 * 1024) - text = QString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); + text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); else if (s < 1000 * 1024) - text = QString("%1 kB").arg((int)(s/1024+.5)); + text = TQString("%1 kB").arg((int)(s/1024+.5)); else if (s < 10 * 1024 * 1024) - text = QString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); + text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); else if (s < 100 * 1024 * 1024) - text = QString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); + text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); else if (s < 1000 * 1024 * 1024) - text = QString("%1 MB").arg((int)(s/1024/1024+.5)); + text = TQString("%1 MB").arg((int)(s/1024/1024+.5)); else - text = QString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); + text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); if (_sizeEstimation>0) text += "+"; return text; @@ -347,17 +347,17 @@ QString Inode::text(int i) const if ((i==2) || (i==3)) { /* file/dir count makes no sense for files */ - if (_filePeer) return QString(); + if (_filePeer) return TQString(); - QString text; + TQString text; unsigned int f = (i==2) ? fileCount() : dirCount(); if (f>0) { while (f>1000) { - text = QString("%1 %2").arg(QString::number(f).right(3)).arg(text); + text = TQString("%1 %2").arg(TQString::number(f).right(3)).arg(text); f /= 1000; } - text = QString("%1 %2").arg(QString::number(f)).arg(text); + text = TQString("%1 %2").arg(TQString::number(f)).arg(text); if (_fileCountEstimation>0) text += "+"; } return text; @@ -367,12 +367,12 @@ QString Inode::text(int i) const if (i==5) return _info.owner(); if (i==6) return _info.group(); if (i==7) return mimeType()->comment(); - return QString(); + return TQString(); } -QPixmap Inode::pixmap(int i) const +TQPixmap Inode::pixmap(int i) const { - if (i!=0) return QPixmap(); + if (i!=0) return TQPixmap(); if (!_mimePixmapSet) { KURL u; diff --git a/konq-plugins/fsview/inode.h b/konq-plugins/fsview/inode.h index 8289f6b..eb1e3dd 100644 --- a/konq-plugins/fsview/inode.h +++ b/konq-plugins/fsview/inode.h @@ -23,10 +23,10 @@ #ifndef INODE_H #define INODE_H -#include <qmap.h> -#include <qptrlist.h> -#include <qfileinfo.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqfileinfo.h> +#include <tqstring.h> #include <kmimetype.h> @@ -49,7 +49,7 @@ public: Inode(ScanDir*, Inode*); Inode(ScanFile*, Inode*); ~Inode(); - void init(const QString&); + void init(const TQString&); void setPeer(ScanDir*); @@ -59,13 +59,13 @@ public: double size() const; unsigned int fileCount() const; unsigned int dirCount() const; - QString path() const; - QString text(int i) const; - QPixmap pixmap(int i) const; - QColor backColor() const; + TQString path() const; + TQString text(int i) const; + TQPixmap pixmap(int i) const; + TQColor backColor() const; KMimeType::Ptr mimeType() const; - const QFileInfo& fileInfo() const { return _info; } + const TQFileInfo& fileInfo() const { return _info; } ScanDir* dirPeer() { return _dirPeer; } ScanFile* filePeer() { return _filePeer; } bool isDir() { return (_dirPeer != 0); } @@ -78,7 +78,7 @@ public: private: void setMetrics(double, unsigned int); - QFileInfo _info; + TQFileInfo _info; ScanDir* _dirPeer; ScanFile* _filePeer; @@ -91,7 +91,7 @@ private: // This means a change even in const methods, thus has to be "mutable" mutable bool _mimeSet, _mimePixmapSet; mutable KMimeType::Ptr _mimeType; - mutable QPixmap _mimePixmap; + mutable TQPixmap _mimePixmap; }; #endif diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index da18dcf..5a93886 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -31,8 +31,8 @@ int main(int argc, char* argv[]) KCmdLineArgs::addCmdLineOptions(options); KApplication a; - KConfigGroup gconfig(KGlobal::config(), QCString("General")); - QString path = gconfig.readPathEntry("Path", "."); + KConfigGroup gconfig(KGlobal::config(), TQCString("General")); + TQString path = gconfig.readPathEntry("Path", "."); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if (args->count()>0) path = args->arg(0); @@ -40,17 +40,17 @@ int main(int argc, char* argv[]) // TreeMap Widget as toplevel window FSView w(new Inode()); - QObject::connect(&w,SIGNAL(clicked(TreeMapItem*)), - &w,SLOT(selected(TreeMapItem*))); - QObject::connect(&w,SIGNAL(returnPressed(TreeMapItem*)), - &w,SLOT(selected(TreeMapItem*))); - QObject::connect(&w, - SIGNAL(contextMenuRequested(TreeMapItem*,const QPoint&)), - &w,SLOT(contextMenu(TreeMapItem*, const QPoint&))); + TQObject::connect(&w,TQT_SIGNAL(clicked(TreeMapItem*)), + &w,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(&w,TQT_SIGNAL(returnPressed(TreeMapItem*)), + &w,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(&w, + TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), + &w,TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); w.setPath(path); w.show(); - a.connect( &a, SIGNAL( lastWindowClosed() ), &w, SLOT( quit() ) ); + a.connect( &a, TQT_SIGNAL( lastWindowClosed() ), &w, TQT_SLOT( quit() ) ); return a.exec(); } diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp index ed691e3..1d3d06a 100644 --- a/konq-plugins/fsview/scan.cpp +++ b/konq-plugins/fsview/scan.cpp @@ -16,8 +16,8 @@ Boston, MA 02110-1301, USA. */ -#include <qdir.h> -#include <qstringlist.h> +#include <tqdir.h> +#include <tqstringlist.h> #include <kapplication.h> #include <kdebug.h> @@ -34,7 +34,7 @@ ScanManager::ScanManager() _listener = 0; } -ScanManager::ScanManager(const QString& path) +ScanManager::ScanManager(const TQString& path) { _topDir = 0; _listener = 0; @@ -52,7 +52,7 @@ void ScanManager::setListener(ScanListener* l) _listener = l; } -ScanDir* ScanManager::setTop(const QString& path, int data) +ScanDir* ScanManager::setTop(const TQString& path, int data) { stopScan(); if (_topDir) { @@ -120,7 +120,7 @@ ScanFile::ScanFile() _listener = 0; } -ScanFile::ScanFile(const QString& n, KIO::fileoffset_t s) +ScanFile::ScanFile(const TQString& n, KIO::fileoffset_t s) { _name = n; _size = s; @@ -145,7 +145,7 @@ ScanDir::ScanDir() _data = 0; } -ScanDir::ScanDir(const QString& n, ScanManager* m, +ScanDir::ScanDir(const TQString& n, ScanManager* m, ScanDir* p, int data) : _name(n) { @@ -168,10 +168,10 @@ void ScanDir::setListener(ScanListener* l) _listener = l; } -QString ScanDir::path() +TQString ScanDir::path() { if (_parent) { - QString p = _parent->path(); + TQString p = _parent->path(); if (!p.endsWith("/")) p += "/"; return p + _name; } @@ -231,30 +231,30 @@ int ScanDir::scan(ScanItem* si, ScanItemList& list, int data) return 0; } - QDir d(si->absPath); - QStringList fileList = d.entryList( QDir::Files | - QDir::Hidden | QDir::NoSymLinks ); + TQDir d(si->absPath); + TQStringList fileList = d.entryList( TQDir::Files | + TQDir::Hidden | TQDir::NoSymLinks ); if (fileList.count()>0) { KDE_struct_stat buff; _files.reserve(fileList.count()); - QStringList::Iterator it; + TQStringList::Iterator it; for (it = fileList.begin(); it != fileList.end(); ++it ) { - KDE_lstat( QFile::encodeName(si->absPath + "/" + (*it)), &buff ); + KDE_lstat( TQFile::encodeName(si->absPath + "/" + (*it)), &buff ); _files.append( ScanFile(*it, buff.st_size) ); _fileSize += buff.st_size; } } - QStringList dirList = d.entryList( QDir::Dirs | - QDir::Hidden | QDir::NoSymLinks ); + TQStringList dirList = d.entryList( TQDir::Dirs | + TQDir::Hidden | TQDir::NoSymLinks ); if (dirList.count()>2) { _dirs.reserve(dirList.count()-2); - QStringList::Iterator it; + TQStringList::Iterator it; for (it = dirList.begin(); it != dirList.end(); ++it ) { if ( ((*it) == "..") || ((*it) == ".") ) continue; _dirs.append( ScanDir(*it, _manager, this, data) ); diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h index 38b015c..ca4ce4f 100644 --- a/konq-plugins/fsview/scan.h +++ b/konq-plugins/fsview/scan.h @@ -23,9 +23,9 @@ #ifndef FSDIR_H #define FSDIR_H -#include <qptrlist.h> -#include <qvaluevector.h> -#include <qfile.h> +#include <tqptrlist.h> +#include <tqvaluevector.h> +#include <tqfile.h> /* Use KDE_lstat and KIO::fileoffset_t for 64-bit sizes */ #include <klargefile.h> @@ -37,14 +37,14 @@ class ScanFile; class ScanItem { public: - ScanItem(const QString& p, ScanDir* d) + ScanItem(const TQString& p, ScanDir* d) { absPath = p; dir = d; } - QString absPath; + TQString absPath; ScanDir* dir; }; -typedef QPtrList<ScanItem> ScanItemList; +typedef TQPtrList<ScanItem> ScanItemList; /** @@ -83,13 +83,13 @@ class ScanManager { public: ScanManager(); - ScanManager(const QString& path); + ScanManager(const TQString& path); ~ScanManager(); /** Set the top path for scanning * The ScanDir object created gets attribute data. */ - ScanDir* setTop(const QString& path, int data = 0); + ScanDir* setTop(const TQString& path, int data = 0); ScanDir* top() { return _topDir; } bool scanRunning(); @@ -131,10 +131,10 @@ class ScanFile { public: ScanFile(); - ScanFile(const QString& n, KIO::fileoffset_t s); + ScanFile(const TQString& n, KIO::fileoffset_t s); ~ScanFile(); - const QString& name() { return _name; } + const TQString& name() { return _name; } KIO::fileoffset_t size() { return _size; } /* set listener to get callbacks from this ScanDir */ @@ -142,13 +142,13 @@ class ScanFile ScanListener* listener() { return _listener; } private: - QString _name; + TQString _name; KIO::fileoffset_t _size; ScanListener* _listener; }; -typedef QValueVector<ScanFile> ScanFileVector; -typedef QValueVector<ScanDir> ScanDirVector; +typedef TQValueVector<ScanFile> ScanFileVector; +typedef TQValueVector<ScanDir> ScanDirVector; /** * A directory to scan. @@ -159,7 +159,7 @@ class ScanDir { public: ScanDir(); - ScanDir(const QString& n, ScanManager* m, + ScanDir(const TQString& n, ScanManager* m, ScanDir* p = 0, int data = 0); ~ScanDir(); @@ -180,7 +180,7 @@ class ScanDir void setupChildRescan(); /* Absolute path. Warning: Slow, loops to top parent. */ - QString path(); + TQString path(); /* get integer data attribute */ int data() { return _data; } @@ -188,7 +188,7 @@ class ScanDir ScanFileVector& files() { return _files; } ScanDirVector& dirs() { return _dirs; } - const QString& name() { return _name; } + const TQString& name() { return _name; } KIO::fileoffset_t size() { update(); return _size; } unsigned int fileCount() { update(); return _fileCount; } unsigned int dirCount() { update(); return _dirCount; } @@ -217,7 +217,7 @@ class ScanDir ScanFileVector _files; ScanDirVector _dirs; - QString _name; + TQString _name; bool _dirty; /* needs a call to update() */ KIO::fileoffset_t _size, _fileSize; unsigned int _fileCount, _dirCount; diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index 8de5c01..5a42c75 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -18,16 +18,16 @@ /* * A Widget for visualizing hierarchical metrics as areas. - * The API is similar to QListView. + * The API is similar to TQListView. */ #include <math.h> -#include <qpainter.h> -#include <qtooltip.h> -#include <qregexp.h> -#include <qstyle.h> -#include <qpopupmenu.h> +#include <tqpainter.h> +#include <tqtooltip.h> +#include <tqregexp.h> +#include <tqstyle.h> +#include <tqpopupmenu.h> #include <klocale.h> #include <kconfig.h> @@ -56,7 +56,7 @@ StoredDrawParams::StoredDrawParams() // field array has size 0 } -StoredDrawParams::StoredDrawParams(QColor c, +StoredDrawParams::StoredDrawParams(TQColor c, bool selected, bool current) { _backColor = c; @@ -69,18 +69,18 @@ StoredDrawParams::StoredDrawParams(QColor c, // field array has size 0 } -QString StoredDrawParams::text(int f) const +TQString StoredDrawParams::text(int f) const { if ((f<0) || (f >= (int)_field.size())) - return QString::null; + return TQString::null; return _field[f].text; } -QPixmap StoredDrawParams::pixmap(int f) const +TQPixmap StoredDrawParams::pixmap(int f) const { if ((f<0) || (f >= (int)_field.size())) - return QPixmap(); + return TQPixmap(); return _field[f].pix; } @@ -101,10 +101,10 @@ int StoredDrawParams::maxLines(int f) const return _field[f].maxLines; } -const QFont& StoredDrawParams::font() const +const TQFont& StoredDrawParams::font() const { - static QFont* f = 0; - if (!f) f = new QFont(QApplication::font()); + static TQFont* f = 0; + if (!f) f = new TQFont(TQApplication::font()); return *f; } @@ -124,7 +124,7 @@ void StoredDrawParams::ensureField(int f) } -void StoredDrawParams::setField(int f, const QString& t, QPixmap pm, +void StoredDrawParams::setField(int f, const TQString& t, TQPixmap pm, Position p, int maxLines) { if (f<0 || f>=MAX_FIELD) return; @@ -136,7 +136,7 @@ void StoredDrawParams::setField(int f, const QString& t, QPixmap pm, _field[f].maxLines = maxLines; } -void StoredDrawParams::setText(int f, const QString& t) +void StoredDrawParams::setText(int f, const TQString& t) { if (f<0 || f>=MAX_FIELD) return; ensureField(f); @@ -144,7 +144,7 @@ void StoredDrawParams::setText(int f, const QString& t) _field[f].text = t; } -void StoredDrawParams::setPixmap(int f, const QPixmap& pm) +void StoredDrawParams::setPixmap(int f, const TQPixmap& pm) { if (f<0 || f>=MAX_FIELD) return; ensureField(f); @@ -174,7 +174,7 @@ void StoredDrawParams::setMaxLines(int f, int m) // RectDrawing // -RectDrawing::RectDrawing(QRect r) +RectDrawing::RectDrawing(TQRect r) { _fm = 0; _dp = 0; @@ -203,7 +203,7 @@ void RectDrawing::setDrawParams(DrawParams* dp) _dp = dp; } -void RectDrawing::setRect(QRect r) +void RectDrawing::setRect(TQRect r) { _rect = r; @@ -217,7 +217,7 @@ void RectDrawing::setRect(QRect r) _fontHeight = 0; } -QRect RectDrawing::remainingRect(DrawParams* dp) +TQRect RectDrawing::remainingRect(DrawParams* dp) { if (!dp) dp = drawParams(); @@ -242,19 +242,19 @@ QRect RectDrawing::remainingRect(DrawParams* dp) } -void RectDrawing::drawBack(QPainter* p, DrawParams* dp) +void RectDrawing::drawBack(TQPainter* p, DrawParams* dp) { if (!dp) dp = drawParams(); if (_rect.width()<=0 || _rect.height()<=0) return; - QRect r = _rect; - QColor normal = dp->backColor(); + TQRect r = _rect; + TQColor normal = dp->backColor(); if (dp->selected()) normal = normal.light(); bool isCurrent = dp->current(); // 3D raised/sunken frame effect... - QColor high = normal.light(); - QColor low = normal.dark(); + TQColor high = normal.light(); + TQColor low = normal.dark(); p->setPen( isCurrent ? low:high); p->drawLine(r.left(), r.top(), r.right(), r.top()); p->drawLine(r.left(), r.top(), r.left(), r.bottom()); @@ -269,7 +269,7 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) bool goDark = qGray(normal.rgb())>128; int rBase, gBase, bBase; normal.rgb(&rBase, &gBase, &bBase); - p->setBrush(QBrush::NoBrush); + p->setBrush(TQBrush::NoBrush); // shade parameters: int d = 7; @@ -290,7 +290,7 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) int gDiff = goDark ? -gBase/d : (255-gBase)/d; int bDiff = goDark ? -bBase/d : (255-bBase)/d; - QColor shadeColor; + TQColor shadeColor; while (factor<.95) { shadeColor.setRgb((int)(rBase+factor*rDiff+.5), (int)(gBase+factor*gDiff+.5), @@ -329,22 +329,22 @@ void RectDrawing::drawBack(QPainter* p, DrawParams* dp) } // fill inside - p->setPen(QPen::NoPen); + p->setPen(TQPen::NoPen); p->setBrush(normal); p->drawRect(r); } -bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) +bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) { if (!dp) dp = drawParams(); if (!_fm) { - _fm = new QFontMetrics(dp->font()); + _fm = new TQFontMetrics(dp->font()); _fontHeight = _fm->height(); } - QRect r = _rect; + TQRect r = _rect; if (0) kdDebug(90100) << "DrawField: Rect " << r.x() << "/" << r.y() << " - " << r.width() << "x" << r.height() << endl; @@ -484,9 +484,9 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) // get text and pixmap now, only if we need to, because it is possible // that they are calculated on demand (and this can take some time) - QString name = dp->text(f); + TQString name = dp->text(f); if (name.isEmpty()) return 0; - QPixmap pix = dp->pixmap(f); + TQPixmap pix = dp->pixmap(f); // check if pixmap can be drawn int pixW = pix.width(); @@ -548,14 +548,14 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) * If the text is to be written at the bottom, we start with the * end of the string (so everything is reverted) */ - QString remaining; + TQString remaining; int origLines = lines; while (lines>0) { if (w>width && lines>1) { int lastBreakPos = name.length(), lastWidth = w; int len = name.length(); - QChar::Category caOld, ca; + TQChar::Category caOld, ca; if (!isBottom) { // start with comparing categories of last 2 chars @@ -565,8 +565,8 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) ca = name[len-1].category(); if (ca != caOld) { // "Aa" has no break between... - if (ca == QChar::Letter_Uppercase && - caOld == QChar::Letter_Lowercase) { + if (ca == TQChar::Letter_Uppercase && + caOld == TQChar::Letter_Lowercase) { caOld = ca; continue; } @@ -580,7 +580,7 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) w = lastWidth; remaining = name.mid(lastBreakPos); // remove space on break point - if (name[lastBreakPos-1].category() == QChar::Separator_Space) + if (name[lastBreakPos-1].category() == TQChar::Separator_Space) name = name.left(lastBreakPos-1); else name = name.left(lastBreakPos); @@ -594,8 +594,8 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) if (ca != caOld) { // "Aa" has no break between... - if (caOld == QChar::Letter_Uppercase && - ca == QChar::Letter_Lowercase) { + if (caOld == TQChar::Letter_Uppercase && + ca == TQChar::Letter_Lowercase) { caOld = ca; continue; } @@ -609,14 +609,14 @@ bool RectDrawing::drawField(QPainter* p, int f, DrawParams* dp) w = lastWidth; remaining = name.left(l-lastBreakPos); // remove space on break point - if (name[l-lastBreakPos].category() == QChar::Separator_Space) + if (name[l-lastBreakPos].category() == TQChar::Separator_Space) name = name.right(lastBreakPos-1); else name = name.right(lastBreakPos); } } else - remaining = QString::null; + remaining = TQString::null; /* truncate and add ... if needed */ if (w>width) { @@ -776,8 +776,8 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, - QString text1, QString text2, - QString text3, QString text4) + TQString text1, TQString text2, + TQString text3, TQString text4) { _value = value; _parent = parent; @@ -861,13 +861,13 @@ void TreeMapItem::refresh() } -QStringList TreeMapItem::path(int textNo) const +TQStringList TreeMapItem::path(int textNo) const { - QStringList list(text(textNo)); + TQStringList list(text(textNo)); TreeMapItem* i = _parent; while (i) { - QString text = i->text(textNo); + TQString text = i->text(textNo); if (!text.isEmpty()) list.prepend(i->text(textNo)); i = i->_parent; @@ -934,7 +934,7 @@ DrawParams::Position TreeMapItem::position(int f) const } // use widget font -const QFont& TreeMapItem::font() const +const TQFont& TreeMapItem::font() const { return _widget->currentFont(); } @@ -1013,7 +1013,7 @@ TreeMapItemList* TreeMapItem::children() void TreeMapItem::clearItemRect() { - _rect = QRect(); + _rect = TQRect(); clearFreeRects(); } @@ -1022,13 +1022,13 @@ void TreeMapItem::clearFreeRects() if (_freeRects) _freeRects->clear(); } -void TreeMapItem::addFreeRect(const QRect& r) +void TreeMapItem::addFreeRect(const TQRect& r) { // don't add invalid rects if ((r.width() < 1) || (r.height() < 1)) return; if (!_freeRects) { - _freeRects = new QPtrList<QRect>; + _freeRects = new TQPtrList<TQRect>; _freeRects->setAutoDelete(true); } @@ -1036,9 +1036,9 @@ void TreeMapItem::addFreeRect(const QRect& r) << r.x() << "/" << r.y() << "-" << r.width() << "x" << r.height() << ")" << endl; - QRect* last = _freeRects->last(); + TQRect* last = _freeRects->last(); if (!last) { - _freeRects->append(new QRect(r)); + _freeRects->append(new TQRect(r)); return; } @@ -1060,7 +1060,7 @@ void TreeMapItem::addFreeRect(const QRect& r) } if (!replaced) { - _freeRects->append(new QRect(r)); + _freeRects->append(new TQRect(r)); return; } @@ -1075,13 +1075,13 @@ void TreeMapItem::addFreeRect(const QRect& r) class TreeMapTip: public QToolTip { public: - TreeMapTip( QWidget* p ):QToolTip(p) {} + TreeMapTip( TQWidget* p ):TQToolTip(p) {} protected: - void maybeTip( const QPoint & ); + void maybeTip( const TQPoint & ); }; -void TreeMapTip::maybeTip( const QPoint& pos ) +void TreeMapTip::maybeTip( const TQPoint& pos ) { if ( !parentWidget()->inherits( "TreeMapWidget" ) ) return; @@ -1089,9 +1089,9 @@ void TreeMapTip::maybeTip( const QPoint& pos ) TreeMapWidget* p = (TreeMapWidget*)parentWidget(); TreeMapItem* i; i = p->item(pos.x(), pos.y()); - QPtrList<QRect>* rList = i ? i->freeRects() : 0; + TQPtrList<TQRect>* rList = i ? i->freeRects() : 0; if (rList) { - QRect* r; + TQRect* r; for(r=rList->first();r;r=rList->next()) if (r->contains(pos)) tip(*r, p->tipString(i)); @@ -1103,8 +1103,8 @@ void TreeMapTip::maybeTip( const QPoint& pos ) // TreeMapWidget TreeMapWidget::TreeMapWidget(TreeMapItem* base, - QWidget* parent, const char* name) - : QWidget(parent, name) + TQWidget* parent, const char* name) + : TQWidget(parent, name) { _base = base; _base->setWidget(this); @@ -1140,7 +1140,7 @@ TreeMapWidget::TreeMapWidget(TreeMapItem* base, _needsRefresh = _base; setBackgroundMode(Qt::NoBackground); - setFocusPolicy(QWidget::StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); _tip = new TreeMapTip(this); } @@ -1148,7 +1148,7 @@ TreeMapWidget::~TreeMapWidget() { } -const QFont& TreeMapWidget::currentFont() const +const TQFont& TreeMapWidget::currentFont() const { return _font; } @@ -1166,7 +1166,7 @@ TreeMapItem::SplitMode TreeMapWidget::splitMode() const return _splitMode; } -bool TreeMapWidget::setSplitMode(QString mode) +bool TreeMapWidget::setSplitMode(TQString mode) { if (mode == "Bisection") setSplitMode(TreeMapItem::Bisection); else if (mode == "Columns") setSplitMode(TreeMapItem::Columns); @@ -1182,9 +1182,9 @@ bool TreeMapWidget::setSplitMode(QString mode) return true; } -QString TreeMapWidget::splitModeString() const +TQString TreeMapWidget::splitModeString() const { - QString mode; + TQString mode; switch(splitMode()) { case TreeMapItem::Bisection: mode = "Bisection"; break; case TreeMapItem::Columns: mode = "Columns"; break; @@ -1250,14 +1250,14 @@ void TreeMapWidget::setMaxDrawingDepth(int d) redraw(); } -QString TreeMapWidget::defaultFieldType(int f) const +TQString TreeMapWidget::defaultFieldType(int f) const { return i18n("Text %1").arg(f+1); } -QString TreeMapWidget::defaultFieldStop(int) const +TQString TreeMapWidget::defaultFieldStop(int) const { - return QString(); + return TQString(); } bool TreeMapWidget::defaultFieldVisible(int f) const @@ -1302,7 +1302,7 @@ bool TreeMapWidget::resizeAttr(int size) return true; } -void TreeMapWidget::setFieldType(int f, QString type) +void TreeMapWidget::setFieldType(int f, TQString type) { if (((int)_attr.size() < f+1) && (type == defaultFieldType(f))) return; @@ -1311,13 +1311,13 @@ void TreeMapWidget::setFieldType(int f, QString type) // no need to redraw: the type string is not visible in the TreeMap } -QString TreeMapWidget::fieldType(int f) const +TQString TreeMapWidget::fieldType(int f) const { if (f<0 || (int)_attr.size()<f+1) return defaultFieldType(f); return _attr[f].type; } -void TreeMapWidget::setFieldStop(int f, QString stop) +void TreeMapWidget::setFieldStop(int f, TQString stop) { if (((int)_attr.size() < f+1) && (stop == defaultFieldStop(f))) return; @@ -1327,7 +1327,7 @@ void TreeMapWidget::setFieldStop(int f, QString stop) } } -QString TreeMapWidget::fieldStop(int f) const +TQString TreeMapWidget::fieldStop(int f) const { if (f<0 || (int)_attr.size()<f+1) return defaultFieldStop(f); return _attr[f].stop; @@ -1390,7 +1390,7 @@ DrawParams::Position TreeMapWidget::fieldPosition(int f) const return _attr[f].pos; } -void TreeMapWidget::setFieldPosition(int f, QString pos) +void TreeMapWidget::setFieldPosition(int f, TQString pos) { if (pos == "TopLeft") setFieldPosition(f, DrawParams::TopLeft); @@ -1408,17 +1408,17 @@ void TreeMapWidget::setFieldPosition(int f, QString pos) setFieldPosition(f, DrawParams::Default); } -QString TreeMapWidget::fieldPositionString(int f) const +TQString TreeMapWidget::fieldPositionString(int f) const { TreeMapItem::Position pos = fieldPosition(f); - if (pos == DrawParams::TopLeft) return QString("TopLeft"); - if (pos == DrawParams::TopCenter) return QString("TopCenter"); - if (pos == DrawParams::TopRight) return QString("TopRight"); - if (pos == DrawParams::BottomLeft) return QString("BottomLeft"); - if (pos == DrawParams::BottomCenter) return QString("BottomCenter"); - if (pos == DrawParams::BottomRight) return QString("BottomRight"); - if (pos == DrawParams::Default) return QString("Default"); - return QString("unknown"); + if (pos == DrawParams::TopLeft) return TQString("TopLeft"); + if (pos == DrawParams::TopCenter) return TQString("TopCenter"); + if (pos == DrawParams::TopRight) return TQString("TopRight"); + if (pos == DrawParams::BottomLeft) return TQString("BottomLeft"); + if (pos == DrawParams::BottomCenter) return TQString("BottomCenter"); + if (pos == DrawParams::BottomRight) return TQString("BottomRight"); + if (pos == DrawParams::Default) return TQString("Default"); + return TQString("unknown"); } void TreeMapWidget::setMinimalArea(int area) @@ -1453,9 +1453,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i) } -QString TreeMapWidget::tipString(TreeMapItem* i) const +TQString TreeMapWidget::tipString(TreeMapItem* i) const { - QString tip, itemTip; + TQString tip, itemTip; while (i) { if (!i->text(0).isEmpty()) { @@ -1572,7 +1572,7 @@ void TreeMapWidget::setSelected(TreeMapItem* item, bool selected) redraw(changed); if (0) kdDebug(90100) << (selected ? "S":"Des") << "elected Item " - << (item ? item->path(0).join("") : QString("(null)")) + << (item ? item->path(0).join("") : TQString("(null)")) << " (depth " << (item ? item->depth() : -1) << ")" << endl; } @@ -1764,16 +1764,16 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, return changed; } -void TreeMapWidget::contextMenuEvent( QContextMenuEvent* e ) +void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( receivers( SIGNAL(contextMenuRequested(TreeMapItem*, const QPoint &)) ) ) + if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); - if ( e->reason() == QContextMenuEvent::Keyboard ) { - QRect r = (_current) ? _current->itemRect() : _base->itemRect(); - QPoint p = QPoint(r.left() + r.width()/2, r.top() + r.height()/2); + if ( e->reason() == TQContextMenuEvent::Keyboard ) { + TQRect r = (_current) ? _current->itemRect() : _base->itemRect(); + TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2); emit contextMenuRequested(_current, p); } else { @@ -1783,7 +1783,7 @@ void TreeMapWidget::contextMenuEvent( QContextMenuEvent* e ) } -void TreeMapWidget::mousePressEvent( QMouseEvent* e ) +void TreeMapWidget::mousePressEvent( TQMouseEvent* e ) { //kdDebug(90100) << "TreeMapWidget::mousePressEvent" << endl; @@ -1851,7 +1851,7 @@ void TreeMapWidget::mousePressEvent( QMouseEvent* e ) } } -void TreeMapWidget::mouseMoveEvent( QMouseEvent* e ) +void TreeMapWidget::mouseMoveEvent( TQMouseEvent* e ) { //kdDebug(90100) << "TreeMapWidget::mouseMoveEvent" << endl; @@ -1894,7 +1894,7 @@ void TreeMapWidget::mouseMoveEvent( QMouseEvent* e ) redraw(changed); } -void TreeMapWidget::mouseReleaseEvent( QMouseEvent* ) +void TreeMapWidget::mouseReleaseEvent( TQMouseEvent* ) { //kdDebug(90100) << "TreeMapWidget::mouseReleaseEvent" << endl; @@ -1924,7 +1924,7 @@ void TreeMapWidget::mouseReleaseEvent( QMouseEvent* ) } -void TreeMapWidget::mouseDoubleClickEvent( QMouseEvent* e ) +void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) { TreeMapItem* over = item(e->x(), e->y()); @@ -1943,7 +1943,7 @@ int nextVisible(TreeMapItem* i) while (idx < (int)p->children()->count()-1) { idx++; - QRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->children()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1961,7 +1961,7 @@ int prevVisible(TreeMapItem* i) while (idx > 0) { idx--; - QRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->children()->at(idx)->itemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1971,7 +1971,7 @@ int prevVisible(TreeMapItem* i) -void TreeMapWidget::keyPressEvent( QKeyEvent* e ) +void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) { if (e->key() == Key_Escape && _pressed) { @@ -2085,24 +2085,24 @@ void TreeMapWidget::keyPressEvent( QKeyEvent* e ) } } -void TreeMapWidget::fontChange( const QFont& ) +void TreeMapWidget::fontChange( const TQFont& ) { redraw(); } -void TreeMapWidget::resizeEvent( QResizeEvent * ) +void TreeMapWidget::resizeEvent( TQResizeEvent * ) { // this automatically redraws (as size is changed) drawTreeMap(); } -void TreeMapWidget::paintEvent( QPaintEvent * ) +void TreeMapWidget::paintEvent( TQPaintEvent * ) { drawTreeMap(); } -void TreeMapWidget::showEvent( QShowEvent * ) +void TreeMapWidget::showEvent( TQShowEvent * ) { // refresh only if needed drawTreeMap(); @@ -2125,14 +2125,14 @@ void TreeMapWidget::drawTreeMap() if (_needsRefresh == _base) { // redraw whole widget - _pixmap = QPixmap(size()); + _pixmap = TQPixmap(size()); _pixmap.fill(backgroundColor()); } - QPainter p(&_pixmap); + TQPainter p(&_pixmap); if (_needsRefresh == _base) { p.setPen(black); - p.drawRect(QRect(2, 2, QWidget::width()-4, QWidget::height()-4)); - _base->setItemRect(QRect(3, 3, QWidget::width()-6, QWidget::height()-6)); + p.drawRect(TQRect(2, 2, TQWidget::width()-4, TQWidget::height()-4)); + _base->setItemRect(TQRect(3, 3, TQWidget::width()-6, TQWidget::height()-6)); } else { // only subitem @@ -2148,12 +2148,12 @@ void TreeMapWidget::drawTreeMap() } bitBlt( this, 0, 0, &_pixmap, 0, 0, - QWidget::width(), QWidget::height(), CopyROP, true); + TQWidget::width(), TQWidget::height(), CopyROP, true); if (hasFocus()) { - QPainter p(this); - style().drawPrimitive( QStyle::PE_FocusRect, &p, - QRect(0, 0, QWidget::width(), QWidget::height()), + TQPainter p(this); + style().drawPrimitive( TQStyle::PE_FocusRect, &p, + TQRect(0, 0, TQWidget::width(), TQWidget::height()), colorGroup() ); } } @@ -2177,7 +2177,7 @@ void TreeMapWidget::redraw(TreeMapItem* i) } } -void TreeMapWidget::drawItem(QPainter* p, +void TreeMapWidget::drawItem(TQPainter* p, TreeMapItem* item) { bool isSelected = false; @@ -2206,7 +2206,7 @@ void TreeMapWidget::drawItem(QPainter* p, } -bool TreeMapWidget::horizontal(TreeMapItem* i, const QRect& r) +bool TreeMapWidget::horizontal(TreeMapItem* i, const TQRect& r) { switch(i->splitMode()) { case TreeMapItem::HAlternate: @@ -2227,7 +2227,7 @@ bool TreeMapWidget::horizontal(TreeMapItem* i, const QRect& r) /** * Draw TreeMapItems recursive, starting from item */ -void TreeMapWidget::drawItems(QPainter* p, +void TreeMapWidget::drawItems(TQPainter* p, TreeMapItem* item) { if (DEBUG_DRAWING) @@ -2240,9 +2240,9 @@ void TreeMapWidget::drawItems(QPainter* p, drawItem(p, item); item->clearFreeRects(); - QRect origRect = item->itemRect(); + TQRect origRect = item->itemRect(); int bw = item->borderWidth(); - QRect r = QRect(origRect.x()+bw, origRect.y()+bw, + TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); TreeMapItemList* list = item->children(); @@ -2266,7 +2266,7 @@ void TreeMapWidget::drawItems(QPainter* p, // stop drawing if stopAtText is reached if (!stopDrawing) for (int no=0;no<(int)_attr.size();no++) { - QString stopAt = fieldStop(no); + TQString stopAt = fieldStop(no); if (!stopAt.isEmpty() && (item->text(no) == stopAt)) { stopDrawing = true; break; @@ -2320,7 +2320,7 @@ void TreeMapWidget::drawItems(QPainter* p, << i->value() << endl; } - QRect orig = r; + TQRect orig = r; // if we have space for text... if ((r.height() >= _fontHeight) && (r.width() >= _fontHeight)) { @@ -2337,12 +2337,12 @@ void TreeMapWidget::drawItems(QPainter* p, if (orig.x() == r.x()) { // Strings on top - item->addFreeRect(QRect(orig.x(), orig.y(), + item->addFreeRect(TQRect(orig.x(), orig.y(), orig.width(), orig.height()-r.height())); } else { // Strings on the left - item->addFreeRect(QRect(orig.x(), orig.y(), + item->addFreeRect(TQRect(orig.x(), orig.y(), orig.width()-r.width(), orig.height())); } @@ -2389,7 +2389,7 @@ void TreeMapWidget::drawItems(QPainter* p, self / user_sum + .5); if (self_length > 0) { // take space for self cost - QRect sr = r; + TQRect sr = r; if (rotate) { sr.setWidth( self_length ); r.setRect(r.x()+sr.width(), r.y(), r.width()-sr.width(), r.height()); @@ -2450,7 +2450,7 @@ void TreeMapWidget::drawItems(QPainter* p, // we always split horizontally int nextPos = (int)((double)r.width() * valSum / user_sum); - QRect firstRect = QRect(r.x(), r.y(), nextPos, r.height()); + TQRect firstRect = TQRect(r.x(), r.y(), nextPos, r.height()); if (nextPos < _visibleWidth) { if (item->sorting(0) == -1) { @@ -2501,7 +2501,7 @@ void TreeMapWidget::drawItems(QPainter* p, // we always split horizontally int nextPos = (int)((double)r.height() * valSum / user_sum); - QRect firstRect = QRect(r.x(), r.y(), r.width(), nextPos); + TQRect firstRect = TQRect(r.x(), r.y(), r.width(), nextPos); if (nextPos < _visibleWidth) { if (item->sorting(0) == -1) { @@ -2538,7 +2538,7 @@ void TreeMapWidget::drawItems(QPainter* p, } // fills area with a pattern if to small to draw children -void TreeMapWidget::drawFill(TreeMapItem* i, QPainter* p, QRect& r) +void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r) { p->setBrush(Qt::Dense4Pattern); p->setPen(Qt::NoPen); @@ -2547,7 +2547,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, QPainter* p, QRect& r) } // fills area with a pattern if to small to draw children -void TreeMapWidget::drawFill(TreeMapItem* i, QPainter* p, QRect& r, +void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r, TreeMapItemListIterator it, int len, bool goBack) { if (DEBUG_DRAWING) @@ -2577,8 +2577,8 @@ void TreeMapWidget::drawFill(TreeMapItem* i, QPainter* p, QRect& r, } // returns false if rect gets to small -bool TreeMapWidget::drawItemArray(QPainter* p, TreeMapItem* item, - QRect& r, double user_sum, +bool TreeMapWidget::drawItemArray(TQPainter* p, TreeMapItem* item, + TQRect& r, double user_sum, TreeMapItemListIterator it, int len, bool goBack) { @@ -2618,14 +2618,14 @@ bool TreeMapWidget::drawItemArray(QPainter* p, TreeMapItem* item, if (r.width() > r.height()) { int halfPos = (int)((double)r.width() * valSum / user_sum); - QRect firstRect = QRect(r.x(), r.y(), halfPos, r.height()); + TQRect firstRect = TQRect(r.x(), r.y(), halfPos, r.height()); drawOn = drawItemArray(p, item, firstRect, valSum, first, len-lenLeft, goBack); r.setRect(r.x()+halfPos, r.y(), r.width()-halfPos, r.height()); } else { int halfPos = (int)((double)r.height() * valSum / user_sum); - QRect firstRect = QRect(r.x(), r.y(), r.width(), halfPos); + TQRect firstRect = TQRect(r.x(), r.y(), r.width(), halfPos); drawOn = drawItemArray(p, item, firstRect, valSum, first, len-lenLeft, goBack); r.setRect(r.x(), r.y()+halfPos, r.width(), r.height()-halfPos); @@ -2694,7 +2694,7 @@ bool TreeMapWidget::drawItemArray(QPainter* p, TreeMapItem* item, return false; } - QRect currRect = r; + TQRect currRect = r; if (hor) currRect.setWidth(nextPos); @@ -2769,13 +2769,13 @@ void TreeMapWidget::splitActivated(int id) } -void TreeMapWidget::addSplitDirectionItems(QPopupMenu* popup, int id) +void TreeMapWidget::addSplitDirectionItems(TQPopupMenu* popup, int id) { _splitID = id; popup->setCheckable(true); - connect(popup, SIGNAL(activated(int)), - this, SLOT(splitActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(splitActivated(int))); popup->insertItem(i18n("Recursive Bisection"), id); popup->insertItem(i18n("Columns"), id+1); @@ -2824,21 +2824,21 @@ void TreeMapWidget::visualizationActivated(int id) else if ((id%10) == 8) setFieldPosition(f, DrawParams::BottomRight); } -void TreeMapWidget::addVisualizationItems(QPopupMenu* popup, int id) +void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) { _visID = id; popup->setCheckable(true); - QPopupMenu* bpopup = new QPopupMenu(); + TQPopupMenu* bpopup = new TQPopupMenu(); bpopup->setCheckable(true); - connect(popup, SIGNAL(activated(int)), - this, SLOT(visualizationActivated(int))); - connect(bpopup, SIGNAL(activated(int)), - this, SLOT(visualizationActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(visualizationActivated(int))); + connect(bpopup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(visualizationActivated(int))); - QPopupMenu* spopup = new QPopupMenu(); + TQPopupMenu* spopup = new TQPopupMenu(); addSplitDirectionItems(spopup, id+100); popup->insertItem(i18n("Nesting"), spopup, id); @@ -2864,10 +2864,10 @@ void TreeMapWidget::addVisualizationItems(QPopupMenu* popup, int id) popup->insertSeparator(); int f; - QPopupMenu* tpopup; + TQPopupMenu* tpopup; id += 20; for (f=0;f<(int)_attr.size();f++, id+=10) { - tpopup = new QPopupMenu(); + tpopup = new TQPopupMenu(); tpopup->setCheckable(true); popup->insertItem(_attr[f].type, tpopup, id); tpopup->insertItem(i18n("Visible"), id+1); @@ -2896,8 +2896,8 @@ void TreeMapWidget::addVisualizationItems(QPopupMenu* popup, int id) tpopup->setItemChecked(id+7,_attr[f].pos == DrawParams::BottomCenter); tpopup->setItemChecked(id+8,_attr[f].pos == DrawParams::BottomRight); - connect(tpopup, SIGNAL(activated(int)), - this, SLOT(visualizationActivated(int))); + connect(tpopup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(visualizationActivated(int))); } } @@ -2913,7 +2913,7 @@ void TreeMapWidget::selectionActivated(int id) setSelected(i, true); } -void TreeMapWidget::addSelectionItems(QPopupMenu* popup, +void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, int id, TreeMapItem* i) { if (!i) return; @@ -2921,11 +2921,11 @@ void TreeMapWidget::addSelectionItems(QPopupMenu* popup, _selectionID = id; _menuItem = i; - connect(popup, SIGNAL(activated(int)), - this, SLOT(selectionActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(selectionActivated(int))); while (i) { - QString name = i->text(0); + TQString name = i->text(0); if (name.isEmpty()) break; popup->insertItem(i->text(0), id++); i = i->parent(); @@ -2934,7 +2934,7 @@ void TreeMapWidget::addSelectionItems(QPopupMenu* popup, void TreeMapWidget::fieldStopActivated(int id) { - if (id == _fieldStopID) setFieldStop(0, QString::null); + if (id == _fieldStopID) setFieldStop(0, TQString::null); else { TreeMapItem* i = _menuItem; id -= _fieldStopID+1; @@ -2947,13 +2947,13 @@ void TreeMapWidget::fieldStopActivated(int id) } } -void TreeMapWidget::addFieldStopItems(QPopupMenu* popup, +void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, int id, TreeMapItem* i) { _fieldStopID = id; - connect(popup, SIGNAL(activated(int)), - this, SLOT(fieldStopActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(fieldStopActivated(int))); popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); @@ -2964,7 +2964,7 @@ void TreeMapWidget::addFieldStopItems(QPopupMenu* popup, while (i) { id++; - QString name = i->text(0); + TQString name = i->text(0); if (name.isEmpty()) break; popup->insertItem(i->text(0), id); if (fieldStop(0) == i->text(0)) { @@ -2996,14 +2996,14 @@ void TreeMapWidget::areaStopActivated(int id) else if (id == _areaStopID+6) setMinimalArea(minimalArea()/2); } -void TreeMapWidget::addAreaStopItems(QPopupMenu* popup, +void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, int id, TreeMapItem* i) { _areaStopID = id; _menuItem = i; - connect(popup, SIGNAL(activated(int)), - this, SLOT(areaStopActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(areaStopActivated(int))); bool foundArea = false; @@ -3061,14 +3061,14 @@ void TreeMapWidget::depthStopActivated(int id) else if (id == _depthStopID+6) setMaxDrawingDepth(6); } -void TreeMapWidget::addDepthStopItems(QPopupMenu* popup, +void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, int id, TreeMapItem* i) { _depthStopID = id; _menuItem = i; - connect(popup, SIGNAL(activated(int)), - this, SLOT(depthStopActivated(int))); + connect(popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(depthStopActivated(int))); bool foundDepth = false; @@ -3117,7 +3117,7 @@ void TreeMapWidget::addDepthStopItems(QPopupMenu* popup, * Option saving/restoring */ -void TreeMapWidget::saveOptions(KConfigGroup* config, QString prefix) +void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix) { config->writeEntry(prefix+"Nesting", splitModeString()); config->writeEntry(prefix+"AllowRotation", allowRotation()); @@ -3130,23 +3130,23 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, QString prefix) int f, fCount = _attr.size(); config->writeEntry(prefix+"FieldCount", fCount); for (f=0;f<fCount;f++) { - config->writeEntry(QString(prefix+"FieldVisible%1").arg(f), + config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f), _attr[f].visible); - config->writeEntry(QString(prefix+"FieldForced%1").arg(f), + config->writeEntry(TQString(prefix+"FieldForced%1").arg(f), _attr[f].forced); - config->writeEntry(QString(prefix+"FieldStop%1").arg(f), + config->writeEntry(TQString(prefix+"FieldStop%1").arg(f), _attr[f].stop); - config->writeEntry(QString(prefix+"FieldPosition%1").arg(f), + config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f), fieldPositionString(f)); } } -void TreeMapWidget::restoreOptions(KConfigGroup* config, QString prefix) +void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix) { bool enabled; int num; - QString str; + TQString str; str = config->readEntry(prefix+"Nesting"); if (!str.isEmpty()) setSplitMode(str); @@ -3180,18 +3180,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, QString prefix) int f; for (f=0;f<num;f++) { - str = QString(prefix+"FieldVisible%1").arg(f); + str = TQString(prefix+"FieldVisible%1").arg(f); if (config->hasKey(str)) setFieldVisible(f, config->readBoolEntry(str)); - str = QString(prefix+"FieldForced%1").arg(f); + str = TQString(prefix+"FieldForced%1").arg(f); if (config->hasKey(str)) setFieldForced(f, config->readBoolEntry(str)); - str = config->readEntry(QString(prefix+"FieldStop%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f)); setFieldStop(f, str); - str = config->readEntry(QString(prefix+"FieldPosition%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f)); if (!str.isEmpty()) setFieldPosition(f, str); } } diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index a834d23..1deee35 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -18,7 +18,7 @@ /** * A Widget for visualizing hierarchical metrics as areas. - * The API is similar to QListView. + * The API is similar to TQListView. * * This file defines the following classes: * DrawParams, RectDrawing, TreeMapItem, TreeMapWidget @@ -30,14 +30,14 @@ #ifndef TREEMAP_H #define TREEMAP_H -#include <qstring.h> -#include <qwidget.h> -#include <qpixmap.h> -#include <qptrlist.h> -#include <qvaluevector.h> -#include <qcolor.h> -#include <qapplication.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqpixmap.h> +#include <tqptrlist.h> +#include <tqvaluevector.h> +#include <tqcolor.h> +#include <tqapplication.h> +#include <tqstringlist.h> class QPopupMenu; class TreeMapTip; @@ -74,15 +74,15 @@ public: // no constructor as this is an abstract class virtual ~DrawParams() {} - virtual QString text(int) const = 0; - virtual QPixmap pixmap(int) const = 0; + virtual TQString text(int) const = 0; + virtual TQPixmap pixmap(int) const = 0; virtual Position position(int) const = 0; // 0: no limit, negative: leave at least -maxLines() free virtual int maxLines(int) const { return 0; } virtual int fieldCount() const { return 0; } - virtual QColor backColor() const { return Qt::white; } - virtual const QFont& font() const = 0; + virtual TQColor backColor() const { return Qt::white; } + virtual const TQFont& font() const = 0; virtual bool selected() const { return false; } virtual bool current() const { return false; } @@ -98,39 +98,39 @@ class StoredDrawParams: public DrawParams { public: StoredDrawParams(); - StoredDrawParams(QColor c, + StoredDrawParams(TQColor c, bool selected = false, bool current = false); // getters - QString text(int) const; - QPixmap pixmap(int) const; + TQString text(int) const; + TQPixmap pixmap(int) const; Position position(int) const; int maxLines(int) const; int fieldCount() const { return _field.size(); } - QColor backColor() const { return _backColor; } + TQColor backColor() const { return _backColor; } bool selected() const { return _selected; } bool current() const { return _current; } bool shaded() const { return _shaded; } bool rotated() const { return _rotated; } - const QFont& font() const; + const TQFont& font() const; // attribute setters - void setField(int f, const QString& t, QPixmap pm = QPixmap(), + void setField(int f, const TQString& t, TQPixmap pm = TQPixmap(), Position p = Default, int maxLines = 0); - void setText(int f, const QString&); - void setPixmap(int f, const QPixmap&); + void setText(int f, const TQString&); + void setPixmap(int f, const TQPixmap&); void setPosition(int f, Position); void setMaxLines(int f, int); - void setBackColor(const QColor& c) { _backColor = c; } + void setBackColor(const TQColor& c) { _backColor = c; } void setSelected(bool b) { _selected = b; } void setCurrent(bool b) { _current = b; } void setShaded(bool b) { _shaded = b; } void setRotated(bool b) { _rotated = b; } protected: - QColor _backColor; + TQColor _backColor; bool _selected, _current, _shaded, _rotated; private: @@ -138,13 +138,13 @@ private: void ensureField(int f); struct Field { - QString text; - QPixmap pix; + TQString text; + TQPixmap pix; Position pos; int maxLines; }; - QValueVector<Field> _field; + TQValueVector<Field> _field; }; @@ -160,7 +160,7 @@ private: class RectDrawing { public: - RectDrawing(QRect); + RectDrawing(TQRect); ~RectDrawing(); // The default DrawParams object used. @@ -168,33 +168,33 @@ public: // we take control over the given object (i.e. delete at destruction) void setDrawParams(DrawParams*); - // draw on a given QPainter, use this class as info provider per default - void drawBack(QPainter*, DrawParams* dp = 0); + // draw on a given TQPainter, use this class as info provider per default + void drawBack(TQPainter*, DrawParams* dp = 0); /* Draw field at position() from pixmap()/text() with maxLines(). * Returns true if something was drawn */ - bool drawField(QPainter*, int f, DrawParams* dp = 0); + bool drawField(TQPainter*, int f, DrawParams* dp = 0); // resets rectangle for free space - void setRect(QRect); + void setRect(TQRect); // Returns the rectangle area still free of text/pixmaps after // a number of drawText() calls. - QRect remainingRect(DrawParams* dp = 0); + TQRect remainingRect(DrawParams* dp = 0); private: int _usedTopLeft, _usedTopCenter, _usedTopRight; int _usedBottomLeft, _usedBottomCenter, _usedBottomRight; - QRect _rect; + TQRect _rect; // temporary int _fontHeight; - QFontMetrics* _fm; + TQFontMetrics* _fm; DrawParams* _dp; }; -class TreeMapItemList: public QPtrList<TreeMapItem> +class TreeMapItemList: public TQPtrList<TreeMapItem> { public: TreeMapItem* commonParent(); @@ -202,7 +202,7 @@ protected: int compareItems ( Item item1, Item item2 ); }; -typedef QPtrListIterator<TreeMapItem> TreeMapItemListIterator; +typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator; /** @@ -239,8 +239,8 @@ public: TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 ); TreeMapItem(TreeMapItem* parent, double value, - QString text1, QString text2 = QString::null, - QString text3 = QString::null, QString text4 = QString::null); + TQString text1, TQString text2 = TQString::null, + TQString text3 = TQString::null, TQString text4 = TQString::null); virtual ~TreeMapItem(); bool isChildOf(TreeMapItem*); @@ -272,7 +272,7 @@ public: * Returns a list of text strings of specified text number, * from root up to this item. */ - QStringList path(int) const; + TQStringList path(int) const; /** * Depth of this item. This is the distance to root. @@ -288,9 +288,9 @@ public: * Temporary rectangle used for drawing this item the last time. * This is internally used to map from a point to an item. */ - void setItemRect(const QRect& r) { _rect = r; } + void setItemRect(const TQRect& r) { _rect = r; } void clearItemRect(); - const QRect& itemRect() const { return _rect; } + const TQRect& itemRect() const { return _rect; } int width() const { return _rect.width(); } int height() const { return _rect.height(); } @@ -299,8 +299,8 @@ public: * Used internally to enable tooltip. */ void clearFreeRects(); - QPtrList<QRect>* freeRects() const { return _freeRects; } - void addFreeRect(const QRect& r); + TQPtrList<TQRect>* freeRects() const { return _freeRects; } + void addFreeRect(const TQRect& r); /** * Temporary child item index of the child that was current() recently. @@ -323,7 +323,7 @@ public: virtual double value() const; // replace "Default" position with setting from TreeMapWidget virtual Position position(int) const; - virtual const QFont& font() const; + virtual const TQFont& font() const; virtual bool isMarked(int) const; virtual int borderWidth() const; @@ -373,8 +373,8 @@ private: bool _sortAscending; // temporary layout - QRect _rect; - QPtrList<QRect>* _freeRects; + TQRect _rect; + TQPtrList<TQRect>* _freeRects; int _depth; // temporary self value (when using level skipping) @@ -400,7 +400,7 @@ public: */ enum SelectionMode { Single, Multi, Extended, NoSelection }; - TreeMapWidget(TreeMapItem* base, QWidget* parent=0, const char* name=0); + TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0); ~TreeMapWidget(); /** @@ -411,7 +411,7 @@ public: /** * Returns a reference to the current widget font. */ - const QFont& currentFont() const; + const TQFont& currentFont() const; /** * Returns the area item at position x/y, independent from any @@ -493,8 +493,8 @@ public: void setSplitMode(TreeMapItem::SplitMode m); TreeMapItem::SplitMode splitMode() const; // returns true if string was recognized - bool setSplitMode(QString); - QString splitModeString() const; + bool setSplitMode(TQString); + TQString splitModeString() const; /* @@ -542,8 +542,8 @@ public: int minimalArea() const { return _minimalArea; } /* defaults for text attributes */ - QString defaultFieldType(int) const; - QString defaultFieldStop(int) const; + TQString defaultFieldType(int) const; + TQString defaultFieldStop(int) const; bool defaultFieldVisible(int) const; bool defaultFieldForced(int) const; DrawParams::Position defaultFieldPosition(int) const; @@ -553,14 +553,14 @@ public: * This is important for the visualization menu generated * with visualizationMenu() */ - void setFieldType(int, QString); - QString fieldType(int) const; + void setFieldType(int, TQString); + TQString fieldType(int) const; /** * Stop drawing at item with name */ - void setFieldStop(int, QString); - QString fieldStop(int) const; + void setFieldStop(int, TQString); + TQString fieldStop(int) const; /** * Should the text with number textNo be visible? @@ -583,8 +583,8 @@ public: */ void setFieldPosition(int, DrawParams::Position); DrawParams::Position fieldPosition(int) const; - void setFieldPosition(int, QString); - QString fieldPositionString(int) const; + void setFieldPosition(int, TQString); + TQString fieldPositionString(int) const; /** * Do we allow the texts to be rotated by 90 degrees for better fitting? @@ -598,8 +598,8 @@ public: /** * Save/restore options. */ - void saveOptions(KConfigGroup*, QString prefix = QString::null); - void restoreOptions(KConfigGroup*, QString prefix = QString::null); + void saveOptions(KConfigGroup*, TQString prefix = TQString::null); + void restoreOptions(KConfigGroup*, TQString prefix = TQString::null); /** * These functions populate given popup menus. @@ -607,12 +607,12 @@ public: * * The int is the menu id where to start for the items (100 IDs reserved). */ - void addSplitDirectionItems(QPopupMenu*, int); - void addSelectionItems(QPopupMenu*, int, TreeMapItem*); - void addFieldStopItems(QPopupMenu*, int, TreeMapItem*); - void addAreaStopItems(QPopupMenu*, int, TreeMapItem*); - void addDepthStopItems(QPopupMenu*, int, TreeMapItem*); - void addVisualizationItems(QPopupMenu*, int); + void addSplitDirectionItems(TQPopupMenu*, int); + void addSelectionItems(TQPopupMenu*, int, TreeMapItem*); + void addFieldStopItems(TQPopupMenu*, int, TreeMapItem*); + void addAreaStopItems(TQPopupMenu*, int, TreeMapItem*); + void addDepthStopItems(TQPopupMenu*, int, TreeMapItem*); + void addVisualizationItems(TQPopupMenu*, int); TreeMapWidget* widget() { return this; } TreeMapItem* current() const { return _current; } @@ -625,7 +625,7 @@ public: * Return tooltip string to show for a item (can be rich text) * Default implementation gives lines with "text0 (text1)" going to root. */ - virtual QString tipString(TreeMapItem* i) const; + virtual TQString tipString(TreeMapItem* i) const; /** * Redraws an item with all children. @@ -666,20 +666,20 @@ signals: void clicked(TreeMapItem*); void returnPressed(TreeMapItem*); void doubleClicked(TreeMapItem*); - void rightButtonPressed(TreeMapItem*, const QPoint &); - void contextMenuRequested(TreeMapItem*, const QPoint &); + void rightButtonPressed(TreeMapItem*, const TQPoint &); + void contextMenuRequested(TreeMapItem*, const TQPoint &); protected: - void mousePressEvent( QMouseEvent * ); - void contextMenuEvent( QContextMenuEvent * ); - void mouseReleaseEvent( QMouseEvent * ); - void mouseMoveEvent( QMouseEvent * ); - void mouseDoubleClickEvent( QMouseEvent * ); - void keyPressEvent( QKeyEvent* ); - void paintEvent( QPaintEvent * ); - void resizeEvent( QResizeEvent * ); - void showEvent( QShowEvent * ); - void fontChange( const QFont& ); + void mousePressEvent( TQMouseEvent * ); + void contextMenuEvent( TQContextMenuEvent * ); + void mouseReleaseEvent( TQMouseEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void mouseDoubleClickEvent( TQMouseEvent * ); + void keyPressEvent( TQKeyEvent* ); + void paintEvent( TQPaintEvent * ); + void resizeEvent( TQResizeEvent * ); + void showEvent( TQShowEvent * ); + void fontChange( const TQFont& ); private: TreeMapItemList diff(TreeMapItemList&, TreeMapItemList&); @@ -689,13 +689,13 @@ private: TreeMapItem* i2, bool selected); bool isTmpSelected(TreeMapItem* i); - void drawItem(QPainter* p, TreeMapItem*); - void drawItems(QPainter* p, TreeMapItem*); - bool horizontal(TreeMapItem* i, const QRect& r); - void drawFill(TreeMapItem*,QPainter* p, QRect& r); - void drawFill(TreeMapItem*,QPainter* p, QRect& r, + void drawItem(TQPainter* p, TreeMapItem*); + void drawItems(TQPainter* p, TreeMapItem*); + bool horizontal(TreeMapItem* i, const TQRect& r); + void drawFill(TreeMapItem*,TQPainter* p, TQRect& r); + void drawFill(TreeMapItem*,TQPainter* p, TQRect& r, TreeMapItemListIterator it, int len, bool goBack); - bool drawItemArray(QPainter* p, TreeMapItem*, QRect& r, double, + bool drawItemArray(TQPainter* p, TreeMapItem*, TQRect& r, double, TreeMapItemListIterator it, int len, bool); bool resizeAttr(int); @@ -706,11 +706,11 @@ private: // attributes for field, per textNo struct FieldAttr { - QString type, stop; + TQString type, stop; bool visible, forced; DrawParams::Position pos; }; - QValueVector<FieldAttr> _attr; + TQValueVector<FieldAttr> _attr; SelectionMode _selectionMode; TreeMapItem::SplitMode _splitMode; @@ -732,11 +732,11 @@ private: bool _inShiftDrag, _inControlDrag; // temporary widget font metrics while drawing - QFont _font; + TQFont _font; int _fontHeight; // back buffer pixmap - QPixmap _pixmap; + TQPixmap _pixmap; }; #endif diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp index 74f2613..989ec43 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp @@ -39,8 +39,8 @@ static const KAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Setting K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin, SettingsPluginFactory( &aboutdata ) ) -SettingsPlugin::SettingsPlugin( QObject* parent, const char* name, - const QStringList & ) +SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, + const TQStringList & ) : KParts::Plugin( parent, name ), mConfig(0) { @@ -57,40 +57,40 @@ SettingsPlugin::SettingsPlugin( QObject* parent, const char* name, action = new KToggleAction( i18n("Java&Script"), 0, - this, SLOT(toggleJavascript()), + this, TQT_SLOT(toggleJavascript()), actionCollection(), "javascript" ); menu->insert( action ); action = new KToggleAction( i18n("&Java"), 0, - this, SLOT(toggleJava()), + this, TQT_SLOT(toggleJava()), actionCollection(), "java" ); menu->insert( action ); action = new KToggleAction( i18n("&Cookies"), 0, - this, SLOT(toggleCookies()), + this, TQT_SLOT(toggleCookies()), actionCollection(), "cookies" ); menu->insert( action ); action = new KToggleAction( i18n("&Plugins"), 0, - this, SLOT(togglePlugins()), + this, TQT_SLOT(togglePlugins()), actionCollection(), "plugins" ); menu->insert( action ); action = new KToggleAction( i18n("Autoload &Images"), 0, - this, SLOT(toggleImageLoading()), + this, TQT_SLOT(toggleImageLoading()), actionCollection(), "imageloading" ); menu->insert( action ); menu->insert( new KActionSeparator(actionCollection()) ); action = new KToggleAction( i18n("Enable Pro&xy"), 0, - this, SLOT(toggleProxy()), + this, TQT_SLOT(toggleProxy()), actionCollection(), "useproxy" ); action->setCheckedState(i18n("Disable Pro&xy")); menu->insert( action ); action = new KToggleAction( i18n("Enable Cac&he"), 0, - this, SLOT(toggleCache()), + this, TQT_SLOT(toggleCache()), actionCollection(), "usecache" ); action->setCheckedState(i18n("Disable Cac&he")); menu->insert( action ); @@ -99,16 +99,16 @@ SettingsPlugin::SettingsPlugin( QObject* parent, const char* name, KSelectAction *sAction = new KSelectAction( i18n("Cache Po&licy"), 0, 0, 0, actionCollection(), "cachepolicy" ); - QStringList policies; + TQStringList policies; policies += i18n( "&Keep Cache in Sync" ); policies += i18n( "&Use Cache if Possible" ); policies += i18n( "&Offline Browsing Mode" ); sAction->setItems( policies ); - connect( sAction, SIGNAL( activated( int ) ), SLOT( cachePolicyChanged(int) ) ); + connect( sAction, TQT_SIGNAL( activated( int ) ), TQT_SLOT( cachePolicyChanged(int) ) ); menu->insert( sAction ); - connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() )); + connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( showPopup() )); } SettingsPlugin::~SettingsPlugin() @@ -182,16 +182,16 @@ void SettingsPlugin::toggleCookies() KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); - QString advice; + TQString advice; bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked(); advice = enable ? "Accept" : "Reject"; - QCString replyType; - QByteArray data, replyData; - QDataStream stream( data, IO_WriteOnly ); + TQCString replyType; + TQByteArray data, replyData; + TQDataStream stream( data, IO_WriteOnly ); stream << part->url().url() << advice; bool ok = kapp->dcopClient()->call( "kded", "kcookiejar", - "setDomainAdvice(QString,QString)", + "setDomainAdvice(TQString,TQString)", data, replyType, replyData, true ); if ( !ok ) @@ -219,20 +219,20 @@ void SettingsPlugin::toggleImageLoading() } } -bool SettingsPlugin::cookiesEnabled( const QString& url ) +bool SettingsPlugin::cookiesEnabled( const TQString& url ) { - QByteArray data, reply; - QCString replyType; - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data, reply; + TQCString replyType; + TQDataStream stream( data, IO_WriteOnly ); stream << url; - kapp->dcopClient()->call( "kcookiejar", "kcookiejar", "getDomainAdvice(QString)", data, replyType, reply, true ); + kapp->dcopClient()->call( "kcookiejar", "kcookiejar", "getDomainAdvice(TQString)", data, replyType, reply, true ); bool enabled = false; - if ( replyType == "QString" ) + if ( replyType == "TQString" ) { - QString advice; - QDataStream s( reply, IO_ReadOnly ); + TQString advice; + TQDataStream s( reply, IO_ReadOnly ); s >> advice; enabled = ( advice == "Accept" ); if ( !enabled && advice == "Dunno" ) { @@ -288,7 +288,7 @@ void SettingsPlugin::toggleCache() void SettingsPlugin::cachePolicyChanged( int p ) { - QString policy; + TQString policy; switch ( p ) { case 0: @@ -312,17 +312,17 @@ void SettingsPlugin::cachePolicyChanged( int p ) void SettingsPlugin::updateIOSlaves() { - QByteArray data; - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream stream( data, IO_WriteOnly ); DCOPClient* client = kapp->dcopClient(); if ( !client->isAttached() ) client->attach(); - QString protocol; // null -> all of them + TQString protocol; // null -> all of them stream << protocol; client->send( "*", "KIO::Scheduler", - "reparseSlaveConfiguration(QString)", data ); + "reparseSlaveConfiguration(TQString)", data ); } #include "settingsplugin.moc" diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/khtmlsettingsplugin/settingsplugin.h index 367846b..63be54d 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.h @@ -29,12 +29,12 @@ class SettingsPlugin : public KParts::Plugin { Q_OBJECT public: - SettingsPlugin( QObject* parent, const char* name, - const QStringList & ); + SettingsPlugin( TQObject* parent, const char* name, + const TQStringList & ); virtual ~SettingsPlugin(); private: - bool cookiesEnabled( const QString& url ); + bool cookiesEnabled( const TQString& url ); void updateIOSlaves(); private slots: diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index 54db458..87e2e31 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -18,15 +18,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qvbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qspinbox.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqspinbox.h> #include <klocale.h> @@ -44,7 +44,7 @@ Boston, MA 02110-1301, USA. #include "imgallerydialog.h" #include "imgallerydialog.moc" -KIGPDialog::KIGPDialog(QWidget *parent, const QString& path, const char *name ) +KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name ) : KDialogBase( IconList, i18n("Configure"), Default|Ok|Cancel, Ok, parent, name, true, true ), m_dialogOk( false ) @@ -67,8 +67,8 @@ void KIGPDialog::slotDefault() m_imageProperty->setChecked(false); m_fontName->setCurrentText( KGlobalSettings::generalFont().family() ); m_fontSize->setValue(14); - m_foregroundColor->setColor( QColor( "#d0ffd0") ); - m_backgroundColor->setColor( QColor("#333333") ); + m_foregroundColor->setColor( TQColor( "#d0ffd0") ); + m_backgroundColor->setColor( TQColor("#333333") ); m_imageNameReq->setURL(m_path + "images.html"); m_recurseSubDir->setChecked( false ); @@ -84,19 +84,19 @@ void KIGPDialog::slotDefault() m_colorDepth->setCurrentText("8"); } -void KIGPDialog::setupLookPage(const QString& path) { - QFrame *page = addPage( i18n("Look"), i18n("Page Look"), +void KIGPDialog::setupLookPage(const TQString& path) { + TQFrame *page = addPage( i18n("Look"), i18n("Page Look"), BarIcon("colorize", KIcon::SizeMedium ) ); m_config->setGroup("Look"); - QVBoxLayout *vlay = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *label; + TQLabel *label; - label = new QLabel( i18n("&Page title:"), page); + label = new TQLabel( i18n("&Page title:"), page); vlay->addWidget(label); - m_title = new QLineEdit(i18n("Image Gallery for %1").arg(path), page); + m_title = new TQLineEdit(i18n("Image Gallery for %1").arg(path), page); vlay->addWidget( m_title ); label->setBuddy(m_title); @@ -105,67 +105,67 @@ void KIGPDialog::setupLookPage(const QString& path) { m_imagesPerRow->setLabel( i18n("I&mages per row:") ); vlay->addWidget( m_imagesPerRow ); - QGridLayout *grid = new QGridLayout( 2, 2 ); + TQGridLayout *grid = new TQGridLayout( 2, 2 ); vlay->addLayout( grid ); - m_imageName = new QCheckBox( i18n("Show image file &name"), page); + m_imageName = new TQCheckBox( i18n("Show image file &name"), page); m_imageName->setChecked( m_config->readBoolEntry("ImageName", true) ); grid->addWidget( m_imageName, 0, 0 ); - m_imageSize = new QCheckBox( i18n("Show image file &size"), page); + m_imageSize = new TQCheckBox( i18n("Show image file &size"), page); m_imageSize->setChecked( m_config->readBoolEntry("ImageSize", false) ); grid->addWidget( m_imageSize, 0, 1 ); - m_imageProperty = new QCheckBox( i18n("Show image &dimensions"), page); + m_imageProperty = new TQCheckBox( i18n("Show image &dimensions"), page); m_imageProperty->setChecked( m_config->readBoolEntry("ImageProperty", false) ); grid->addWidget( m_imageProperty, 1, 0 ); - QHBoxLayout *hlay11 = new QHBoxLayout( ); + TQHBoxLayout *hlay11 = new TQHBoxLayout( ); vlay->addLayout( hlay11 ); - m_fontName = new QComboBox( false,page ); - QStringList standardFonts; + m_fontName = new TQComboBox( false,page ); + TQStringList standardFonts; KFontChooser::getFontList(standardFonts, 0); m_fontName->insertStringList( standardFonts ); m_fontName->setCurrentText( m_config->readEntry("FontName", KGlobalSettings::generalFont().family() ) ); - label = new QLabel( i18n("Fon&t name:"), page ); + label = new TQLabel( i18n("Fon&t name:"), page ); label->setBuddy( m_fontName ); hlay11->addWidget( label ); hlay11->addStretch( 1 ); hlay11->addWidget( m_fontName ); - QHBoxLayout *hlay12 = new QHBoxLayout( ); + TQHBoxLayout *hlay12 = new TQHBoxLayout( ); vlay->addLayout( hlay12 ); - m_fontSize = new QSpinBox( 6, 15, 1, page ); + m_fontSize = new TQSpinBox( 6, 15, 1, page ); m_fontSize->setValue( m_config->readNumEntry("FontSize", 14) ); - label = new QLabel( i18n("Font si&ze:"), page ); + label = new TQLabel( i18n("Font si&ze:"), page ); label->setBuddy( m_fontSize ); hlay12->addWidget( label ); hlay12->addStretch( 1 ); hlay12->addWidget( m_fontSize ); - QHBoxLayout *hlay1 = new QHBoxLayout( spacingHint() ); + TQHBoxLayout *hlay1 = new TQHBoxLayout( spacingHint() ); vlay->addLayout( hlay1 ); m_foregroundColor = new KColorButton(page); - m_foregroundColor->setColor( QColor( m_config->readEntry("ForegroundColor", "#d0ffd0") ) ); + m_foregroundColor->setColor( TQColor( m_config->readEntry("ForegroundColor", "#d0ffd0") ) ); - label = new QLabel( i18n("&Foreground color:"), page); + label = new TQLabel( i18n("&Foreground color:"), page); label->setBuddy( m_foregroundColor ); hlay1->addWidget( label ); hlay1->addStretch( 1 ); hlay1->addWidget(m_foregroundColor); - QHBoxLayout *hlay2 = new QHBoxLayout( spacingHint() ); + TQHBoxLayout *hlay2 = new TQHBoxLayout( spacingHint() ); vlay->addLayout( hlay2 ); m_backgroundColor = new KColorButton(page); - m_backgroundColor->setColor( QColor(m_config->readEntry("BackgroundColor", "#333333") ) ); + m_backgroundColor->setColor( TQColor(m_config->readEntry("BackgroundColor", "#333333") ) ); - label = new QLabel( i18n("&Background color:"), page); + label = new TQLabel( i18n("&Background color:"), page); hlay2->addWidget( label ); label->setBuddy( m_backgroundColor ); hlay2->addStretch( 1 ); @@ -174,33 +174,33 @@ void KIGPDialog::setupLookPage(const QString& path) { vlay->addStretch(1); } -void KIGPDialog::setupDirectoryPage(const QString& path) { - QFrame *page = addPage( i18n("Folders"), i18n("Folders"), +void KIGPDialog::setupDirectoryPage(const TQString& path) { + TQFrame *page = addPage( i18n("Folders"), i18n("Folders"), BarIcon("folder", KIcon::SizeMedium ) ); m_config->setGroup("Directory"); - QVBoxLayout *dvlay = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *dvlay = new TQVBoxLayout( page, 0, spacingHint() ); - QLabel *label; - label = new QLabel(i18n("&Save to HTML file:"), page); + TQLabel *label; + label = new TQLabel(i18n("&Save to HTML file:"), page); dvlay->addWidget( label ); - QString whatsThis; + TQString whatsThis; whatsThis = i18n("<p>The name of the HTML file this gallery will be saved to."); - QWhatsThis::add( label, whatsThis ); + TQWhatsThis::add( label, whatsThis ); m_imageNameReq = new KURLRequester(path + "images.html", page); label->setBuddy( m_imageNameReq ); dvlay->addWidget(m_imageNameReq); - connect( m_imageNameReq, SIGNAL(textChanged(const QString&)), - this, SLOT(imageUrlChanged(const QString&)) ); - QWhatsThis::add( m_imageNameReq, whatsThis ); + connect( m_imageNameReq, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(imageUrlChanged(const TQString&)) ); + TQWhatsThis::add( m_imageNameReq, whatsThis ); const bool recurseSubDir = m_config->readBoolEntry("RecurseSubDirectories", false); - m_recurseSubDir = new QCheckBox(i18n("&Recurse subfolders"), page); + m_recurseSubDir = new TQCheckBox(i18n("&Recurse subfolders"), page); m_recurseSubDir->setChecked( recurseSubDir ); whatsThis = i18n("<p>Whether subfolders should be included for the " "image gallery creation or not."); - QWhatsThis::add( m_recurseSubDir, whatsThis ); + TQWhatsThis::add( m_recurseSubDir, whatsThis ); const int recursionLevel = m_config->readNumEntry("RecursionLevel", 0); m_recursionLevel = new KIntNumInput( recursionLevel, page ); @@ -212,25 +212,25 @@ void KIGPDialog::setupDirectoryPage(const QString& path) { whatsThis = i18n("<p>You can limit the number of folders the " "image gallery creator will traverse to by setting an " "upper bound for the recursion depth."); - QWhatsThis::add( m_recursionLevel, whatsThis ); + TQWhatsThis::add( m_recursionLevel, whatsThis ); - connect(m_recurseSubDir, SIGNAL( toggled(bool) ), - m_recursionLevel, SLOT( setEnabled(bool) ) ); + connect(m_recurseSubDir, TQT_SIGNAL( toggled(bool) ), + m_recursionLevel, TQT_SLOT( setEnabled(bool) ) ); dvlay->addWidget(m_recurseSubDir); dvlay->addWidget(m_recursionLevel); - m_copyOriginalFiles = new QCheckBox(i18n("Copy or&iginal files"), page); + m_copyOriginalFiles = new TQCheckBox(i18n("Copy or&iginal files"), page); m_copyOriginalFiles->setChecked(m_config->readBoolEntry("CopyOriginalFiles", false) ); dvlay->addWidget(m_copyOriginalFiles); whatsThis = i18n("<p>This makes a copy of all images and the gallery will refer " "to these copies instead of the original images."); - QWhatsThis::add( m_copyOriginalFiles, whatsThis ); + TQWhatsThis::add( m_copyOriginalFiles, whatsThis ); const bool useCommentFile = m_config->readBoolEntry("UseCommentFile", false); - m_useCommentFile = new QCheckBox(i18n("Use &comment file"), page); + m_useCommentFile = new TQCheckBox(i18n("Use &comment file"), page); m_useCommentFile->setChecked(useCommentFile); dvlay->addWidget(m_useCommentFile); @@ -239,9 +239,9 @@ void KIGPDialog::setupDirectoryPage(const QString& path) { "subtitles for the images." "<p>For details about the file format please see " "the \"What's This?\" help below."); - QWhatsThis::add( m_useCommentFile, whatsThis ); + TQWhatsThis::add( m_useCommentFile, whatsThis ); - label = new QLabel(i18n("Comments &file:"), page); + label = new TQLabel(i18n("Comments &file:"), page); label->setEnabled( useCommentFile ); dvlay->addWidget( label ); whatsThis = i18n("<p>You can specify the name of the comment file here. " @@ -254,40 +254,40 @@ void KIGPDialog::setupDirectoryPage(const QString& path) { "<br>Description" "<br>" "<br>and so on"); - QWhatsThis::add( label, whatsThis ); + TQWhatsThis::add( label, whatsThis ); m_commentFileReq = new KURLRequester(path + "comments", page); m_commentFileReq->setEnabled(useCommentFile); label->setBuddy( m_commentFileReq ); dvlay->addWidget(m_commentFileReq); - QWhatsThis::add( m_commentFileReq, whatsThis ); + TQWhatsThis::add( m_commentFileReq, whatsThis ); - connect(m_useCommentFile, SIGNAL(toggled(bool)), - label, SLOT(setEnabled(bool))); - connect(m_useCommentFile, SIGNAL(toggled(bool)), - m_commentFileReq, SLOT(setEnabled(bool))); + connect(m_useCommentFile, TQT_SIGNAL(toggled(bool)), + label, TQT_SLOT(setEnabled(bool))); + connect(m_useCommentFile, TQT_SIGNAL(toggled(bool)), + m_commentFileReq, TQT_SLOT(setEnabled(bool))); dvlay->addStretch(1); } -void KIGPDialog::setupThumbnailPage(const QString& path) { - QFrame *page = addPage( i18n("Thumbnails"), i18n("Thumbnails"), +void KIGPDialog::setupThumbnailPage(const TQString& path) { + TQFrame *page = addPage( i18n("Thumbnails"), i18n("Thumbnails"), BarIcon("thumbnail", KIcon::SizeMedium ) ); m_config->setGroup("Thumbnails"); - QLabel *label; + TQLabel *label; - QVBoxLayout *vlay = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); - QHBoxLayout *hlay3 = new QHBoxLayout( spacingHint() ); + TQHBoxLayout *hlay3 = new TQHBoxLayout( spacingHint() ); vlay->addLayout( hlay3 ); - m_imageFormat = new QComboBox(false, page); + m_imageFormat = new TQComboBox(false, page); m_imageFormat->insertItem("JPEG"); m_imageFormat->insertItem("PNG"); m_imageFormat->setCurrentText( m_config->readEntry("ImageFormat", "JPEG") ); - label = new QLabel( i18n("Image format f&or the thumbnails:"), page); + label = new TQLabel( i18n("Image format f&or the thumbnails:"), page); hlay3->addWidget( label ); label->setBuddy( m_imageFormat ); hlay3->addStretch( 1 ); @@ -298,17 +298,17 @@ void KIGPDialog::setupThumbnailPage(const QString& path) { m_thumbnailSize->setLabel( i18n("Thumbnail size:") ); vlay->addWidget( m_thumbnailSize ); - QGridLayout *grid = new QGridLayout( 2, 2 ); + TQGridLayout *grid = new TQGridLayout( 2, 2 ); vlay->addLayout( grid ); - QHBoxLayout *hlay4 = new QHBoxLayout( spacingHint() ); + TQHBoxLayout *hlay4 = new TQHBoxLayout( spacingHint() ); vlay->addLayout( hlay4 ); const bool colorDepthSet = m_config->readBoolEntry("ColorDepthSet", false); - m_colorDepthSet = new QCheckBox(i18n("&Set different color depth:"), page); + m_colorDepthSet = new TQCheckBox(i18n("&Set different color depth:"), page); m_colorDepthSet->setChecked(colorDepthSet); hlay4->addWidget( m_colorDepthSet ); - m_colorDepth = new QComboBox(false, page); + m_colorDepth = new TQComboBox(false, page); m_colorDepth->insertItem("1"); m_colorDepth->insertItem("8"); m_colorDepth->insertItem("16"); @@ -317,8 +317,8 @@ void KIGPDialog::setupThumbnailPage(const QString& path) { m_colorDepth->setEnabled(colorDepthSet); hlay4->addWidget( m_colorDepth ); - connect(m_colorDepthSet, SIGNAL( toggled(bool) ), - m_colorDepth, SLOT( setEnabled(bool) ) ); + connect(m_colorDepthSet, TQT_SIGNAL( toggled(bool) ), + m_colorDepth, TQT_SLOT( setEnabled(bool) ) ); vlay->addStretch(1); @@ -354,7 +354,7 @@ KIGPDialog::~KIGPDialog() { } -void KIGPDialog::imageUrlChanged(const QString &url ) +void KIGPDialog::imageUrlChanged(const TQString &url ) { enableButtonOK( !url.isEmpty()); } @@ -414,42 +414,42 @@ bool KIGPDialog::colorDepthSet() const return m_colorDepthSet->isChecked(); } -const QString KIGPDialog::getTitle() const +const TQString KIGPDialog::getTitle() const { return m_title->text(); } -const QString KIGPDialog::getImageName() const +const TQString KIGPDialog::getImageName() const { return m_imageNameReq->url(); } -const QString KIGPDialog::getCommentFile() const +const TQString KIGPDialog::getCommentFile() const { return m_commentFileReq->url(); } -const QString KIGPDialog::getFontName() const +const TQString KIGPDialog::getFontName() const { return m_fontName->currentText(); } -const QString KIGPDialog::getFontSize() const +const TQString KIGPDialog::getFontSize() const { return m_fontSize->text(); } -const QColor KIGPDialog::getBackgroundColor() const +const TQColor KIGPDialog::getBackgroundColor() const { return m_backgroundColor->color(); } -const QColor KIGPDialog::getForegroundColor() const +const TQColor KIGPDialog::getForegroundColor() const { return m_foregroundColor->color(); } -const QString KIGPDialog::getImageFormat() const +const TQString KIGPDialog::getImageFormat() const { return m_imageFormat->currentText(); } diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h index 7aa6163..22cf68e 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.h +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h @@ -34,14 +34,14 @@ class QSpinBox; class KColorButton; class KConfig; -typedef QMap<QString,QString> CommentMap; +typedef TQMap<TQString,TQString> CommentMap; class KIGPDialog : public KDialogBase { Q_OBJECT public: - KIGPDialog(QWidget *parent=0, const QString& path=0, const char *name=0 ); + KIGPDialog(TQWidget *parent=0, const TQString& path=0, const char *name=0 ); ~KIGPDialog(); bool isDialogOk() const; @@ -58,45 +58,45 @@ class KIGPDialog : public KDialogBase int getThumbnailSize() const; int getColorDepth() const; - const QString getTitle() const; - const QString getImageName() const; - const QString getCommentFile() const; - const QString getFontName() const; - const QString getFontSize() const; + const TQString getTitle() const; + const TQString getImageName() const; + const TQString getCommentFile() const; + const TQString getFontName() const; + const TQString getFontSize() const; - const QColor getBackgroundColor() const; - const QColor getForegroundColor() const; + const TQColor getBackgroundColor() const; + const TQColor getForegroundColor() const; - const QString getImageFormat() const; + const TQString getImageFormat() const; void writeConfig(); protected slots: - void imageUrlChanged(const QString & ); + void imageUrlChanged(const TQString & ); void slotDefault(); private: KColorButton *m_foregroundColor; KColorButton *m_backgroundColor; - QLineEdit *m_title; - QString m_path; + TQLineEdit *m_title; + TQString m_path; KIntNumInput *m_imagesPerRow; KIntNumInput *m_thumbnailSize; KIntNumInput *m_recursionLevel; - QSpinBox *m_fontSize; + TQSpinBox *m_fontSize; - QCheckBox *m_copyOriginalFiles; - QCheckBox *m_imageName; - QCheckBox *m_imageSize; - QCheckBox *m_imageProperty; - QCheckBox *m_useCommentFile; - QCheckBox *m_recurseSubDir; - QCheckBox *m_colorDepthSet; + TQCheckBox *m_copyOriginalFiles; + TQCheckBox *m_imageName; + TQCheckBox *m_imageSize; + TQCheckBox *m_imageProperty; + TQCheckBox *m_useCommentFile; + TQCheckBox *m_recurseSubDir; + TQCheckBox *m_colorDepthSet; - QComboBox* m_fontName; - QComboBox* m_imageFormat; - QComboBox* m_colorDepth; + TQComboBox* m_fontName; + TQComboBox* m_imageFormat; + TQComboBox* m_colorDepth; KURLRequester *m_imageNameReq; KURLRequester *m_commentFileReq; @@ -105,9 +105,9 @@ class KIGPDialog : public KDialogBase KConfig *m_config; private: - void setupLookPage(const QString& path); - void setupDirectoryPage(const QString& path); - void setupThumbnailPage(const QString& path); + void setupLookPage(const TQString& path); + void setupDirectoryPage(const TQString& path); + void setupThumbnailPage(const TQString& path); }; #endif diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 43df35b..4b9a5e0 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -18,16 +18,16 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qdir.h> -#include <qtextstream.h> -#include <qfile.h> -#include <qfont.h> -#include <qdatetime.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qprogressdialog.h> -#include <qtextcodec.h> -#include <qstylesheet.h> +#include <tqdir.h> +#include <tqtextstream.h> +#include <tqfile.h> +#include <tqfont.h> +#include <tqdatetime.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqprogressdialog.h> +#include <tqtextcodec.h> +#include <tqstylesheet.h> #include <kaction.h> #include <kglobal.h> @@ -48,11 +48,11 @@ Boston, MA 02110-1301, USA. typedef KGenericFactory<KImGalleryPlugin> KImGalleryPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgalleryplugin" ) ) -KImGalleryPlugin::KImGalleryPlugin( QObject* parent, const char* name, const QStringList & ) +KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ) : KParts::Plugin( parent, name ), m_commentMap(0) { new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, - SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); + TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); } void KImGalleryPlugin::slotExecute() @@ -71,7 +71,7 @@ void KImGalleryPlugin::slotExecute() kdDebug(90170) << "dialog is ok" << endl; m_configDlg = new KIGPDialog(m_part->widget(), m_part->url().path(+1)); - if ( m_configDlg->exec() == QDialog::Accepted ) { + if ( m_configDlg->exec() == TQDialog::Accepted ) { kdDebug(90170) << "dialog is ok" << endl; m_configDlg->writeConfig(); m_copyFiles = m_configDlg->copyOriginalFiles(); @@ -81,8 +81,8 @@ void KImGalleryPlugin::slotExecute() KURL url(m_configDlg->getImageName()); if ( !url.isEmpty() && url.isValid()) { - m_progressDlg = new QProgressDialog(m_part->widget(), "progressDlg", true ); - QObject::connect(m_progressDlg, SIGNAL( cancelled() ), this, SLOT( slotCancelled() ) ); + m_progressDlg = new TQProgressDialog(m_part->widget(), "progressDlg", true ); + TQObject::connect(m_progressDlg, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( slotCancelled() ) ); m_progressDlg->setLabelText( i18n("Creating thumbnails") ); m_progressDlg->setCancelButton(new KPushButton(KStdGuiItem::cancel(),m_progressDlg)); @@ -100,7 +100,7 @@ void KImGalleryPlugin::slotExecute() delete m_progressDlg; } -bool KImGalleryPlugin::createDirectory(QDir thumb_dir, QString imgGalleryDir, QString dirName) +bool KImGalleryPlugin::createDirectory(TQDir thumb_dir, TQString imgGalleryDir, TQString dirName) { if (!thumb_dir.exists()) { thumb_dir.setPath( imgGalleryDir); @@ -116,25 +116,25 @@ bool KImGalleryPlugin::createDirectory(QDir thumb_dir, QString imgGalleryDir, QS } } -void KImGalleryPlugin::createHead(QTextStream& stream) +void KImGalleryPlugin::createHead(TQTextStream& stream) { - const QString chsetName = QTextCodec::codecForLocale()->mimeName(); + const TQString chsetName = TQTextCodec::codecForLocale()->mimeName(); stream << "<?xml version=\"1.0\" encoding=\"" + chsetName + "\" ?>" << endl; stream << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">" << endl; stream << "<html xmlns=\"http://www.w3.org/1999/xhtml\">" << endl; stream << "<head>" << endl; - stream << "<title>" << QStyleSheet::escape(m_configDlg->getTitle()) << "</title>" << endl; + stream << "<title>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</title>" << endl; stream << "<meta http-equiv=\"content-type\" content=\"text/html; charset=" << chsetName << "\"/>" << endl; stream << "<meta name=\"GENERATOR\" content=\"KDE Konqueror KImgallery plugin version " KDE_VERSION_STRING "\"/>" << endl; createCSSSection(stream); stream << "</head>" << endl; } -void KImGalleryPlugin::createCSSSection(QTextStream& stream) +void KImGalleryPlugin::createCSSSection(TQTextStream& stream) { - const QString backgroundColor = m_configDlg->getBackgroundColor().name(); - const QString foregroundColor = m_configDlg->getForegroundColor().name(); + const TQString backgroundColor = m_configDlg->getBackgroundColor().name(); + const TQString foregroundColor = m_configDlg->getForegroundColor().name(); //adding a touch of style stream << "<style type='text/css'>\n"; stream << "BODY {color: " << foregroundColor << "; background: " << backgroundColor << ";" << endl; @@ -148,24 +148,24 @@ void KImGalleryPlugin::createCSSSection(QTextStream& stream) } -QString KImGalleryPlugin::extension(const QString& imageFormat) +TQString KImGalleryPlugin::extension(const TQString& imageFormat) { if (imageFormat == "PNG") return ".png"; if (imageFormat == "JPEG") return ".jpg"; Q_ASSERT(false); - return QString::null; + return TQString::null; } -void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirName, const QStringList& subDirList, - const QDir& imageDir, const KURL& url, const QString& imageFormat) +void KImGalleryPlugin::createBody(TQTextStream& stream, const TQString& sourceDirName, const TQStringList& subDirList, + const TQDir& imageDir, const KURL& url, const TQString& imageFormat) { int numOfImages = imageDir.count(); - const QString imgGalleryDir = url.directory(); - const QString today(KGlobal::locale()->formatDate(QDate::currentDate())); + const TQString imgGalleryDir = url.directory(); + const TQString today(KGlobal::locale()->formatDate(TQDate::currentDate())); - stream << "<body>\n<h1>" << QStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl; + stream << "<body>\n<h1>" << TQStyleSheet::escape(m_configDlg->getTitle()) << "</h1><p>" << endl; stream << i18n("<i>Number of images</i>: %1").arg(numOfImages) << "<br/>" << endl; stream << i18n("<i>Created on</i>: %1").arg(today) << "</p>" << endl; @@ -173,7 +173,7 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN if (m_recurseSubDirectories && subDirList.count() > 2) { //subDirList.count() is always >= 2 because of the "." and ".." directories stream << i18n("<i>Subfolders</i>:") << "<br>" << endl; - for (QStringList::ConstIterator it = subDirList.begin(); it != subDirList.end(); it++) { + for (TQStringList::ConstIterator it = subDirList.begin(); it != subDirList.end(); it++) { if (*it == "." || *it == "..") continue; //disregard the "." and ".." directories stream << "<a href=\"" << *it << "/" << url.fileName() @@ -186,13 +186,13 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN //table with images int imgIndex; - QFileInfo imginfo; - QPixmap imgProp; + TQFileInfo imginfo; + TQPixmap imgProp; for (imgIndex = 0; !m_cancelled && (imgIndex < numOfImages);) { stream << "<tr>" << endl; for (int col=0; !m_cancelled && (col < m_imagesPerRow) && (imgIndex < numOfImages); col++) { - const QString imgName = imageDir[imgIndex]; + const TQString imgName = imageDir[imgIndex]; if (m_copyFiles) { stream << "<td align='center'>\n<a href=\"images/" << imgName << "\">"; @@ -202,7 +202,7 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN if (createThumb(imgName, sourceDirName, imgGalleryDir, imageFormat)) { - const QString imgPath("thumbs/" + imgName + extension(imageFormat)); + const TQString imgPath("thumbs/" + imgName + extension(imageFormat)); stream << "<img src=\"" << imgPath << "\" width=\"" << m_imgWidth << "\" "; stream << "height=\"" << m_imgHeight << "\" alt=\"" << imgPath << "\"/>"; m_progressDlg->setLabelText( i18n("Created thumbnail for: \n%1").arg(imgName) ); @@ -227,8 +227,8 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN } if (m_useCommentFile) { - QString imgComment = (*m_commentMap)[imgName]; - stream << "<div>" << QStyleSheet::escape(imgComment) << "</div>" << endl; + TQString imgComment = (*m_commentMap)[imgName]; + stream << "<div>" << TQStyleSheet::escape(imgComment) << "</div>" << endl; } stream << "</td>" << endl; @@ -244,7 +244,7 @@ void KImGalleryPlugin::createBody(QTextStream& stream, const QString& sourceDirN } -bool KImGalleryPlugin::createHtml(const KURL& url, const QString& sourceDirName, int recursionLevel, const QString& imageFormat) +bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName, int recursionLevel, const TQString& imageFormat) { if(m_cancelled) return false; @@ -253,16 +253,16 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const QString& sourceDirName, return false; KonqDirPart * part = static_cast<KonqDirPart *>(parent()); - QStringList subDirList; + TQStringList subDirList; if (m_recurseSubDirectories && (recursionLevel >= 0)) { //recursionLevel == 0 means endless - QDir toplevel_dir = QDir( sourceDirName ); - toplevel_dir.setFilter( QDir::Dirs | QDir::Readable | QDir::Writable ); + TQDir toplevel_dir = TQDir( sourceDirName ); + toplevel_dir.setFilter( TQDir::Dirs | TQDir::Readable | TQDir::Writable ); subDirList = toplevel_dir.entryList(); - for (QStringList::ConstIterator it = subDirList.begin(); it != subDirList.end() && !m_cancelled; it++) { - const QString currentDir = *it; + for (TQStringList::ConstIterator it = subDirList.begin(); it != subDirList.end() && !m_cancelled; it++) { + const TQString currentDir = *it; if (currentDir == "." || currentDir == "..") { continue;} //disregard the "." and ".." directories - QDir subDir = QDir( url.directory() + "/" + currentDir ); + TQDir subDir = TQDir( url.directory() + "/" + currentDir ); if (!subDir.exists()) { subDir.setPath( url.directory() ); if (!(subDir.mkdir(currentDir, false))) { @@ -284,33 +284,33 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const QString& sourceDirName, kdDebug(90170) << "sourceDirName: " << sourceDirName << endl; //We're interested in only the patterns, so look for the first | //#### perhaps an accessor should be added to KImageIO instead? - QString filter = KImageIO::pattern(KImageIO::Reading).section('|', 0, 0); + TQString filter = KImageIO::pattern(KImageIO::Reading).section('|', 0, 0); - QDir imageDir( sourceDirName, filter.latin1(), - QDir::Name|QDir::IgnoreCase, QDir::Files|QDir::Readable); + TQDir imageDir( sourceDirName, filter.latin1(), + TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable); - const QString imgGalleryDir = url.directory(); + const TQString imgGalleryDir = url.directory(); kdDebug(90170) << "imgGalleryDir: " << imgGalleryDir << endl; // Create the "thumbs" subdirectory if necessary - QDir thumb_dir( imgGalleryDir + QString::fromLatin1("/thumbs/")); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); if (createDirectory(thumb_dir, imgGalleryDir, "thumbs") == false) return false; // Create the "images" subdirectory if necessary - QDir images_dir( imgGalleryDir + QString::fromLatin1("/images/")); + TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); if (m_copyFiles) { if (createDirectory(images_dir, imgGalleryDir, "images") == false) return false; } - QFile file( url.path() ); + TQFile file( url.path() ); kdDebug(90170) << "url.path(): " << url.path() << ", thumb_dir: "<< thumb_dir.path() << ", imageDir: "<< imageDir.path() << endl; if ( imageDir.exists() && file.open(IO_WriteOnly) ) { - QTextStream stream(&file); - stream.setEncoding(QTextStream::Locale); + TQTextStream stream(&file); + stream.setEncoding(TQTextStream::Locale); createHead(stream); createBody(stream, sourceDirName, subDirList, imageDir, url, imageFormat); //ugly @@ -325,15 +325,15 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const QString& sourceDirName, } } -void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const QString& sourceDirName, int recursionLevel, const QString& imageFormat) +void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const TQString& sourceDirName, int recursionLevel, const TQString& imageFormat) { if (m_recurseSubDirectories && (recursionLevel >= 0)) { - QStringList subDirList; - QDir toplevel_dir = QDir( sourceDirName ); - toplevel_dir.setFilter( QDir::Dirs ); + TQStringList subDirList; + TQDir toplevel_dir = TQDir( sourceDirName ); + toplevel_dir.setFilter( TQDir::Dirs ); subDirList = toplevel_dir.entryList(); - for (QStringList::ConstIterator it = subDirList.begin(); it != subDirList.end(); it++) { + for (TQStringList::ConstIterator it = subDirList.begin(); it != subDirList.end(); it++) { if (*it == "." || *it == ".." || *it == "thumbs" || (m_copyFiles && *it == "images")) { continue; //disregard the "." and ".." directories } @@ -343,19 +343,19 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const QString& so } } - const QString imgGalleryDir = url.directory(); - QDir thumb_dir( imgGalleryDir + QString::fromLatin1("/thumbs/")); - QDir images_dir( imgGalleryDir + QString::fromLatin1("/images/")); - QDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP", - QDir::Name|QDir::IgnoreCase, QDir::Files|QDir::Readable); - QFile file( url.path() ); + const TQString imgGalleryDir = url.directory(); + TQDir thumb_dir( imgGalleryDir + TQString::fromLatin1("/thumbs/")); + TQDir images_dir( imgGalleryDir + TQString::fromLatin1("/images/")); + TQDir imageDir( sourceDirName, "*.png *.PNG *.gif *.GIF *.jpg *.JPG *.jpeg *.JPEG *.bmp *.BMP", + TQDir::Name|TQDir::IgnoreCase, TQDir::Files|TQDir::Readable); + TQFile file( url.path() ); // Remove the image file .. file.remove(); // ..all the thumbnails .. for (uint i=0; i < imageDir.count(); i++) { - const QString imgName = imageDir[i]; - const QString imgNameFormat = imgName + extension(imageFormat); + const TQString imgName = imageDir[i]; + const TQString imgNameFormat = imgName + extension(imageFormat); bool isRemoved = thumb_dir.remove(imgNameFormat); kdDebug(90170) << "removing: " << thumb_dir.path() << "/" << imgNameFormat << "; "<< isRemoved << endl; } @@ -365,7 +365,7 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const QString& so // ..and the images directory if images were to be copied if (m_copyFiles) { for (uint i=0; i < imageDir.count(); i++) { - const QString imgName = imageDir[i]; + const TQString imgName = imageDir[i]; bool isRemoved = images_dir.remove(imgName); kdDebug(90170) << "removing: " << images_dir.path() << "/" << imgName << "; "<< isRemoved << endl; } @@ -375,24 +375,24 @@ void KImGalleryPlugin::deleteCancelledGallery(const KURL& url, const QString& so void KImGalleryPlugin::loadCommentFile() { - QFile file(m_configDlg->getCommentFile()); + TQFile file(m_configDlg->getCommentFile()); if (file.open(IO_ReadOnly)) { kdDebug(90170) << "File opened."<< endl; - QTextStream* m_textStream = new QTextStream(&file); - m_textStream->setEncoding(QTextStream::Locale); + TQTextStream* m_textStream = new TQTextStream(&file); + m_textStream->setEncoding(TQTextStream::Locale); delete m_commentMap; m_commentMap = new CommentMap; - QString picName, picComment, curLine, curLineStripped; + TQString picName, picComment, curLine, curLineStripped; while (!m_textStream->eof()) { curLine = m_textStream->readLine(); curLineStripped = curLine.stripWhiteSpace(); // Lines starting with '#' are comment if (!(curLineStripped.isEmpty()) && !curLineStripped.startsWith("#")) { if (curLineStripped.endsWith(":")) { - picComment = QString::null; + picComment = TQString::null; picName = curLineStripped.left(curLineStripped.length()-1); kdDebug(90170) << "picName: " << picName << endl; } else { @@ -420,22 +420,22 @@ void KImGalleryPlugin::loadCommentFile() } } -bool KImGalleryPlugin::createThumb( const QString& imgName, const QString& sourceDirName, - const QString& imgGalleryDir, const QString& imageFormat) +bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sourceDirName, + const TQString& imgGalleryDir, const TQString& imageFormat) { - QImage img; - const QString pixPath = sourceDirName + QString::fromLatin1("/") + imgName; + TQImage img; + const TQString pixPath = sourceDirName + TQString::fromLatin1("/") + imgName; if (m_copyFiles) { KURL srcURL = KURL::fromPathOrURL(pixPath); //kdDebug(90170) << "srcURL: " << srcURL << endl; - KURL destURL = KURL::fromPathOrURL(imgGalleryDir + QString::fromLatin1("/images/") + imgName); + KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName); //kdDebug(90170) << "destURL: " << destURL << endl; KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget()); } - const QString imgNameFormat = imgName + extension(imageFormat); - const QString thumbDir = imgGalleryDir + QString::fromLatin1("/thumbs/"); + const TQString imgNameFormat = imgName + extension(imageFormat); + const TQString thumbDir = imgGalleryDir + TQString::fromLatin1("/thumbs/"); int extent = m_configDlg->getThumbnailSize(); // this code is stolen from kdebase/kioslave/thumbnail/imagecreator.cpp @@ -465,7 +465,7 @@ bool KImGalleryPlugin::createThumb( const QString& imgName, const QString& sourc h = extent; Q_ASSERT( w <= extent ); } - const QImage scaleImg(img.smoothScale( w, h )); + const TQImage scaleImg(img.smoothScale( w, h )); if ( scaleImg.width() != w || scaleImg.height() != h ) { kdDebug(90170) << "Resizing failed. Aborting." << endl; @@ -474,7 +474,7 @@ bool KImGalleryPlugin::createThumb( const QString& imgName, const QString& sourc img = scaleImg; if (m_configDlg->colorDepthSet() == true ) { - const QImage depthImg(img.convertDepth(m_configDlg->getColorDepth())); + const TQImage depthImg(img.convertDepth(m_configDlg->getColorDepth())); img = depthImg; } } diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h index 6b580a0..7520f0b 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h @@ -30,14 +30,14 @@ class QProgressDialog; class KURL; class KIGPDialog; -typedef QMap<QString,QString> CommentMap; +typedef TQMap<TQString,TQString> CommentMap; class KImGalleryPlugin : public KParts::Plugin { Q_OBJECT public: - KImGalleryPlugin( QObject* parent, const char* name, - const QStringList & ); + KImGalleryPlugin( TQObject* parent, const char* name, + const TQStringList & ); ~KImGalleryPlugin() {} public slots: @@ -54,7 +54,7 @@ class KImGalleryPlugin : public KParts::Plugin int m_imgHeight; int m_imagesPerRow; - QProgressDialog *m_progressDlg; + TQProgressDialog *m_progressDlg; KonqDirPart* m_part; @@ -62,19 +62,19 @@ class KImGalleryPlugin : public KParts::Plugin CommentMap* m_commentMap; - bool createDirectory(QDir thumb_dir, QString imgGalleryDir, QString dirName); + bool createDirectory(TQDir thumb_dir, TQString imgGalleryDir, TQString dirName); - void createHead(QTextStream& stream); - void createCSSSection(QTextStream& stream); - void createBody(QTextStream& stream, const QString& sourceDirName, const QStringList& subDirList, const QDir& imageDir, const KURL& url, const QString& imageFormat); + void createHead(TQTextStream& stream); + void createCSSSection(TQTextStream& stream); + void createBody(TQTextStream& stream, const TQString& sourceDirName, const TQStringList& subDirList, const TQDir& imageDir, const KURL& url, const TQString& imageFormat); - bool createThumb( const QString& imgName, const QString& sourceDirName, const QString& imgGalleryDir, const QString& imageFormat); + bool createThumb( const TQString& imgName, const TQString& sourceDirName, const TQString& imgGalleryDir, const TQString& imageFormat); - bool createHtml( const KURL& url, const QString& sourceDirName, int recursionLevel, const QString& imageFormat); - void deleteCancelledGallery( const KURL& url, const QString& sourceDirName, int recursionLevel, const QString& imageFormat); + bool createHtml( const KURL& url, const TQString& sourceDirName, int recursionLevel, const TQString& imageFormat); + void deleteCancelledGallery( const KURL& url, const TQString& sourceDirName, int recursionLevel, const TQString& imageFormat); void loadCommentFile(); - static QString extension(const QString& imageFormat); + static TQString extension(const TQString& imageFormat); }; #endif diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index fdbf5c0..27459ee 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -14,8 +14,8 @@ #include "kcmkuick.h" -#include <qlayout.h> -#include <qfile.h> +#include <tqlayout.h> +#include <tqfile.h> #include <kglobal.h> #include <klocale.h> #include <kconfig.h> @@ -24,16 +24,16 @@ #include <kstandarddirs.h> #include <kservice.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qstring.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqspinbox.h> +#include <tqstring.h> -typedef KGenericFactory<KCMKuick, QWidget> KuickFactory; +typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) ) -KCMKuick::KCMKuick(QWidget *parent, const char *name, const QStringList &) +KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) :KCModule(parent, name) { KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"), @@ -42,16 +42,16 @@ KCMKuick::KCMKuick(QWidget *parent, const char *name, const QStringList &) ab->addAuthor("Holger Freyther",0, "freyther@kde.org"); setAboutData( ab ); - QVBoxLayout *topLayout = new QVBoxLayout(this, 0, 0); + TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0); dialog = new KCMKuickDialog(this); topLayout->add(dialog); topLayout->addStretch(); - connect( dialog->m_sbCopy, SIGNAL(valueChanged(int) ), SLOT(configChanged() ) ); - connect( dialog->m_sbMove, SIGNAL(valueChanged(int) ), SLOT(configChanged() ) ); - connect( dialog->pbCopyClear, SIGNAL(pressed() ), SLOT(slotClearCopyCache() ) ); - connect( dialog->pbMoveClear, SIGNAL(pressed() ), SLOT(slotClearMoveCache() ) ); - connect( dialog->m_chkShow, SIGNAL(clicked() ), SLOT(slotShowToggled() ) ); + connect( dialog->m_sbCopy, TQT_SIGNAL(valueChanged(int) ), TQT_SLOT(configChanged() ) ); + connect( dialog->m_sbMove, TQT_SIGNAL(valueChanged(int) ), TQT_SLOT(configChanged() ) ); + connect( dialog->pbCopyClear, TQT_SIGNAL(pressed() ), TQT_SLOT(slotClearCopyCache() ) ); + connect( dialog->pbMoveClear, TQT_SIGNAL(pressed() ), TQT_SLOT(slotClearMoveCache() ) ); + connect( dialog->m_chkShow, TQT_SIGNAL(clicked() ), TQT_SLOT(slotShowToggled() ) ); load(); } @@ -86,7 +86,7 @@ KCMKuick::~KCMKuick() { } -void KCMKuick::load(const QString & /*s*/) +void KCMKuick::load(const TQString & /*s*/) { } @@ -108,8 +108,8 @@ void KCMKuick::save() config.sync(); //is it necessary ? if ( dialog->m_chkShow->isChecked() ) { - QString servicespath = KGlobal::dirs()->saveLocation( "services"); - QFile::remove(servicespath+"/kuick_plugin.desktop"); + TQString servicespath = KGlobal::dirs()->saveLocation( "services"); + TQFile::remove(servicespath+"/kuick_plugin.desktop"); } else { KConfig cfg("kuick_plugin.desktop", false, false, "services"); @@ -124,14 +124,14 @@ void KCMKuick::save() void KCMKuick::slotClearCopyCache( ) { KConfig config("konquerorrc"); config.setGroup("kuick-copy" ); - config.writePathEntry("Paths", QStringList() ); + config.writePathEntry("Paths", TQStringList() ); config.sync(); //is it necessary ? } void KCMKuick::slotClearMoveCache() { KConfig config("konquerorrc"); config.setGroup("kuick-move" ); - config.writePathEntry("Paths", QStringList() ); + config.writePathEntry("Paths", TQStringList() ); config.sync(); //is it necessary ? } @@ -146,7 +146,7 @@ void KCMKuick::defaults() emit changed( true ); } -QString KCMKuick::quickHelp() const +TQString KCMKuick::quickHelp() const { return i18n("<h1>Kuick</h1> With this module you can configure Kuick, the KDE quick" "copy and move plugin for Konqueror."); diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h index c10d04e..d4316eb 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.h +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h @@ -26,13 +26,13 @@ class KCMKuick Q_OBJECT public: - KCMKuick (QWidget *parent, const char *name, const QStringList &); + KCMKuick (TQWidget *parent, const char *name, const TQStringList &); ~KCMKuick(); void load(); - void load(const QString &); + void load(const TQString &); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; public slots: void configChanged(); private: diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 2cbf6de..4dbd212 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -17,9 +17,9 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qiconset.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqiconset.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include <kaction.h> #include <kapplication.h> @@ -32,11 +32,11 @@ #define CICON(a) (*_icons)[a] -QMap<QString, QPixmap> *KDirMenu::_icons = 0; +TQMap<TQString, TQPixmap> *KDirMenu::_icons = 0; -KDirMenu::KDirMenu ( QWidget *parent, const KURL &_src, - const QString &_path, const QString &_name, bool /*showfile*/ ) - : QPopupMenu(parent), +KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, + const TQString &_path, const TQString &_name, bool /*showfile*/ ) + : TQPopupMenu(parent), path(_path), name(_name), src( _src ), @@ -44,33 +44,33 @@ KDirMenu::KDirMenu ( QWidget *parent, const KURL &_src, { children.setAutoDelete( true ); initIconMap( ); - connect( this, SIGNAL( aboutToShow( ) ), this, SLOT( slotAboutToShow( ) ) ); - connect( this, SIGNAL( aboutToHide( ) ), this, SLOT( slotAboutToHide( ) ) ); + connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); + connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) ); children.clear(); // just in case - QFileInfo fileInfo(path); + TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) - action = new KAction(name, 0, this, SLOT(new_slot( ) ), this); + action = new KAction(name, 0, this, TQT_SLOT(new_slot( ) ), this); } KDirMenu::~KDirMenu( ) { delete action; clear( ); children.clear( ); } -void KDirMenu::insert( KDirMenu *submenu, const QString &_path ) { - static const QIconSet folder = SmallIconSet("folder"); - QString escapedPath = _path; - QString completPath=path+'/'+_path; +void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { + static const TQIconSet folder = SmallIconSet("folder"); + TQString escapedPath = _path; + TQString completPath=path+'/'+_path; // parse .directory if it does exist - if (QFile::exists(completPath + "/.directory")) { + if (TQFile::exists(completPath + "/.directory")) { KSimpleConfig c(completPath + "/.directory", true); c.setDesktopGroup(); - QString iconPath = c.readEntry("Icon"); + TQString iconPath = c.readEntry("Icon"); if ( iconPath.startsWith("./") ) iconPath = _path + '/' + iconPath.mid(2); - QPixmap icon; + TQPixmap icon; icon = KGlobal::iconLoader()->loadIcon(iconPath, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); @@ -81,8 +81,8 @@ void KDirMenu::insert( KDirMenu *submenu, const QString &_path ) { else insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); children.append( submenu ); - connect(submenu, SIGNAL(fileChosen(const QString &)), - this, SLOT(slotFileSelected(const QString &))); + connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), + this, TQT_SLOT(slotFileSelected(const TQString &))); } void KDirMenu::slotAboutToShow( ) { @@ -92,7 +92,7 @@ void KDirMenu::slotAboutToShow( ) { //Precaution: if not a directory, exit, in case some path in KMetaMenu //isn't checked right - if ( !QFileInfo(path).isDir() ) + if ( !TQFileInfo(path).isDir() ) return; if ( action ) @@ -101,9 +101,9 @@ void KDirMenu::slotAboutToShow( ) { setItemEnabled( insertItem( name ), false ); // all dirs writeable and readable - QDir dir(path, QString::null, - QDir::Name | QDir::DirsFirst | QDir::IgnoreCase, - QDir::Dirs | QDir::Readable | QDir::Executable); + TQDir dir(path, TQString::null, + TQDir::Name | TQDir::DirsFirst | TQDir::IgnoreCase, + TQDir::Dirs | TQDir::Readable | TQDir::Executable); const QFileInfoList* dirList = dir.entryInfoList(); if ( !dirList || dirList->isEmpty() ) { @@ -120,11 +120,11 @@ void KDirMenu::slotAboutToShow( ) { return; } - static const QString& dot = KGlobal::staticQString( "." ); - static const QString& dotdot = KGlobal::staticQString( ".." ); + static const TQString& dot = KGlobal::staticQString( "." ); + static const TQString& dotdot = KGlobal::staticQString( ".." ); for ( QFileInfoListIterator it( *dirList ); *it; ++it ) { - QString fileName = (*it)->fileName(); + TQString fileName = (*it)->fileName(); if ( fileName == dot || fileName == dotdot ) continue; @@ -146,7 +146,7 @@ void KDirMenu::initIconMap() // kdDebug(90160) << "PanelBrowserMenu::initIconMap" << endl; - _icons = new QMap<QString, QPixmap>; + _icons = new TQMap<TQString, TQPixmap>; _icons->insert("folder", SmallIcon("folder")); _icons->insert("unknown", SmallIcon("mime_empty")); @@ -158,7 +158,7 @@ void KDirMenu::initIconMap() _icons->insert("exec", SmallIcon("exec")); _icons->insert("chardevice", SmallIcon("chardevice")); } -void KDirMenu::slotFileSelected(const QString &_path ){ +void KDirMenu::slotFileSelected(const TQString &_path ){ emit fileChosen( _path ); } diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h index 6356e83..5bbe68e 100644 --- a/konq-plugins/kuick/kdirmenu.h +++ b/konq-plugins/kuick/kdirmenu.h @@ -21,38 +21,38 @@ #ifndef __kdirmenu_h #define __kdirmenu_h -#include <qpopupmenu.h> -#include <qptrlist.h> -#include <qmap.h> +#include <tqpopupmenu.h> +#include <tqptrlist.h> +#include <tqmap.h> class KAction; class KURL; -class KDirMenu : public QPopupMenu { +class KDirMenu : public TQPopupMenu { Q_OBJECT public: - KDirMenu( QWidget *parent, const KURL &src, const QString &_path, - const QString &name, bool showfiles = false ); + KDirMenu( TQWidget *parent, const KURL &src, const TQString &_path, + const TQString &name, bool showfiles = false ); ~KDirMenu( ); - void setPath( const QString &_path); - void insert( KDirMenu *menu, const QString &path ); + void setPath( const TQString &_path); + void insert( KDirMenu *menu, const TQString &path ); protected: int target_id; - static QMap<QString, QPixmap> *_icons; + static TQMap<TQString, TQPixmap> *_icons; signals: - void fileChosen( const QString &_path ); + void fileChosen( const TQString &_path ); private: - QString path; - QString name; + TQString path; + TQString name; KURL src; KAction *action; - QPtrList<KDirMenu> children; + TQPtrList<KDirMenu> children; void initIconMap( ); public slots: void slotAboutToShow( ); void slotAboutToHide( ); - void slotFileSelected(const QString &_path ); + void slotFileSelected(const TQString &_path ); /** No descriptions */ void new_slot(); }; diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index 42cf980..77ef7a4 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -#include <qstringlist.h> +#include <tqstringlist.h> // The following enables kabc for contact name lookups instead of using Kopete's idea of their name. //#define KIMCONTACTS_USE_KABC @@ -34,14 +34,14 @@ #include "kimcontactmenu.h" -KIMContactMenu::KIMContactMenu( QWidget *parent, KIMProxy *proxy ) - : QPopupMenu( parent), mProxy( proxy ) +KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy ) + : TQPopupMenu( parent), mProxy( proxy ) { #ifdef KIMCONTACTS_USE_KABC m_addressBook = KABC::StdAddressBook::self( false ); #endif - connect( this, SIGNAL( activated( int ) ), SLOT( slotItemActivated( int ) ) ); - connect( this, SIGNAL( aboutToShow( ) ), this, SLOT( slotAboutToShow( ) ) ); + connect( this, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotItemActivated( int ) ) ); + connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); } KIMContactMenu::~KIMContactMenu() @@ -61,7 +61,7 @@ void KIMContactMenu::slotAboutToShow() int i = 0; - for ( QStringList::Iterator it = mContacts.begin(); it != mContacts.end(); ++it, ++i ) + for ( TQStringList::Iterator it = mContacts.begin(); it != mContacts.end(); ++it, ++i ) { #ifdef KIMCONTACTS_USE_KABC insertItem( mProxy->presenceIcon( *it ), m_addressBook->findByUid( *it ).realName(), i ); @@ -74,7 +74,7 @@ void KIMContactMenu::slotAboutToShow() void KIMContactMenu::slotItemActivated( int item ) { // look up corresponding UID - QString uid = mContacts[ item ]; + TQString uid = mContacts[ item ]; // emit signal emit contactChosen( uid ); } diff --git a/konq-plugins/kuick/kimcontactmenu.h b/konq-plugins/kuick/kimcontactmenu.h index 62c13bc..478c55b 100644 --- a/konq-plugins/kuick/kimcontactmenu.h +++ b/konq-plugins/kuick/kimcontactmenu.h @@ -23,8 +23,8 @@ #ifndef __kim_contact_menu_h #define __kim_contact_menu_h -#include <qpopupmenu.h> -#include <qstringlist.h> +#include <tqpopupmenu.h> +#include <tqstringlist.h> class KIMProxy; namespace KABC { @@ -35,7 +35,7 @@ class KIMContactMenu : public QPopupMenu { Q_OBJECT public: - KIMContactMenu( QWidget *parent, KIMProxy *proxy ); + KIMContactMenu( TQWidget *parent, KIMProxy *proxy ); ~KIMContactMenu(); protected slots: // populate menus if not already populated @@ -43,11 +43,11 @@ protected slots: void slotAboutToHide(); void slotItemActivated( int item ); signals: - void contactChosen( const QString &uid ); + void contactChosen( const TQString &uid ); protected: KIMProxy *mProxy; - QStringList mContacts; + TQStringList mContacts; KABC::AddressBook* m_addressBook; }; diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 065a825..2b5d78a 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -26,53 +26,53 @@ #include <kurl.h> #include <konq_popupmenu.h> -#include <qpixmap.h> -#include <qdir.h> -#include <qiconset.h> -#include <qstringlist.h> +#include <tqpixmap.h> +#include <tqdir.h> +#include <tqiconset.h> +#include <tqstringlist.h> #include "kmetamenu.h" #include "kdirmenu.h" #include "kimcontactmenu.h" #include "kmetamenu.moc" -KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, - const QString &text, const QString &key, KIMProxy *imProxy ) -: QPopupMenu( parent), +KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, + const TQString &text, const TQString &key, KIMProxy *imProxy ) +: TQPopupMenu( parent), m_root( 0 ), m_home( 0 ), m_etc( 0 ), m_current( 0 ), m_browse( 0 ) { int recent_no; group = key; actions.setAutoDelete( TRUE ); - QStringList dirList; + TQStringList dirList; KURL u; - u.setPath(QDir::homeDirPath()); + u.setPath(TQDir::homeDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { m_home = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home); dirList << u.path(); - connect(m_home, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_home, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } - u.setPath(QDir::rootDirPath()); + u.setPath(TQDir::rootDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { m_root = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root); dirList << u.path(); - connect(m_root, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_root, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } - QString confDir = QDir::rootDirPath()+ "etc"; + TQString confDir = TQDir::rootDirPath()+ "etc"; u.setPath(confDir); - if ( QFileInfo( confDir ).isWritable() && + if ( TQFileInfo( confDir ).isWritable() && kapp->authorizeURLAction("list", u, u) ) { m_etc = new KDirMenu( parent, url, confDir, text ); @@ -80,14 +80,14 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, i18n("&System Configuration"), m_etc); dirList << confDir; - connect(m_etc , SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_etc , TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } if ( url.isLocalFile() && dirList.find( url.path() ) == dirList.end() - && QFileInfo( url.path() ).isWritable() - && QFileInfo( url.path() ).isDir() + && TQFileInfo( url.path() ).isWritable() + && TQFileInfo( url.path() ).isDir() && kapp->authorizeURLAction("list", url, url) ) //Need to check whether a directory so we don't crash trying to access it //(#60192) @@ -97,21 +97,21 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ), m_current ); - connect(m_current, SIGNAL(fileChosen(const QString &)), - SLOT(slotFileChosen(const QString &) ) ); + connect(m_current, TQT_SIGNAL(fileChosen(const TQString &)), + TQT_SLOT(slotFileChosen(const TQString &) ) ); } if ( imProxy ) { m_contacts = new KIMContactMenu( parent, imProxy ); int item = insertItem( SmallIconSet( "personal" ), i18n( "C&ontact" ), m_contacts ); - connect ( m_contacts, SIGNAL( contactChosen( const QString &) ), SIGNAL( contactChosen( const QString & ) ) ); + connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) ); if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() ) setItemEnabled( item, false ); } - m_browse = new KAction(i18n("&Browse..."), 0, this, SLOT(slotBrowse()), this ); + m_browse = new KAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this ); m_browse->plug(this); // read the last chosen dirs // first set the group according to our parameter @@ -122,18 +122,18 @@ KMetaMenu::KMetaMenu( QWidget *parent, const KURL &url, if ( list.count() > 0 ) insertSeparator(); int i=1; - QStringList::Iterator it = list.begin(); + TQStringList::Iterator it = list.begin(); while( it != list.end() ) { if( i == (recent_no + 1) ) break; - QDir dir( *it ); + TQDir dir( *it ); u.setPath( *it ); if ( !dir.exists() || !kapp->authorizeURLAction("list", u, u) ) { it = list.remove( it ); continue; } - QString escapedDir = *it; - KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, SLOT(slotFastPath()), this); + TQString escapedDir = *it; + KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this); action->plug(this ); actions.append( action ); ++it; @@ -152,7 +152,7 @@ KMetaMenu::~KMetaMenu(){ delete m_browse; actions.clear(); } -void KMetaMenu::slotFileChosen(const QString &path ){ +void KMetaMenu::slotFileChosen(const TQString &path ){ writeConfig(path ); emit fileChosen(path ); } @@ -160,10 +160,10 @@ void KMetaMenu::slotFileChosen(const QString &path ){ void KMetaMenu::slotFastPath( ) { KAction *action; action = (KAction*) sender(); - QString text = action->plainText( ); + TQString text = action->plainText( ); slotFileChosen( text ); } -void KMetaMenu::writeConfig( const QString &path){ +void KMetaMenu::writeConfig( const TQString &path){ list.remove(path ); list.prepend(path ); conf->setGroup( group ); diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h index f6670f6..ff33df6 100644 --- a/konq-plugins/kuick/kmetamenu.h +++ b/konq-plugins/kuick/kmetamenu.h @@ -20,8 +20,8 @@ #ifndef _kmetamenu_h #define _kmetamenu_h -#include <qpopupmenu.h> -#include <qptrlist.h> +#include <tqpopupmenu.h> +#include <tqptrlist.h> #include <kaction.h> @@ -33,22 +33,22 @@ class KIMContactMenu; class KIMProxy; class KURL; -class KMetaMenu : public QPopupMenu { +class KMetaMenu : public TQPopupMenu { Q_OBJECT public: - KMetaMenu( QWidget *parent, const KURL &url, const QString &text, - const QString &key, KIMProxy * imProxy = 0L ); + KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, + const TQString &key, KIMProxy * imProxy = 0L ); KMetaMenu(); ~KMetaMenu(); - void writeConfig( const QString &path ); + void writeConfig( const TQString &path ); public slots: - void slotFileChosen( const QString &path); + void slotFileChosen( const TQString &path); void slotFastPath( ); void slotBrowse( ); signals: - void fileChosen( const QString &path ); - void contactChosen( const QString &uid ); + void fileChosen( const TQString &path ); + void contactChosen( const TQString &uid ); private: KDirMenu *m_root; KDirMenu *m_home; @@ -57,10 +57,10 @@ private: KIMContactMenu *m_contacts; KIMProxy *m_proxy; KAction *m_browse; - QStringList list; + TQStringList list; KConfig *conf; - QString group; - QPtrList<KAction> actions; + TQString group; + TQPtrList<KAction> actions; }; #endif diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 80a7cc7..772f169 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -30,7 +30,7 @@ #include <konq_popupmenu.h> #include <kmessagebox.h> #include <kgenericfactory.h> -#include <qobject.h> +#include <tqobject.h> #include <kio/jobclasses.h> #include <kio/job.h> #include <kurl.h> @@ -38,15 +38,15 @@ typedef KGenericFactory<KTestMenu, KonqPopupMenu> KTestMenuFactory; K_EXPORT_COMPONENT_FACTORY( libkuickplugin, KTestMenuFactory("kuick_plugin") ) -KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const QStringList& /*list*/ ) : KonqPopupMenuPlugin( popupmenu, name) { +KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQStringList& /*list*/ ) : KonqPopupMenuPlugin( popupmenu, name) { popup= popupmenu ; meta_copy_mmu = 0L; meta_move_mmu = 0L; - my_action = new KAction( "kuick_plugin", 0, this, SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); + my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); addAction( my_action ); addSeparator(); //popupmenu->addMerge(); - connect( popup, SIGNAL(aboutToShow() ), this, SLOT(slotPrepareMenu( ) ) ); + connect( popup, TQT_SIGNAL(aboutToShow() ), this, TQT_SLOT(slotPrepareMenu( ) ) ); m_imProxy = KIMProxy::instance( kapp->dcopClient() ); } KTestMenu::~KTestMenu( ){ @@ -56,20 +56,20 @@ KTestMenu::~KTestMenu( ){ void KTestMenu::slotPopupMaeh( ){ } -void KTestMenu::slotStartCopyJob( const QString &path ) { +void KTestMenu::slotStartCopyJob( const TQString &path ) { KURL url = KURL::fromPathOrURL( path ); KIO::CopyJob *copy; copy = KIO::copy( popup->popupURLList(), url); copy->setAutoErrorHandlingEnabled( true ); } -void KTestMenu::slotStartMoveJob( const QString &path) { +void KTestMenu::slotStartMoveJob( const TQString &path) { KURL url = KURL::fromPathOrURL( path ); KIO::CopyJob *move; move = KIO::move( popup->popupURLList(), url ); move->setAutoErrorHandlingEnabled( true ); } -void KTestMenu::slotFileTransfer( const QString &uid ) { +void KTestMenu::slotFileTransfer( const TQString &uid ) { m_imProxy->sendFile( uid, popup->popupURLList().first() ); } @@ -77,11 +77,11 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... // search for the dummy entry 'kuick_plugin' stores it index reomev it plug copy at the position KGlobal::locale()->insertCatalogue("kuick_plugin"); - bool isKDesktop = QCString( kapp->name() ) == "kdesktop"; + bool isKDesktop = TQCString( kapp->name() ) == "kdesktop"; for(int i= popup->count(); i >=1; i--) { int id = popup->idAt( i ); - QString text = popup->text( id ); + TQString text = popup->text( id ); if( text.contains("kuick_plugin") ) { popup->removeItem( id ); if (isKDesktop && !kapp->authorize("editable_desktop_icons")) @@ -95,18 +95,18 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... meta_copy_mmu = new KMetaMenu(popup, popup->url(), i18n("&Copy Here") , "kuick-copy", m_imProxy ); popup->insertItem(i18n("Copy To"), meta_copy_mmu, -1, i ); - connect( meta_copy_mmu, SIGNAL(fileChosen(const QString &) ), - SLOT(slotStartCopyJob(const QString & )) ); + connect( meta_copy_mmu, TQT_SIGNAL(fileChosen(const TQString &) ), + TQT_SLOT(slotStartCopyJob(const TQString & )) ); - connect( meta_copy_mmu, SIGNAL( contactChosen( const QString & ) ), - SLOT( slotFileTransfer( const QString & )) ); + connect( meta_copy_mmu, TQT_SIGNAL( contactChosen( const TQString & ) ), + TQT_SLOT( slotFileTransfer( const TQString & )) ); if( popup->protocolInfo().supportsMoving() ){ meta_move_mmu = new KMetaMenu(popup, popup->url(), i18n("&Move Here"), "kuick-move"); popup->insertItem(i18n("Move To"), meta_move_mmu, -1, i+1 ); - connect( meta_move_mmu, SIGNAL(fileChosen(const QString &) ), - SLOT(slotStartMoveJob(const QString & )) ); + connect( meta_move_mmu, TQT_SIGNAL(fileChosen(const TQString &) ), + TQT_SLOT(slotStartMoveJob(const TQString & )) ); } break; } diff --git a/konq-plugins/kuick/kuick_plugin.h b/konq-plugins/kuick/kuick_plugin.h index 15ffdcd..8369f7f 100644 --- a/konq-plugins/kuick/kuick_plugin.h +++ b/konq-plugins/kuick/kuick_plugin.h @@ -29,7 +29,7 @@ class KURL; class KTestMenu : public KonqPopupMenuPlugin { Q_OBJECT public: - KTestMenu (KonqPopupMenu *, const char *name, const QStringList &list); + KTestMenu (KonqPopupMenu *, const char *name, const TQStringList &list); virtual ~KTestMenu( ); KMetaMenu *meta_copy_mmu; KMetaMenu *meta_move_mmu; @@ -41,11 +41,11 @@ private: public slots: void slotPopupMaeh( ); - void slotStartCopyJob(const QString &path ); + void slotStartCopyJob(const TQString &path ); //void slotStartCopyJob(const KURL &url ); - void slotStartMoveJob(const QString &path ); + void slotStartMoveJob(const TQString &path ); //void slotStartMoveJob(const KURL &url ); - void slotFileTransfer( const QString &uid ); + void slotFileTransfer( const TQString &uid ); void slotPrepareMenu( ); }; diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 51fdd97..9dfa53c 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -32,16 +32,16 @@ #include <kstatusbar.h> #include <kurllabel.h> -#include <qcursor.h> -#include <qstylesheet.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqcursor.h> +#include <tqstylesheet.h> +#include <tqtimer.h> +#include <tqtooltip.h> typedef KGenericFactory<KonqMFIcon> KonqMFIconFactory; K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon, KonqMFIconFactory("mfkonqmficon")) -KonqMFIcon::KonqMFIcon(QObject *parent, const char *name, const QStringList &) +KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("mf_konqplugin"); @@ -50,14 +50,14 @@ KonqMFIcon::KonqMFIcon(QObject *parent, const char *name, const QStringList &) kdDebug() << "couldn't get part" << endl; return; } - QTimer::singleShot(0, this, SLOT(waitPartToLoad())); + TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad())); } void KonqMFIcon::waitPartToLoad() { - connect(m_part, SIGNAL(completed()), this, SLOT(addMFIcon())); - connect(m_part, SIGNAL(completed(bool)), this, SLOT(addMFIcon())); // to make pages with metarefresh to work - connect(m_part, SIGNAL(started(KIO::Job *)), this, SLOT(removeMFIcon())); + connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addMFIcon())); + connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addMFIcon())); // to make pages with metarefresh to work + connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeMFIcon())); } @@ -68,8 +68,8 @@ KonqMFIcon::~KonqMFIcon() { } -static QString textForNode(DOM::Node node) { - QString rc; +static TQString textForNode(DOM::Node node) { + TQString rc; DOM::NodeList nl = node.childNodes(); for (unsigned int i = 0; i < nl.length(); ++i) { DOM::Node n = nl.item(i); @@ -82,9 +82,9 @@ static QString textForNode(DOM::Node node) { } -static QString extractAddress(DOM::Node node) { - QString rc = ";;"; - QMap<QString,QString> entry; +static TQString extractAddress(DOM::Node node) { + TQString rc = ";;"; + TQMap<TQString,TQString> entry; DOM::NodeList nodes = node.childNodes(); unsigned int n = nodes.length(); for (unsigned int i = 0; i < n; ++i) { @@ -94,7 +94,7 @@ static QString extractAddress(DOM::Node node) { if (map.item(j).nodeName().string() != "class") { continue; } - QString a = map.item(j).nodeValue().string(); + TQString a = map.item(j).nodeValue().string(); if (a == "street-address") { entry["street-address"] = textForNode(node); } else if (a == "locality") { @@ -113,7 +113,7 @@ static QString extractAddress(DOM::Node node) { void KonqMFIcon::extractCard(DOM::Node node) { - QString name, value; + TQString name, value; DOM::NodeList nodes = node.childNodes(); unsigned int n = nodes.length(); value += "BEGIN:VCARD\nVERSION:3.0\n"; @@ -124,8 +124,8 @@ void KonqMFIcon::extractCard(DOM::Node node) { if (map.item(j).nodeName().string() != "class") { continue; } - QStringList l = QStringList::split(' ', map.item(j).nodeValue().string()); - for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { + TQStringList l = TQStringList::split(' ', map.item(j).nodeValue().string()); + for (TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { if (*it == "photo") { } else if (*it == "adr") { value += "ADR:" + extractAddress(node) + "\n"; @@ -142,7 +142,7 @@ void KonqMFIcon::extractCard(DOM::Node node) { } else if (*it == "email") { DOM::Node at = node.attributes().getNamedItem("href"); if (!at.isNull()) { - QString v = at.nodeValue().string(); + TQString v = at.nodeValue().string(); if (v.startsWith("mailto:")) { v = v.mid(7); } @@ -163,7 +163,7 @@ void KonqMFIcon::extractCard(DOM::Node node) { void KonqMFIcon::extractEvent(DOM::Node node) { - QString name, value = "BEGIN:VCALENDAR\nPRODID:-//Konqueror//EN\nVERSION:2.0\nBEGIN:VEVENT\n"; + TQString name, value = "BEGIN:VCALENDAR\nPRODID:-//Konqueror//EN\nVERSION:2.0\nBEGIN:VEVENT\n"; DOM::NodeList nodes = node.childNodes(); unsigned int n = nodes.length(); for (unsigned int i = 0; i < n; ++i) { @@ -173,8 +173,8 @@ void KonqMFIcon::extractEvent(DOM::Node node) { if (map.item(j).nodeName().string() != "class") { continue; } - QStringList l = QStringList::split(' ', map.item(j).nodeValue().string()); - for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { + TQStringList l = TQStringList::split(' ', map.item(j).nodeValue().string()); + for (TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { if (*it == "url") { DOM::Node at = node.attributes().getNamedItem("href"); if (!at.isNull()) { @@ -247,19 +247,19 @@ void KonqMFIcon::contextMenu() { delete m_menu; m_menu = new KPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Microformats")); - connect(m_menu, SIGNAL(activated(int)), this, SLOT(addMF(int))); + connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int))); int id = 0; - for (QValueList<QPair<QString, QString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) { + for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id); id++; } - for (QValueList<QPair<QString, QString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) { + for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id); id++; } m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Import All Microformats"), this, SLOT(addMFs()), 0, 50000 ); - m_menu->popup(QCursor::pos()); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Import All Microformats"), this, TQT_SLOT(addMFs()), 0, 50000 ); + m_menu->popup(TQCursor::pos()); } @@ -275,17 +275,17 @@ void KonqMFIcon::addMFIcon() { m_mfIcon = new KURLLabel(m_statusBarEx->statusBar()); m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_mfIcon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mfIcon->setUseCursor(false); //FIXME hackish - m_mfIcon->setPixmap(QPixmap(locate("data", "microformat/pics/microformat.png"))); + m_mfIcon->setPixmap(TQPixmap(locate("data", "microformat/pics/microformat.png"))); - QToolTip::remove(m_mfIcon); - QToolTip::add(m_mfIcon, i18n("This site has a microformat entry", "This site has %n microformat entries", _events.count() + _cards.count())); + TQToolTip::remove(m_mfIcon); + TQToolTip::add(m_mfIcon, i18n("This site has a microformat entry", "This site has %n microformat entries", _events.count() + _cards.count())); m_statusBarEx->addStatusBarItem(m_mfIcon, 0, true); - connect(m_mfIcon, SIGNAL(leftClickedURL()), this, SLOT(contextMenu())); + connect(m_mfIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu())); } diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h index 819bb2e..3b928c6 100644 --- a/konq-plugins/microformat/konqmficon.h +++ b/konq-plugins/microformat/konqmficon.h @@ -42,7 +42,7 @@ namespace KParts { class KonqMFIcon : public KParts::Plugin, PluginBase { Q_OBJECT public: - KonqMFIcon(QObject *parent, const char *name, const QStringList &); + KonqMFIcon(TQObject *parent, const char *name, const TQStringList &); ~KonqMFIcon(); @@ -52,11 +52,11 @@ class KonqMFIcon : public KParts::Plugin, PluginBase { void extractCard(DOM::Node node); void extractEvent(DOM::Node node); - QGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<KHTMLPart> m_part; KURLLabel *m_mfIcon; KParts::StatusBarExtension *m_statusBarEx; - QGuardedPtr<KPopupMenu> m_menu; - QValueList<QPair<QString, QString> > _events, _cards; + TQGuardedPtr<KPopupMenu> m_menu; + TQValueList<QPair<TQString, TQString> > _events, _cards; private slots: void waitPartToLoad(); diff --git a/konq-plugins/microformat/pluginbase.cpp b/konq-plugins/microformat/pluginbase.cpp index 9f73dd6..486721a 100644 --- a/konq-plugins/microformat/pluginbase.cpp +++ b/konq-plugins/microformat/pluginbase.cpp @@ -37,7 +37,7 @@ PluginBase::~PluginBase() { } -void PluginBase::addVCardViaDCOP(const QString& card) { +void PluginBase::addVCardViaDCOP(const TQString& card) { DCOPRef("kaddressbook", "AddressBookServiceIface").send("importVCard", card); } diff --git a/konq-plugins/microformat/pluginbase.h b/konq-plugins/microformat/pluginbase.h index e37ea36..7cfd26b 100644 --- a/konq-plugins/microformat/pluginbase.h +++ b/konq-plugins/microformat/pluginbase.h @@ -32,7 +32,7 @@ class PluginBase { ~PluginBase(); public: - void addVCardViaDCOP(const QString& vcard); + void addVCardViaDCOP(const TQString& vcard); }; #endif diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 53f109b..a1a5bfc 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <qfile.h> +#include <tqfile.h> #include <kdebug.h> #include <kaction.h> @@ -42,7 +42,7 @@ typedef KGenericFactory<MinitoolsPlugin> MinitoolsPluginFactory; K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitoolsplugin") ) -MinitoolsPlugin::MinitoolsPlugin(QObject* parent, const char* name, const QStringList &) +MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &) : KParts::Plugin(parent, name) { m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; @@ -51,8 +51,8 @@ MinitoolsPlugin::MinitoolsPlugin(QObject* parent, const char* name, const QStrin m_pMinitoolsMenu->setDelayed(false); m_pMinitoolsMenu->setEnabled(true); - connect(m_pMinitoolsMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotAboutToShow() )); + connect(m_pMinitoolsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotAboutToShow() )); } MinitoolsPlugin::~MinitoolsPlugin() { @@ -63,17 +63,17 @@ void MinitoolsPlugin::slotAboutToShow() { m_minitoolsList.clear(); KXBELBookmarkImporterImpl importer; - connect(&importer, SIGNAL( newBookmark( const QString &, const QCString &, const QString &) ), - SLOT( newBookmarkCallback( const QString &, const QCString &, const QString & ) )); - connect(&importer, SIGNAL( endFolder() ), - SLOT( endFolderCallback() )); - QString filename = minitoolsFilename(true); - if (!filename.isEmpty() && QFile::exists(filename)) { + connect(&importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), + TQT_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) )); + connect(&importer, TQT_SIGNAL( endFolder() ), + TQT_SLOT( endFolderCallback() )); + TQString filename = minitoolsFilename(true); + if (!filename.isEmpty() && TQFile::exists(filename)) { importer.setFilename(filename); importer.parse(); } filename = minitoolsFilename(false); - if (!filename.isEmpty() && QFile::exists(filename)) { + if (!filename.isEmpty() && TQFile::exists(filename)) { importer.setFilename(filename); importer.parse(); } @@ -94,7 +94,7 @@ void MinitoolsPlugin::slotAboutToShow() { gotSep = true; count++; } else { - QString str = (*e).first; + TQString str = (*e).first; // emsquieezzy thingy? if (str.length() > 48) { str.truncate(48); @@ -102,7 +102,7 @@ void MinitoolsPlugin::slotAboutToShow() { } m_pMinitoolsMenu->popupMenu()->insertItem( str, this, - SLOT(slotItemSelected(int)), + TQT_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; } @@ -116,12 +116,12 @@ void MinitoolsPlugin::slotAboutToShow() { m_pMinitoolsMenu->popupMenu() ->insertItem(i18n("&Edit Minitools"), - this, SLOT(slotEditBookmarks()), + this, TQT_SLOT(slotEditBookmarks()), 0, ++count ); } void MinitoolsPlugin::newBookmarkCallback( - const QString & text, const QCString & url, const QString & + const TQString & text, const TQCString & url, const TQString & ) { kdDebug(90150) << "MinitoolsPlugin::newBookmarkCallback" << text << url << endl; m_minitoolsList.prepend(qMakePair(text,url)); @@ -129,12 +129,12 @@ void MinitoolsPlugin::newBookmarkCallback( void MinitoolsPlugin::endFolderCallback() { kdDebug(90150) << "MinitoolsPlugin::endFolderCallback" << endl; - m_minitoolsList.prepend(qMakePair(QString("-"),QCString("-"))); + m_minitoolsList.prepend(qMakePair(TQString("-"),TQCString("-"))); } -QString MinitoolsPlugin::minitoolsFilename(bool local) { - return local ? locateLocal("data", QString::fromLatin1("konqueror/minitools.xml")) - : locateLocal("data", QString::fromLatin1("konqueror/minitools-global.xml")); +TQString MinitoolsPlugin::minitoolsFilename(bool local) { + return local ? locateLocal("data", TQString::fromLatin1("konqueror/minitools.xml")) + : locateLocal("data", TQString::fromLatin1("konqueror/minitools-global.xml")); } void MinitoolsPlugin::slotEditBookmarks() { @@ -145,12 +145,12 @@ void MinitoolsPlugin::slotEditBookmarks() { void MinitoolsPlugin::slotItemSelected(int id) { if (m_minitoolsList.count() == 0) return; - QString tmp = m_minitoolsList[id-1].second; - QString script = KURL::decode_string(tmp.right(tmp.length() - 11)); // sizeof("javascript:") - connect(this, SIGNAL( executeScript(const QString &) ), - m_part, SLOT( executeScript(const QString &) )); + TQString tmp = m_minitoolsList[id-1].second; + TQString script = KURL::decode_string(tmp.right(tmp.length() - 11)); // sizeof("javascript:") + connect(this, TQT_SIGNAL( executeScript(const TQString &) ), + m_part, TQT_SLOT( executeScript(const TQString &) )); emit executeScript(script); - disconnect(this, SIGNAL( executeScript(const QString &) ), 0, 0); + disconnect(this, TQT_SIGNAL( executeScript(const TQString &) ), 0, 0); } #include "minitoolsplugin.moc" diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h index 7db1a77..04d2ae8 100644 --- a/konq-plugins/minitools/minitoolsplugin.h +++ b/konq-plugins/minitools/minitoolsplugin.h @@ -21,9 +21,9 @@ #ifndef __MINITOOLS_PLUGIN_H #define __MINITOOLS_PLUGIN_H -#include <qmap.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <kurl.h> #include <klibloader.h> @@ -36,29 +36,29 @@ class MinitoolsPlugin : public KParts::Plugin { Q_OBJECT public: - MinitoolsPlugin( QObject* parent, const char* name, const QStringList & ); + MinitoolsPlugin( TQObject* parent, const char* name, const TQStringList & ); ~MinitoolsPlugin(); protected slots: void slotAboutToShow(); void slotEditBookmarks(); void slotItemSelected(int); - void newBookmarkCallback( const QString &, const QCString &, const QString & ); + void newBookmarkCallback( const TQString &, const TQCString &, const TQString & ); void endFolderCallback( ); signals: - void executeScript( const QString &script ); + void executeScript( const TQString &script ); private: - QString minitoolsFilename(bool local); + TQString minitoolsFilename(bool local); int m_selectedItem; KHTMLPart* m_part; KActionMenu* m_pMinitoolsMenu; - typedef QPair<QString,QCString> Minitool; - typedef QValueList<Minitool> MinitoolsList; + typedef QPair<TQString,TQCString> Minitool; + typedef TQValueList<Minitool> MinitoolsList; MinitoolsList m_minitoolsList; }; diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 212c37f..14a47a3 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -24,8 +24,8 @@ // Qt includes -#include <qapplication.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqtimer.h> // KDE include #include <dom/dom_doc.h> @@ -61,7 +61,7 @@ K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") ) #endif /** Constructor of the plugin. */ -RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringList &) +RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin( parent, name ), m_part(0), m_viewVisible(false) @@ -70,28 +70,28 @@ RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringL setInstance(RelLinksFactory::instance()); // ------------- Navigation links -------------- - kaction_map["home"] = new KAction( i18n("&Top"), "2uparrow", KShortcut("Ctrl+Alt+T"), this, SLOT(goHome()), actionCollection(), "rellinks_top" ); + kaction_map["home"] = new KAction( i18n("&Top"), "2uparrow", KShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" ); kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") ); - kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, SLOT(goUp()), actionCollection(), "rellinks_up" ); + kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") ); - bool isRTL = QApplication::reverseLayout(); + bool isRTL = TQApplication::reverseLayout(); - kaction_map["begin"] = new KAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", KShortcut("Ctrl+Alt+F"), this, SLOT(goFirst()), actionCollection(), "rellinks_first" ); + kaction_map["begin"] = new KAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", KShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" ); kaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") ); - kaction_map["prev"] = new KAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", KShortcut("Ctrl+Alt+P"), this, SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); + kaction_map["prev"] = new KAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", KShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); kaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") ); - kaction_map["next"] = new KAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", KShortcut("Ctrl+Alt+N"), this, SLOT(goNext()), actionCollection(), "rellinks_next" ); + kaction_map["next"] = new KAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", KShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" ); kaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") ); - kaction_map["last"] = new KAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", KShortcut("Ctrl+Alt+L"), this, SLOT(goLast()), actionCollection(), "rellinks_last" ); + kaction_map["last"] = new KAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", KShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" ); kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") ); // ------------ special items -------------------------- - kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, SLOT(goSearch()), actionCollection(), "rellinks_search" ); + kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") ); // ------------ Document structure links --------------- @@ -99,39 +99,39 @@ RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringL m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") ); m_document->setDelayed(false); - kaction_map["contents"] = new KAction( i18n("Table of &Contents"), "contents", KShortcut("Ctrl+Alt+C"), this, SLOT(goContents()), actionCollection(), "rellinks_toc" ); + kaction_map["contents"] = new KAction( i18n("Table of &Contents"), "contents", KShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" ); m_document->insert(kaction_map["contents"]); kaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") ); kactionmenu_map["chapter"] = new KActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" ); m_document->insert(kactionmenu_map["chapter"]); - connect( kactionmenu_map["chapter"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT(goChapter(int))); + connect( kactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int))); kactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") ); kactionmenu_map["chapter"]->setDelayed(false); kactionmenu_map["section"] = new KActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" ); m_document->insert(kactionmenu_map["section"]); - connect( kactionmenu_map["section"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goSection( int ) ) ); + connect( kactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) ); kactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") ); kactionmenu_map["section"]->setDelayed(false); kactionmenu_map["subsection"] = new KActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" ); m_document->insert(kactionmenu_map["subsection"]); - connect( kactionmenu_map["subsection"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goSubsection( int ) ) ); + connect( kactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) ); kactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") ); kactionmenu_map["subsection"]->setDelayed(false); kactionmenu_map["appendix"] = new KActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" ); m_document->insert(kactionmenu_map["appendix"]); - connect( kactionmenu_map["appendix"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goAppendix( int ) ) ); + connect( kactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) ); kactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") ); kactionmenu_map["appendix"]->setDelayed(false); - kaction_map["glossary"] = new KAction( i18n("&Glossary"), "flag", KShortcut("Ctrl+Alt+G"), this, SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); + kaction_map["glossary"] = new KAction( i18n("&Glossary"), "flag", KShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); m_document->insert(kaction_map["glossary"]); kaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") ); - kaction_map["index"] = new KAction( i18n("&Index"), "info", KShortcut("Ctrl+Alt+I"), this, SLOT(goIndex()), actionCollection(), "rellinks_index" ); + kaction_map["index"] = new KAction( i18n("&Index"), "info", KShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" ); m_document->insert(kaction_map["index"]); kaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") ); @@ -140,35 +140,35 @@ RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringL m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") ); m_more->setDelayed(false); - kaction_map["help"] = new KAction( i18n("&Help"), "help", KShortcut("Ctrl+Alt+H"), this, SLOT(goHelp()), actionCollection(), "rellinks_help" ); + kaction_map["help"] = new KAction( i18n("&Help"), "help", KShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" ); m_more->insert(kaction_map["help"]); kaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") ); - kaction_map["author"] = new KAction( i18n("&Authors"), "mail_new", KShortcut("Ctrl+Alt+A"), this, SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); + kaction_map["author"] = new KAction( i18n("&Authors"), "mail_new", KShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); m_more->insert(kaction_map["author"]); kaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") ); - kaction_map["copyright"] = new KAction( i18n("Copy&right"), "signature", KShortcut("Ctrl+Alt+R"), this, SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); + kaction_map["copyright"] = new KAction( i18n("Copy&right"), "signature", KShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); m_more->insert(kaction_map["copyright"]); kaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") ); kactionmenu_map["bookmark"] = new KActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" ); m_more->insert(kactionmenu_map["bookmark"]); kactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") ); - connect( kactionmenu_map["bookmark"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goBookmark( int ) ) ); + connect( kactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) ); kactionmenu_map["bookmark"]->setDelayed(false); kactionmenu_map["alternate"] = new KActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" ); m_more->insert(kactionmenu_map["alternate"]); kactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") ); - connect( kactionmenu_map["alternate"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goAlternate( int ) ) ); + connect( kactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) ); kactionmenu_map["alternate"]->setDelayed(false); // Unclassified menu m_links = new KActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" ); kactionmenu_map["unclassified"] = m_links; kactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") ); - connect( kactionmenu_map["unclassified"]->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( goAllElements( int ) ) ); + connect( kactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) ); kactionmenu_map["unclassified"]->setDelayed(false); // We unactivate all the possible actions @@ -179,22 +179,22 @@ RelLinksPlugin::RelLinksPlugin(QObject *parent, const char *name, const QStringL if (!m_part) return; - connect( m_part, SIGNAL( docCreated() ), this, SLOT( newDocument() ) ); - connect( m_part, SIGNAL( completed() ), this, SLOT( loadingFinished() ) ); + connect( m_part, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( newDocument() ) ); + connect( m_part, TQT_SIGNAL( completed() ), this, TQT_SLOT( loadingFinished() ) ); // create polling timer and connect it - m_pollTimer = new QTimer(this, "polling timer"); - connect( m_pollTimer, SIGNAL( timeout() ), this, SLOT( updateToolbar() ) ); + m_pollTimer = new TQTimer(this, "polling timer"); + connect( m_pollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateToolbar() ) ); // delay access to our part's members until it has finished its initialisation - QTimer::singleShot(0, this, SLOT(delayedSetup())); + TQTimer::singleShot(0, this, TQT_SLOT(delayedSetup())); } /** Destructor */ RelLinksPlugin::~RelLinksPlugin() { } -bool RelLinksPlugin::eventFilter(QObject *watched, QEvent* event) { +bool RelLinksPlugin::eventFilter(TQObject *watched, TQEvent* event) { if (m_part == 0) return false; if (watched == 0 || event == 0) return false; @@ -203,17 +203,17 @@ bool RelLinksPlugin::eventFilter(QObject *watched, QEvent* event) { { switch (event->type()) { - case QEvent::Show: + case TQEvent::Show: m_viewVisible = true; updateToolbar(); break; - case QEvent::Hide: + case TQEvent::Hide: m_viewVisible = false; updateToolbar(); break; - case QEvent::Close: + case TQEvent::Close: m_pollTimer->stop(); m_view->removeEventFilter(this); break; @@ -277,11 +277,11 @@ void RelLinksPlugin::updateToolbar() { // --- Retrieve of the relation type -- - QString rel = e.getAttribute( "rel" ).string(); + TQString rel = e.getAttribute( "rel" ).string(); rel = rel.simplifyWhiteSpace(); if (rel.isEmpty()) { // If the "rel" attribut is null then use the "rev" attribute... - QString rev = e.getAttribute( "rev" ).string(); + TQString rev = e.getAttribute( "rev" ).string(); rev = rev.simplifyWhiteSpace(); if (rev.isEmpty()) { // if "rev" attribut is also empty => ignore @@ -291,18 +291,18 @@ void RelLinksPlugin::updateToolbar() { rel = transformRevToRel(rev); } // Determin the name used internally - QString lrel = getLinkType(rel.lower()); + TQString lrel = getLinkType(rel.lower()); // relation to ignore if (lrel.isEmpty()) continue; // kdDebug() << "lrel=" << lrel << endl; // -- Retrieve of other usefull informations -- - QString href = e.getAttribute( "href" ).string(); + TQString href = e.getAttribute( "href" ).string(); // if nowhere to go, ignore the link if (href.isEmpty()) continue; - QString title = e.getAttribute( "title" ).string(); - QString hreflang = e.getAttribute( "hreflang" ).string(); + TQString title = e.getAttribute( "title" ).string(); + TQString hreflang = e.getAttribute( "hreflang" ).string(); KURL ref( m_part->url(), href ); if ( title.isEmpty() ) @@ -378,23 +378,23 @@ void RelLinksPlugin::guessRelations() // - We make sure that the number is followed by a dot, a &, or the end, we // don't want to match stuff like that: page.html?id=A14E12FD // - We make also sure the number is not preceded dirrectly by others number - QRegExp rx("^(.*[=/?&][^=/?&.\\-0-9]*)([\\d]{1,3})([.&][^/0-9]{0,15})?$"); + TQRegExp rx("^(.*[=/?&][^=/?&.\\-0-9]*)([\\d]{1,3})([.&][^/0-9]{0,15})?$"); - const QString zeros("0000"); - QString url=m_part->url().url(); + const TQString zeros("0000"); + TQString url=m_part->url().url(); if(rx.search(url)!=-1) { uint val=rx.cap(2).toUInt(); uint lenval=rx.cap(2).length(); - QString nval_str=QString::number(val+1); + TQString nval_str=TQString::number(val+1); //prepend by zeros if the original also contains zeros. if(nval_str.length() < lenval && rx.cap(2)[0]=='0') nval_str.prepend(zeros.left(lenval-nval_str.length())); - QString href=rx.cap(1)+ nval_str + rx.cap(3); + TQString href=rx.cap(1)+ nval_str + rx.cap(3); KURL ref( m_part->url(), href ); - QString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); + TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); DOM::Element e= m_part->document().createElement("link"); e.setAttribute("href",href); element_map["next"][0] = e; @@ -403,12 +403,12 @@ void RelLinksPlugin::guessRelations() if(val>1) { - nval_str=QString::number(val-1); + nval_str=TQString::number(val-1); if(nval_str.length() < lenval && rx.cap(2)[0]=='0') nval_str.prepend(zeros.left(lenval-nval_str.length())); - QString href=rx.cap(1)+ nval_str + rx.cap(3); + TQString href=rx.cap(1)+ nval_str + rx.cap(3); KURL ref( m_part->url(), href ); - QString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); + TQString title = i18n("[Autodetected] %1").arg(ref.prettyURL()); e= m_part->document().createElement("link"); e.setAttribute("href",href); element_map["prev"][0] = e; @@ -420,16 +420,16 @@ void RelLinksPlugin::guessRelations() /** Menu links */ -void RelLinksPlugin::goToLink(const QString & rel, int id) { +void RelLinksPlugin::goToLink(const TQString & rel, int id) { // have the KHTML part open it KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); if (!part) return; DOM::Element e = element_map[rel][id]; - QString href = e.getAttribute("href").string(); + TQString href = e.getAttribute("href").string(); KURL url( part->url(), href ); - QString target = e.getAttribute("target").string(); + TQString target = e.getAttribute("target").string(); // URL arguments KParts::URLArgs args; @@ -440,7 +440,7 @@ void RelLinksPlugin::goToLink(const QString & rel, int id) { part->browserExtension()->openURLRequest(url, args); } else { KURL baseURL = part->baseURL(); - QString endURL = url.prettyURL(); + TQString endURL = url.prettyURL(); KURL realURL = KURL(baseURL, endURL); part->browserExtension()->openURLRequest(realURL, args); } @@ -559,14 +559,14 @@ void RelLinksPlugin::disableAll() { } -QString RelLinksPlugin::getLinkType(const QString &lrel) { +TQString RelLinksPlugin::getLinkType(const TQString &lrel) { // Relations to ignore... if (lrel.contains("stylesheet") || lrel == "script" || lrel == "icon" || lrel == "shortcut icon" || lrel == "prefetch" ) - return QString::null; + return TQString::null; // ...known relations... if (lrel == "top" || lrel == "origin" || lrel == "start") @@ -596,8 +596,8 @@ QString RelLinksPlugin::getLinkType(const QString &lrel) { return lrel; } -QString RelLinksPlugin::transformRevToRel(const QString &rev) { - QString altRev = getLinkType(rev); +TQString RelLinksPlugin::transformRevToRel(const TQString &rev) { + TQString altRev = getLinkType(rev); // Known relations if (altRev == "prev") @@ -612,7 +612,7 @@ QString RelLinksPlugin::transformRevToRel(const QString &rev) { return getLinkType("sibling"); //...unknown inverse relation => ignore for the moment - return QString::null; + return TQString::null; } #include "plugin_rellinks.moc" diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h index 63260ce..e856e4a 100644 --- a/konq-plugins/rellinks/plugin_rellinks.h +++ b/konq-plugins/rellinks/plugin_rellinks.h @@ -31,16 +31,16 @@ */ // Qt includes -#include <qmap.h> +#include <tqmap.h> // KDE includes #include <kparts/plugin.h> #include <dom/dom_string.h> // type definitions -typedef QMap<int,DOM::Element> DOMElementMap; -typedef QMap<QString, KAction*> KActionMap; -typedef QMap<QString, KActionMenu*> KActionMenuMap; +typedef TQMap<int,DOM::Element> DOMElementMap; +typedef TQMap<TQString, KAction*> KActionMap; +typedef TQMap<TQString, KActionMenu*> KActionMenuMap; // forward declarations class KActionMenu; @@ -59,11 +59,11 @@ class RelLinksPlugin : public KParts::Plugin { Q_OBJECT public: /** Constructor */ - RelLinksPlugin( QObject *parent, const char *name, const QStringList & ); + RelLinksPlugin( TQObject *parent, const char *name, const TQStringList & ); /** Destructor */ virtual ~RelLinksPlugin(); - bool eventFilter(QObject *watched, QEvent* event); + bool eventFilter(TQObject *watched, TQEvent* event); private slots: void delayedSetup(); @@ -125,7 +125,7 @@ private: * @param lrel Previous relation name * @return New relation name */ - QString getLinkType(const QString &lrel); + TQString getLinkType(const TQString &lrel); /** * Function used to return the "rel" equivalent of "rev" link type @@ -133,7 +133,7 @@ private: * @param rev Inverse relation name * @return Equivalent relation name */ - QString transformRevToRel(const QString &rev) ; + TQString transformRevToRel(const TQString &rev) ; /** * Function used to disable all the item of the toolbar @@ -145,7 +145,7 @@ private: * @param rel Relation name * @param id Identifier of the menu item */ - void goToLink(const QString & rel, int id=0); + void goToLink(const TQString & rel, int id=0); private: KHTMLPart* m_part; @@ -162,9 +162,9 @@ private: KActionMenuMap kactionmenu_map; /** Map of all the link element which can be managed by rellinks */ - QMap<QString,DOMElementMap> element_map; + TQMap<TQString,DOMElementMap> element_map; - QTimer* m_pollTimer; + TQTimer* m_pollTimer; }; #endif // _PLUGIN_RELLINKS_H_ diff --git a/konq-plugins/rsync/rsyncconfigdialog.cpp b/konq-plugins/rsync/rsyncconfigdialog.cpp index 0549356..ae89efa 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.cpp +++ b/konq-plugins/rsync/rsyncconfigdialog.cpp @@ -50,25 +50,25 @@ #include <util.h> #endif -#include <qfile.h> -#include <qtimer.h> -#include <qapplication.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qwhatsthis.h> -#include <qiconview.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qregexp.h> -#include <qstyle.h> -#include <qtimer.h> -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqapplication.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> +#include <tqiconview.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqstyle.h> +#include <tqtimer.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> #include <kdebug.h> #include <klocale.h> @@ -100,9 +100,9 @@ /* * RsyncConfigDialog implementation */ -RsyncConfigDialog::RsyncConfigDialog(QWidget* parent, const char* name, - const QString& caption, const QString& text, - const QString& localfolder, const QString& remotefolder, +RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, + const TQString& caption, const TQString& text, + const TQString& localfolder, const TQString& remotefolder, int syncmode, bool modal) : KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel | KDialogBase::Ok, KDialogBase::Ok, parent, name, modal), @@ -116,25 +116,25 @@ RsyncConfigDialog::RsyncConfigDialog(QWidget* parent, const char* name, #ifdef Q_WS_X11 KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); #endif - mShowTimer = new QTimer(this); + mShowTimer = new TQTimer(this); showButton(KDialogBase::Close, false); mCancelText = actionButton(KDialogBase::Cancel)->text(); - QFrame* mainWidget = plainPage(); - QVBoxLayout* layout = new QVBoxLayout(mainWidget, 10); - mLabel = new QLabel(QString("<b>") + text + QString("</b><br>")+i18n("Setting up synchronization for local folder")+QString("<br><i>") + localfolder, mainWidget); + TQFrame* mainWidget = plainPage(); + TQVBoxLayout* layout = new TQVBoxLayout(mainWidget, 10); + mLabel = new TQLabel(TQString("<b>") + text + TQString("</b><br>")+i18n("Setting up synchronization for local folder")+TQString("<br><i>") + localfolder, mainWidget); layout->addWidget(mLabel); // Create an exclusive button group - QButtonGroup *layoutg = new QButtonGroup( 1, QGroupBox::Horizontal, i18n("Synchronization Method")+QString(":"), mainWidget); + TQButtonGroup *layoutg = new TQButtonGroup( 1, TQGroupBox::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget); layout->addWidget( layoutg ); layoutg->setExclusive( TRUE ); // Insert radiobuttons - rsync_rb1 = new QRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), layoutg); - rsync_rb2 = new QRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), layoutg); - rsync_rb3 = new QRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), layoutg); + rsync_rb1 = new TQRadioButton(i18n("&Utilize rsync + ssh for upload to remote server\nExample: servername:/path/to/remote/folder"), layoutg); + rsync_rb2 = new TQRadioButton(i18n("&Utilize rsync + ssh for download from remote server\nExample: servername:/path/to/remote/folder"), layoutg); + rsync_rb3 = new TQRadioButton(i18n("&Utilize unison + ssh for bidirectional synchronization with remote server\nExample: ssh://servername//path/to/remote/folder"), layoutg); if (syncmode == 1) rsync_rb1->setChecked( TRUE ); @@ -143,15 +143,15 @@ RsyncConfigDialog::RsyncConfigDialog(QWidget* parent, const char* name, else if (syncmode == 3) rsync_rb3->setChecked( TRUE ); - //(void)new QRadioButton( "R&adiobutton 2", layoutg ); - //(void)new QRadioButton( "Ra&diobutton 3", layoutg ); + //(void)new TQRadioButton( "R&adiobutton 2", layoutg ); + //(void)new TQRadioButton( "Ra&diobutton 3", layoutg ); // Create an exclusive button group - QButtonGroup *layoutm = new QButtonGroup( 1, QGroupBox::Horizontal, i18n("Remote Folder")+QString(":"), mainWidget); + TQButtonGroup *layoutm = new TQButtonGroup( 1, TQGroupBox::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget); layout->addWidget( layoutm ); layoutg->setExclusive( TRUE ); - m_rsync_txt = new QLineEdit(layoutm); + m_rsync_txt = new TQLineEdit(layoutm); if (remotefolder.isEmpty() == false) { m_rsync_txt->setText(remotefolder); } @@ -168,12 +168,12 @@ int RsyncConfigDialog::getSyncMode() return 3; } -QLineEdit* RsyncConfigDialog::lineEdit() +TQLineEdit* RsyncConfigDialog::lineEdit() { return m_rsync_txt; } -const QLineEdit* RsyncConfigDialog::lineEdit() const +const TQLineEdit* RsyncConfigDialog::lineEdit() const { return m_rsync_txt; } diff --git a/konq-plugins/rsync/rsyncconfigdialog.h b/konq-plugins/rsync/rsyncconfigdialog.h index 38f8687..8e02d54 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.h +++ b/konq-plugins/rsync/rsyncconfigdialog.h @@ -19,10 +19,10 @@ #ifndef __RSYNC_CONFIG_DIALOG_H #define __RSYNC_CONFIG_DIALOG_H -#include <qmap.h> -#include <qstringlist.h> -#include <qlineedit.h> -#include <qradiobutton.h> +#include <tqmap.h> +#include <tqstringlist.h> +#include <tqlineedit.h> +#include <tqradiobutton.h> #include <kurl.h> #include <kprocess.h> @@ -39,26 +39,26 @@ class RsyncConfigDialog : public KDialogBase Q_OBJECT public: - RsyncConfigDialog(QWidget* parent = 0, const char* name = 0, - const QString& caption = QString::null, - const QString& text = QString::null, - const QString& localfolder = QString::null, - const QString& remotefolder = QString::null, + RsyncConfigDialog(TQWidget* parent = 0, const char* name = 0, + const TQString& caption = TQString::null, + const TQString& text = TQString::null, + const TQString& localfolder = TQString::null, + const TQString& remotefolder = TQString::null, int syncmode = 1, bool modal = false); /** - * Returns the QLineEdit used in this dialog. + * Returns the TQLineEdit used in this dialog. * To set the number of lines or other text box related * settings, access the KTextEdit object directly via this method. */ - QLineEdit* lineEdit(); + TQLineEdit* lineEdit(); /** - * Returns the QLineEdit used in this dialog. + * Returns the TQLineEdit used in this dialog. * To set the number of lines or other text box related * settings, access the KTextEdit object directly via this method. */ - const QLineEdit* lineEdit() const; + const TQLineEdit* lineEdit() const; /** * Returns index of selected synchronization mode @@ -75,14 +75,14 @@ class RsyncConfigDialog : public KDialogBase bool mAllowCancel; bool mAllowTextEdit; bool mShown; - QString mCancelText; - QLabel* mLabel; + TQString mCancelText; + TQLabel* mLabel; KProgress* mProgressBar; KTextEdit* mTextBox; - QTimer* mShowTimer; - QLineEdit* m_rsync_txt; - QRadioButton *rsync_rb1; - QRadioButton *rsync_rb2; - QRadioButton *rsync_rb3; + TQTimer* mShowTimer; + TQLineEdit* m_rsync_txt; + TQRadioButton *rsync_rb1; + TQRadioButton *rsync_rb2; + TQRadioButton *rsync_rb3; }; #endif diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index 3c4ae1a..81a5253 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -50,23 +50,23 @@ #include <util.h> #endif -#include <qfile.h> -#include <qtimer.h> -#include <qapplication.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qhbox.h> -#include <qwhatsthis.h> -#include <qiconview.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qstring.h> -#include <qregexp.h> -#include <qstyle.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqhbox.h> +#include <tqwhatsthis.h> +#include <tqiconview.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqstyle.h> +#include <tqtimer.h> #include <kdebug.h> #include <klocale.h> @@ -106,8 +106,8 @@ typedef KGenericFactory<RsyncPlugin> RsyncPluginFactory; K_EXPORT_COMPONENT_FACTORY(librsyncplugin, RsyncPluginFactory("rsyncplugin")) -RsyncPlugin::RsyncPlugin (QObject* parent, const char* name, - const QStringList&) +RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, + const TQStringList&) :KParts::Plugin (parent, name), m_pSyncNow(0), m_pSyncSetup(0) @@ -125,10 +125,10 @@ RsyncPlugin::RsyncPlugin (QObject* parent, const char* name, m_pSyncSetup->setIcon("remotesyncconfig"); m_pSyncNow->setEnabled (false); - connect (m_part, SIGNAL(aboutToOpenURL()), SLOT(slotOpenURL())); + connect (m_part, TQT_SIGNAL(aboutToOpenURL()), TQT_SLOT(slotOpenURL())); - connect(m_pSyncNow, SIGNAL(activated()), this, SLOT(slotSync())); - connect(m_pSyncSetup, SIGNAL(activated()), this, SLOT(slotSetup())); + connect(m_pSyncNow, TQT_SIGNAL(activated()), this, TQT_SLOT(slotSync())); + connect(m_pSyncSetup, TQT_SIGNAL(activated()), this, TQT_SLOT(slotSetup())); loadSettings(); @@ -221,10 +221,10 @@ close_master: /** creates the unidirectional sync subprocess */ -bool RsyncPlugin::syncUnidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath) { +bool RsyncPlugin::syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) { int fd[2]; int rc, flags; - thisFn = QString::null; + thisFn = TQString::null; rc = open_pty_pair(fd); if (rc == -1) { @@ -242,12 +242,12 @@ bool RsyncPlugin::syncUnidirectional(QString synccommand, QString syncflags, int } if (childPid == 0) { // Create the rsync command to run - QString execstring; + TQString execstring; if (parameter_order == 0) { - execstring = synccommand + syncflags + localfolder + QString("/ ") + remotepath; + execstring = synccommand + syncflags + localfolder + TQString("/ ") + remotepath; } else { - execstring = synccommand + syncflags + remotepath + QString("/ ") + localfolder; + execstring = synccommand + syncflags + remotepath + TQString("/ ") + localfolder; } // taken from konsole, see TEPty.C for details @@ -358,10 +358,10 @@ bool RsyncPlugin::syncUnidirectional(QString synccommand, QString syncflags, int /** creates the bidirectional sync subprocess */ -bool RsyncPlugin::syncBidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath) { +bool RsyncPlugin::syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath) { int fd[2]; int rc, flags; - thisFn = QString::null; + thisFn = TQString::null; // Check for and remove the trailing slash in localfolder if (localfolder.endsWith("/")) { @@ -384,8 +384,8 @@ bool RsyncPlugin::syncBidirectional(QString synccommand, QString syncflags, int } if (childPid == 0) { // Create the rsync command to run - QString execstring; - execstring = synccommand + syncflags + localfolder + QString(" ") + remotepath; + TQString execstring; + execstring = synccommand + syncflags + localfolder + TQString(" ") + remotepath; // taken from konsole, see TEPty.C for details // note: if we're running on socket pairs, @@ -498,7 +498,7 @@ writes one chunk of data to stdin of child process void RsyncPlugin::writeChild(const char *buf, KIO::fileoffset_t len) { if (outBufPos >= 0 && outBuf) { #if 0 - QString debug; + TQString debug; debug.setLatin1(outBuf,outBufLen); if (len > 0) myDebug( << "write request while old one is pending, throwing away input (" << outBufLen << "," << outBufPos << "," << debug.left(10) << "...)" << endl); #endif @@ -513,7 +513,7 @@ void RsyncPlugin::writeChild(const char *buf, KIO::fileoffset_t len) { manages initial communication setup including password queries */ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { - QString buf; + TQString buf; buf.setLatin1(buffer,len); int pos; // Strip trailing whitespace @@ -526,7 +526,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { qApp->processEvents(); } pos++; - QString str = buf.left(pos); + TQString str = buf.left(pos); buf = buf.mid(pos); if (str == "\n") continue; @@ -544,7 +544,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { m_progressDialog->setAutoClose(true); m_progressDialog->progressBar()->setTotalSteps(2); m_progressDialog->progressBar()->setValue(1); - connect (m_progressDialog, SIGNAL(cancelClicked()), SLOT(slotRsyncCancelled())); + connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotRsyncCancelled())); m_progressDialog->show(); m_progressDialogExists = true; } @@ -557,25 +557,25 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { } else if (!connectionPassword.isEmpty()) { myDebug( << "sending cpass" << endl); connectionAuth.password = connectionPassword+"\n"; - connectionPassword = QString::null; + connectionPassword = TQString::null; writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } else { myDebug( << "sending mpass" << endl); connectionAuth.prompt = thisFn+buf; - connectionAuth.password = QString::null; // don't prefill - QCString thispass; - if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + QString("\n") + i18n("Please input") + QString(" ") + QString(buf), NULL) != 1) { + connectionAuth.password = TQString::null; // don't prefill + TQCString thispass; + if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + TQString("\n") + i18n("Please input") + TQString(" ") + TQString(buf), NULL) != 1) { shutdownConnection(true, false); return -1; } else { - connectionAuth.password = QString(thispass); + connectionAuth.password = TQString(thispass); } connectionAuth.password += "\n"; myDebug( << "sending pass" << endl); writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } - thisFn = QString::null; + thisFn = TQString::null; return 0; } else if (buf.endsWith("?")) { @@ -585,7 +585,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { } else { writeChild("no\n",3); } - thisFn = QString::null; + thisFn = TQString::null; return 0; } @@ -598,8 +598,8 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { else { if (str.contains(", to-check=")) { // Parse the to-check output - QString tocheck_out_cur; - QString tocheck_out_tot; + TQString tocheck_out_cur; + TQString tocheck_out_tot; tocheck_out_cur = str.mid(str.find(", to-check=") + 11, str.length()); tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.find("/") + 1, tocheck_out_cur.length()); tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.find("/")); @@ -620,8 +620,8 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { /** manages initial communication setup including password queries */ -int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, QString localfolder, QString remotepath) { - QString buf; +int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath) { + TQString buf; buf.setLatin1(buffer,len); int pos; // Strip trailing whitespace @@ -634,7 +634,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, qApp->processEvents(); } pos++; - QString str = buf.left(pos); + TQString str = buf.left(pos); buf = buf.mid(pos); if (str == "\n") continue; @@ -651,7 +651,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, m_progressDialog->progressBar()->setFormat("%v / %m"); m_progressDialog->progressBar()->setTotalSteps(0); m_progressDialog->setAutoClose(true); - connect (m_progressDialog, SIGNAL(cancelClicked()), SLOT(slotUnisonCancelled())); + connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotUnisonCancelled())); m_progressDialog->show(); m_progressDialogExists = true; } @@ -664,25 +664,25 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } else if (!connectionPassword.isEmpty()) { myDebug( << "sending cpass" << endl); connectionAuth.password = connectionPassword+"\n"; - connectionPassword = QString::null; + connectionPassword = TQString::null; writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } else { myDebug( << "sending mpass" << endl); connectionAuth.prompt = thisFn+buf; - connectionAuth.password = QString::null; // don't prefill - QCString thispass; - if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + QString("\n") + i18n("Please input") + QString(" ") + QString(buf), NULL) != 1) { + connectionAuth.password = TQString::null; // don't prefill + TQCString thispass; + if (KPasswordDialog::getPassword (thispass, i18n("Remote authorization required") + TQString("\n") + i18n("Please input") + TQString(" ") + TQString(buf), NULL) != 1) { slotUnisonCancelled(); return -1; } else { - connectionAuth.password = QString(thispass); + connectionAuth.password = TQString(thispass); } connectionAuth.password += "\n"; myDebug( << "sending pass" << endl); writeChild(connectionAuth.password.latin1(),connectionAuth.password.length()); } - thisFn = QString::null; + thisFn = TQString::null; return 0; } else if (buf.endsWith("?") || buf.endsWith("? []")) { @@ -703,7 +703,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, writeChild("no\n",3); } } - thisFn = QString::null; + thisFn = TQString::null; buf = ""; return 0; } @@ -715,13 +715,13 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, currentPos = m_progressDialog->progressBar()->progress(); m_progressDialog->progressBar()->setProgress(++currentPos); } - QString file_name; + TQString file_name; file_name = buf; file_name.replace("[]", ""); - file_name.replace(QString("changed "), ""); + file_name.replace(TQString("changed "), ""); //file_name = file_name.simplifyWhiteSpace(); KDialogBase *dialog= new KDialogBase(i18n("User Intervention Required"), KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, KDialogBase::Yes, KDialogBase::Cancel, NULL, "warningYesNoCancel", true, true, i18n("Use &Local File"), i18n("Use &Remote File"), i18n("&Ignore")); - int rc = KMessageBox::createKMessageBox(dialog, QMessageBox::Warning, QString("<b>") + i18n("WARNING: Both the local and remote file have been modified") + QString("</b><p>") + i18n("Local") + QString(": ") + localfolder + QString("/") + file_name + QString("<br>") + i18n("Remote") + QString(": ") + remotepath + QString("/") + file_name + QString("<p>") + i18n("Please select the file to duplicate (the other will be overwritten)") + QString("<br>") + i18n("Or, select Ignore to skip synchronization of this file for now"), QStringList(), QString::null, NULL, 1); + int rc = KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, TQString("<b>") + i18n("WARNING: Both the local and remote file have been modified") + TQString("</b><p>") + i18n("Local") + TQString(": ") + localfolder + TQString("/") + file_name + TQString("<br>") + i18n("Remote") + TQString(": ") + remotepath + TQString("/") + file_name + TQString("<p>") + i18n("Please select the file to duplicate (the other will be overwritten)") + TQString("<br>") + i18n("Or, select Ignore to skip synchronization of this file for now"), TQStringList(), TQString::null, NULL, 1); if (rc == KDialogBase::Yes) { writeChild(">\n",3); } @@ -794,11 +794,11 @@ void RsyncPlugin::saveSettings() KConfig cfg ("rsyncrc", false, false); cfg.setGroup ("General"); - QString longstring = QString(""); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end();) { + TQString longstring = TQString(""); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end();) { longstring = longstring + (*i); i++; - longstring = longstring + QString(";"); + longstring = longstring + TQString(";"); } cfg.writeEntry("LocalFolders", longstring); @@ -818,13 +818,13 @@ void RsyncPlugin::loadSettings() m_bSettingsLoaded = true; } -QString RsyncPlugin::findLocalFolderByName(QString folderurl) +TQString RsyncPlugin::findLocalFolderByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; return (*i); i++; @@ -837,13 +837,13 @@ QString RsyncPlugin::findLocalFolderByName(QString folderurl) return NULL; } -QString RsyncPlugin::findSyncMethodByName(QString folderurl) +TQString RsyncPlugin::findSyncMethodByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; i++; return (*i); @@ -856,13 +856,13 @@ QString RsyncPlugin::findSyncMethodByName(QString folderurl) return NULL; } -QString RsyncPlugin::findLoginSyncEnabledByName(QString folderurl) +TQString RsyncPlugin::findLoginSyncEnabledByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; i++; i++; @@ -875,13 +875,13 @@ QString RsyncPlugin::findLoginSyncEnabledByName(QString folderurl) return NULL; } -QString RsyncPlugin::findLogoutSyncEnabledByName(QString folderurl) +TQString RsyncPlugin::findLogoutSyncEnabledByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; i++; i++; @@ -894,13 +894,13 @@ QString RsyncPlugin::findLogoutSyncEnabledByName(QString folderurl) return NULL; } -QString RsyncPlugin::findTimedSyncEnabledByName(QString folderurl) +TQString RsyncPlugin::findTimedSyncEnabledByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i++; i++; i++; @@ -913,13 +913,13 @@ QString RsyncPlugin::findTimedSyncEnabledByName(QString folderurl) return NULL; } -int RsyncPlugin::deleteLocalFolderByName(QString folderurl) +int RsyncPlugin::deleteLocalFolderByName(TQString folderurl) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); - for (QStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { - if (QString::compare((*i), folderurl_stripped) == 0) { + folderurl_stripped.replace(TQString("file://"), TQString("")); + for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { + if (TQString::compare((*i), folderurl_stripped) == 0) { i=cfgfolderlist.remove(i); i=cfgfolderlist.remove(i); i=cfgfolderlist.remove(i); @@ -933,11 +933,11 @@ int RsyncPlugin::deleteLocalFolderByName(QString folderurl) return 1; } -int RsyncPlugin::addLocalFolderByName(QString folderurl, QString remoteurl, QString syncmethod, QString excludelist, QString sync_on_login, QString sync_on_logout, QString sync_timed_interval) +int RsyncPlugin::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval) { - QString folderurl_stripped; + TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.replace(QString("file://"), QString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); cfgfolderlist.append(folderurl); cfgfolderlist.append(remoteurl); cfgfolderlist.append(syncmethod); @@ -956,19 +956,19 @@ void RsyncPlugin::slotOpenURL () { // See if this URL is "/", "/dev", or "/proc", and disable sync if so // Also disable sync for non-"file://" URLs - if ((url.directory(true, true) + QString("/") + url.fileName(true)) == "//") { + if ((url.directory(true, true) + TQString("/") + url.fileName(true)) == "//") { m_pSyncSetup->setEnabled(false); m_pSyncNow->setEnabled(false); } - else if (((url.directory(true, true) + QString("/") + url.fileName(true)).left(5) == "//dev") || ((url.directory(true, true) + QString("/") + url.fileName(true)).left(4) == "/dev")) { + else if (((url.directory(true, true) + TQString("/") + url.fileName(true)).left(5) == "//dev") || ((url.directory(true, true) + TQString("/") + url.fileName(true)).left(4) == "/dev")) { m_pSyncSetup->setEnabled(false); m_pSyncNow->setEnabled(false); } - else if (((url.directory(true, true) + QString("/") + url.fileName(true)).left(6) == "//proc") || ((url.directory(true, true) + QString("/") + url.fileName(true)).left(5) == "/proc")) { + else if (((url.directory(true, true) + TQString("/") + url.fileName(true)).left(6) == "//proc") || ((url.directory(true, true) + TQString("/") + url.fileName(true)).left(5) == "/proc")) { m_pSyncSetup->setEnabled(false); m_pSyncNow->setEnabled(false); } - else if (url.protocol() != QString("file")) { + else if (url.protocol() != TQString("file")) { m_pSyncSetup->setEnabled(false); m_pSyncNow->setEnabled(false); } @@ -976,7 +976,7 @@ void RsyncPlugin::slotOpenURL () m_pSyncSetup->setEnabled(true); // See if this URL is in the list of rsync-able directories - if (findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true)) != NULL) { + if (findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true)) != NULL) { m_pSyncNow->setEnabled (true); } else { @@ -994,9 +994,9 @@ void RsyncPlugin::slotSetup() m_pSyncSetup->setEnabled (false); // Look up settings - QString localfolder = url.directory(true, true) + QString("/") + url.fileName(true); - QString remotefolder = findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true)); - QString syncmethod = findSyncMethodByName(url.directory(true, true) + QString("/") + url.fileName(true)); + TQString localfolder = url.directory(true, true) + TQString("/") + url.fileName(true); + TQString remotefolder = findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true)); + TQString syncmethod = findSyncMethodByName(url.directory(true, true) + TQString("/") + url.fileName(true)); int syncint; if (syncmethod == NULL) { syncint = 1; @@ -1014,8 +1014,8 @@ void RsyncPlugin::slotSetup() m_configDialog = new RsyncConfigDialog(0, "rsyncConfig", i18n("Remote Folder Synchronization"), i18n("Configuring Remote Folder Synchronization"), localfolder, remotefolder, syncint, true); m_configDialog->show(); - connect (m_configDialog, SIGNAL(okClicked()), SLOT(slotSetupOK())); - connect (m_configDialog, SIGNAL(cancelClicked()), SLOT(slotSetupCancelled())); + connect (m_configDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSetupOK())); + connect (m_configDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotSetupCancelled())); } void RsyncPlugin::slotSetupOK() @@ -1026,11 +1026,11 @@ void RsyncPlugin::slotSetupOK() KURL url = m_part->url(); // Look up settings - QString localfolder = url.directory(true, true) + QString("/") + url.fileName(true); - QString remotefolder = findLocalFolderByName(localfolder); - QString remotefolder_new = m_configDialog->lineEdit()->text().ascii(); + TQString localfolder = url.directory(true, true) + TQString("/") + url.fileName(true); + TQString remotefolder = findLocalFolderByName(localfolder); + TQString remotefolder_new = m_configDialog->lineEdit()->text().ascii(); int syncmethod = m_configDialog->getSyncMode(); - QString syncmethod_new = ""; + TQString syncmethod_new = ""; if (syncmethod == 1) { syncmethod_new = "rsync_upload"; } @@ -1093,19 +1093,19 @@ void RsyncPlugin::slotSync() m_pSyncNow->setEnabled (false); - QString syncmethod = findSyncMethodByName(url.directory(true, true) + QString("/") + url.fileName(true)); + TQString syncmethod = findSyncMethodByName(url.directory(true, true) + TQString("/") + url.fileName(true)); if (syncmethod == NULL) { // Do nothing } else if (syncmethod == "rsync_upload") { // Initiate rsync - syncUnidirectional(QString("rsync"), QString(" -avtzAXE --delete --progress "), 0, url.directory(true, true) + QString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true))); + syncUnidirectional(TQString("rsync"), TQString(" -avtzAXE --delete --progress "), 0, url.directory(true, true) + TQString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true))); } else if (syncmethod == "rsync_download") { - syncUnidirectional(QString("rsync"), QString(" -avtzAXE --delete --progress "), 1, url.directory(true, true) + QString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true))); + syncUnidirectional(TQString("rsync"), TQString(" -avtzAXE --delete --progress "), 1, url.directory(true, true) + TQString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true))); } else if (syncmethod == "rsync_bidirectional") { - syncBidirectional(QString("unison"), QString(" -ui text -auto "), 1, url.directory(true, true) + QString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + QString("/") + url.fileName(true))); + syncBidirectional(TQString("unison"), TQString(" -ui text -auto "), 1, url.directory(true, true) + TQString("/") + url.fileName(true), findLocalFolderByName(url.directory(true, true) + TQString("/") + url.fileName(true))); } m_progressDialogExists = false; diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h index 67af3d5..0adbfc0 100644 --- a/konq-plugins/rsync/rsyncplugin.h +++ b/konq-plugins/rsync/rsyncplugin.h @@ -19,8 +19,8 @@ #ifndef __RSYNC_PLUGIN_H #define __RSYNC_PLUGIN_H -#include <qmap.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqstringlist.h> #include <kurl.h> #include <kprocess.h> @@ -51,27 +51,27 @@ class RsyncPlugin : public KParts::Plugin public: - RsyncPlugin (QObject* parent, const char* name, const QStringList &); + RsyncPlugin (TQObject* parent, const char* name, const TQStringList &); virtual ~RsyncPlugin(); protected: void loadSettings(); void saveSettings(); - QString findLocalFolderByName(QString folderurl); - QString findLoginSyncEnabledByName(QString folderurl); - QString findLogoutSyncEnabledByName(QString folderurl); - QString findTimedSyncEnabledByName(QString folderurl); - int deleteLocalFolderByName(QString folderurl); - int addLocalFolderByName(QString folderurl, QString remoteurl, QString syncmethod, QString excludelist, QString sync_on_login, QString sync_on_logout, QString sync_timed_interval); - QString findSyncMethodByName(QString folderurl); + TQString findLocalFolderByName(TQString folderurl); + TQString findLoginSyncEnabledByName(TQString folderurl); + TQString findLogoutSyncEnabledByName(TQString folderurl); + TQString findTimedSyncEnabledByName(TQString folderurl); + int deleteLocalFolderByName(TQString folderurl); + int addLocalFolderByName(TQString folderurl, TQString remoteurl, TQString syncmethod, TQString excludelist, TQString sync_on_login, TQString sync_on_logout, TQString sync_timed_interval); + TQString findSyncMethodByName(TQString folderurl); /** manages initial communication setup including password queries */ int establishConnectionRsync(char *buffer, KIO::fileoffset_t len); /** manages initial communication setup including password queries */ - int establishConnectionUnison(char *buffer, KIO::fileoffset_t len, QString localfolder, QString remotepath); + int establishConnectionUnison(char *buffer, KIO::fileoffset_t len, TQString localfolder, TQString remotepath); /** creates the unidirectional sync subprocess */ - bool syncUnidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath); + bool syncUnidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath); /** creates the bidirectional sync subprocess */ - bool syncBidirectional(QString synccommand, QString syncflags, int parameter_order, QString localfolder, QString remotepath); + bool syncBidirectional(TQString synccommand, TQString syncflags, int parameter_order, TQString localfolder, TQString remotepath); /** writes one chunk of data to stdin of child process */ void writeChild(const char *buf, KIO::fileoffset_t len); /** AuthInfo object used for logging in */ @@ -100,7 +100,7 @@ private: KProgressBoxDialog* m_progressDialog; RsyncConfigDialog* m_configDialog; - QStringList cfgfolderlist; + TQStringList cfgfolderlist; bool m_progressDialogExists; bool m_bSettingsLoaded; @@ -122,14 +122,14 @@ private: /** // FIXME: just a workaround for konq deficiencies */ bool isStat; /** // FIXME: just a workaround for konq deficiencies */ - QString redirectUser, redirectPass; + TQString redirectUser, redirectPass; /** user name of current connection */ - QString connectionUser; + TQString connectionUser; /** password of current connection */ - QString connectionPassword; + TQString connectionPassword; /** true if this is the first login attempt (== use cached password) */ bool firstLogin; - QString thisFn; + TQString thisFn; }; #endif diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 739a871..b8cd24c 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -45,11 +45,11 @@ #include <kparts/mainwindow.h> #include <kparts/partmanager.h> -#include <qpainter.h> -#include <qpopupmenu.h> -#include <qtimer.h> -#include <qstyle.h> -#include <qwhatsthis.h> +#include <tqpainter.h> +#include <tqpopupmenu.h> +#include <tqtimer.h> +#include <tqstyle.h> +#include <tqwhatsthis.h> #include "searchbar.h" typedef KGenericFactory<SearchBarPlugin> SearchBarPluginFactory; @@ -57,8 +57,8 @@ K_EXPORT_COMPONENT_FACTORY(libsearchbarplugin, SearchBarPluginFactory("searchbarplugin")) -SearchBarPlugin::SearchBarPlugin(QObject *parent, const char *name, - const QStringList &) : +SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, + const TQStringList &) : KParts::Plugin(parent, name), m_searchCombo(0), m_searchMode(UseSearchProvider), @@ -81,15 +81,15 @@ SearchBarPlugin::SearchBarPlugin(QObject *parent, const char *name, 0, 0, actionCollection(), "toolbar_search_bar"); m_searchComboAction->setShortcutConfigurable(false); - connect(m_searchCombo, SIGNAL(activated(const QString &)), - SLOT(startSearch(const QString &))); - connect(m_searchCombo, SIGNAL(iconClicked()), SLOT(showSelectionMenu())); + connect(m_searchCombo, TQT_SIGNAL(activated(const TQString &)), + TQT_SLOT(startSearch(const TQString &))); + connect(m_searchCombo, TQT_SIGNAL(iconClicked()), TQT_SLOT(showSelectionMenu())); - QWhatsThis::add(m_searchCombo, i18n("Search Bar<p>" + TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>" "Enter a search term. Click on the icon to change search mode or provider.")); new KAction( i18n( "Focus Searchbar" ), CTRL+Key_S, - this, SLOT(focusSearchbar()), + this, TQT_SLOT(focusSearchbar()), actionCollection(), "focus_search_bar"); configurationChanged(); @@ -100,15 +100,15 @@ SearchBarPlugin::SearchBarPlugin(QObject *parent, const char *name, KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager")); if (partMan) { - connect(partMan, SIGNAL(activePartChanged(KParts::Part*)), - SLOT (partChanged (KParts::Part*))); + connect(partMan, TQT_SIGNAL(activePartChanged(KParts::Part*)), + TQT_SLOT (partChanged (KParts::Part*))); partChanged(partMan->activePart()); } - connect(this, SIGNAL(gsCompleteDelayed()), SLOT(gsStartDelay())); - connect(&m_gsTimer, SIGNAL(timeout()), SLOT(gsMakeCompletionList())); - connect(m_searchCombo->listBox(), SIGNAL(highlighted(const QString&)), SLOT(gsSetCompletedText(const QString&))); - connect(m_searchCombo, SIGNAL(activated(const QString&)), SLOT(gsPutTextInBox(const QString&))); + connect(this, TQT_SIGNAL(gsCompleteDelayed()), TQT_SLOT(gsStartDelay())); + connect(&m_gsTimer, TQT_SIGNAL(timeout()), TQT_SLOT(gsMakeCompletionList())); + connect(m_searchCombo->listBox(), TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(gsSetCompletedText(const TQString&))); + connect(m_searchCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(gsPutTextInBox(const TQString&))); } SearchBarPlugin::~SearchBarPlugin() @@ -123,19 +123,19 @@ SearchBarPlugin::~SearchBarPlugin() m_searchCombo = 0L; } -QChar delimiter() +TQChar delimiter() { KConfig config( "kuriikwsfilterrc", true, false ); config.setGroup( "General" ); return config.readNumEntry( "KeywordDelimiter", ':' ); } -bool SearchBarPlugin::eventFilter(QObject *o, QEvent *e) +bool SearchBarPlugin::eventFilter(TQObject *o, TQEvent *e) { - if( o==m_searchCombo->lineEdit() && e->type() == QEvent::KeyPress ) + if( o==m_searchCombo->lineEdit() && e->type() == TQEvent::KeyPress ) { - QKeyEvent *k = (QKeyEvent *)e; - QString text = k->text(); + TQKeyEvent *k = (TQKeyEvent *)e; + TQString text = k->text(); if(!text.isEmpty()) { if(k->key() != Qt::Key_Return && k->key() != Key_Enter && k->key() != Key_Escape) @@ -206,7 +206,7 @@ void SearchBarPlugin::nextSearchEntry() } else { - QStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); it++; if(it==m_searchEngines.end()) { @@ -236,7 +236,7 @@ void SearchBarPlugin::previousSearchEntry() } else { - QStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); if(it==m_searchEngines.begin()) { m_searchMode = FindInThisPage; @@ -250,7 +250,7 @@ void SearchBarPlugin::previousSearchEntry() setIcon(); } -void SearchBarPlugin::startSearch(const QString &_search) +void SearchBarPlugin::startSearch(const TQString &_search) { if(m_urlEnterLock || _search.isEmpty() || !m_part) return; @@ -258,7 +258,7 @@ void SearchBarPlugin::startSearch(const QString &_search) m_gsTimer.stop(); m_searchCombo->listBox()->hide(); - QString search = _search.section('(', 0, 0).stripWhiteSpace(); + TQString search = _search.section('(', 0, 0).stripWhiteSpace(); if(m_searchMode == FindInThisPage) { @@ -270,18 +270,18 @@ void SearchBarPlugin::startSearch(const QString &_search) m_urlEnterLock = true; KService::Ptr service; KURIFilterData data; - QStringList list; + TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_currentEngine)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine)); if (service) { - const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); + const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + search ); } if(!service || !KURIFilter::self()->filterURI(data, list)) { - data.setData( QString::fromLatin1( "google" ) + delimiter() + search ); + data.setData( TQString::fromLatin1( "google" ) + delimiter() + search ); KURIFilter::self()->filterURI( data, list ); } @@ -315,7 +315,7 @@ void SearchBarPlugin::startSearch(const QString &_search) void SearchBarPlugin::setIcon() { - QString hinttext; + TQString hinttext; if(m_searchMode == FindInThisPage) { m_searchIcon = SmallIcon("find"); @@ -323,28 +323,28 @@ void SearchBarPlugin::setIcon() } else { - QString providername; + TQString providername; KService::Ptr service; KURIFilterData data; - QStringList list; + TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(m_currentEngine)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(m_currentEngine)); if (service) { - const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); + const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + "some keyword" ); } if (service && KURIFilter::self()->filterURI(data, list)) { - QString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); + TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); if(iconPath.isEmpty()) { m_searchIcon = SmallIcon("enhanced_browsing"); } else { - m_searchIcon = QPixmap(iconPath); + m_searchIcon = TQPixmap(iconPath); } providername = service->name(); } @@ -358,13 +358,13 @@ void SearchBarPlugin::setIcon() static_cast<KLineEdit*>(m_searchCombo->lineEdit())->setClickMessage(hinttext); // Create a bit wider icon with arrow - QPixmap arrowmap = QPixmap(m_searchIcon.width()+5,m_searchIcon.height()+5); + TQPixmap arrowmap = TQPixmap(m_searchIcon.width()+5,m_searchIcon.height()+5); arrowmap.fill(m_searchCombo->lineEdit()->backgroundColor()); - QPainter p( &arrowmap ); + TQPainter p( &arrowmap ); p.drawPixmap(0, 2, m_searchIcon); - QStyle::SFlags arrowFlags = QStyle::Style_Default; - m_searchCombo->style().drawPrimitive(QStyle::PE_ArrowDown, &p, QRect(arrowmap.width()-6, - arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, QStyleOption() ); + TQStyle::SFlags arrowFlags = TQStyle::Style_Default; + m_searchCombo->style().drawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, + arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() ); p.end(); m_searchIcon = arrowmap; @@ -376,54 +376,54 @@ void SearchBarPlugin::showSelectionMenu() if(!m_popupMenu) { KService::Ptr service; - QPixmap icon; + TQPixmap icon; KURIFilterData data; - QStringList list; + TQStringList list; list << "kurisearchfilter" << "kuriikwsfilter"; - m_popupMenu = new QPopupMenu(m_searchCombo, "search selection menu"); - m_popupMenu->insertItem(SmallIcon("find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()), 0, 999); + m_popupMenu = new TQPopupMenu(m_searchCombo, "search selection menu"); + m_popupMenu->insertItem(SmallIcon("find"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); m_popupMenu->insertSeparator(); int i=-1; - for (QStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it ) + for (TQStringList::ConstIterator it = m_searchEngines.begin(); it != m_searchEngines.end(); ++it ) { i++; - service = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(*it)); + service = KService::serviceByDesktopPath(TQString("searchproviders/%1.desktop").arg(*it)); if(!service) { continue; } - const QString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); + const TQString searchProviderPrefix = *(service->property("Keys").toStringList().begin()) + delimiter(); data.setData( searchProviderPrefix + "some keyword" ); if(KURIFilter::self()->filterURI(data, list)) { - QString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); + TQString iconPath = locate("cache", KMimeType::favIconForURL(data.uri()) + ".png"); if(iconPath.isEmpty()) { icon = SmallIcon("enhanced_browsing"); } else { - icon = QPixmap( iconPath ); + icon = TQPixmap( iconPath ); } m_popupMenu->insertItem(icon, service->name(), i); } } m_popupMenu->insertSeparator(); - m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, SLOT(selectGoogleSuggestMode()), m_popupMenu); - QStringList google_modes; + m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu); + TQStringList google_modes; google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never"); m_googleMenu->setItems(google_modes); m_googleMenu->plug(m_popupMenu); m_popupMenu->insertItem(SmallIcon("enhanced_browsing"), i18n("Select Search Engines..."), - this, SLOT(selectSearchEngines()), 0, 1000); - connect(m_popupMenu, SIGNAL(activated(int)), SLOT(useSearchProvider(int))); + this, TQT_SLOT(selectSearchEngines()), 0, 1000); + connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(useSearchProvider(int))); } m_googleMenu->setCurrentItem(m_googleMode); - m_popupMenu->popup(m_searchCombo->mapToGlobal(QPoint(0, m_searchCombo->height() + 1)), 0); + m_popupMenu->popup(m_searchCombo->mapToGlobal(TQPoint(0, m_searchCombo->height() + 1)), 0); } void SearchBarPlugin::useFindInThisPage() @@ -450,7 +450,7 @@ void SearchBarPlugin::selectSearchEngines() *process << "kcmshell" << "ebrowsing"; - connect(process, SIGNAL(processExited(KProcess *)), SLOT(searchEnginesSelected(KProcess *))); + connect(process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(searchEnginesSelected(KProcess *))); if(!process->start()) { @@ -476,9 +476,9 @@ void SearchBarPlugin::configurationChanged() { KConfig *config = new KConfig("kuriikwsfilterrc"); config->setGroup("General"); - QString engine = config->readEntry("DefaultSearchEngine", "google"); + TQString engine = config->readEntry("DefaultSearchEngine", "google"); - QStringList favoriteEngines; + TQStringList favoriteEngines; favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia"; favoriteEngines = config->readListEntry("FavoriteSearchEngines", favoriteEngines); @@ -486,7 +486,7 @@ void SearchBarPlugin::configurationChanged() m_popupMenu = 0; m_searchEngines.clear(); m_searchEngines << engine; - for (QStringList::ConstIterator it = favoriteEngines.begin(); it != favoriteEngines.end(); ++it ) + for (TQStringList::ConstIterator it = favoriteEngines.begin(); it != favoriteEngines.end(); ++it ) if(*it!=engine) m_searchEngines << *it; @@ -518,7 +518,7 @@ void SearchBarPlugin::partChanged(KParts::Part *newPart) m_part = ::qt_cast<KHTMLPart*>(newPart); //Delay since when destroying tabs part 0 gets activated for a bit, before the proper part - QTimer::singleShot(0, this, SLOT(updateComboVisibility())); + TQTimer::singleShot(0, this, TQT_SLOT(updateComboVisibility())); } void SearchBarPlugin::updateComboVisibility() @@ -537,24 +537,24 @@ void SearchBarPlugin::updateComboVisibility() void SearchBarPlugin::focusSearchbar() { - QFocusEvent::setReason( QFocusEvent::Shortcut ); + TQFocusEvent::setReason( TQFocusEvent::Shortcut ); m_searchCombo->setFocus(); - QFocusEvent::resetReason(); + TQFocusEvent::resetReason(); } -SearchBarCombo::SearchBarCombo(QWidget *parent, const char *name) : +SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) : KHistoryCombo(parent, name), m_pluginActive(true) { - connect(this, SIGNAL(cleared()), SLOT(historyCleared())); + connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared())); } -const QPixmap &SearchBarCombo::icon() const +const TQPixmap &SearchBarCombo::icon() const { return m_icon; } -void SearchBarCombo::setIcon(const QPixmap &icon) +void SearchBarCombo::setIcon(const TQPixmap &icon) { m_icon = icon; @@ -571,7 +571,7 @@ void SearchBarCombo::setIcon(const QPixmap &icon) } } -int SearchBarCombo::findHistoryItem(const QString &searchText) +int SearchBarCombo::findHistoryItem(const TQString &searchText) { for(int i = 0; i < count(); i++) { @@ -584,9 +584,9 @@ int SearchBarCombo::findHistoryItem(const QString &searchText) return -1; } -void SearchBarCombo::mousePressEvent(QMouseEvent *e) +void SearchBarCombo::mousePressEvent(TQMouseEvent *e) { - int x0 = QStyle::visualRect( style().querySubControlMetrics( QStyle::CC_ComboBox, this, QStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if(e->x() > x0 + 2 && e->x() < lineEdit()->x()) { @@ -649,20 +649,20 @@ void SearchBarPlugin::gsMakeCompletionList() { KIO::TransferJob* tj = KIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false); - connect(tj, SIGNAL(data(KIO::Job*, const QByteArray&)), this, SLOT(gsDataArrived(KIO::Job*, const QByteArray&))); - connect(tj, SIGNAL(result(KIO::Job*)), this, SLOT(gsJobFinished(KIO::Job*))); + connect(tj, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(KIO::Job*, const TQByteArray&))); + connect(tj, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(gsJobFinished(KIO::Job*))); } } -void SearchBarPlugin::gsDataArrived(KIO::Job*, const QByteArray& data) +void SearchBarPlugin::gsDataArrived(KIO::Job*, const TQByteArray& data) { - m_gsData += QString::fromUtf8(data.data()); + m_gsData += TQString::fromUtf8(data.data()); } -static QString reformatNumber(const QString& number) +static TQString reformatNumber(const TQString& number) { static const char suffix[] = { 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y' }; - QString s = number.stripWhiteSpace(); + TQString s = number.stripWhiteSpace(); uint c = 0; for (int i = s.length() - 1; i > 0 && s[i] == '0'; --i) ++c; c /= 3; @@ -676,18 +676,18 @@ void SearchBarPlugin::gsJobFinished(KIO::Job* job) { if (((KIO::TransferJob*)job)->error() == 0) { - QString temp; + TQString temp; temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1); temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1); temp.remove('"'); - QStringList compList1 = QStringList::split(',', temp); + TQStringList compList1 = TQStringList::split(',', temp); temp = m_gsData.mid(m_gsData.find(')') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1); temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1); temp.remove('"'); temp.remove(','); temp.remove('s'); - QStringList compList2 = QStringList::split("reult", temp); - QStringList finalList; + TQStringList compList2 = TQStringList::split("reult", temp); + TQStringList finalList; for(uint j = 0; j < compList1.count(); j++) { if (m_googleMode!=ForAll || m_currentEngine == "google") @@ -710,9 +710,9 @@ void SearchBarPlugin::gsJobFinished(KIO::Job* job) m_gsData = ""; } -void SearchBarPlugin::gsSetCompletedText(const QString& text) +void SearchBarPlugin::gsSetCompletedText(const TQString& text) { - QString currentText; + TQString currentText; if (m_searchCombo->lineEdit()->hasSelectedText()) currentText = m_searchCombo->currentText().left(m_searchCombo->lineEdit()->selectionStart()); else @@ -725,7 +725,7 @@ void SearchBarPlugin::gsSetCompletedText(const QString& text) } } -void SearchBarPlugin::gsPutTextInBox(const QString& text) +void SearchBarPlugin::gsPutTextInBox(const TQString& text) { m_searchCombo->lineEdit()->setText(text.section('(', 0, 0).stripWhiteSpace()); } diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index 25e7ded..2bce26d 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -27,9 +27,9 @@ #include <kparts/plugin.h> #include <kparts/mainwindow.h> -#include <qguardedptr.h> -#include <qpixmap.h> -#include <qstring.h> +#include <tqguardedptr.h> +#include <tqpixmap.h> +#include <tqstring.h> class KHTMLPart; class KProcess; @@ -47,23 +47,23 @@ class SearchBarCombo : public KHistoryCombo /** * Constructor. */ - SearchBarCombo(QWidget *parent, const char *name); + SearchBarCombo(TQWidget *parent, const char *name); /** * Returns the icon currently displayed in the combo box. */ - const QPixmap &icon() const; + const TQPixmap &icon() const; /** * Sets the icon displayed in the combo box. */ - void setIcon(const QPixmap &icon); + void setIcon(const TQPixmap &icon); /** * Finds a history item by its text. * @return The item number, or -1 if the item is not found. */ - int findHistoryItem(const QString &text); + int findHistoryItem(const TQString &text); /** * Sets whether the plugin is active. It can be inactive @@ -85,13 +85,13 @@ class SearchBarCombo : public KHistoryCombo * Captures mouse clicks and emits iconClicked() if the icon * was clicked. */ - virtual void mousePressEvent(QMouseEvent *e); + virtual void mousePressEvent(TQMouseEvent *e); private slots: void historyCleared(); private: - QPixmap m_icon; + TQPixmap m_icon; bool m_pluginActive; }; @@ -111,19 +111,19 @@ class SearchBarPlugin : public KParts::Plugin /** Possible search modes */ enum SearchModes { FindInThisPage = 0, UseSearchProvider }; - SearchBarPlugin(QObject *parent, const char *name, - const QStringList &); + SearchBarPlugin(TQObject *parent, const char *name, + const TQStringList &); virtual ~SearchBarPlugin(); protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(TQObject *o, TQEvent *e); private slots: /** * Starts a search by putting the query URL from the selected * search provider in the locationbar and calling goURL() */ - void startSearch(const QString &search); + void startSearch(const TQString &search); /** * Sets the icon to indicate which search engine is used. @@ -157,10 +157,10 @@ class SearchBarPlugin : public KParts::Plugin void selectGoogleSuggestMode(); void gsStartDelay(); void gsMakeCompletionList(); - void gsDataArrived(KIO::Job*, const QByteArray& data); + void gsDataArrived(KIO::Job*, const TQByteArray& data); void gsJobFinished(KIO::Job* job); - void gsSetCompletedText(const QString& text); - void gsPutTextInBox(const QString& text); + void gsSetCompletedText(const TQString& text); + void gsPutTextInBox(const TQString& text); signals: @@ -172,22 +172,22 @@ class SearchBarPlugin : public KParts::Plugin void nextSearchEntry(); void previousSearchEntry(); - QGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<KHTMLPart> m_part; SearchBarCombo *m_searchCombo; KWidgetAction *m_searchComboAction; - QPopupMenu *m_popupMenu; + TQPopupMenu *m_popupMenu; KSelectAction *m_googleMenu; - QPixmap m_searchIcon; + TQPixmap m_searchIcon; SearchModes m_searchMode; - QString m_providerName; + TQString m_providerName; bool m_urlEnterLock; - QString m_currentEngine; - QStringList m_searchEngines; + TQString m_currentEngine; + TQStringList m_searchEngines; // Google Suggest private members - QTimer m_gsTimer; - QString m_gsData; + TQTimer m_gsTimer; + TQString m_gsData; enum GoogleMode {GoogleOnly,ForAll,Never}; GoogleMode m_googleMode; }; diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index 64e626d..5e3b0b3 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -24,18 +24,18 @@ #include <kglobal.h> #include <klocale.h> -BookmarkListItem::BookmarkListItem( QListView *parent, const QString & url, const QString & desc, time_t time ) +BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) : KListViewItem( parent ), m_desc( desc ) { m_url = KURL::fromPathOrURL( url ); m_dateTime.setTime_t( time ); } -int BookmarkListItem::compare( QListViewItem * i, int col, bool ascending ) const +int BookmarkListItem::compare( TQListViewItem * i, int col, bool ascending ) const { if ( col == 1 ) { - QDateTime them = static_cast<BookmarkListItem *>( i )->date(); + TQDateTime them = static_cast<BookmarkListItem *>( i )->date(); if ( m_dateTime < them ) return -1; else if ( m_dateTime > them ) @@ -43,17 +43,17 @@ int BookmarkListItem::compare( QListViewItem * i, int col, bool ascending ) cons else return 0; } - return QListViewItem::compare( i, col, ascending ); + return TQListViewItem::compare( i, col, ascending ); } -QString BookmarkListItem::text( int column ) const +TQString BookmarkListItem::text( int column ) const { if ( column == 0 ) return m_desc; else if ( column == 1 ) return KGlobal::locale()->formatDateTime( m_dateTime ); - return QString::null; + return TQString::null; } KURL BookmarkListItem::url() const @@ -61,12 +61,12 @@ KURL BookmarkListItem::url() const return m_url; } -QDateTime BookmarkListItem::date() const +TQDateTime BookmarkListItem::date() const { return m_dateTime; } -QString BookmarkListItem::desc() const +TQString BookmarkListItem::desc() const { return m_desc; } diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h index 5e60022..392eab8 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.h +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h @@ -22,7 +22,7 @@ #ifndef _BOOKMARKLISTITEM_H_ #define _BOOKMARKLISTITEM_H_ -#include <qdatetime.h> +#include <tqdatetime.h> #include <klistview.h> #include <kurl.h> @@ -34,18 +34,18 @@ class QString; class BookmarkListItem: public KListViewItem { public: - BookmarkListItem( QListView *parent, const QString & url, const QString & desc, time_t time ); + BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); KURL url() const; - QDateTime date() const; - QString desc() const; + TQDateTime date() const; + TQString desc() const; protected: - virtual int compare( QListViewItem * i, int col, bool ascending ) const; - virtual QString text( int column ) const; + virtual int compare( TQListViewItem * i, int col, bool ascending ) const; + virtual TQString text( int column ) const; KURL m_url; - QString m_desc; - QDateTime m_dateTime; + TQString m_desc; + TQDateTime m_dateTime; }; #endif diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 1b76c94..612be03 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -24,12 +24,12 @@ #include "tagListItem.h" #include "bookmarkListItem.h" -#include <qlistview.h> -#include <qdom.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qtimer.h> -#include <qdatetime.h> +#include <tqlistview.h> +#include <tqdom.h> +#include <tqpopupmenu.h> +#include <tqpushbutton.h> +#include <tqtimer.h> +#include <tqdatetime.h> #include <kdebug.h> #include <kio/job.h> @@ -42,7 +42,7 @@ #include <kconfig.h> #include <kinputdialog.h> -MainWidget::MainWidget( KConfig * config, QWidget * parent ) +MainWidget::MainWidget( KConfig * config, TQWidget * parent ) : MainWidget_base( parent ), m_config( config ) { loadTags(); @@ -53,28 +53,28 @@ MainWidget::MainWidget( KConfig * config, QWidget * parent ) btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", KIcon::Small ) ); btnNew->setIconSet( il->loadIconSet( "bookmark_add", KIcon::Small ) ); - connect( ( QWidget * ) btnRefreshTags, SIGNAL( clicked() ), - this, SLOT( slotGetTags() ) ); + connect( ( TQWidget * ) btnRefreshTags, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotGetTags() ) ); - connect( ( QWidget * ) btnRefreshBookmarks, SIGNAL( clicked() ), - this, SLOT( slotGetBookmarks() ) ); + connect( ( TQWidget * ) btnRefreshBookmarks, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotGetBookmarks() ) ); - connect( ( QWidget * ) btnNew, SIGNAL( clicked() ), - this, SLOT( slotNewBookmark() ) ); + connect( ( TQWidget * ) btnNew, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( slotNewBookmark() ) ); - connect( lvBookmarks, SIGNAL( executed( QListViewItem * ) ), - this, SLOT( slotBookmarkExecuted( QListViewItem * ) ) ); - connect( lvBookmarks, SIGNAL( mouseButtonClicked ( int, QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotBookmarkClicked( int, QListViewItem *, const QPoint &, int ) ) ); + connect( lvBookmarks, TQT_SIGNAL( executed( TQListViewItem * ) ), + this, TQT_SLOT( slotBookmarkExecuted( TQListViewItem * ) ) ); + connect( lvBookmarks, TQT_SIGNAL( mouseButtonClicked ( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotBookmarkClicked( int, TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvTags, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotTagsContextMenu( QListViewItem *, const QPoint &, int ) ) ); + connect( lvTags, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotTagsContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvBookmarks, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint &, int ) ), - this, SLOT( slotBookmarksContextMenu( QListViewItem *, const QPoint &, int ) ) ); + connect( lvBookmarks, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( slotBookmarksContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - m_updateTimer = new QTimer( this ); - connect( m_updateTimer, SIGNAL( timeout() ), SLOT( slotGetBookmarks() ) ); + m_updateTimer = new TQTimer( this ); + connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotGetBookmarks() ) ); slotGetTags(); } @@ -94,8 +94,8 @@ void MainWidget::slotGetTags() kdDebug() << k_funcinfo << endl; KIO::StoredTransferJob * job = KIO::storedGet( "http://del.icio.us/api/tags/get" ); - connect( job, SIGNAL( result( KIO::Job * ) ), - this, SLOT( slotFillTags( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), + this, TQT_SLOT( slotFillTags( KIO::Job * ) ) ); } void MainWidget::slotFillTags( KIO::Job * job ) @@ -112,17 +112,17 @@ void MainWidget::slotFillTags( KIO::Job * job ) m_tags.clear(); // fill lvTags with job->data() - QDomDocument doc; + TQDomDocument doc; doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() ); - QDomNodeList tags = doc.elementsByTagName( "tag" ); + TQDomNodeList tags = doc.elementsByTagName( "tag" ); for ( uint i = 0; i < tags.length(); ++i ) { - QDomElement tag = tags.item( i ).toElement(); + TQDomElement tag = tags.item( i ).toElement(); if ( !tag.isNull() ) { TagListItem *item = new TagListItem( lvTags, tag.attribute( "tag" ), tag.attribute( "count" ).toInt() ); m_tags.append( tag.attribute( "tag" ) ); - connect( item, SIGNAL( signalItemChecked( TagListItem * ) ), SLOT( itemToggled() ) ); + connect( item, TQT_SIGNAL( signalItemChecked( TagListItem * ) ), TQT_SLOT( itemToggled() ) ); } } } @@ -135,8 +135,8 @@ void MainWidget::slotGetBookmarks() kdDebug() << k_funcinfo << url.url() << endl; KIO::StoredTransferJob * job = KIO::storedGet( url ); - connect( job, SIGNAL( result( KIO::Job * ) ), - this, SLOT( slotFillBookmarks( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), + this, TQT_SLOT( slotFillBookmarks( KIO::Job * ) ) ); } void MainWidget::slotFillBookmarks( KIO::Job * job ) @@ -152,13 +152,13 @@ void MainWidget::slotFillBookmarks( KIO::Job * job ) lvBookmarks->clear(); // fill lvBookmarks with job->data() - QDomDocument doc; + TQDomDocument doc; doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() ); - QDomNodeList posts = doc.elementsByTagName( "post" ); + TQDomNodeList posts = doc.elementsByTagName( "post" ); for ( uint i = 0; i < posts.length(); ++i ) { - QDomElement post = posts.item( i ).toElement(); + TQDomElement post = posts.item( i ).toElement(); if ( !post.isNull() ) { new BookmarkListItem( lvBookmarks, post.attribute( "href" ), post.attribute( "description" ), @@ -167,11 +167,11 @@ void MainWidget::slotFillBookmarks( KIO::Job * job ) } } -QStringList MainWidget::checkedTags() const +TQStringList MainWidget::checkedTags() const { - QListViewItemIterator it( lvTags, QListViewItemIterator::Visible | QListViewItemIterator::Checked ); + TQListViewItemIterator it( lvTags, TQListViewItemIterator::Visible | TQListViewItemIterator::Checked ); - QStringList tmp; + TQStringList tmp; while ( it.current() ) { @@ -182,7 +182,7 @@ QStringList MainWidget::checkedTags() const return tmp; } -void MainWidget::slotBookmarkExecuted( QListViewItem * item ) +void MainWidget::slotBookmarkExecuted( TQListViewItem * item ) { BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( item ); if ( bookmark ) @@ -192,7 +192,7 @@ void MainWidget::slotBookmarkExecuted( QListViewItem * item ) } } -void MainWidget::slotBookmarkClicked( int button, QListViewItem * item, const QPoint &, int ) +void MainWidget::slotBookmarkClicked( int button, TQListViewItem * item, const TQPoint &, int ) { BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( item ); if ( bookmark && button == Qt::MidButton ) // handle middle click @@ -202,16 +202,16 @@ void MainWidget::slotBookmarkClicked( int button, QListViewItem * item, const QP } } -QStringList MainWidget::tags() const +TQStringList MainWidget::tags() const { return m_tags; } -QStringList MainWidget::bookmarks() const +TQStringList MainWidget::bookmarks() const { - QListViewItemIterator it( lvBookmarks ); + TQListViewItemIterator it( lvBookmarks ); - QStringList tmp; + TQStringList tmp; while ( it.current() ) { @@ -222,30 +222,30 @@ QStringList MainWidget::bookmarks() const return tmp; } -void MainWidget::slotTagsContextMenu( QListViewItem *, const QPoint & pos, int ) +void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int ) { if ( lvTags->childCount() == 0 ) return; - QPopupMenu * tagMenu = new QPopupMenu( this ); + TQPopupMenu * tagMenu = new TQPopupMenu( this ); Q_CHECK_PTR( tagMenu ); - tagMenu->insertItem( i18n( "Check All" ), this, SLOT( slotCheckAllTags() ) ); - tagMenu->insertItem( i18n( "Uncheck All" ), this, SLOT( slotUncheckAllTags() ) ); - tagMenu->insertItem( i18n( "Toggle All" ), this, SLOT( slotToggleTags() ) ); + tagMenu->insertItem( i18n( "Check All" ), this, TQT_SLOT( slotCheckAllTags() ) ); + tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) ); + tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) ); tagMenu->insertSeparator(); tagMenu->insertItem( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small ), - i18n( "Rename Tag..." ), this, SLOT( slotRenameTag() ) ); + i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) ); tagMenu->exec( pos ); } void MainWidget::slotCheckAllTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast<QCheckListItem *>( *it ); + TQCheckListItem * item = static_cast<TQCheckListItem *>( *it ); if ( item ) item->setOn( true ); ++it; @@ -254,10 +254,10 @@ void MainWidget::slotCheckAllTags() void MainWidget::slotUncheckAllTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast<QCheckListItem *>( *it ); + TQCheckListItem * item = static_cast<TQCheckListItem *>( *it ); if ( item ) item->setOn( false ); ++it; @@ -266,10 +266,10 @@ void MainWidget::slotUncheckAllTags() void MainWidget::slotToggleTags() { - QListViewItemIterator it( lvTags ); + TQListViewItemIterator it( lvTags ); while ( it.current() ) { - QCheckListItem * item = static_cast<QCheckListItem *>( *it ); + TQCheckListItem * item = static_cast<TQCheckListItem *>( *it ); if ( item ) item->setOn( !item->isOn() ); ++it; @@ -301,8 +301,8 @@ void MainWidget::slotRenameTag() TagListItem * tag = static_cast<TagListItem *>( lvTags->currentItem() ); if ( tag ) { - QString oldName = tag->name(); - QString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) ); + TQString oldName = tag->name(); + TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) ); if ( !newName.isEmpty() ) { KURL url( "http://del.icio.us/api/tags/rename" ); @@ -315,16 +315,16 @@ void MainWidget::slotRenameTag() } } -void MainWidget::slotBookmarksContextMenu( QListViewItem *, const QPoint & pos, int ) +void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos, int ) { if ( lvBookmarks->childCount() == 0 ) return; - QPopupMenu * menu = new QPopupMenu( this ); + TQPopupMenu * menu = new TQPopupMenu( this ); Q_CHECK_PTR( menu ); menu->insertItem( KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small ), - i18n( "Delete Bookmark" ), this, SLOT( slotDeleteBookmark() ) ); + i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) ); menu->exec( pos ); } diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h index fdaa9ea..59be8d6 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.h +++ b/konq-plugins/sidebar/delicious/mainWidget.h @@ -39,20 +39,20 @@ class MainWidget: public MainWidget_base { Q_OBJECT public: - MainWidget( KConfig * config, QWidget * parent ); + MainWidget( KConfig * config, TQWidget * parent ); ~MainWidget(); /** * @return all the tags user has * (used in the DCOP iface) */ - QStringList tags() const; + TQStringList tags() const; /** * @return all the (currently visible) bookmark (URLs) * (used in the DCOP iface) */ - QStringList bookmarks() const; + TQStringList bookmarks() const; /** * Set the internal URL to @p url @@ -92,22 +92,22 @@ private slots: /** * Handle clicking on a bookmark (KDE mode) */ - void slotBookmarkExecuted( QListViewItem * item ); + void slotBookmarkExecuted( TQListViewItem * item ); /** * Handle middle clicking a bookmark */ - void slotBookmarkClicked( int button, QListViewItem * item, const QPoint & pnt, int col ); + void slotBookmarkClicked( int button, TQListViewItem * item, const TQPoint & pnt, int col ); /** * Popup a tag context menu over @p item and position @pos */ - void slotTagsContextMenu( QListViewItem * item, const QPoint & pos, int col ); + void slotTagsContextMenu( TQListViewItem * item, const TQPoint & pos, int col ); /** * Popup a bookmark context menu over @p item and position @pos */ - void slotBookmarksContextMenu( QListViewItem * item, const QPoint & pos, int col ); + void slotBookmarksContextMenu( TQListViewItem * item, const TQPoint & pos, int col ); /** * Put a checkmark before all tags @@ -154,7 +154,7 @@ private: /** * @return list of checked tags */ - QStringList checkedTags() const; + TQStringList checkedTags() const; /** * Save the tag list to the config file @@ -166,9 +166,9 @@ private: */ void loadTags(); - QTimer *m_updateTimer; + TQTimer *m_updateTimer; KURL m_currentURL; - QStringList m_tags; + TQStringList m_tags; KConfig * m_config; }; diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index cc5759f..3ed6c09 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -21,24 +21,24 @@ #include "plugin.h" -#include <qstring.h> +#include <tqstring.h> #include <kapplication.h> #include <klocale.h> #include <kglobal.h> -KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, QObject *parent, - QWidget *widgetParent, QString &desktopName_, +KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent, + TQWidget *widgetParent, TQString &desktopName_, const char* name ) : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ), DCOPObject( "sidebar-delicious" ) { m_widget = new MainWidget( instance->config(), widgetParent ); - connect( m_widget, SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), - this, SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( m_widget, SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), - this, SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQT_SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQT_SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); } KonqSidebarDelicious::~KonqSidebarDelicious() @@ -46,12 +46,12 @@ KonqSidebarDelicious::~KonqSidebarDelicious() } -void * KonqSidebarDelicious::provides( const QString & ) +void * KonqSidebarDelicious::provides( const TQString & ) { return 0; } -QWidget * KonqSidebarDelicious::getWidget() +TQWidget * KonqSidebarDelicious::getWidget() { return m_widget; } @@ -68,8 +68,8 @@ bool KonqSidebarDelicious::universalMode() extern "C" { - KDE_EXPORT void* create_konqsidebar_delicious( KInstance *instance, QObject *par, QWidget *widp, - QString &desktopname, const char *name ) + KDE_EXPORT void* create_konqsidebar_delicious( KInstance *instance, TQObject *par, TQWidget *widp, + TQString &desktopname, const char *name ) { KGlobal::locale()->insertCatalogue( "konqsidebar_delicious" ); return new KonqSidebarDelicious( instance, par, widp, desktopname, name ); @@ -78,7 +78,7 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_delicious( QString* fn, QString* /*param*/, QMap<QString,QString> *map ) + KDE_EXPORT bool add_konqsidebar_delicious( TQString* fn, TQString* /*param*/, TQMap<TQString,TQString> *map ) { map->insert("Type", "Link"); map->insert("Icon", "konqsidebar_delicious"); @@ -90,12 +90,12 @@ extern "C" } } -QStringList KonqSidebarDelicious::tags() const +TQStringList KonqSidebarDelicious::tags() const { return m_widget->tags(); } -QStringList KonqSidebarDelicious::bookmarks() const +TQStringList KonqSidebarDelicious::bookmarks() const { return m_widget->bookmarks(); } diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h index cc1479c..34d740f 100644 --- a/konq-plugins/sidebar/delicious/plugin.h +++ b/konq-plugins/sidebar/delicious/plugin.h @@ -42,18 +42,18 @@ class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject Q_OBJECT K_DCOP public: - KonqSidebarDelicious( KInstance * instance, QObject * parent, QWidget * widgetParent, - QString & desktopName_, const char * name = 0 ); + KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent, + TQString & desktopName_, const char * name = 0 ); ~KonqSidebarDelicious(); - virtual void * provides( const QString & ); + virtual void * provides( const TQString & ); /** * @return the main widget */ - virtual QWidget * getWidget(); + virtual TQWidget * getWidget(); k_dcop: - QStringList tags() const; - QStringList bookmarks() const; + TQStringList tags() const; + TQStringList bookmarks() const; void newBookmark(); protected: diff --git a/konq-plugins/sidebar/delicious/tagListItem.cpp b/konq-plugins/sidebar/delicious/tagListItem.cpp index fcafca7..e7396a6 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.cpp +++ b/konq-plugins/sidebar/delicious/tagListItem.cpp @@ -21,20 +21,20 @@ #include "tagListItem.h" -TagListItem::TagListItem( QListView * parent, const QString & tagName, int count ) - : QCheckListItem( parent, tagName, QCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) +TagListItem::TagListItem( TQListView * parent, const TQString & tagName, int count ) + : TQCheckListItem( parent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) { } // virtual void TagListItem::stateChange( bool state ) { - QCheckListItem::stateChange( state ); + TQCheckListItem::stateChange( state ); emit signalItemChecked( this ); } // virtual -int TagListItem::compare( QListViewItem * i, int col, bool ascending ) const +int TagListItem::compare( TQListViewItem * i, int col, bool ascending ) const { if ( col == 1 ) { @@ -46,7 +46,7 @@ int TagListItem::compare( QListViewItem * i, int col, bool ascending ) const else return 0; } - return QCheckListItem::compare( i, col, ascending ); + return TQCheckListItem::compare( i, col, ascending ); } int TagListItem::count() const @@ -55,22 +55,22 @@ int TagListItem::count() const } // virtual -QString TagListItem::text( int column ) const +TQString TagListItem::text( int column ) const { if ( column == 0 ) return m_name; else if ( column == 1 ) - return QString::number( m_count ); + return TQString::number( m_count ); else - return QString::null; + return TQString::null; } -QString TagListItem::name() const +TQString TagListItem::name() const { return m_name; } -void TagListItem::setName( const QString & name ) +void TagListItem::setName( const TQString & name ) { m_name = name; } diff --git a/konq-plugins/sidebar/delicious/tagListItem.h b/konq-plugins/sidebar/delicious/tagListItem.h index 40e4c31..fe557de 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.h +++ b/konq-plugins/sidebar/delicious/tagListItem.h @@ -22,28 +22,28 @@ #ifndef _TAGLISTITEM_H_ #define _TAGLISTITEM_H_ -#include <qobject.h> -#include <qlistview.h> +#include <tqobject.h> +#include <tqlistview.h> -class TagListItem: public QObject, public QCheckListItem +class TagListItem: public TQObject, public QCheckListItem { Q_OBJECT public: - TagListItem( QListView * parent, const QString & tagName, int count = 1 ); + TagListItem( TQListView * parent, const TQString & tagName, int count = 1 ); int count() const; - QString name() const; - void setName( const QString & name ); + TQString name() const; + void setName( const TQString & name ); protected: virtual void stateChange( bool state ); - virtual int compare( QListViewItem * i, int col, bool ascending ) const; - virtual QString text( int column ) const; + virtual int compare( TQListViewItem * i, int col, bool ascending ) const; + virtual TQString text( int column ) const; signals: void signalItemChecked( TagListItem * ); private: - QString m_name; + TQString m_name; int m_count; }; diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 76671d5..6c3be21 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "controls.h" -L33tSlider::L33tSlider(QWidget * parent, const char * name) : - QSlider(parent,name), pressed(false) +L33tSlider::L33tSlider(TQWidget * parent, const char * name) : + TQSlider(parent,name), pressed(false) {} -L33tSlider::L33tSlider(Orientation o, QWidget * parent, const char * name) : - QSlider(o,parent,name), pressed(false) +L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) : + TQSlider(o,parent,name), pressed(false) {} L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation o, QWidget * parent, const char * name) : - QSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) + Orientation o, TQWidget * parent, const char * name) : + TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false) {} bool L33tSlider::currentlyPressed() const @@ -42,28 +42,28 @@ bool L33tSlider::currentlyPressed() const void L33tSlider::setValue(int i) { if (!pressed) - QSlider::setValue(i); + TQSlider::setValue(i); } -void L33tSlider::mousePressEvent(QMouseEvent*e) +void L33tSlider::mousePressEvent(TQMouseEvent*e) { if (e->button()!=RightButton) { pressed=true; - QSlider::mousePressEvent(e); + TQSlider::mousePressEvent(e); } } -void L33tSlider::mouseReleaseEvent(QMouseEvent*e) +void L33tSlider::mouseReleaseEvent(TQMouseEvent*e) { pressed=false; - QSlider::mouseReleaseEvent(e); + TQSlider::mouseReleaseEvent(e); emit userChanged(value()); } -void L33tSlider::wheelEvent(QWheelEvent *e) +void L33tSlider::wheelEvent(TQWheelEvent *e) { - QSlider::wheelEvent(e); + TQSlider::wheelEvent(e); int newValue = value(); if(newValue < minValue()) @@ -75,15 +75,15 @@ void L33tSlider::wheelEvent(QWheelEvent *e) emit userChanged(newValue); } -SliderAction::SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ) +SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ) : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; } -int SliderAction::plug( QWidget *w, int index ) +int SliderAction::plug( TQWidget *w, int index ) { if (!w->inherits("KToolBar")) return -1; @@ -97,11 +97,11 @@ int SliderAction::plug( QWidget *w, int index ) addContainer( toolBar, id ); - connect( toolBar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) ); + connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); if (w->inherits( "KToolBar" )) - connect(toolBar, SIGNAL(moved(KToolBar::BarPosition)), this, SLOT(toolbarMoved(KToolBar::BarPosition))); + connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition))); emit plugged(); @@ -126,7 +126,7 @@ return; */ } -void SliderAction::unplug( QWidget *w ) +void SliderAction::unplug( TQWidget *w ) { KToolBar *toolBar = (KToolBar *)w; int idx = findContainer( w ); diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index d05a977..37604eb 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -24,12 +24,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __CONTROLS_H #define __CONTROLS_H -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kaction.h> #include <ktoolbar.h> -#include <qslider.h> -#include <qstringlist.h> +#include <tqslider.h> +#include <tqstringlist.h> class QComboBox; class QLabel; @@ -42,10 +42,10 @@ class L33tSlider : public QSlider { Q_OBJECT public: - L33tSlider(QWidget * parent, const char * name=0); - L33tSlider(Orientation, QWidget * parent, const char * name=0); + L33tSlider(TQWidget * parent, const char * name=0); + L33tSlider(Orientation, TQWidget * parent, const char * name=0); L33tSlider(int minValue, int maxValue, int pageStep, int value, - Orientation, QWidget * parent, const char * name=0); + Orientation, TQWidget * parent, const char * name=0); bool currentlyPressed() const; signals: @@ -57,9 +57,9 @@ signals: public slots: virtual void setValue(int); protected: - virtual void mousePressEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); - virtual void wheelEvent(QWheelEvent *e); + virtual void mousePressEvent(TQMouseEvent*); + virtual void mouseReleaseEvent(TQMouseEvent*); + virtual void wheelEvent(TQWheelEvent *e); private: bool pressed; @@ -72,11 +72,11 @@ class SliderAction : public KAction { Q_OBJECT public: - SliderAction(const QString& text, int accel, const QObject *receiver, - const char *member, QObject* parent, const char* name ); - virtual int plug( QWidget *w, int index = -1 ); - virtual void unplug( QWidget *w ); - QSlider* slider() const { return m_slider; } + SliderAction(const TQString& text, int accel, const TQObject *receiver, + const char *member, TQObject* parent, const char* name ); + virtual int plug( TQWidget *w, int index = -1 ); + virtual void unplug( TQWidget *w ); + TQSlider* slider() const { return m_slider; } signals: void plugged(); @@ -84,9 +84,9 @@ signals: public slots: void toolbarMoved(KToolBar::BarPosition pos); private: - QGuardedPtr<QSlider> m_slider; - QStringList m_items; - const QObject *m_receiver; + TQGuardedPtr<TQSlider> m_slider; + TQStringList m_items; + const TQObject *m_receiver; const char *m_member; }; diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index cdb9486..e4590b6 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -33,9 +33,9 @@ extern "C" #include <kmimetype.h> #include <kstandarddirs.h> #include <kurl.h> -#include <qtimer.h> -#include <qfile.h> -#include <qdir.h> +#include <tqtimer.h> +#include <tqfile.h> +#include <tqdir.h> #include <connect.h> #include <dynamicrequest.h> @@ -71,8 +71,8 @@ public: KURL file; }; -Engine::Engine(QObject *parent) - : QObject(parent) +Engine::Engine(TQObject *parent) + : TQObject(parent) , d(new EnginePrivate) { } diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h index 1a5638f..07e46f1 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.h +++ b/konq-plugins/sidebar/mediaplayer/engine.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _ENGINE_H #define _ENGINE_H -#include <qobject.h> +#include <tqobject.h> #include <kmedia2.h> #include <kmediaplayer/player.h> #include <kurl.h> @@ -45,7 +45,7 @@ class Engine : public QObject Q_OBJECT public: - Engine(QObject *parent=0); + Engine(TQObject *parent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index ce8d1af..2de09af 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -27,7 +27,7 @@ #include <kdemacros.h> #include "mediawidget.h" -KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name): +KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { widget=new KSB_MediaWidget(widgetParent); @@ -36,11 +36,11 @@ KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,QObject *pa KonqSidebar_MediaPlayer::~KonqSidebar_MediaPlayer(){;} -void* KonqSidebar_MediaPlayer::provides(const QString &) {return 0;} +void* KonqSidebar_MediaPlayer::provides(const TQString &) {return 0;} -void KonqSidebar_MediaPlayer::emitStatusBarText (const QString &) {;} +void KonqSidebar_MediaPlayer::emitStatusBarText (const TQString &) {;} -QWidget *KonqSidebar_MediaPlayer::getWidget(){return widget;} +TQWidget *KonqSidebar_MediaPlayer::getWidget(){return widget;} void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) { @@ -51,7 +51,7 @@ void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) extern "C" { - KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name); @@ -60,7 +60,7 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_mediaplayer(QString* fn, QString* /*param*/, QMap<QString,QString> *map) + KDE_EXPORT bool add_konqsidebar_mediaplayer(TQString* fn, TQString* /*param*/, TQMap<TQString,TQString> *map) { map->insert("Type","Link"); map->insert("Icon","konqsidebar_mediaplayer"); diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index c563e20..0e74248 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -28,11 +28,11 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin { Q_OBJECT public: - KonqSidebar_MediaPlayer(KInstance *instance,QObject *parent,QWidget *widgetParent, QString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_MediaPlayer(); - virtual void *provides(const QString &); - void emitStatusBarText (const QString &); - virtual QWidget *getWidget(); + virtual void *provides(const TQString &); + void emitStatusBarText (const TQString &); + virtual TQWidget *getWidget(); protected: virtual void handleURL(const KURL &url); private: diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index c460c3c..ac37e9c 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -24,45 +24,45 @@ #include <kurldrag.h> #include <klocale.h> -#include <qlabel.h> -#include <qwidget.h> -#include <qpushbutton.h> -#include <qlcdnumber.h> -#include <qpopupmenu.h> -#include <qslider.h> -#include <qtooltip.h> - -KSB_MediaWidget::KSB_MediaWidget(QWidget *parent):KSB_MediaWidget_skel(parent) +#include <tqlabel.h> +#include <tqwidget.h> +#include <tqpushbutton.h> +#include <tqlcdnumber.h> +#include <tqpopupmenu.h> +#include <tqslider.h> +#include <tqtooltip.h> + +KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) { player = new Player(this); empty(); - QFont labelFont = time->font(); + TQFont labelFont = time->font(); labelFont.setPointSize(18); labelFont.setBold(true); time->setFont(labelFont); - connect(Play, SIGNAL(clicked()), player, SLOT(play())); - connect(Pause, SIGNAL(clicked()), player, SLOT(pause())); - connect(Stop, SIGNAL(clicked()), player, SLOT(stop())); + connect(Play, TQT_SIGNAL(clicked()), player, TQT_SLOT(play())); + connect(Pause, TQT_SIGNAL(clicked()), player, TQT_SLOT(pause())); + connect(Stop, TQT_SIGNAL(clicked()), player, TQT_SLOT(stop())); - connect(player, SIGNAL(timeout()), this, SLOT(playerTimeout())); - connect(player, SIGNAL(finished()), this, SLOT(playerFinished())); - connect(player, SIGNAL(playing()), this, SLOT(playing())); - connect(player, SIGNAL(paused()), this, SLOT(paused())); - connect(player, SIGNAL(stopped()), this, SLOT(stopped())); - connect(player, SIGNAL(empty()), this, SLOT(empty())); + connect(player, TQT_SIGNAL(timeout()), this, TQT_SLOT(playerTimeout())); + connect(player, TQT_SIGNAL(finished()), this, TQT_SLOT(playerFinished())); + connect(player, TQT_SIGNAL(playing()), this, TQT_SLOT(playing())); + connect(player, TQT_SIGNAL(paused()), this, TQT_SLOT(paused())); + connect(player, TQT_SIGNAL(stopped()), this, TQT_SLOT(stopped())); + connect(player, TQT_SIGNAL(empty()), this, TQT_SLOT(empty())); - connect(Position, SIGNAL(userChanged(int)), this, SLOT(skipToWrapper(int))); - connect(this, SIGNAL(skipTo(unsigned long)), player, SLOT(skipTo(unsigned long))); + connect(Position, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); + connect(this, TQT_SIGNAL(skipTo(unsigned long)), player, TQT_SLOT(skipTo(unsigned long))); setAcceptDrops(true); pretty=""; needLengthUpdate=false; - QToolTip::add(Play,i18n("Play")); - QToolTip::add(Pause,i18n("Pause")); - QToolTip::add(Stop,i18n("Stop")); + TQToolTip::add(Play,i18n("Play")); + TQToolTip::add(Pause,i18n("Pause")); + TQToolTip::add(Stop,i18n("Stop")); } void KSB_MediaWidget::skipToWrapper(int second) @@ -70,12 +70,12 @@ void KSB_MediaWidget::skipToWrapper(int second) emit skipTo((unsigned long)(second*1000)); } -void KSB_MediaWidget::dragEnterEvent ( QDragEnterEvent * e) +void KSB_MediaWidget::dragEnterEvent ( TQDragEnterEvent * e) { e->accept(KURLDrag::canDecode(e)); } -void KSB_MediaWidget::dropEvent ( QDropEvent * e) +void KSB_MediaWidget::dropEvent ( TQDropEvent * e) { m_kuri_list.clear(); if (KURLDrag::decode(e, m_kuri_list)) @@ -101,7 +101,7 @@ void KSB_MediaWidget::playerTimeout() if (needLengthUpdate) { int counter = player->lengthString().length() - (player->lengthString().find("/")+1); - QString length=player->lengthString().right(counter); + TQString length=player->lengthString().right(counter); needLengthUpdate=false; } } diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.h b/konq-plugins/sidebar/mediaplayer/mediawidget.h index ff2137b..69fa0f2 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.h +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h @@ -25,18 +25,18 @@ class KSB_MediaWidget: public KSB_MediaWidget_skel { Q_OBJECT public: - KSB_MediaWidget(QWidget *parent); + KSB_MediaWidget(TQWidget *parent); ~KSB_MediaWidget(){;} private: class Player *player; - QString pretty; + TQString pretty; bool needLengthUpdate; KURL::List m_kuri_list; protected: - virtual void dragEnterEvent ( QDragEnterEvent * ); - virtual void dropEvent ( QDropEvent * ); + virtual void dragEnterEvent ( TQDragEnterEvent * ); + virtual void dropEvent ( TQDropEvent * ); private slots: void playerTimeout(); diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index 360f8e8..741a6b6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -29,14 +29,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "engine.h" #include "player.h" -Player::Player(QObject *parent) - : QObject(parent) +Player::Player(TQObject *parent) + : TQObject(parent) , position(0) , unfinished(false) { mEngine = new Engine; mLooping = false; - connect(&ticker, SIGNAL(timeout()), SLOT(tickerTimeout())); + connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout())); ticker.start(500); stop(); } @@ -134,7 +134,7 @@ void Player::tickerTimeout() } -QString Player::lengthString(long _position) +TQString Player::lengthString(long _position) { if(_position == -1) _position = position; @@ -146,7 +146,7 @@ QString Player::lengthString(long _position) int totSeconds = totSecs % 60; int totMinutes = (totSecs - totSeconds) / 60; - QString result; + TQString result; result.sprintf("%.2d:%.2d/%.2d:%.2d", posMinutes, posSeconds, totMinutes, totSeconds); return result; } diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h index 6acf146..c262ab6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.h +++ b/konq-plugins/sidebar/mediaplayer/player.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PLAYER_H #define PLAYER_H -#include <qobject.h> -#include <qtimer.h> +#include <tqobject.h> +#include <tqtimer.h> #include <kurl.h> class Engine; @@ -39,7 +39,7 @@ Q_OBJECT friend class KaboodlePart; public: - Player(QObject *parent = 0); + Player(TQObject *parent = 0); ~Player(); /** @@ -47,7 +47,7 @@ public: * be used in the UI: * CC:CC/LL:LL (mm:ss) **/ - QString lengthString(long _position = -1); + TQString lengthString(long _position = -1); bool looping(void) const { return mLooping; } @@ -166,7 +166,7 @@ protected: private: Engine *mEngine; - QTimer ticker; + TQTimer ticker; long position; bool mLooping; unsigned long mLength; diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 13e1e27..047437e 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -19,16 +19,16 @@ ***************************************************************************/ -#include <qgroupbox.h> -#include <qlayout.h> -#include <qtabwidget.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qmap.h> -#include <qcstring.h> -#include <qdatastream.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqmap.h> +#include <tqcstring.h> +#include <tqdatastream.h> #include <kdebug.h> #include <klocale.h> @@ -44,19 +44,19 @@ #include "configdialog.h" -LinkEntry::LinkEntry(QString name, QString url, QString icon){ +LinkEntry::LinkEntry(TQString name, TQString url, TQString icon){ LinkEntry::name = name; LinkEntry::url = url; LinkEntry::icon = icon; } -ActionListItem::ActionListItem(QListBox *listbox, const QString &action, const QString &text, const QPixmap &pixmap) : QListBoxPixmap(listbox, pixmap) +ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const TQString &text, const TQPixmap &pixmap) : TQListBoxPixmap(listbox, pixmap) { setAction(action); setText(text); } -ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, name) +ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name) { topWidgetName = parent->topLevelWidget()->name(); config = new KConfig("metabarrc"); @@ -66,21 +66,21 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, setIcon(SmallIcon("metabar")); ok = new KPushButton(KStdGuiItem::ok(), this); - connect(ok, SIGNAL(clicked()), this, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(cancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - QTabWidget *tab = new QTabWidget(this); + TQTabWidget *tab = new TQTabWidget(this); //general page config->setGroup("General"); - QWidget *general = new QWidget; + TQWidget *general = new QWidget; - QGroupBox *entries_group = new QGroupBox(2, Qt::Horizontal, i18n("Items"), general); - entries_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *entries_group = new TQGroupBox(2, Qt::Horizontal, i18n("Items"), general); + entries_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); - QLabel *entries_label = new QLabel(i18n("Open with:"), entries_group); + TQLabel *entries_label = new TQLabel(i18n("Open with:"), entries_group); max_entries = new KIntSpinBox(entries_group); max_entries->setMinValue(1); max_entries->setMaxValue(99); @@ -88,7 +88,7 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, max_entries->setValue(config->readNumEntry("MaxEntries", 3)); entries_label->setBuddy(max_entries); - QLabel *actions_label = new QLabel(i18n("Actions:"), entries_group); + TQLabel *actions_label = new TQLabel(i18n("Actions:"), entries_group); max_actions = new KIntSpinBox(entries_group); max_actions->setMinValue(1); max_actions->setMaxValue(99); @@ -97,62 +97,62 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, actions_label->setBuddy(max_actions); - QGroupBox *appearance_group = new QGroupBox(1, Qt::Horizontal, i18n("Appearance"), general); - appearance_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *appearance_group = new TQGroupBox(1, Qt::Horizontal, i18n("Appearance"), general); + appearance_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); - animate = new QCheckBox(i18n("Animate resize"), appearance_group); + animate = new TQCheckBox(i18n("Animate resize"), appearance_group); animate->setChecked(config->readBoolEntry("AnimateResize", false)); - servicemenus = new QCheckBox(i18n("Show service menus"), appearance_group); + servicemenus = new TQCheckBox(i18n("Show service menus"), appearance_group); servicemenus->setChecked(config->readBoolEntry("ShowServicemenus", true)); - showframe = new QCheckBox(i18n("Show frame"), appearance_group); + showframe = new TQCheckBox(i18n("Show frame"), appearance_group); showframe->setChecked(config->readBoolEntry("ShowFrame", true)); - QGroupBox *theme_group = new QGroupBox(2, Qt::Horizontal, i18n("Themes"), general); - theme_group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + TQGroupBox *theme_group = new TQGroupBox(2, Qt::Horizontal, i18n("Themes"), general); + theme_group->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); themes = new KComboBox(theme_group); - themes->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + themes->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); install_theme = new KPushButton(i18n("Install New Theme..."), theme_group); - install_theme->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - connect(install_theme, SIGNAL(clicked()), this, SLOT(installTheme())); + install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); + connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme())); loadThemes(); //link page - QWidget *links = new QWidget; + TQWidget *links = new QWidget; link_create = new KPushButton(i18n("New..."), links); - connect(link_create, SIGNAL(clicked()), this, SLOT(createLink())); + connect(link_create, TQT_SIGNAL(clicked()), this, TQT_SLOT(createLink())); link_delete = new KPushButton(i18n("Delete"), links); - connect(link_delete, SIGNAL(clicked()), this, SLOT(deleteLink())); + connect(link_delete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLink())); link_edit = new KPushButton(i18n("Edit..."), links); - connect(link_edit, SIGNAL(clicked()), this, SLOT(editLink())); + connect(link_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editLink())); link_up = new KPushButton(links); link_up->setIconSet(SmallIconSet("up")); link_up->setEnabled(false); - connect(link_up, SIGNAL(clicked()), this, SLOT(moveLinkUp())); + connect(link_up, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkUp())); link_down = new KPushButton(links); link_down->setIconSet(SmallIconSet("down")); link_down->setEnabled(false); - connect(link_down, SIGNAL(clicked()), this, SLOT(moveLinkDown())); + connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); link_list = new KListView(links); - link_list->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); link_list->setSorting(-1); link_list->setItemsMovable(TRUE); link_list->addColumn(i18n("Name")); link_list->addColumn(i18n("Address")); - connect(link_list, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(editLink(QListViewItem*))); - connect(link_list, SIGNAL(selectionChanged()), SLOT(updateArrows())); + connect(link_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(editLink(TQListViewItem*))); + connect(link_list, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateArrows())); - QWidget *actionPage = new QWidget; + TQWidget *actionPage = new QWidget; actionSelector = new KActionSelector(actionPage); loadAvailableActions(); @@ -162,81 +162,81 @@ ConfigDialog::ConfigDialog(QWidget *parent, const char *name) : QDialog(parent, tab->addTab(links, i18n("Links")); //layout - QGridLayout *general_layout = new QGridLayout(general, 2, 2, 5, 5); + TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5); general_layout->addWidget(entries_group, 0, 0); general_layout->addWidget(appearance_group, 0, 1); general_layout->addMultiCellWidget(theme_group, 1, 1, 0, 1); - general_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding), 2, 0); - //general_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding), 0, 2); + general_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 2, 0); + //general_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding), 0, 2); - QVBoxLayout *link_button_layout = new QVBoxLayout(0, 0, 5); + TQVBoxLayout *link_button_layout = new TQVBoxLayout(0, 0, 5); link_button_layout->addWidget(link_create); link_button_layout->addWidget(link_edit); link_button_layout->addWidget(link_delete); - link_button_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + link_button_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); link_button_layout->addWidget(link_up); link_button_layout->addWidget(link_down); - QHBoxLayout *link_layout = new QHBoxLayout(links, 5, 5); + TQHBoxLayout *link_layout = new TQHBoxLayout(links, 5, 5); link_layout->addWidget(link_list); link_layout->addLayout(link_button_layout); - QHBoxLayout *action_layout = new QHBoxLayout(actionPage, 5, 5); + TQHBoxLayout *action_layout = new TQHBoxLayout(actionPage, 5, 5); action_layout->addWidget(actionSelector); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 5, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 5, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QVBoxLayout *main_layout = new QVBoxLayout(this, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(this, 5, 5); main_layout->addWidget(tab); main_layout->addLayout(bottom_layout); //load config config->setGroup("General"); - QStringList _links = config->readListEntry("Links"); + TQStringList _links = config->readListEntry("Links"); - for(QStringList::Iterator it = _links.begin(); it != _links.end(); ++it){ + for(TQStringList::Iterator it = _links.begin(); it != _links.end(); ++it){ config->setGroup("Link_" + (*it)); - QString icon_str = config->readEntry("Icon", "folder"); - QPixmap icon(icon_str); + TQString icon_str = config->readEntry("Icon", "folder"); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } - QListViewItem *item = new QListViewItem(link_list, link_list->lastItem(), config->readEntry("Name"), config->readEntry("URL")); + TQListViewItem *item = new TQListViewItem(link_list, link_list->lastItem(), config->readEntry("Name"), config->readEntry("URL")); item->setPixmap(0, icon); linkList.insert(item, new LinkEntry(config->readEntry("Name"), config->readEntry("URL"), icon_str)); } config->setGroup("General"); - QStringList actions = config->readListEntry("Actions"); - for(QStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ + TQStringList actions = config->readListEntry("Actions"); + for(TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ if((*it).startsWith("metabar/")){ if((*it).right((*it).length() - 8) == "share"){ - QString text = i18n("Share"); + TQString text = i18n("Share"); ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), *it, text, SmallIcon("network")); - QListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); if(avItem){ delete avItem; } } } else{ - DCOPRef action(kapp->dcopClient()->appId(), QCString(topWidgetName).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(topWidgetName).append("/action/").append((*it).utf8())); - QString text = action.call("plainText()"); - QString icon = iconConfig->readEntry(*it, action.call("icon()")); + TQString text = action.call("plainText()"); + TQString icon = iconConfig->readEntry(*it, action.call("icon()")); - ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), QString(*it), text, SmallIcon(icon)); + ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), TQString(*it), text, SmallIcon(icon)); - QListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, Qt::ExactMatch); if(avItem){ delete avItem; } @@ -254,17 +254,17 @@ ConfigDialog::~ConfigDialog() void ConfigDialog::accept() { - QStringList groups = config->groupList(); - for(QStringList::Iterator it = groups.begin(); it != groups.end(); ++it){ + TQStringList groups = config->groupList(); + for(TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it){ if((*it).startsWith("Link_")){ config->deleteGroup(*it); } } - QStringList links; - QPtrDictIterator<LinkEntry> it(linkList); + TQStringList links; + TQPtrDictIterator<LinkEntry> it(linkList); - QListViewItem *item = link_list->firstChild(); + TQListViewItem *item = link_list->firstChild(); while(item) { LinkEntry *entry = linkList[item]; config->setGroup("Link_" + entry->name); @@ -277,8 +277,8 @@ void ConfigDialog::accept() item = item->nextSibling(); } - QStringList actions; - QListBox *box = actionSelector->selectedListBox(); + TQStringList actions; + TQListBox *box = actionSelector->selectedListBox(); for(int i = 0; i < box->numRows(); i++){ ActionListItem *item = static_cast<ActionListItem*>(box->item(i)); @@ -301,65 +301,65 @@ void ConfigDialog::accept() config->sync(); - QDialog::accept(); + TQDialog::accept(); } void ConfigDialog::createLink() { - QDialog *main = new QDialog(this); + TQDialog *main = new TQDialog(this); main->setCaption(i18n("Create Link")); main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, SIGNAL(clicked()), main, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, SIGNAL(clicked()), main, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); - QLineEdit *name = new QLineEdit(i18n("New link"), main); - QLineEdit *url = new QLineEdit("file:/", main); + TQLineEdit *name = new TQLineEdit(i18n("New link"), main); + TQLineEdit *url = new TQLineEdit("file:/", main); KIconButton *icon = new KIconButton(main); - icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon("folder"); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 0, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 0, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QGridLayout *layout = new QGridLayout(0, 2, 3, 0, 5); + TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); layout->addMultiCellWidget(icon, 0, 1, 0, 0); - layout->addWidget(new QLabel(i18n("Name:"), main), 0, 1); + layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); layout->addWidget(name, 0, 2); - layout->addWidget(new QLabel(i18n("URL:"), main), 1, 1); + layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); layout->addWidget(url, 1, 2); - QVBoxLayout *main_layout = new QVBoxLayout(main, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); main_layout->addLayout(layout); - main_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); main->resize(300, main->sizeHint().height()); - if(main->exec() == QDialog::Accepted){ - QString name_str = name->text(); - QString url_str = url->text(); - QString icon_str = icon->icon(); + if(main->exec() == TQDialog::Accepted){ + TQString name_str = name->text(); + TQString url_str = url->text(); + TQString icon_str = icon->icon(); if(!name_str.isEmpty() && !url_str.isEmpty()){ if(icon_str.isEmpty()){ icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small); } - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } - QListViewItem *item = new QListViewItem(link_list, link_list->lastItem(), name_str, url_str); + TQListViewItem *item = new TQListViewItem(link_list, link_list->lastItem(), name_str, url_str); item->setPixmap(0, icon); linkList.insert(item, new LinkEntry(name_str, url_str, icon_str)); @@ -372,7 +372,7 @@ void ConfigDialog::createLink() void ConfigDialog::deleteLink() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ linkList.remove(item); delete item; @@ -382,62 +382,62 @@ void ConfigDialog::deleteLink() void ConfigDialog::editLink() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); editLink(item); } -void ConfigDialog::editLink(QListViewItem *item) +void ConfigDialog::editLink(TQListViewItem *item) { if(item){ - QDialog *main = new QDialog(this); + TQDialog *main = new TQDialog(this); main->setCaption(i18n("Edit Link")); main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, SIGNAL(clicked()), main, SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, SIGNAL(clicked()), main, SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); - QLineEdit *name = new QLineEdit(linkList[item]->name, main); - QLineEdit *url = new QLineEdit(linkList[item]->url, main); + TQLineEdit *name = new TQLineEdit(linkList[item]->name, main); + TQLineEdit *url = new TQLineEdit(linkList[item]->url, main); KIconButton *icon = new KIconButton(main); - icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + icon->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); icon->setIconType(KIcon::Small, KIcon::Any); icon->setStrictIconSize(true); icon->setIcon(linkList[item]->icon); - QHBoxLayout *bottom_layout = new QHBoxLayout(0, 0, 5); - bottom_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + TQHBoxLayout *bottom_layout = new TQHBoxLayout(0, 0, 5); + bottom_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); bottom_layout->addWidget(ok); bottom_layout->addWidget(cancel); - QGridLayout *layout = new QGridLayout(0, 2, 3, 0, 5); + TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5); layout->addMultiCellWidget(icon, 0, 1, 0, 0); - layout->addWidget(new QLabel(i18n("Name:"), main), 0, 1); + layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1); layout->addWidget(name, 0, 2); - layout->addWidget(new QLabel(i18n("URL:"), main), 1, 1); + layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1); layout->addWidget(url, 1, 2); - QVBoxLayout *main_layout = new QVBoxLayout(main, 5, 5); + TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5); main_layout->addLayout(layout); - main_layout->addItem(new QSpacerItem(10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding)); + main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); main_layout->addLayout(bottom_layout); main->resize(300, main->sizeHint().height()); - if(main->exec() == QDialog::Accepted){ - QString name_str = name->text(); - QString url_str = url->text(); - QString icon_str = icon->icon(); + if(main->exec() == TQDialog::Accepted){ + TQString name_str = name->text(); + TQString url_str = url->text(); + TQString icon_str = icon->icon(); if(!name_str.isEmpty() && !url_str.isEmpty()){ if(icon_str.isEmpty()){ icon_str = kapp->iconLoader()->iconPath("folder", KIcon::Small); } - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -458,21 +458,21 @@ void ConfigDialog::editLink(QListViewItem *item) void ConfigDialog::moveLinkUp() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ if(link_list->itemIndex(item) > 0){ - QListViewItem *after; - QListViewItem *above = item->itemAbove(); + TQListViewItem *after; + TQListViewItem *above = item->itemAbove(); if(above){ after = above->itemAbove(); } - QString name = linkList[item]->name; - QString url = linkList[item]->url; - QString icon_str = linkList[item]->icon; + TQString name = linkList[item]->name; + TQString url = linkList[item]->url; + TQString icon_str = linkList[item]->icon; - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -481,7 +481,7 @@ void ConfigDialog::moveLinkUp() linkList.remove(item); delete item; - QListViewItem *newItem = new QListViewItem(link_list, after, name, url); + TQListViewItem *newItem = new TQListViewItem(link_list, after, name, url); newItem->setPixmap(0, icon); link_list->setSelected(newItem, TRUE); @@ -493,17 +493,17 @@ void ConfigDialog::moveLinkUp() void ConfigDialog::moveLinkDown() { - QListViewItem *item = link_list->selectedItem(); + TQListViewItem *item = link_list->selectedItem(); if(item){ if(link_list->itemIndex(item) < linkList.count() - 1){ - QListViewItem *after = item->itemBelow(); + TQListViewItem *after = item->itemBelow(); - QString name = linkList[item]->name; - QString url = linkList[item]->url; - QString icon_str = linkList[item]->icon; + TQString name = linkList[item]->name; + TQString url = linkList[item]->url; + TQString icon_str = linkList[item]->icon; - QPixmap icon(icon_str); + TQPixmap icon(icon_str); if(icon.isNull()){ icon = SmallIcon(icon_str); } @@ -512,7 +512,7 @@ void ConfigDialog::moveLinkDown() linkList.remove(item); delete item; - QListViewItem *newItem = new QListViewItem(link_list, after, name, url); + TQListViewItem *newItem = new TQListViewItem(link_list, after, name, url); newItem->setPixmap(0, icon); link_list->setSelected(newItem, TRUE); @@ -524,29 +524,29 @@ void ConfigDialog::moveLinkDown() void ConfigDialog::loadAvailableActions() { - QListBox *box = actionSelector->availableListBox(); + TQListBox *box = actionSelector->availableListBox(); - QByteArray data, replyData; - QCString replyType; + TQByteArray data, replyData; + TQCString replyType; if(DCOPClient::mainClient()->call(kapp->dcopClient()->appId(), topWidgetName, "actionMap()", data, replyType, replyData)){ - if(replyType == "QMap<QCString,DCOPRef>"){ - QMap<QCString,DCOPRef> actionMap; + if(replyType == "TQMap<TQCString,DCOPRef>"){ + TQMap<TQCString,DCOPRef> actionMap; - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); reply >> actionMap; iconConfig->setGroup("Icons"); - QMap<QCString,DCOPRef>::Iterator it; + TQMap<TQCString,DCOPRef>::Iterator it; for(it = actionMap.begin(); it != actionMap.end(); ++it){ DCOPRef action = it.data(); - QString text = action.call("plainText()"); - QCString cname = action.call("name()"); - QString icon = iconConfig->readEntry(QString(cname), action.call("icon()")); + TQString text = action.call("plainText()"); + TQCString cname = action.call("name()"); + TQString icon = iconConfig->readEntry(TQString(cname), action.call("icon()")); - ActionListItem *item = new ActionListItem(box, QString(cname), text, SmallIcon(icon)); + ActionListItem *item = new ActionListItem(box, TQString(cname), text, SmallIcon(icon)); } } } @@ -565,12 +565,12 @@ void ConfigDialog::loadThemes() { themes->clear(); - QString theme = config->readEntry("Theme", "default"); + TQString theme = config->readEntry("Theme", "default"); bool foundTheme = false; - QStringList dirs = kapp->dirs()->findDirs("data", "metabar/themes"); - for(QStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it){ - QStringList theme_list = QDir(*it).entryList(QDir::Dirs); + TQStringList dirs = kapp->dirs()->findDirs("data", "metabar/themes"); + for(TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it){ + TQStringList theme_list = TQDir(*it).entryList(TQDir::Dirs); theme_list.remove("."); theme_list.remove(".."); @@ -591,10 +591,10 @@ void ConfigDialog::loadThemes() void ConfigDialog::installTheme() { - QString file = KFileDialog::getOpenFileName(); + TQString file = KFileDialog::getOpenFileName(); if(file.isNull() && file.isEmpty()) return; - QString themedir = locateLocal("data", "metabar/themes"); + TQString themedir = locateLocal("data", "metabar/themes"); if(themedir.isNull()) return; KTar archive(file); diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index 4153054..94f5fee 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -20,26 +20,26 @@ #ifndef _CONFIGDIALOG_H_ #define _CONFIGDIALOG_H_ -#include <qdialog.h> +#include <tqdialog.h> #include <kpushbutton.h> #include <klistview.h> #include <knuminput.h> #include <kconfig.h> -#include <qptrdict.h> -#include <qlistbox.h> +#include <tqptrdict.h> +#include <tqlistbox.h> #include <kactionselector.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kcombobox.h> class LinkEntry{ public: - LinkEntry(QString name, QString url, QString icon); + LinkEntry(TQString name, TQString url, TQString icon); ~LinkEntry(){} - QString name; - QString url; - QString icon; + TQString name; + TQString url; + TQString icon; }; class ConfigDialog : public QDialog @@ -47,7 +47,7 @@ class ConfigDialog : public QDialog Q_OBJECT public: - ConfigDialog(QWidget *parent = 0, const char *name = 0); + ConfigDialog(TQWidget *parent = 0, const char *name = 0); ~ConfigDialog(); protected: @@ -65,19 +65,19 @@ class ConfigDialog : public QDialog KIntSpinBox *max_entries; KIntSpinBox *max_actions; - QCheckBox *animate; - QCheckBox *servicemenus; - QCheckBox *showframe; + TQCheckBox *animate; + TQCheckBox *servicemenus; + TQCheckBox *showframe; KListView *link_list; KComboBox *themes; - QCString topWidgetName; + TQCString topWidgetName; KActionSelector *actionSelector; - QPtrDict<LinkEntry> linkList; + TQPtrDict<LinkEntry> linkList; KConfig *config; KConfig *iconConfig; @@ -87,7 +87,7 @@ class ConfigDialog : public QDialog void createLink(); void deleteLink(); void editLink(); - void editLink(QListViewItem *item); + void editLink(TQListViewItem *item); void moveLinkUp(); void moveLinkDown(); void updateArrows(); @@ -101,14 +101,14 @@ class ConfigDialog : public QDialog class ActionListItem : public QListBoxPixmap { public: - ActionListItem(QListBox *listbox, const QString &action, const QString &text, const QPixmap &pixmap); + ActionListItem(TQListBox *listbox, const TQString &action, const TQString &text, const TQPixmap &pixmap); ~ActionListItem(){} - const QString action() { return act; } - void setAction(const QString act){ ActionListItem::act = act; } + const TQString action() { return act; } + void setAction(const TQString act){ ActionListItem::act = act; } private: - QString act; + TQString act; }; #endif diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index d6c44c1..6c3982e 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -41,11 +41,11 @@ #include <dcopclient.h> #include <dcopref.h> -#include <qdir.h> -#include <qfile.h> -#include <qrect.h> -#include <qpoint.h> -#include <qbuffer.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqrect.h> +#include <tqpoint.h> +#include <tqbuffer.h> #include <dom_string.h> #include <html_image.h> @@ -92,26 +92,26 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node) DOM::DOMString innerHTML; - QStringList actions = config.readListEntry("Actions"); + TQStringList actions = config.readListEntry("Actions"); int maxActions = config.readNumEntry("MaxActions", 5); int actionCount = 0; - for(QStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ + for(TQStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ if((*it).startsWith("metabar/")){ if((*it).right((*it).length() - 8) == "share"){ - MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", QString::null, actionCount < maxActions ? QString::null : QString("hiddenaction"), actionCount >= maxActions); + MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions); actionCount++; } } else{ - DCOPRef action(kapp->dcopClient()->appId(), QCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); + DCOPRef action(kapp->dcopClient()->appId(), TQCString(m_html->view()->topLevelWidget()->name()).append("/action/").append((*it).utf8())); if(!action.isNull()){ if(action.call("enabled()")){ - QString text = action.call("plainText()"); - QString icon = iconConfig.readEntry(*it, action.call("icon()")); + TQString text = action.call("plainText()"); + TQString icon = iconConfig.readEntry(*it, action.call("icon()")); - MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, QString::null, actionCount < maxActions ? QString::null : QString("hiddenaction"), actionCount >= maxActions); + MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, TQString::null, actionCount < maxActions ? TQString::null : TQString("hiddenaction"), actionCount >= maxActions); actionCount++; } } @@ -142,7 +142,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) KFileItem *item = m_items.getFirst(); KURL url = item->url(); - QDir dir(url.path()); + TQDir dir(url.path()); dir = dir.canonicalPath(); if(item->isDir() || dir.isRoot()){ @@ -180,11 +180,11 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node) KTrader::OfferList::ConstIterator it = offers.begin(); for(; it != offers.end(); it++){ - QString nam; + TQString nam; nam.setNum(id); bool hide = id >= max; - MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), QString::null, hide ? QString("hiddenapp") : QString::null, hide); + MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), TQString::null, hide ? TQString("hiddenapp") : TQString::null, hide); runMap.insert(id, *it); id++; @@ -241,21 +241,21 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node) if(!item->isDir()){ const KFileMetaInfo &metaInfo = item->metaInfo(); if(metaInfo.isValid()){ - QStringList groups = metaInfo.supportedGroups(); + TQStringList groups = metaInfo.supportedGroups(); int id = 0; - QString nam; + TQString nam; - for(QStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it){ + for(TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it){ KFileMetaInfoGroup group = metaInfo.group(*it); if(group.isValid()){ nam.setNum(id); innerHTML += "<ul class=\"info\"><a class=\"infotitle\" id=\"info_" + nam + "\" href=\"more://info_" + nam + "\">" + group.translatedName() + "</a></ul>"; - QStringList keys = group.supportedKeys(); + TQStringList keys = group.supportedKeys(); - for(QStringList::ConstIterator it = keys.begin(); it != keys.end(); ++it){ + for(TQStringList::ConstIterator it = keys.begin(); it != keys.end(); ++it){ const KFileMetaInfoItem metaInfoItem = group.item(*it); if(metaInfoItem.isValid()){ @@ -294,11 +294,11 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node) innerHTML += "<ul class=\"info\"><b>" + i18n("Size") + ": </b>"; innerHTML += KIO::convertSize(size); innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Files") + ": </b>"; - innerHTML += QString().setNum(files); + innerHTML += TQString().setNum(files); innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Folders") + ": </b>"; - innerHTML += QString().setNum(dirs); + innerHTML += TQString().setNum(dirs); innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Total Entries") + ": </b>"; - innerHTML += QString().setNum(m_items.count()); + innerHTML += TQString().setNum(m_items.count()); innerHTML += "</ul>"; node.setInnerHTML(innerHTML); } @@ -311,7 +311,7 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node) KFileItem *item = m_items.getFirst(); KURL url = item->url(); - QDir dir(url.path()); + TQDir dir(url.path()); dir = dir.canonicalPath(); if(item->isDir() || dir.isRoot()){ @@ -336,9 +336,9 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node) preview_job = KIO::filePreview(KURL::List(url), m_html->view()->width() - 30); - connect(preview_job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), this, SLOT(slotSetPreview(const KFileItem*, const QPixmap&))); - connect(preview_job, SIGNAL(failed(const KFileItem *)), this, SLOT(slotPreviewFailed(const KFileItem *))); - connect(preview_job, SIGNAL(result(KIO::Job *)), this, SLOT(slotJobFinished(KIO::Job *))); + connect(preview_job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&))); + connect(preview_job, TQT_SIGNAL(failed(const KFileItem *)), this, TQT_SLOT(slotPreviewFailed(const KFileItem *))); + connect(preview_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *))); } m_functions->show("preview"); @@ -354,22 +354,22 @@ void DefaultPlugin::loadBookmarks(DOM::HTMLElement node) m_functions->hide("bookmarks"); } -void DefaultPlugin::slotSetPreview(const KFileItem *item, const QPixmap &pix) +void DefaultPlugin::slotSetPreview(const KFileItem *item, const TQPixmap &pix) { DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = doc.getElementById("preview"); - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - QString src = QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + TQString src = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); bool media = item->mimetype().startsWith("video/"); DOM::DOMString innerHTML; - innerHTML += QString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15); + innerHTML += TQString("<ul style=\"height: %1px\"><a class=\"preview\"").arg(pix.height() + 15); if(media){ innerHTML += " href=\"preview:///\""; @@ -377,9 +377,9 @@ void DefaultPlugin::slotSetPreview(const KFileItem *item, const QPixmap &pix) innerHTML +="><img id=\"previewimage\" src=\""; innerHTML += src; innerHTML += "\" width=\""; - innerHTML += QString().setNum(pix.width()); + innerHTML += TQString().setNum(pix.width()); innerHTML += "\" height=\""; - innerHTML += QString().setNum(pix.height()); + innerHTML += TQString().setNum(pix.height()); innerHTML += "\" /></a></ul>"; if(media){ @@ -413,12 +413,12 @@ void DefaultPlugin::slotJobFinished(KIO::Job *job) bool DefaultPlugin::handleRequest(const KURL &url) { - QString protocol = url.protocol(); + TQString protocol = url.protocol(); if(protocol == "exec"){ int id = url.host().toInt(); - QMap<int,KService::Ptr>::Iterator it = runMap.find(id); + TQMap<int,KService::Ptr>::Iterator it = runMap.find(id); if(it != runMap.end()){ KFileItem *item = m_items.getFirst(); @@ -430,21 +430,21 @@ bool DefaultPlugin::handleRequest(const KURL &url) } else if(protocol == "service"){ - QString name = url.url().right(url.url().length() - 10); + TQString name = url.url().right(url.url().length() - 10); services->runAction(name); return true; } else if(protocol == "servicepopup"){ - QString id = url.host(); + TQString id = url.host(); DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById("popup" + id)); if(!node.isNull()){ - QRect rect = node.getRect(); - QPoint p = m_html->view()->mapToGlobal(rect.bottomLeft()); + TQRect rect = node.getRect(); + TQPoint p = m_html->view()->mapToGlobal(rect.bottomLeft()); services->showPopup(id, p); } diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h index 36b0060..319d771 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.h +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h @@ -26,8 +26,8 @@ #include <kio/previewjob.h> -#include <qdict.h> -#include <qmap.h> +#include <tqdict.h> +#include <tqmap.h> class DefaultPlugin : public ProtocolPlugin { @@ -50,13 +50,13 @@ class DefaultPlugin : public ProtocolPlugin void loadBookmarks(DOM::HTMLElement node); private: - QMap<int,KService::Ptr> runMap; + TQMap<int,KService::Ptr> runMap; KIO::PreviewJob *preview_job; ServiceLoader *services; private slots: - void slotSetPreview(const KFileItem*, const QPixmap&); + void slotSetPreview(const KFileItem*, const TQPixmap&); void slotPreviewFailed(const KFileItem *item); void slotJobFinished(KIO::Job *item); }; diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index d4b772b..bbfb9e2 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -32,8 +32,8 @@ #include <dcopref.h> #include <dcopclient.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqregexp.h> +#include <tqfile.h> #include <dom_node.h> #include <html_inline.h> @@ -100,8 +100,8 @@ void HTTPPlugin::loadBookmarks(DOM::HTMLElement node) bool HTTPPlugin::handleRequest(const KURL &url) { if(url.protocol() == "find"){ - QString keyword = url.queryItem("find"); - QString type = url.queryItem("type"); + TQString keyword = url.queryItem("find"); + TQString type = url.queryItem("type"); if(!keyword.isNull() && !keyword.isEmpty()){ KURL url("http://www.google.com/search"); diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 8181a11..6a020f0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -1,5 +1,5 @@ #include <kinstance.h> -#include <qstring.h> +#include <tqstring.h> #include <kimageio.h> #include <klocale.h> @@ -7,7 +7,7 @@ #include "metabar.h" #include "metabar.moc" -Metabar::Metabar(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name): +Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); @@ -37,7 +37,7 @@ void Metabar::handlePreview(const KFileItemList &items) extern "C" { - bool add_konqsidebar_metabar(QString* fn, QString* param, QMap<QString,QString> *map) { + bool add_konqsidebar_metabar(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) { Q_UNUSED(param); map->insert("Type", "Link"); @@ -52,7 +52,7 @@ extern "C" { extern "C" { - void* create_konqsidebar_metabar(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name) + void* create_konqsidebar_metabar(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new Metabar(instance,par,widp,desktopname,name); } diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h index 6d43592..d4bb63f 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.h +++ b/konq-plugins/sidebar/metabar/src/metabar.h @@ -6,7 +6,7 @@ #endif #include <konqsidebarplugin.h> -#include <qstring.h> +#include <tqstring.h> #include <kconfig.h> @@ -15,11 +15,11 @@ class Metabar : public KonqSidebarPlugin Q_OBJECT public: - Metabar(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name=0); + Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~Metabar(); - virtual QWidget *getWidget(){ return widget; } - virtual void *provides(const QString &) { return 0; } + virtual TQWidget *getWidget(){ return widget; } + virtual void *provides(const TQString &) { return 0; } protected: MetabarWidget *widget; diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index 8c457de..1aaf9e8 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -26,16 +26,16 @@ #include <kconfig.h> -#include <qrect.h> +#include <tqrect.h> #define CSS_PRIORITY "important" #define RESIZE_SPEED 5 #define RESIZE_STEP 2 -MetabarFunctions::MetabarFunctions(KHTMLPart *html, QObject *parent, const char* name) : QObject(parent, name), m_html(html) +MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) { - timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(animate())); + timer = new TQTimer(this); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); } MetabarFunctions::~MetabarFunctions() @@ -47,8 +47,8 @@ MetabarFunctions::~MetabarFunctions() void MetabarFunctions::handleRequest(const KURL &url) { - QString function = url.host(); - QStringList params = QStringList::split(',', url.filename()); + TQString function = url.host(); + TQStringList params = TQStringList::split(',', url.filename()); if(function == "toggle"){ if(params.size() == 1){ @@ -106,7 +106,7 @@ void MetabarFunctions::toggle(DOM::DOMString item) } } else{ - style.setProperty("height", QString("%1px").arg(height), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY); } } } @@ -137,7 +137,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item) } } else{ - style.setProperty("height", QString("%1px").arg(height), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(height), CSS_PRIORITY); } } } @@ -145,9 +145,9 @@ void MetabarFunctions::adjustSize(DOM::DOMString item) void MetabarFunctions::animate() { - QMap<QString, int>::Iterator it; + TQMap<TQString, int>::Iterator it; for(it = resizeMap.begin(); it != resizeMap.end(); ++it ) { - QString id = it.key(); + TQString id = it.key(); int height = it.data(); int currentHeight = 0; @@ -155,7 +155,7 @@ void MetabarFunctions::animate() DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(id)); DOM::CSSStyleDeclaration style = node.style(); - QString currentHeightString = style.getPropertyValue("height").string(); + TQString currentHeightString = style.getPropertyValue("height").string(); if(currentHeightString.endsWith("px")){ currentHeight = currentHeightString.left(currentHeightString.length() - 2).toInt(); } @@ -176,7 +176,7 @@ void MetabarFunctions::animate() } int change = currentHeight < height ? changeValue : -changeValue; - style.setProperty("height", QString("%1px").arg(currentHeight + change), CSS_PRIORITY); + style.setProperty("height", TQString("%1px").arg(currentHeight + change), CSS_PRIORITY); doc.updateRendering(); } } diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h index aa5f110..1ccce3c 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h @@ -23,8 +23,8 @@ #include <dom_string.h> -#include <qtimer.h> -#include <qmap.h> +#include <tqtimer.h> +#include <tqmap.h> #include <kurl.h> #include <khtml_part.h> @@ -34,7 +34,7 @@ class MetabarFunctions : public QObject Q_OBJECT public: - MetabarFunctions(KHTMLPart *html, QObject *parent = 0, const char* name=0); + MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0); ~MetabarFunctions(); void toggle(DOM::DOMString item); @@ -47,9 +47,9 @@ class MetabarFunctions : public QObject KHTMLPart *m_html; private: - QTimer *timer; + TQTimer *timer; - QMap<QString, int> resizeMap; + TQMap<TQString, int> resizeMap; int getHeight(DOM::HTMLElement &element); private slots: diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 07b010a..bf074e8 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -26,14 +26,14 @@ #include "remoteplugin.h" #include "httpplugin.h" -#include <qwidget.h> -#include <qlayout.h> -#include <qdir.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qvaluelist.h> -#include <qurl.h> -#include <qbuffer.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqvaluelist.h> +#include <tqurl.h> +#include <tqbuffer.h> #include <khtmlview.h> #include <kapplication.h> @@ -73,7 +73,7 @@ #define EVENT_TYPE DOM::DOMString("click") #define ACTIVATION 1 -MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent, name) +MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { skip = false; loadComplete = false; @@ -84,9 +84,9 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent config = new KConfig("metabarrc"); dir_watch = new KDirWatch(); - connect(dir_watch, SIGNAL(dirty(const QString&)), this, SLOT(slotUpdateCurrentInfo(const QString&))); - connect(dir_watch, SIGNAL(created(const QString&)), this, SLOT(slotUpdateCurrentInfo(const QString&))); - connect(dir_watch, SIGNAL(deleted(const QString&)), this, SLOT(slotDeleteCurrentInfo(const QString&))); + connect(dir_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteCurrentInfo(const TQString&))); html = new KHTMLPart(this, "metabarhtmlpart"); html->setJScriptEnabled(true); @@ -94,12 +94,12 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent html->setCaretVisible(false); html->setDNDEnabled(false); html->setJavaEnabled(false); - html->view()->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); html->view()->hide(); - connect(html->browserExtension(), SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); - connect(html, SIGNAL(completed()), this, SLOT(loadCompleted())); - connect(html, SIGNAL(popupMenu(const QString &, const QPoint &)), this, SLOT(slotShowPopup(const QString&, const QPoint &))); + connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); + connect(html, TQT_SIGNAL(completed()), this, TQT_SLOT(loadCompleted())); + connect(html, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotShowPopup(const TQString&, const TQPoint &))); functions = new MetabarFunctions(html, this); @@ -114,14 +114,14 @@ MetabarWidget::MetabarWidget(QWidget *parent, const char *name) : QWidget(parent plugins.insert("http", httpPlugin); plugins.insert("https", httpPlugin); - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); layout->addWidget(html->view()); popup = new KPopupMenu(0); - KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), this, SLOT(slotShowConfig()), html->actionCollection(), "configure"); + KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), this, SLOT(setTheme()), html->actionCollection(), "reload"); + KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload"); reloadAction->plug(popup); setTheme(); @@ -197,7 +197,7 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) currentPlugin->deactivate(); } - QString protocol = currentItems->getFirst()->url().protocol(); + TQString protocol = currentItems->getFirst()->url().protocol(); currentPlugin = plugins[protocol]; if(!currentPlugin){ @@ -208,14 +208,14 @@ void MetabarWidget::setFileItems(const KFileItemList &items, bool check) currentPlugin->setFileItems(*currentItems); } -QString MetabarWidget::getCurrentURL() +TQString MetabarWidget::getCurrentURL() { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("currentURL()"); if (reply.isValid()) { - QString url; - reply.get(url, "QString"); + TQString url; + reply.get(url, "TQString"); if(!url.isNull() && !url.isEmpty()){ return url; @@ -224,21 +224,21 @@ QString MetabarWidget::getCurrentURL() return 0; } -void MetabarWidget::openURL(const QString &url) +void MetabarWidget::openURL(const TQString &url) { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("openURL", url); } -void MetabarWidget::openTab(const QString &url) +void MetabarWidget::openTab(const TQString &url) { DCOPRef ref(kapp->dcopClient()->appId(), this->topLevelWidget()->name()); DCOPReply reply = ref.call("newTab", url); } -void MetabarWidget::callAction(const QString &action) +void MetabarWidget::callAction(const TQString &action) { - DCOPRef ref(kapp->dcopClient()->appId(), QString(this->topLevelWidget()->name()).append("/action/").append(action).utf8()); + DCOPRef ref(kapp->dcopClient()->appId(), TQString(this->topLevelWidget()->name()).append("/action/").append(action).utf8()); if(ref.call("enabled()")){ ref.call("activate()"); } @@ -247,7 +247,7 @@ void MetabarWidget::callAction(const QString &action) void MetabarWidget::loadLinks() { config->setGroup("General"); - QStringList links = config->readListEntry("Links"); + TQStringList links = config->readListEntry("Links"); if(links.count() == 0){ functions->hide("links"); @@ -261,7 +261,7 @@ void MetabarWidget::loadLinks() if(!node.isNull()){ DOM::DOMString innerHTML; - for(QStringList::Iterator it = links.begin(); it != links.end(); ++it){ + for(TQStringList::Iterator it = links.begin(); it != links.end(); ++it){ config->setGroup("Link_" + (*it)); addEntry(innerHTML, config->readEntry("Name"), config->readEntry("URL"), config->readEntry("Icon", "folder")); } @@ -282,14 +282,14 @@ void MetabarWidget::loadCompleted() DOM::HTMLElement node = static_cast<DOM::HTMLElement>(i18n_a_list.item(i)); if(!node.isNull()){ if(node.hasAttribute("i18n")){ - QString text = node.innerText().string(); + TQString text = node.innerText().string(); node.setInnerText(DOM::DOMString(i18n(text.utf8().data()))); } if(node.hasAttribute("image")){ - QString icon = node.getAttribute("image").string(); - QString url = getIconPath(icon); - QString style = QString("background-image: url(%1);").arg(url); + TQString icon = node.getAttribute("image").string(); + TQString url = getIconPath(icon); + TQString style = TQString("background-image: url(%1);").arg(url); node.setAttribute("style", style); } @@ -301,22 +301,22 @@ void MetabarWidget::loadCompleted() DOM::HTMLElement node = static_cast<DOM::HTMLElement>(i18n_ul_list.item(i)); if(!node.isNull()){ if(node.hasAttribute("i18n")){ - QString text = node.innerText().string(); + TQString text = node.innerText().string(); node.setInnerText(DOM::DOMString(i18n(text.utf8().data()))); } } } config->setGroup("General"); - QString file = locate("data", QString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default"))); + TQString file = locate("data", TQString("metabar/themes/%1/default.css").arg(config->readEntry("Theme", "default"))); if(file.isNull()){ - file = locate("data", QString("metabar/themes/default/default.css")); + file = locate("data", TQString("metabar/themes/default/default.css")); } - QFile cssfile(file); + TQFile cssfile(file); if(cssfile.open(IO_ReadOnly)){ - QTextStream stream( &cssfile ); - QString tmp = stream.read(); + TQTextStream stream( &cssfile ); + TQString tmp = stream.read(); cssfile.close(); tmp.replace("./", KURL::fromPathOrURL(file).directory(false)); @@ -324,14 +324,14 @@ void MetabarWidget::loadCompleted() } loadComplete = true; - html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? QFrame::StyledPanel : QFrame::NoFrame); + html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? TQFrame::StyledPanel : TQFrame::NoFrame); html->view()->show(); if(currentItems && !currentItems->isEmpty()){ setFileItems(*currentItems, false); } else{ - QString url = getCurrentURL(); + TQString url = getCurrentURL(); KFileItem *item = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL(url), true); KFileItemList list; list.append(item); @@ -347,14 +347,14 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg return; } - QString protocol = url.protocol(); + TQString protocol = url.protocol(); if(currentPlugin->handleRequest(url)){ return; } if(protocol == "desktop"){ - QString path = url.path(); + TQString path = url.path(); if(KDesktopFile::isDesktopFile(path)){ KRun::run(new KDesktopFile(path, true), KURL::List()); @@ -362,15 +362,15 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } else if(protocol == "kcmshell"){ - QString module = url.path().remove('/'); + TQString module = url.path().remove('/'); KRun::runCommand("kcmshell " + module); } else if(protocol == "action"){ - QString action = url.url().right(url.url().length() - 9); + TQString action = url.url().right(url.url().length() - 9); if(action.startsWith("metabar/")){ - QString newact = action.right(action.length() - 8); + TQString newact = action.right(action.length() - 8); if(newact == "share"){ slotShowSharingDialog(); @@ -393,15 +393,15 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg skip = true; //needed to prevent some weired reload DOM::DOMString innerHTML; - innerHTML += QString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height()); + innerHTML += TQString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height()); innerHTML += "<object class=\"preview\" type=\""; innerHTML += item->mimetype(); innerHTML += "\" data=\""; innerHTML += item->url().url(); innerHTML += "\" width=\""; - innerHTML += QString().setNum(image.width()); + innerHTML += TQString().setNum(image.width()); innerHTML += "\" height=\""; - innerHTML += QString().setNum(image.height()); + innerHTML += TQString().setNum(image.height()); innerHTML += "\" /></ul>"; node.setInnerHTML(innerHTML); } @@ -409,7 +409,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } else if(protocol == "more"){ - QString name = url.host(); + TQString name = url.host(); DOM::HTMLDocument doc = html->htmlDocument(); DOM::NodeList list = doc.getElementsByName(name); @@ -431,7 +431,7 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } if(element.id().string().startsWith("hidden")){ - QString style = QString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow")); + TQString style = TQString("background-image: url(%1);").arg(getIconPath(showMore ? "1downarrow" : "1uparrow")); element.setInnerText( showMore ? i18n("More") : i18n("Less") ); element.setAttribute("style", style); } @@ -466,16 +466,16 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg } } -QString MetabarWidget::getIconPath(const QString &name) +TQString MetabarWidget::getIconPath(const TQString &name) { - QPixmap icon = SmallIcon(name); + TQPixmap icon = SmallIcon(name); - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); icon.save(&buffer, "PNG"); - return QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + return TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); } void MetabarWidget::slotShowSharingDialog() @@ -489,7 +489,7 @@ void MetabarWidget::slotShowSharingDialog() void MetabarWidget::slotShowConfig() { ConfigDialog *config_dialog = new ConfigDialog(this); - if(config_dialog->exec() == QDialog::Accepted){ + if(config_dialog->exec() == TQDialog::Accepted){ config->reparseConfiguration(); setFileItems(*currentItems, false); @@ -497,18 +497,18 @@ void MetabarWidget::slotShowConfig() setTheme(); - html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? QFrame::StyledPanel : QFrame::NoFrame); + html->view()->setFrameShape(config->readBoolEntry("ShowFrame", true) ? TQFrame::StyledPanel : TQFrame::NoFrame); } delete config_dialog; } -void MetabarWidget::slotShowPopup(const QString &url, const QPoint &point) +void MetabarWidget::slotShowPopup(const TQString &url, const TQPoint &point) { popup->exec(point); } -void MetabarWidget::slotUpdateCurrentInfo(const QString &path) +void MetabarWidget::slotUpdateCurrentInfo(const TQString &path) { if(currentItems){ KFileItem *item = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL(path), true); @@ -522,10 +522,10 @@ void MetabarWidget::slotUpdateCurrentInfo(const QString &path) } } -void MetabarWidget::slotDeleteCurrentInfo(const QString&) +void MetabarWidget::slotDeleteCurrentInfo(const TQString&) { if(currentItems && currentItems->count() == 1){ - QString url = getCurrentURL(); + TQString url = getCurrentURL(); KURL currentURL; if(currentItems){ @@ -548,7 +548,7 @@ void MetabarWidget::slotDeleteCurrentInfo(const QString&) } } -void MetabarWidget::addEntry(DOM::DOMString &html, const QString name, const QString url, const QString icon, const QString id, const QString nameatt, bool hidden) +void MetabarWidget::addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id, const TQString nameatt, bool hidden) { html += "<ul"; @@ -584,7 +584,7 @@ void MetabarWidget::setTheme() loadComplete = false; config->setGroup("General"); - QString file = locate("data", QString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default"))); + TQString file = locate("data", TQString("metabar/themes/%1/layout.html").arg(config->readEntry("Theme", "default"))); html->openURL(KURL(file)); } diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index abd901d..e88a003 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -30,7 +30,7 @@ #include <kpopupmenu.h> #include <kdirwatch.h> -#include <qmap.h> +#include <tqmap.h> #include "protocolplugin.h" #include "metabarfunctions.h" @@ -40,13 +40,13 @@ class MetabarWidget : public QWidget Q_OBJECT public: - MetabarWidget(QWidget *parent = 0, const char* name=0); + MetabarWidget(TQWidget *parent = 0, const char* name=0); ~MetabarWidget(); void setFileItems(const KFileItemList &items, bool check = true); - static QString getIconPath(const QString &name); - static void addEntry(DOM::DOMString &html, const QString name, const QString url, const QString icon, const QString id = QString::null, const QString nameatt = QString::null, bool hidden = false); + static TQString getIconPath(const TQString &name); + static void addEntry(DOM::DOMString &html, const TQString name, const TQString url, const TQString icon, const TQString id = TQString::null, const TQString nameatt = TQString::null, bool hidden = false); private: KFileItemList *currentItems; @@ -62,26 +62,26 @@ class MetabarWidget : public QWidget KDirWatch *dir_watch; KPopupMenu *popup; - QDict<ProtocolPlugin> plugins; + TQDict<ProtocolPlugin> plugins; bool skip; bool loadComplete; - void callAction(const QString &action); - void openURL(const QString &url); - void openTab(const QString &url); + void callAction(const TQString &action); + void openURL(const TQString &url); + void openTab(const TQString &url); void loadLinks(); - QString getCurrentURL(); + TQString getCurrentURL(); private slots: void loadCompleted(); void slotShowSharingDialog(); void slotShowConfig(); - void slotShowPopup(const QString &url, const QPoint &pos); + void slotShowPopup(const TQString &url, const TQPoint &pos); void handleURLRequest(const KURL &url, const KParts::URLArgs &args); - void slotUpdateCurrentInfo(const QString &path); - void slotDeleteCurrentInfo(const QString &path); + void slotUpdateCurrentInfo(const TQString &path); + void slotDeleteCurrentInfo(const TQString &path); void setTheme(); }; diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp index ad8f2e5..99f5b31 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp @@ -20,7 +20,7 @@ #include "protocolplugin.h" -#include <qbuffer.h> +#include <tqbuffer.h> #include <kimageio.h> #include <kmdcodec.h> @@ -32,7 +32,7 @@ ProtocolPlugin* ProtocolPlugin::activePlugin = 0; -ProtocolPlugin::ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name) : QObject(html, name), m_html(html), m_functions(functions) +ProtocolPlugin::ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name) : TQObject(html, name), m_html(html), m_functions(functions) { } @@ -59,7 +59,7 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items) DOM::HTMLElement size = doc.getElementById("size"); if(!icon.isNull()){ - QPixmap pix; + TQPixmap pix; if(m_items.count() == 1){ pix = m_items.getFirst()->pixmap(KIcon::SizeLarge); } @@ -67,11 +67,11 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items) pix = DesktopIcon("kmultiple", KIcon::SizeLarge); } - QByteArray data; - QBuffer buffer(data); + TQByteArray data; + TQBuffer buffer(data); buffer.open(IO_WriteOnly); pix.save(&buffer, "PNG"); - QString icondata = QString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); + TQString icondata = TQString::fromLatin1("data:image/png;base64,%1").arg(KCodecs::base64Encode(data)); icon.setSrc(icondata); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 7e3e60d..1b59527 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -20,9 +20,9 @@ #include "serviceloader.h" -#include <qdir.h> -#include <qvaluelist.h> -#include <qptrlist.h> +#include <tqdir.h> +#include <tqvaluelist.h> +#include <tqptrlist.h> #include <dcopclient.h> @@ -37,7 +37,7 @@ #include <kstandarddirs.h> -ServiceLoader::ServiceLoader(QWidget *parent, const char *name) : QObject(parent, name) +ServiceLoader::ServiceLoader(TQWidget *parent, const char *name) : TQObject(parent, name) { popups.setAutoDelete(true); } @@ -51,40 +51,40 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int popups.clear(); KURL url = item.url(); - QString mimeType = item.mimetype(); - QString mimeGroup = mimeType.left(mimeType.find('/')); + TQString mimeType = item.mimetype(); + TQString mimeGroup = mimeType.left(mimeType.find('/')); urlList.clear(); urlList.append(url); - QStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); + TQStringList dirs = KGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" ); KConfig config("metabarrc", true, false); config.setGroup("General"); int maxActions = config.readNumEntry("MaxActions"); bool matchAll = false; // config.readBoolEntry("MatchAll"); int id = 0; - QString idString; + TQString idString; - for(QStringList::Iterator dit = dirs.begin(); dit != dirs.end(); ++dit){ + for(TQStringList::Iterator dit = dirs.begin(); dit != dirs.end(); ++dit){ idString.setNum(id); - QDir dir(*dit); - QStringList entries = dir.entryList("*.desktop", QDir::Files); + TQDir dir(*dit); + TQStringList entries = dir.entryList("*.desktop", TQDir::Files); - for(QStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit){ + for(TQStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit){ KSimpleConfig cfg( *dit + *eit, true ); cfg.setDesktopGroup(); if(cfg.hasKey("X-KDE-ShowIfRunning" )){ - const QString app = cfg.readEntry( "X-KDE-ShowIfRunning" ); + const TQString app = cfg.readEntry( "X-KDE-ShowIfRunning" ); if(!kapp->dcopClient()->isApplicationRegistered(app.utf8())){ continue; } } if(cfg.hasKey("X-KDE-Protocol")){ - const QString protocol = cfg.readEntry( "X-KDE-Protocol" ); + const TQString protocol = cfg.readEntry( "X-KDE-Protocol" ); if(protocol != url.protocol()){ continue; } @@ -95,18 +95,18 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } if(cfg.hasKey("X-KDE-Require")){ - const QStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); + const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); if (capabilities.contains( "Write" )){ continue; } } if ( cfg.hasKey( "Actions" ) && cfg.hasKey( "ServiceTypes" ) ){ - const QStringList types = cfg.readListEntry( "ServiceTypes" ); - const QStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" ); + const TQStringList types = cfg.readListEntry( "ServiceTypes" ); + const TQStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" ); bool ok = false; - for (QStringList::ConstIterator it = types.begin(); it != types.end() && !ok; ++it){ + for (TQStringList::ConstIterator it = types.begin(); it != types.end() && !ok; ++it){ bool checkTheMimetypes = false; if(matchAll){ @@ -131,7 +131,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int if(checkTheMimetypes){ ok = true; - for(QStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ + for(TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) || ((*itex) == mimeType)) { @@ -142,8 +142,8 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } } if (ok){ - const QString priority = cfg.readEntry("X-KDE-Priority"); - const QString submenuName = cfg.readEntry( "X-KDE-Submenu" ); + const TQString priority = cfg.readEntry("X-KDE-Priority"); + const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" ); bool usePopup = false; KPopupMenu *popup; @@ -154,7 +154,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int popup = popups[submenuName]; } else{ - MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? QString::null : QString("hiddenaction"), count >= maxActions); + MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions); popup = new KPopupMenu(); popups.insert(idString, popup); @@ -163,16 +163,16 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int } } - QValueList<KDEDesktopMimeType::Service> list = KDEDesktopMimeType::userDefinedServices( *dit + *eit, url.isLocalFile()); + TQValueList<KDEDesktopMimeType::Service> list = KDEDesktopMimeType::userDefinedServices( *dit + *eit, url.isLocalFile()); - for (QValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ + for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ if(usePopup){ - KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), this, SLOT(runAction()), popup, idString.utf8()); + KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8()); action->plug(popup); } else{ - MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, QString::null, count < maxActions ? QString::null : QString("hiddenaction"), count >= maxActions); + MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, TQString::null, count < maxActions ? TQString::null : TQString("hiddenaction"), count >= maxActions); count++; } @@ -194,7 +194,7 @@ void ServiceLoader::runAction() } } -void ServiceLoader::runAction(const QString& name) +void ServiceLoader::runAction(const TQString& name) { KDEDesktopMimeType::Service s = services[name]; if(!s.isEmpty()){ @@ -202,7 +202,7 @@ void ServiceLoader::runAction(const QString& name) } } -void ServiceLoader::showPopup(const QString &popup, const QPoint &point) +void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point) { KPopupMenu *p = popups[popup]; if(p){ diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index cd3fa8c..527ea97 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -21,10 +21,10 @@ #ifndef _SERVICELOADER_H_ #define _SERVICELOADER_H_ -#include <qstring.h> -#include <qdict.h> -#include <qmap.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqdict.h> +#include <tqmap.h> +#include <tqwidget.h> #include <kpopupmenu.h> #include <kfileitem.h> @@ -40,16 +40,16 @@ class ServiceLoader : public QObject Q_OBJECT public: - ServiceLoader(QWidget *parent, const char *name = 0); + ServiceLoader(TQWidget *parent, const char *name = 0); ~ServiceLoader(); void loadServices(const KFileItem item, DOM::DOMString &html, int &count); - void runAction(const QString &name); - void showPopup(const QString &popup, const QPoint &point); + void runAction(const TQString &name); + void showPopup(const TQString &popup, const TQPoint &point); private: - QDict<KPopupMenu> popups; - QMap<QString,KDEDesktopMimeType::Service> services; + TQDict<KPopupMenu> popups; + TQMap<TQString,KDEDesktopMimeType::Service> services; KURL::List urlList; private slots: diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp index 91bb96d..76853c6 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp @@ -58,14 +58,14 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node) if(url.path().endsWith("/")){ list_job = KIO::listDir(url, true, false); - connect(list_job, SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &))); - connect(list_job, SIGNAL(result(KIO::Job *)), this, SLOT(slotJobFinished(KIO::Job *))); + connect(list_job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &))); + connect(list_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *))); m_functions->show("actions"); } else{ - QString path = url.path(); - QString name = url.filename(); + TQString path = url.path(); + TQString name = url.filename(); KService::Ptr service = KService::serviceByStorageId(name); if(service && service->isValid()){ @@ -90,8 +90,8 @@ void SettingsPlugin::loadInformation(DOM::HTMLElement node) m_functions->hide("info"); } else{ - QString path = url.path(); - QString name = url.filename(); + TQString path = url.path(); + TQString name = url.filename(); KService::Ptr service = KService::serviceByStorageId(name); if(service && service->isValid()){ @@ -154,9 +154,9 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list KIO::UDSEntryList::ConstIterator it = list.begin(); KIO::UDSEntryList::ConstIterator it_end = list.end(); for(; it != it_end; ++it){ - QString name; - QString icon; - QString url; + TQString name; + TQString icon; + TQString url; long type; KIO::UDSEntry::ConstIterator atomit = (*it).begin(); diff --git a/konq-plugins/sidebar/newsticker/configfeeds.cpp b/konq-plugins/sidebar/newsticker/configfeeds.cpp index c682ab3..dd038b6 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.cpp +++ b/konq-plugins/sidebar/newsticker/configfeeds.cpp @@ -29,7 +29,7 @@ namespace KSB_News { -ConfigFeeds::ConfigFeeds(QWidget* parent, const char* name) : ConfigFeedsBase(parent, name) +ConfigFeeds::ConfigFeeds(TQWidget* parent, const char* name) : ConfigFeedsBase(parent, name) { } diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h index 555b4f5..127ba27 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.h +++ b/konq-plugins/sidebar/newsticker/configfeeds.h @@ -43,7 +43,7 @@ namespace KSB_News { Q_OBJECT public: - ConfigFeeds(QWidget* parent, const char* name = 0); + ConfigFeeds(TQWidget* parent, const char* name = 0); }; diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index d4c803a..db793bd 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -22,8 +22,8 @@ Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qsizepolicy.h> +#include <tqlayout.h> +#include <tqsizepolicy.h> #include <dcopref.h> #include <kiconloader.h> #include <klocale.h> @@ -37,16 +37,16 @@ namespace KSB_News { - NoRSSWidget::NoRSSWidget(QWidget *parent, const char *name) - : QWidget(parent, name) { + NoRSSWidget::NoRSSWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { - QVBoxLayout *topLayout = new QVBoxLayout(this); + TQVBoxLayout *topLayout = new TQVBoxLayout(this); topLayout->addStretch(); KPushButton *btn = new KPushButton(i18n("&Configure"), this); - btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); - connect(btn, SIGNAL(clicked()), this, SLOT(slotBtnClicked())); + btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); + connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked())); topLayout->addWidget(btn, 0, Qt::AlignHCenter); topLayout->addStretch(); @@ -71,8 +71,8 @@ namespace KSB_News { // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, SIGNAL(settingsChanged()), this, - SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, + TQT_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } @@ -82,10 +82,10 @@ namespace KSB_News { DCOPRef rss_document("rssservice", "RSSService"); // read list of sources - QStringList m_our_rsssources = SidebarSettings::sources(); + TQStringList m_our_rsssources = SidebarSettings::sources(); // add new sources - QStringList::iterator it; + TQStringList::iterator it; for (it = m_our_rsssources.begin(); it != m_our_rsssources.end(); ++it) { rss_document.call("add", ( *it )); } diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h index cebac3b..91a8c61 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.h +++ b/konq-plugins/sidebar/newsticker/norsswidget.h @@ -31,11 +31,11 @@ class KConfigDialog; namespace KSB_News { - class NoRSSWidget : public QWidget { + class NoRSSWidget : public TQWidget { Q_OBJECT public: - NoRSSWidget(QWidget *parent = 0, const char *name = 0); + NoRSSWidget(TQWidget *parent = 0, const char *name = 0); private slots: void slotBtnClicked(); diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index 8086b35..a5c1261 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -22,9 +22,9 @@ Boston, MA 02110-1301, USA. */ -#include <qlistview.h> -#include <qfontmetrics.h> -#include <qtimer.h> +#include <tqlistview.h> +#include <tqfontmetrics.h> +#include <tqtimer.h> #include <kdebug.h> #include <klistbox.h> #include "nspanel.h" @@ -35,22 +35,22 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - TTListBox::TTListBox(QWidget *parent, const char *name, WFlags f) + TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) : KListBox(parent, name, f), - QToolTip(this) { + TQToolTip(this) { } void TTListBox::clear() { KListBox::clear(); } - void TTListBox::maybeTip(const QPoint &point) { - QListBoxItem *item = itemAt(point); + void TTListBox::maybeTip(const TQPoint &point) { + TQListBoxItem *item = itemAt(point); if (item) { - QString text = item->text(); + TQString text = item->text(); if (!text.isEmpty()) { // Show ToolTip only if necessary - QFontMetrics fm(fontMetrics()); + TQFontMetrics fm(fontMetrics()); int textWidth = fm.width(text); int widgetSpace = visibleWidth(); if ((textWidth > widgetSpace) || (contentsX() > 0)) @@ -61,10 +61,10 @@ namespace KSB_News { - NSPanel::NSPanel(QObject *parent, const char *name, const QString &key, + NSPanel::NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice) - :QObject(parent, name) - ,DCOPObject(QString(QString("sidebar-newsticker-")+key).latin1()) + :TQObject(parent, name) + ,DCOPObject(TQString(TQString("sidebar-newsticker-")+key).latin1()) ,m_listbox() ,m_pixmap() { @@ -72,7 +72,7 @@ namespace KSB_News { m_rssservice = rssservice; m_key = key; - m_rssdocument = m_rssservice->call("document(QString)", m_key); + m_rssdocument = m_rssservice->call("document(TQString)", m_key); m_isValid = false; connectDCOPSignal("rssservice", m_rssdocument.obj(), @@ -87,8 +87,8 @@ namespace KSB_News { // updating of RSS documents m_timeoutinterval = 10 * 60 * 1000; // 10 mins - m_timer = new QTimer(this); - connect(m_timer, SIGNAL(timeout()), this, SLOT(refresh())); + m_timer = new TQTimer(this); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refresh())); m_timer->start(m_timeoutinterval); refresh(); } @@ -103,7 +103,7 @@ namespace KSB_News { } - void NSPanel::setTitle(const QString &tit) { + void NSPanel::setTitle(const TQString &tit) { m_title = tit; } @@ -113,7 +113,7 @@ namespace KSB_News { } - void NSPanel::setPixmap(const QPixmap &pm) { + void NSPanel::setPixmap(const TQPixmap &pm) { m_pixmap = pm; } @@ -123,24 +123,24 @@ namespace KSB_News { } - QPixmap NSPanel::pixmap() { + TQPixmap NSPanel::pixmap() { return m_pixmap; } - QString NSPanel::key() const { + TQString NSPanel::key() const { return m_key; } - QString NSPanel::title() const { + TQString NSPanel::title() const { return m_title; } - QStringList NSPanel::articles() { + TQStringList NSPanel::articles() { return m_articles; } - QStringList NSPanel::articleLinks() { + TQStringList NSPanel::articleLinks() { return m_articlelinks; } @@ -155,7 +155,7 @@ namespace KSB_News { m_articles.clear(); m_articlelinks.clear(); m_count = m_rssdocument.call("count()"); - QString temp = m_rssdocument.call("title()"); + TQString temp = m_rssdocument.call("title()"); m_title = temp; m_isValid = true; for (int idx = 0; idx < m_count; ++idx) { @@ -169,7 +169,7 @@ namespace KSB_News { void NSPanel::emitPixmapUpdated(DCOPRef /*dcopref*/) { if (m_rssdocument.call("pixmapValid()")) { - QPixmap tmp = m_rssdocument.call("pixmap()"); + TQPixmap tmp = m_rssdocument.call("pixmap()"); m_pixmap = tmp; emit pixmapUpdated(this); diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index 0f30152..1f60947 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -25,9 +25,9 @@ #ifndef _konq_sidebar_news_nspanelh_ #define _konq_sidebar_news_nspanelh_ -#include <qstring.h> -#include <qpixmap.h> -#include <qtooltip.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqtooltip.h> #include <dcopref.h> #include <dcopobject.h> #include <kio/job.h> @@ -42,38 +42,38 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - class TTListBox : public KListBox, QToolTip { + class TTListBox : public KListBox, TQToolTip { public: - TTListBox (QWidget *parent = 0, const char *name = 0, WFlags f = 0); + TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); void clear(); protected: - virtual void maybeTip(const QPoint &); + virtual void maybeTip(const TQPoint &); }; - class NSPanel : public QObject, public DCOPObject { + class NSPanel : public TQObject, public DCOPObject { Q_OBJECT K_DCOP public: - NSPanel(QObject *parent, const char *name, const QString &key, + NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice); ~NSPanel(); - void setTitle(const QString &tit); + void setTitle(const TQString &tit); void setListbox(TTListBox *lb); - void setPixmap(const QPixmap &pm); - void setPixmapBuffer(QBuffer *buf); + void setPixmap(const TQPixmap &pm); + void setPixmapBuffer(TQBuffer *buf); void setJob(KIO::Job *kio_job); TTListBox *listbox() const; - QPixmap pixmap(); - QString key() const; - QString title() const; - QStringList articles(); - QStringList articleLinks(); + TQPixmap pixmap(); + TQString key() const; + TQString title() const; + TQStringList articles(); + TQStringList articleLinks(); bool isValid() const; k_dcop: @@ -83,15 +83,15 @@ namespace KSB_News { private: DCOPRef *m_rssservice; DCOPRef m_rssdocument; - QString m_key; - QString m_title; + TQString m_key; + TQString m_title; TTListBox *m_listbox; - QPixmap m_pixmap; + TQPixmap m_pixmap; int m_count; - QStringList m_articles; // TODO: use proper container - QStringList m_articlelinks; // TODO: use proper container + TQStringList m_articles; // TODO: use proper container + TQStringList m_articlelinks; // TODO: use proper container int m_timeoutinterval; - QTimer *m_timer; + TQTimer *m_timer; bool m_isValid; signals: diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 74aa07e..6c7e44b 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -25,14 +25,14 @@ Boston, MA 02110-1301, USA. */ -#include <qpushbutton.h> -#include <qlayout.h> -#include <qscrollview.h> -#include <qptrdict.h> -#include <qsizepolicy.h> -#include <qtooltip.h> -#include <qcursor.h> -#include <qimage.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqscrollview.h> +#include <tqptrdict.h> +#include <tqsizepolicy.h> +#include <tqtooltip.h> +#include <tqcursor.h> +#include <tqimage.h> #include <kdebug.h> #include <kaboutdata.h> #include <kaboutapplication.h> @@ -50,10 +50,10 @@ namespace KSB_News { - NSStackTabWidget::NSStackTabWidget(QWidget *parent, const char *name, - QPixmap appIcon) : QWidget(parent, name) { + NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name, + TQPixmap appIcon) : TQWidget(parent, name) { currentPage = 0; - layout = new QVBoxLayout(this); + layout = new TQVBoxLayout(this); pagesheader.setAutoDelete(TRUE); pages.setAutoDelete(TRUE); @@ -86,19 +86,19 @@ namespace KSB_News { popup = new KPopupMenu(this); popup->insertItem(KStdGuiItem::configure().iconSet(), i18n("&Configure Newsticker..."), this, - SLOT(slotConfigure())); + TQT_SLOT(slotConfigure())); popup->insertItem(SmallIconSet("reload"), i18n("&Reload"), this, - SLOT(slotRefresh())); + TQT_SLOT(slotRefresh())); popup->insertItem(KStdGuiItem::close().iconSet(), - KStdGuiItem::close().text(), this, SLOT(slotClose())); + KStdGuiItem::close().text(), this, TQT_SLOT(slotClose())); popup->insertSeparator(); // help menu helpmenu = new KPopupMenu(this); helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this, - SLOT(slotShowAbout())); + TQT_SLOT(slotShowAbout())); helpmenu->insertItem(i18n("&Report Bug..."), this, - SLOT(slotShowBugreport())); + TQT_SLOT(slotShowBugreport())); popup->insertItem(KStdGuiItem::help().iconSet(), KStdGuiItem::help().text(), helpmenu); @@ -109,24 +109,24 @@ namespace KSB_News { } - void NSStackTabWidget::addStackTab(NSPanel *nsp, QWidget *page) { - QPushButton *button = new QPushButton(this); + void NSStackTabWidget::addStackTab(NSPanel *nsp, TQWidget *page) { + TQPushButton *button = new TQPushButton(this); button->setText(KStringHandler::rPixelSqueeze(nsp->title(), button->fontMetrics(), button->width() - 4 )); - button->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, - QSizePolicy::Preferred)); - connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked())); - QToolTip::add(button, nsp->title()); + button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + TQSizePolicy::Preferred)); + connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked())); + TQToolTip::add(button, nsp->title()); // eventFiler for the title button button->installEventFilter(this); - QScrollView *sv = new QScrollView(this); - sv->setResizePolicy(QScrollView::AutoOneFit); + TQScrollView *sv = new TQScrollView(this); + sv->setResizePolicy(TQScrollView::AutoOneFit); sv->addChild(page); - sv->setFrameStyle(QFrame::NoFrame); + sv->setFrameStyle(TQFrame::NoFrame); page->show(); pagesheader.insert(nsp, button); @@ -150,8 +150,8 @@ namespace KSB_News { pagesheader.remove(nsp); if (pages.count() >= 1) { - QPtrDictIterator<QWidget> it(pages); - QWidget *previousPage = currentPage; + TQPtrDictIterator<TQWidget> it(pages); + TQWidget *previousPage = currentPage; currentPage = it.current(); if (currentPage != previousPage) currentPage->show(); @@ -161,7 +161,7 @@ namespace KSB_News { void NSStackTabWidget::updateTitle(NSPanel *nsp) { - QPushButton *pb = (QPushButton *)pagesheader.find(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); if (! pb->pixmap()) pb->setText(nsp->title()); } @@ -169,11 +169,11 @@ namespace KSB_News { void NSStackTabWidget::updatePixmap(NSPanel *nsp) { - QPushButton *pb = (QPushButton *)pagesheader.find(nsp); - QPixmap pixmap = nsp->pixmap(); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); + TQPixmap pixmap = nsp->pixmap(); if ((pixmap.width() > 88) || (pixmap.height() > 31)) { - QImage image = pixmap.convertToImage(); - pixmap.convertFromImage(image.smoothScale(88, 31, QImage::ScaleMin)); + TQImage image = pixmap.convertToImage(); + pixmap.convertFromImage(image.smoothScale(88, 31, TQImage::ScaleMin)); } pb->setPixmap(pixmap); } @@ -182,13 +182,13 @@ namespace KSB_News { void NSStackTabWidget::buttonClicked() { - QPushButton *pb = (QPushButton*)sender(); + TQPushButton *pb = (TQPushButton*)sender(); NSPanel *nsp = NULL; // Which NSPanel belongs to pb - QPtrDictIterator<QWidget> it(pagesheader); + TQPtrDictIterator<TQWidget> it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == pb) nsp = (NSPanel *)it.currentKey(); } @@ -197,7 +197,7 @@ namespace KSB_News { return; // Find current ScrollView - QWidget *sv = pages.find(nsp); + TQWidget *sv = pages.find(nsp); // Change visible page if (currentPage != sv) { @@ -211,22 +211,22 @@ namespace KSB_News { - bool NSStackTabWidget::eventFilter(QObject *obj, QEvent *ev) { - if (ev->type() == QEvent::MouseButtonPress - && ((QMouseEvent *)ev)->button() == QMouseEvent::RightButton) { - m_last_button_rightclicked = (QPushButton *)obj; - popup->exec(QCursor::pos()); + bool NSStackTabWidget::eventFilter(TQObject *obj, TQEvent *ev) { + if (ev->type() == TQEvent::MouseButtonPress + && ((TQMouseEvent *)ev)->button() == TQMouseEvent::RightButton) { + m_last_button_rightclicked = (TQPushButton *)obj; + popup->exec(TQCursor::pos()); return true; - } else if (ev->type() == QEvent::Resize) { - QPushButton *pb = (QPushButton *)obj; + } else if (ev->type() == TQEvent::Resize) { + TQPushButton *pb = (TQPushButton *)obj; - const QPixmap *pm = pb->pixmap(); + const TQPixmap *pm = pb->pixmap(); if ( ! pm ) { // Which NSPanel belongs to pb NSPanel *nsp = NULL; - QPtrDictIterator<QWidget> it(pagesheader); + TQPtrDictIterator<TQWidget> it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == pb) nsp = (NSPanel *)it.currentKey(); } @@ -256,12 +256,12 @@ namespace KSB_News { KDialogBase::Ok, true); ConfigFeeds *conf_widget = new ConfigFeeds(0, "feedcfgdlg"); - m_confdlg->addPage(conf_widget, i18n("RSS Settings"), QString()); + m_confdlg->addPage(conf_widget, i18n("RSS Settings"), TQString()); // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, SIGNAL(settingsChanged()), this, - SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, + TQT_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } @@ -271,7 +271,7 @@ namespace KSB_News { DCOPRef rss_document("rssservice", "RSSService"); // remove old sources and old stack tabs - QStringList::iterator it; + TQStringList::iterator it; for (it = m_our_rsssources.begin(); it != m_our_rsssources.end(); ++it) { rss_document.call("remove", (*it)); } @@ -304,9 +304,9 @@ namespace KSB_News { NSPanel *nsp = NULL; // find appendant NSPanel - QPtrDictIterator<QWidget> it(pagesheader); + TQPtrDictIterator<TQWidget> it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == m_last_button_rightclicked) nsp = (NSPanel *)it.currentKey(); } @@ -322,9 +322,9 @@ namespace KSB_News { void NSStackTabWidget::slotClose() { NSPanel *nsp = NULL; // find appendant NSPanel - QPtrDictIterator<QWidget> it(pagesheader); + TQPtrDictIterator<TQWidget> it(pagesheader); for (; it.current(); ++it) { - QPushButton *currentWidget = (QPushButton *)it.current(); + TQPushButton *currentWidget = (TQPushButton *)it.current(); if (currentWidget == m_last_button_rightclicked) nsp = (NSPanel *)it.currentKey(); } @@ -350,7 +350,7 @@ namespace KSB_News { } - bool NSStackTabWidget::isRegistered(const QString &key) { + bool NSStackTabWidget::isRegistered(const TQString &key) { m_our_rsssources = SidebarSettings::sources(); if (m_our_rsssources.findIndex(key) == -1) return false; diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index 7b84289..fb0da4d 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -28,7 +28,7 @@ #ifndef _NSSTACKTABWIDGET_H_ #define _NSSTACKTABWIDGET_H_ -#include <qptrdict.h> +#include <tqptrdict.h> #include "nspanel.h" @@ -45,21 +45,21 @@ namespace KSB_News { class NewRssSourceDlg; - class NSStackTabWidget : public QWidget { + class NSStackTabWidget : public TQWidget { Q_OBJECT public: - NSStackTabWidget(QWidget *parent = 0, const char *name = 0, - QPixmap appIcon = QPixmap()); - void addStackTab(NSPanel *nsp, QWidget *page); + NSStackTabWidget(TQWidget *parent = 0, const char *name = 0, + TQPixmap appIcon = TQPixmap()); + void addStackTab(NSPanel *nsp, TQWidget *page); void delStackTab(NSPanel *nsp); void updateTitle(NSPanel *nsp); void updatePixmap(NSPanel *nsp); bool isEmpty() const; - bool isRegistered(const QString &key); + bool isRegistered(const TQString &key); protected: - bool eventFilter(QObject *obj, QEvent *ev); + bool eventFilter(TQObject *obj, TQEvent *ev); private slots: void buttonClicked(); @@ -71,17 +71,17 @@ namespace KSB_News { void slotConfigure_okClicked(); private: - QPtrDict<QWidget> pages; - QPtrDict<QWidget> pagesheader; - QVBoxLayout *layout; - QWidget *currentPage; + TQPtrDict<TQWidget> pages; + TQPtrDict<TQWidget> pagesheader; + TQVBoxLayout *layout; + TQWidget *currentPage; KPopupMenu *popup, *helpmenu; KAboutData *m_aboutdata; KAboutApplication *m_about; KBugReport *m_bugreport; - QPushButton *m_last_button_rightclicked; + TQPushButton *m_last_button_rightclicked; KConfigDialog *m_confdlg; - QStringList m_our_rsssources; + TQStringList m_our_rsssources; }; diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index f96bcd6..ae9c51b 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -28,9 +28,9 @@ */ #include <dcopclient.h> -#include <qtimer.h> -#include <qbuffer.h> -#include <qwidgetstack.h> +#include <tqtimer.h> +#include <tqbuffer.h> +#include <tqwidgetstack.h> #include <kdebug.h> #include <kapplication.h> #include <klocale.h> @@ -46,9 +46,9 @@ namespace KSB_News { - KonqSidebar_News::KonqSidebar_News(KInstance *inst, QObject *parent, - QWidget *widgetParent, - QString &desktopName, const char* name) + KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent, + TQWidget *widgetParent, + TQString &desktopName, const char* name) : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), DCOPObject("sidebar-newsticker") { @@ -56,12 +56,12 @@ namespace KSB_News { // FIXME: as konqueror knows the icon there might be a possibility to // access the already present QPixmap KDesktopFile desktopFile(desktopName, true); - QString iconName = desktopFile.readIcon(); + TQString iconName = desktopFile.readIcon(); KIconLoader iconLoader; m_appIcon = iconLoader.loadIcon(iconName, KIcon::Small); // create all sidebar widgets - widgets = new QWidgetStack(widgetParent, "main_widgetstack"); + widgets = new TQWidgetStack(widgetParent, "main_widgetstack"); newswidget = new NSStackTabWidget(widgets, "feedbrowser_stackchld", m_appIcon); noRSSwidget = new NoRSSWidget(widgets, "nofeed_stackchld"); @@ -82,17 +82,17 @@ namespace KSB_News { } else { m_rssservice = DCOPRef("rssservice", "RSSService"); - QStringList reslist = SidebarSettings::sources(); - QStringList::iterator it; + TQStringList reslist = SidebarSettings::sources(); + TQStringList::iterator it; for (it = reslist.begin(); it != reslist.end(); ++it) { addedRSSSource(*it); } // fetch added and removed RSS sources - connectDCOPSignal("rssservice", m_rssservice.obj(), "added(QString)", - "addedRSSSource(QString)", false); - connectDCOPSignal("rssservice", m_rssservice.obj(), "removed(QString)", - "removedRSSSource(QString)", false); + connectDCOPSignal("rssservice", m_rssservice.obj(), "added(TQString)", + "addedRSSSource(TQString)", false); + connectDCOPSignal("rssservice", m_rssservice.obj(), "removed(TQString)", + "removedRSSSource(TQString)", false); // show special widget if there are no RSS sources available if (newswidget->isEmpty()) { @@ -110,11 +110,11 @@ namespace KSB_News { - void *KonqSidebar_News::provides(const QString &) {return 0;} + void *KonqSidebar_News::provides(const TQString &) {return 0;} - void KonqSidebar_News::emitStatusBarText (const QString &) {;} + void KonqSidebar_News::emitStatusBarText (const TQString &) {;} - QWidget *KonqSidebar_News::getWidget(){return widgets;} + TQWidget *KonqSidebar_News::getWidget(){return widgets;} void KonqSidebar_News::handleURL(const KURL &/*url*/) {;} @@ -122,11 +122,11 @@ namespace KSB_News { ///////// startup of the DCOP servce /////////////////////////////////////// int KonqSidebar_News::checkDcopService() { - QString rdfservice_error; + TQString rdfservice_error; int err = 0; if (! kapp->dcopClient()->isApplicationRegistered("rssservice")) - if (KApplication::startServiceByDesktopName("rssservice", QString(), + if (KApplication::startServiceByDesktopName("rssservice", TQString(), &rdfservice_error) > 0) err = 1; @@ -137,7 +137,7 @@ namespace KSB_News { ///////// helper methods /////////////////////////////////////////////////// - NSPanel *KonqSidebar_News::getNSPanelByKey(QString key) { + NSPanel *KonqSidebar_News::getNSPanelByKey(TQString key) { NSPanel *nsp = NULL, *current_nsp; for (current_nsp = nspanelptrlist.first(); current_nsp; @@ -150,14 +150,14 @@ namespace KSB_News { } - void KonqSidebar_News::addedRSSSource(QString key) { + void KonqSidebar_News::addedRSSSource(TQString key) { kdDebug(90140) << "KonqSidebar_News::addedRSSSource: " << key << endl; // Only add RSS source if we have registered the URI before in // NSStackTabWidget. if (newswidget->isRegistered(key)) { NSPanel *nspanel = new NSPanel(this, - QString(QString("sidebar-newsticker-")+key).latin1(), + TQString(TQString("sidebar-newsticker-")+key).latin1(), key, &m_rssservice); nspanel->setTitle(key); nspanelptrlist.append(nspanel); @@ -166,19 +166,19 @@ namespace KSB_News { if (! nspanel->listbox()) { TTListBox *listbox = new TTListBox(newswidget, "article_lb"); newswidget->addStackTab(nspanel, listbox); - connect(listbox, SIGNAL(executed(QListBoxItem *)), - this, SLOT(slotArticleItemExecuted(QListBoxItem *))); + connect(listbox, TQT_SIGNAL(executed(TQListBoxItem *)), + this, TQT_SLOT(slotArticleItemExecuted(TQListBoxItem *))); listbox->insertItem(i18n("Connecting..." )); nspanel->setListbox(listbox); } // listen to updates - connect(nspanel, SIGNAL(documentUpdated(NSPanel *)), - this, SLOT(updateArticles(NSPanel *))); - connect(nspanel, SIGNAL(documentUpdated(NSPanel *)), - this, SLOT(updateTitle(NSPanel *))); - connect(nspanel, SIGNAL(pixmapUpdated(NSPanel *)), - this, SLOT(updatePixmap(NSPanel *))); + connect(nspanel, TQT_SIGNAL(documentUpdated(NSPanel *)), + this, TQT_SLOT(updateArticles(NSPanel *))); + connect(nspanel, TQT_SIGNAL(documentUpdated(NSPanel *)), + this, TQT_SLOT(updateTitle(NSPanel *))); + connect(nspanel, TQT_SIGNAL(pixmapUpdated(NSPanel *)), + this, TQT_SLOT(updatePixmap(NSPanel *))); if (widgets->visibleWidget() != newswidget) widgets->raiseWidget(newswidget); @@ -186,7 +186,7 @@ namespace KSB_News { } - void KonqSidebar_News::removedRSSSource(QString key) { + void KonqSidebar_News::removedRSSSource(TQString key) { kdDebug(90140) << "inside KonqSidebar_News::removedSource " << key << endl; if (NSPanel *nsp = getNSPanelByKey(key)) { @@ -202,7 +202,7 @@ namespace KSB_News { ///////////////////////////////////////////////////////////////////// - void KonqSidebar_News::slotArticleItemExecuted(QListBoxItem *item) { + void KonqSidebar_News::slotArticleItemExecuted(TQListBoxItem *item) { if (!item) return; NSPanel *current_nspanel, *nspanel = NULL; @@ -213,7 +213,7 @@ namespace KSB_News { } int subid = nspanel->listbox()->index(item); - QString link = nspanel->articleLinks()[subid]; + TQString link = nspanel->articleLinks()[subid]; emit openURLRequest(KURL(link)); @@ -226,8 +226,8 @@ namespace KSB_News { void KonqSidebar_News::updateArticles(NSPanel *nsp) { nsp->listbox()->clear(); - QStringList articleList = nsp->articles(); - QStringList::iterator it; + TQStringList articleList = nsp->articles(); + TQStringList::iterator it; for (it = articleList.begin(); it != articleList.end(); ++it) nsp->listbox()->insertItem((*it)); } @@ -252,9 +252,9 @@ namespace KSB_News { extern "C" { - KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, QObject *par, - QWidget *widp, - QString &desktopname, + KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, TQObject *par, + TQWidget *widp, + TQString &desktopname, const char *name) { KGlobal::locale()->insertCatalogue("konqsidebar_news"); return new KonqSidebar_News(instance, par, widp, desktopname, name); @@ -262,8 +262,8 @@ namespace KSB_News { } extern "C" { - KDE_EXPORT bool add_konq_sidebarnews(QString* fn, QString*, - QMap<QString,QString> *map) { + KDE_EXPORT bool add_konq_sidebarnews(TQString* fn, TQString*, + TQMap<TQString,TQString> *map) { map->insert("Type", "Link"); map->insert("Icon", "konqsidebar_news"); map->insert("Name", i18n("Newsticker")); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h index e6da786..d09862f 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.h +++ b/konq-plugins/sidebar/newsticker/sidebar_news.h @@ -47,30 +47,30 @@ namespace KSB_News { K_DCOP public: - KonqSidebar_News(KInstance *instance, QObject *parent, - QWidget *widgetParent, QString &desktopName_, + KonqSidebar_News(KInstance *instance, TQObject *parent, + TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_News(); - virtual void *provides(const QString &); - void emitStatusBarText (const QString &); - virtual QWidget *getWidget(); + virtual void *provides(const TQString &); + void emitStatusBarText (const TQString &); + virtual TQWidget *getWidget(); k_dcop: - virtual void addedRSSSource(QString); - virtual void removedRSSSource(QString); + virtual void addedRSSSource(TQString); + virtual void removedRSSSource(TQString); protected: virtual void handleURL(const KURL &url); private: int checkDcopService(); - QWidgetStack *widgets; + TQWidgetStack *widgets; NSStackTabWidget *newswidget; NoRSSWidget *noRSSwidget; - QPtrList<NSPanel> nspanelptrlist; - NSPanel *getNSPanelByKey(QString key); + TQPtrList<NSPanel> nspanelptrlist; + NSPanel *getNSPanelByKey(TQString key); DCOPRef m_rssservice; - QPixmap m_appIcon; + TQPixmap m_appIcon; signals: // see <konqsidebarplugin.h> @@ -78,7 +78,7 @@ namespace KSB_News { const KParts::URLArgs &args = KParts::URLArgs()); private slots: - void slotArticleItemExecuted(QListBoxItem *item); + void slotArticleItemExecuted(TQListBoxItem *item); void updateArticles(NSPanel *nsp); void updateTitle(NSPanel *nsp); void updatePixmap(NSPanel *nsp); diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index b929930..b6ad880 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -20,7 +20,7 @@ #include <sys/utsname.h> -#include <qregexp.h> +#include <tqregexp.h> #include <krun.h> #include <kdebug.h> @@ -47,11 +47,11 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL1(x) QString::fromLatin1(x) +#define QFL1(x) TQString::fromLatin1(x) -UAChangerPlugin::UAChangerPlugin( QObject* parent, const char* name, - const QStringList & ) +UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, + const TQStringList & ) :KParts::Plugin( parent, name ), m_bSettingsLoaded(false), m_part(0L), m_config(0L) { @@ -60,16 +60,16 @@ UAChangerPlugin::UAChangerPlugin( QObject* parent, const char* name, m_pUAMenu = new KActionMenu( i18n("Change Browser &Identification"), "agent", actionCollection(), "changeuseragent" ); m_pUAMenu->setDelayed( false ); - connect( m_pUAMenu->popupMenu(), SIGNAL( aboutToShow() ), - this, SLOT( slotAboutToShow() ) ); + connect( m_pUAMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + this, TQT_SLOT( slotAboutToShow() ) ); m_pUAMenu->setEnabled ( false ); if ( parent && parent->inherits( "KHTMLPart" ) ) { m_part = static_cast<KHTMLPart*>(parent); - connect( m_part, SIGNAL(started(KIO::Job*)), this, - SLOT(slotStarted(KIO::Job*)) ); + connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this, + TQT_SLOT(slotStarted(KIO::Job*)) ); } } @@ -98,10 +98,10 @@ void UAChangerPlugin::parseDescFiles() struct utsname utsn; uname( &utsn ); - QStringList languageList = KGlobal::locale()->languageList(); + TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - QStringList::Iterator it = languageList.find(QFL1("C")); + TQStringList::Iterator it = languageList.find(QFL1("C")); if( it != languageList.end() ) { if( languageList.contains( QFL1("en") ) > 0 ) @@ -116,8 +116,8 @@ void UAChangerPlugin::parseDescFiles() for ( ; it != lastItem; ++it ) { - QString tmp = UA_PTOS("X-KDE-UA-FULL"); - QString tag = UA_PTOS("X-KDE-UA-TAG"); + TQString tmp = UA_PTOS("X-KDE-UA-FULL"); + TQString tag = UA_PTOS("X-KDE-UA-TAG"); if(tag != "IE" && tag != "NN" && tag != "MOZ") tag = "OTHER"; @@ -135,14 +135,14 @@ void UAChangerPlugin::parseDescFiles() continue; // Ignore dups! m_lstIdentity << tmp; - tmp = QString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE")); + tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-SYSNAME")).arg(UA_PTOS("X-KDE-UA-SYSRELEASE")); if ( tmp.stripWhiteSpace().isEmpty() ) { if(tag == "NN" || tag == "IE" || tag == "MOZ") tmp = i18n("Version %1").arg(UA_PTOS("X-KDE-UA-VERSION")); else - tmp = QString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")); + tmp = TQString("%1 %2").arg(UA_PTOS("X-KDE-UA-NAME")).arg(UA_PTOS("X-KDE-UA-VERSION")); } else { @@ -161,7 +161,7 @@ void UAChangerPlugin::parseDescFiles() { if ( m_lstAlias[(*e)] > tmp ) { ualist.insert( e, m_lstAlias.count()-1 ); - tmp = QString::null; + tmp = TQString::null; } ++e; } @@ -184,7 +184,7 @@ void UAChangerPlugin::slotStarted( KIO::Job* ) m_currentURL = m_part->url(); // This plugin works on local files, http[s], and webdav[s]. - QString proto = m_currentURL.protocol(); + TQString proto = m_currentURL.protocol(); if (m_currentURL.isLocalFile() || proto.startsWith("http") || proto.startsWith("webdav")) { @@ -212,12 +212,12 @@ void UAChangerPlugin::slotAboutToShow() m_pUAMenu->popupMenu()->clear(); m_pUAMenu->popupMenu()->insertTitle(i18n("Identify As")); // imho title doesn't need colon.. - QString host = m_currentURL.isLocalFile() ? QFL1("localhost") : m_currentURL.host(); + TQString host = m_currentURL.isLocalFile() ? QFL1("localhost") : m_currentURL.host(); m_currentUserAgent = KProtocolManager::userAgentForHost(host); //kdDebug(90130) << "User Agent: " << m_currentUserAgent << endl; int id = m_pUAMenu->popupMenu()->insertItem( i18n("Default Identification"), this, - SLOT(slotDefault()), 0, ++count ); + TQT_SLOT(slotDefault()), 0, ++count ); if( m_currentUserAgent == KProtocolManager::defaultUserAgent() ) m_pUAMenu->popupMenu()->setItemChecked(id, true); @@ -230,7 +230,7 @@ void UAChangerPlugin::slotAboutToShow() BrowserGroup::ConstIterator e = map.data().begin(); for( ; e != map.data().end(); ++e ) { - int id = browserMenu->insertItem( m_lstAlias[*e], this, SLOT(slotItemSelected(int)), 0, *e ); + int id = browserMenu->insertItem( m_lstAlias[*e], this, TQT_SLOT(slotItemSelected(int)), 0, *e ); if (m_lstIdentity[(*e)] == m_currentUserAgent) browserMenu->setItemChecked(id, true); } @@ -241,16 +241,16 @@ void UAChangerPlugin::slotAboutToShow() /* useless here, imho.. m_pUAMenu->popupMenu()->insertItem( i18n("Reload Identifications"), this, - SLOT(slotReloadDescriptions()), + TQT_SLOT(slotReloadDescriptions()), 0, ++count );*/ m_pUAMenu->popupMenu()->insertItem( i18n("Apply to Entire Site"), this, - SLOT(slotApplyToDomain()), + TQT_SLOT(slotApplyToDomain()), 0, ++count ); m_pUAMenu->popupMenu()->setItemChecked(count, m_bApplyToDomain); m_pUAMenu->popupMenu()->insertItem( i18n("Configure..."), this, - SLOT(slotConfigure())); + TQT_SLOT(slotConfigure())); } @@ -265,7 +265,7 @@ void UAChangerPlugin::slotItemSelected( int id ) { if (m_lstIdentity[id] == m_currentUserAgent) return; - QString host; + TQString host; m_currentUserAgent = m_lstIdentity[id]; host = m_currentURL.isLocalFile() ? QFL1("localhost") : filterHost( m_currentURL.host() ); @@ -285,13 +285,13 @@ void UAChangerPlugin::slotDefault() if( m_currentUserAgent == KProtocolManager::defaultUserAgent() ) return; // don't flicker! // We have no choice but delete all higher domain level settings here since it // affects what will be matched. - QStringList partList = QStringList::split('.', m_currentURL.host(), false); + TQStringList partList = TQStringList::split('.', m_currentURL.host(), false); if ( !partList.isEmpty() ) { partList.remove(partList.begin()); - QStringList domains; + TQStringList domains; // Remove the exact name match... domains << m_currentURL.host (); @@ -308,7 +308,7 @@ void UAChangerPlugin::slotDefault() partList.remove(partList.begin()); } - for (QStringList::Iterator it = domains.begin(); it != domains.end(); it++) + for (TQStringList::Iterator it = domains.begin(); it != domains.end(); it++) { //kdDebug () << "Domain to remove: " << *it << endl; if ( m_config->hasGroup(*it) ) @@ -336,13 +336,13 @@ void UAChangerPlugin::slotDefault() void UAChangerPlugin::updateIOSlaves () { // Inform running http(s) io-slaves about the change... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", QString::null)) + if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null)) kdWarning() << "UAChangerPlugin::updateIOSlaves: Unable to update running application!" << endl; } -QString UAChangerPlugin::filterHost(const QString &hostname) +TQString UAChangerPlugin::filterHost(const TQString &hostname) { - QRegExp rx; + TQRegExp rx; // Check for IPv4 address rx.setPattern ("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}"); @@ -358,10 +358,10 @@ QString UAChangerPlugin::filterHost(const QString &hostname) return (m_bApplyToDomain ? findTLD(hostname): hostname); } -QString UAChangerPlugin::findTLD (const QString &hostname) +TQString UAChangerPlugin::findTLD (const TQString &hostname) { - QStringList domains; - QStringList partList = QStringList::split('.', hostname, false); + TQStringList domains; + TQStringList partList = TQStringList::split('.', hostname, false); if (partList.count()) partList.remove(partList.begin()); // Remove hostname @@ -392,7 +392,7 @@ QString UAChangerPlugin::findTLD (const QString &hostname) // Catch some TLDs that we miss with the previous check // e.g. com.au, org.uk, mil.co - QCString t = partList[0].lower().utf8(); + TQCString t = partList[0].lower().utf8(); if ((t == "com") || (t == "net") || (t == "org") || (t == "gov") || (t == "edu") || (t == "mil") || (t == "int")) break; diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h index eb70704..7732574 100644 --- a/konq-plugins/uachanger/uachangerplugin.h +++ b/konq-plugins/uachanger/uachangerplugin.h @@ -21,9 +21,9 @@ #ifndef __UACHANGER_PLUGIN_H #define __UACHANGER_PLUGIN_H -#include <qmap.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <kurl.h> #include <klibloader.h> @@ -43,8 +43,8 @@ class UAChangerPlugin : public KParts::Plugin Q_OBJECT public: - UAChangerPlugin( QObject* parent, const char* name, - const QStringList & ); + UAChangerPlugin( TQObject* parent, const char* name, + const TQStringList & ); ~UAChangerPlugin(); protected slots: @@ -60,8 +60,8 @@ protected slots: void slotReloadDescriptions(); protected: - QString findTLD (const QString &hostname); - QString filterHost (const QString &hostname); + TQString findTLD (const TQString &hostname); + TQString filterHost (const TQString &hostname); private: void loadSettings(); @@ -76,14 +76,14 @@ private: KConfig* m_config; KURL m_currentURL; - QString m_currentUserAgent; + TQString m_currentUserAgent; - QStringList m_lstAlias; - QStringList m_lstIdentity; + TQStringList m_lstAlias; + TQStringList m_lstIdentity; - typedef QValueList<int> BrowserGroup; - typedef QMap<QString,BrowserGroup> AliasMap; - typedef QMap<QString,QString> BrowserMap; + typedef TQValueList<int> BrowserGroup; + typedef TQMap<TQString,BrowserGroup> AliasMap; + typedef TQMap<TQString,TQString> BrowserMap; typedef AliasMap::Iterator AliasIterator; typedef AliasMap::ConstIterator AliasConstIterator; diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 69f07cd..f669308 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -44,8 +44,8 @@ static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Pa K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin, PluginValidatorsFactory( &aboutdata ) ) -PluginValidators::PluginValidators( QObject* parent, const char* name, - const QStringList & ) +PluginValidators::PluginValidators( TQObject* parent, const char* name, + const TQStringList & ) : Plugin( parent, name ), m_configDialog(0), m_part(0) { setInstance(PluginValidatorsFactory::instance()); @@ -56,17 +56,17 @@ PluginValidators::PluginValidators( QObject* parent, const char* name, m_menu->insert( new KAction( i18n( "Validate &HTML" ), "htmlvalidator", 0, - this, SLOT(slotValidateHTML()), + this, TQT_SLOT(slotValidateHTML()), actionCollection(), "validateHTML") ); m_menu->insert( new KAction( i18n( "Validate &CSS" ), "cssvalidator", 0, - this, SLOT(slotValidateCSS()), + this, TQT_SLOT(slotValidateCSS()), actionCollection(), "validateCSS") ); m_menu->insert( new KAction( i18n( "Validate &Links" ), 0, - this, SLOT(slotValidateLinks()), + this, TQT_SLOT(slotValidateLinks()), actionCollection(), "validateLinks") ); m_menu->setEnabled( false ); @@ -75,15 +75,15 @@ PluginValidators::PluginValidators( QObject* parent, const char* name, { m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ), "configure", 0, - this, SLOT(slotConfigure()), + this, TQT_SLOT(slotConfigure()), actionCollection(), "configure") ); m_part = static_cast<KHTMLPart *>( parent ); m_configDialog = new ValidatorsDialog( m_part->widget() ); setURLs(); - connect( m_part, SIGNAL(started(KIO::Job*)), this, - SLOT(slotStarted(KIO::Job*)) ); + connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this, + TQT_SLOT(slotStarted(KIO::Job*)) ); } } @@ -143,8 +143,8 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) // The parent is assumed to be a KHTMLPart if ( !parent()->inherits("KHTMLPart") ) { - QString title = i18n( "Cannot Validate Source" ); - QString text = i18n( "You cannot validate anything except web pages with " + TQString title = i18n( "Cannot Validate Source" ); + TQString text = i18n( "You cannot validate anything except web pages with " "this plugin." ); KMessageBox::sorry( 0, text, title ); @@ -157,8 +157,8 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) KURL partUrl = m_part->url(); if ( !partUrl.isValid() ) // Just in case ;) { - QString title = i18n( "Malformed URL" ); - QString text = i18n( "The URL you entered is not valid, please " + TQString title = i18n( "Malformed URL" ); + TQString text = i18n( "The URL you entered is not valid, please " "correct it and try again." ); KMessageBox::sorry( 0, text, title ); return; @@ -167,8 +167,8 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) if (partUrl.isLocalFile()) { if ( validatorUrl.isEmpty() ) { - QString title = i18n( "Upload Not Possible" ); - QString text = i18n( "Validating links is not possible for local " + TQString title = i18n( "Upload Not Possible" ); + TQString text = i18n( "Validating links is not possible for local " "files." ); KMessageBox::sorry( 0, text, title ); return; @@ -188,9 +188,9 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) return; } // Set entered URL as a parameter - QString q = partUrl.url(); + TQString q = partUrl.url(); q = KURL::encode_string( q ); - QString p = "uri="; + TQString p = "uri="; p += q; validatorUrl.setQuery( p ); } diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h index 448e77f..2363ddb 100644 --- a/konq-plugins/validators/plugin_validators.h +++ b/konq-plugins/validators/plugin_validators.h @@ -33,7 +33,7 @@ #include <klibloader.h> #include "validatorsdialog.h" -#include <qguardedptr.h> +#include <tqguardedptr.h> class KAction; class KURL; @@ -42,8 +42,8 @@ class PluginValidators : public KParts::Plugin { Q_OBJECT public: - PluginValidators( QObject* parent, const char* name, - const QStringList & ); + PluginValidators( TQObject* parent, const char* name, + const TQStringList & ); virtual ~PluginValidators(); public slots: @@ -57,7 +57,7 @@ private slots: private: KActionMenu *m_menu; - QGuardedPtr<ValidatorsDialog> m_configDialog; // | + TQGuardedPtr<ValidatorsDialog> m_configDialog; // | // +-> Order dependency. KHTMLPart* m_part; // | diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp index 0c524e2..864de55 100644 --- a/konq-plugins/validators/validatorsdialog.cpp +++ b/konq-plugins/validators/validatorsdialog.cpp @@ -17,11 +17,11 @@ Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qvbox.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqvbox.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqcombobox.h> #include <kconfig.h> #include <klocale.h> @@ -29,57 +29,57 @@ #include "validatorsdialog.h" #include "validatorsdialog.moc" -ValidatorsDialog::ValidatorsDialog(QWidget *parent, const char *name ) +ValidatorsDialog::ValidatorsDialog(TQWidget *parent, const char *name ) : KDialogBase( parent, name, false, i18n("Configure"), Ok|Cancel, Ok, true ) { setCaption(i18n("Configure Validating Servers")); setMinimumWidth(300); - QVBox *page = makeVBoxMainWidget (); + TQVBox *page = makeVBoxMainWidget (); - QGroupBox *tgroup = new QGroupBox( i18n("HTML/XML Validator"), page ); - QVBoxLayout *vlay = new QVBoxLayout( tgroup, spacingHint() ); + TQGroupBox *tgroup = new TQGroupBox( i18n("HTML/XML Validator"), page ); + TQVBoxLayout *vlay = new TQVBoxLayout( tgroup, spacingHint() ); vlay->addSpacing( fontMetrics().lineSpacing()); - vlay->addWidget(new QLabel( i18n("URL:"), tgroup)); + vlay->addWidget(new TQLabel( i18n("URL:"), tgroup)); - m_WWWValidatorCB = new QComboBox(true, tgroup); + m_WWWValidatorCB = new TQComboBox(true, tgroup); m_WWWValidatorCB->setDuplicatesEnabled(false); vlay->addWidget( m_WWWValidatorCB ); - vlay->addWidget(new QLabel( i18n("Upload:"), tgroup)); + vlay->addWidget(new TQLabel( i18n("Upload:"), tgroup)); - m_WWWValidatorUploadCB = new QComboBox(true, tgroup); + m_WWWValidatorUploadCB = new TQComboBox(true, tgroup); m_WWWValidatorUploadCB->setDuplicatesEnabled(false); vlay->addWidget( m_WWWValidatorUploadCB ); /// - QGroupBox *group2= new QGroupBox( i18n("CSS Validator"), page ); - QVBoxLayout *vlay2 = new QVBoxLayout( group2, spacingHint() ); + TQGroupBox *group2= new TQGroupBox( i18n("CSS Validator"), page ); + TQVBoxLayout *vlay2 = new TQVBoxLayout( group2, spacingHint() ); vlay2->addSpacing( fontMetrics().lineSpacing()); - vlay2->addWidget(new QLabel( i18n("URL:"), group2)); + vlay2->addWidget(new TQLabel( i18n("URL:"), group2)); - m_CSSValidatorCB = new QComboBox(true, group2); + m_CSSValidatorCB = new TQComboBox(true, group2); m_CSSValidatorCB->setDuplicatesEnabled(false); vlay2->addWidget( m_CSSValidatorCB ); - vlay2->addWidget(new QLabel( i18n("Upload:"), group2)); + vlay2->addWidget(new TQLabel( i18n("Upload:"), group2)); - m_CSSValidatorUploadCB = new QComboBox(true, group2); + m_CSSValidatorUploadCB = new TQComboBox(true, group2); m_CSSValidatorUploadCB->setDuplicatesEnabled(false); vlay2->addWidget( m_CSSValidatorUploadCB ); /// - QGroupBox *group3= new QGroupBox( i18n("Link Validator"), page ); - QVBoxLayout *vlay3 = new QVBoxLayout( group3, spacingHint() ); + TQGroupBox *group3= new TQGroupBox( i18n("Link Validator"), page ); + TQVBoxLayout *vlay3 = new TQVBoxLayout( group3, spacingHint() ); vlay3->addSpacing( fontMetrics().lineSpacing()); - vlay3->addWidget(new QLabel( i18n("URL:"), group3)); + vlay3->addWidget(new TQLabel( i18n("URL:"), group3)); - m_linkValidatorCB = new QComboBox(true, group3); + m_linkValidatorCB = new TQComboBox(true, group3); m_linkValidatorCB->setDuplicatesEnabled(false); vlay3->addWidget( m_linkValidatorCB ); @@ -129,7 +129,7 @@ void ValidatorsDialog::load() void ValidatorsDialog::save() { - QStringList strList; + TQStringList strList; for (int i = 0; i < m_WWWValidatorCB->count(); i++) { strList.append(m_WWWValidatorCB->text(i)); } diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h index 79684f5..4fe9714 100644 --- a/konq-plugins/validators/validatorsdialog.h +++ b/konq-plugins/validators/validatorsdialog.h @@ -20,7 +20,7 @@ #ifndef __validatorsdialog_h #define __validatorsdialog_h -#include <qcombobox.h> +#include <tqcombobox.h> #include <kconfig.h> #include <kdialogbase.h> @@ -30,14 +30,14 @@ class ValidatorsDialog : public KDialogBase Q_OBJECT public: - ValidatorsDialog(QWidget *parent=0, const char *name=0 ); + ValidatorsDialog(TQWidget *parent=0, const char *name=0 ); ~ValidatorsDialog(); - const QString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();} - const QString getCSSValidatorUrl() const {return m_CSSValidatorCB->currentText();} - const QString getWWWValidatorUploadUrl() const {return m_WWWValidatorUploadCB->currentText();} - const QString getCSSValidatorUploadUrl() const {return m_CSSValidatorUploadCB->currentText();} - const QString getLinkValidatorUrl() const {return m_linkValidatorCB->currentText();} + const TQString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();} + const TQString getCSSValidatorUrl() const {return m_CSSValidatorCB->currentText();} + const TQString getWWWValidatorUploadUrl() const {return m_WWWValidatorUploadCB->currentText();} + const TQString getCSSValidatorUploadUrl() const {return m_CSSValidatorUploadCB->currentText();} + const TQString getLinkValidatorUrl() const {return m_linkValidatorCB->currentText();} protected slots: void slotOk(); @@ -47,11 +47,11 @@ class ValidatorsDialog : public KDialogBase void load(); void save(); - QComboBox *m_WWWValidatorCB; - QComboBox *m_WWWValidatorUploadCB; - QComboBox *m_CSSValidatorCB; - QComboBox *m_CSSValidatorUploadCB; - QComboBox *m_linkValidatorCB; + TQComboBox *m_WWWValidatorCB; + TQComboBox *m_WWWValidatorUploadCB; + TQComboBox *m_CSSValidatorCB; + TQComboBox *m_CSSValidatorUploadCB; + TQComboBox *m_linkValidatorCB; KConfig *m_config; }; 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(); |