summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-17 00:52:23 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-05-17 00:52:23 +0000
commitd4e9afe3efaf326948ab4e9c5719ab55c9e4c5f4 (patch)
tree1fa4e44217444a0288a611a363484a44e322119a
parent525b89b11f111c994af641b604eb303459af57be (diff)
downloadadept-d4e9afe3.tar.gz
adept-d4e9afe3.zip
TQt4 port Adept
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/adept@1232311 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--adept/adept/acqprogress.cpp116
-rw-r--r--adept/adept/acqprogress.h50
-rw-r--r--adept/adept/acqprogresswidget.cpp30
-rw-r--r--adept/adept/acqprogresswidget.h7
-rw-r--r--adept/adept/acqprogresswidgetui.ui14
-rw-r--r--adept/adept/actor.h5
-rw-r--r--adept/adept/application.cpp48
-rw-r--r--adept/adept/application.h25
-rw-r--r--adept/adept/changelog.cpp76
-rw-r--r--adept/adept/changelog.h25
-rw-r--r--adept/adept/commitprogress.cpp50
-rw-r--r--adept/adept/commitprogress.h7
-rw-r--r--adept/adept/commitprogressui.ui34
-rw-r--r--adept/adept/desktopentryui.ui18
-rw-r--r--adept/adept/desktoplist.cpp62
-rw-r--r--adept/adept/desktoplist.h26
-rw-r--r--adept/adept/dpkgpm-gui.cpp48
-rw-r--r--adept/adept/dpkgpm-gui.h12
-rw-r--r--adept/adept/dpkgpm.cpp20
-rw-r--r--adept/adept/dpkgpm.h6
-rw-r--r--adept/adept/easytagfilter.cpp36
-rw-r--r--adept/adept/easytagfilter.h5
-rw-r--r--adept/adept/easytagfilterui.ui38
-rw-r--r--adept/adept/extendablelist.cpp116
-rw-r--r--adept/adept/extendablelist.h48
-rw-r--r--adept/adept/filterlist.cpp46
-rw-r--r--adept/adept/filterlist.h27
-rw-r--r--adept/adept/filtersidebar.h3
-rw-r--r--adept/adept/filtersidebarui.ui14
-rw-r--r--adept/adept/filterwidget.cpp12
-rw-r--r--adept/adept/filterwidget.h7
-rw-r--r--adept/adept/groupeddesktopselector.cpp48
-rw-r--r--adept/adept/groupeddesktopselector.h7
-rw-r--r--adept/adept/installerview.cpp38
-rw-r--r--adept/adept/installerview.h7
-rw-r--r--adept/adept/installerviewui.ui26
-rw-r--r--adept/adept/lister.cpp180
-rw-r--r--adept/adept/lister.h70
-rw-r--r--adept/adept/listerextenderui.ui44
-rw-r--r--adept/adept/packagedetails.cpp68
-rw-r--r--adept/adept/packagedetails.h17
-rw-r--r--adept/adept/packagedetailsui.ui54
-rw-r--r--adept/adept/packageinfo.cpp76
-rw-r--r--adept/adept/packageinfo.h19
-rw-r--r--adept/adept/packageinfoui.ui30
-rw-r--r--adept/adept/progress.cpp6
-rw-r--r--adept/adept/quickfilter.cpp38
-rw-r--r--adept/adept/quickfilter.h17
-rw-r--r--adept/adept/quickfilterui.ui22
-rw-r--r--adept/adept/sourceseditor.cpp60
-rw-r--r--adept/adept/sourceseditor.h13
-rw-r--r--adept/adept/sourceseditorui.ui26
-rw-r--r--adept/adept/statefilter.cpp52
-rw-r--r--adept/adept/statefilter.h67
-rw-r--r--adept/adept/statefilterui.ui38
-rw-r--r--adept/adept/tagchooser.cpp32
-rw-r--r--adept/adept/tagchooser.h21
-rw-r--r--adept/adept/tagfilter.cpp16
-rw-r--r--adept/adept/tagfilter.h9
-rw-r--r--adept/adept/tagfilterui.ui6
-rw-r--r--adept/adept/taglist.cpp64
-rw-r--r--adept/adept/taglist.h42
-rw-r--r--adept/adept/threadutils.cpp8
-rw-r--r--adept/adept/utils.h26
-rw-r--r--adept/adept/view.cpp40
-rw-r--r--adept/adept/view.h18
-rw-r--r--adept/batch/app.cpp28
-rw-r--r--adept/batch/app.h11
-rw-r--r--adept/batch/main.cpp4
-rw-r--r--adept/installer/app.cpp120
-rw-r--r--adept/installer/app.h24
-rw-r--r--adept/installer/main.cpp6
-rw-r--r--adept/kubuntu_upgrader/errordialog.cpp10
-rw-r--r--adept/kubuntu_upgrader/errordialog.h5
-rw-r--r--adept/kubuntu_upgrader/errordialogbase.ui14
-rw-r--r--adept/kubuntu_upgrader/upgradewizard.cpp228
-rw-r--r--adept/kubuntu_upgrader/upgradewizard.h35
-rw-r--r--adept/kubuntu_upgrader/upgradewizardbase.ui30
-rw-r--r--adept/libadept/acqprogress.cpp122
-rw-r--r--adept/libadept/acqprogress.h50
-rw-r--r--adept/libadept/acqprogresswidget.cpp30
-rw-r--r--adept/libadept/acqprogresswidget.h7
-rw-r--r--adept/libadept/acqprogresswidgetui.ui14
-rw-r--r--adept/libadept/actor.h5
-rw-r--r--adept/libadept/application.cpp24
-rw-r--r--adept/libadept/application.h19
-rw-r--r--adept/libadept/commitprogress.cpp50
-rw-r--r--adept/libadept/commitprogress.h7
-rw-r--r--adept/libadept/commitprogressui.ui34
-rw-r--r--adept/libadept/desktopentryui.ui18
-rw-r--r--adept/libadept/desktoplist.cpp62
-rw-r--r--adept/libadept/desktoplist.h26
-rw-r--r--adept/libadept/dpkgpm-gui.cpp48
-rw-r--r--adept/libadept/dpkgpm-gui.h12
-rw-r--r--adept/libadept/dpkgpm.cpp30
-rw-r--r--adept/libadept/dpkgpm.h6
-rw-r--r--adept/libadept/easytagfilter.cpp34
-rw-r--r--adept/libadept/easytagfilter.h5
-rw-r--r--adept/libadept/easytagfilterui.ui38
-rw-r--r--adept/libadept/extendablelist.cpp112
-rw-r--r--adept/libadept/extendablelist.h46
-rw-r--r--adept/libadept/filterlist.cpp46
-rw-r--r--adept/libadept/filterlist.h18
-rw-r--r--adept/libadept/filtersidebar.h3
-rw-r--r--adept/libadept/filtersidebarui.ui14
-rw-r--r--adept/libadept/filterwidget.cpp12
-rw-r--r--adept/libadept/filterwidget.h7
-rw-r--r--adept/libadept/groupeddesktopselector.cpp48
-rw-r--r--adept/libadept/groupeddesktopselector.h7
-rw-r--r--adept/libadept/installerview.cpp28
-rw-r--r--adept/libadept/installerview.h7
-rw-r--r--adept/libadept/installerviewui.ui26
-rw-r--r--adept/libadept/lister.cpp134
-rw-r--r--adept/libadept/lister.h44
-rw-r--r--adept/libadept/listerextenderui.ui44
-rw-r--r--adept/libadept/packagedetails.cpp56
-rw-r--r--adept/libadept/packagedetails.h15
-rw-r--r--adept/libadept/packagedetailsui.ui50
-rw-r--r--adept/libadept/packageinfo.cpp76
-rw-r--r--adept/libadept/packageinfo.h19
-rw-r--r--adept/libadept/packageinfoui.ui30
-rw-r--r--adept/libadept/progress.cpp6
-rw-r--r--adept/libadept/quickfilter.cpp38
-rw-r--r--adept/libadept/quickfilter.h17
-rw-r--r--adept/libadept/quickfilterui.ui22
-rw-r--r--adept/libadept/sourceseditor.cpp56
-rw-r--r--adept/libadept/sourceseditor.h13
-rw-r--r--adept/libadept/sourceseditorui.ui26
-rw-r--r--adept/libadept/statefilter.cpp52
-rw-r--r--adept/libadept/statefilter.h51
-rw-r--r--adept/libadept/statefilterui.ui38
-rw-r--r--adept/libadept/tagchooser.cpp32
-rw-r--r--adept/libadept/tagchooser.h21
-rw-r--r--adept/libadept/tagfilter.cpp16
-rw-r--r--adept/libadept/tagfilter.h9
-rw-r--r--adept/libadept/tagfilterui.ui6
-rw-r--r--adept/libadept/taglist.cpp64
-rw-r--r--adept/libadept/taglist.h42
-rw-r--r--adept/libadept/threadutils.cpp8
-rw-r--r--adept/libadept/utils.h26
-rw-r--r--adept/libadept/view.cpp40
-rw-r--r--adept/libadept/view.h18
-rw-r--r--adept/manager/app.cpp60
-rw-r--r--adept/manager/app.h21
-rw-r--r--adept/manager/main.cpp10
-rw-r--r--adept/notifier/app.cpp90
-rw-r--r--adept/notifier/app.h24
-rw-r--r--adept/tests/libcapture/tree-test.cpp16
-rw-r--r--adept/tests/tut.h8
-rw-r--r--adept/updater/app.cpp78
-rw-r--r--adept/updater/app.h26
-rw-r--r--adept/updater/main.cpp8
152 files changed, 2684 insertions, 2592 deletions
diff --git a/adept/adept/acqprogress.cpp b/adept/adept/acqprogress.cpp
index 4b0643f..ca20dc4 100644
--- a/adept/adept/acqprogress.cpp
+++ b/adept/adept/acqprogress.cpp
@@ -1,11 +1,11 @@
// -*- C++ -*-
-#include <qprogressbar.h>
+#include <tqprogressbar.h>
#include <klistview.h>
#include <kapplication.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqstyle.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kdebug.h>
@@ -29,78 +29,78 @@ using namespace std;
namespace adept {
-AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit)
-: KListViewItem( parent )
+AcqtqStatus::Item::Item (KListView *tqparent, pkgAcquire::ItemDesc &item, bool hit)
+: KListViewItem( tqparent )
{
m_pbcol = 0;
m_prog = new ItemProgress( 0, 0 );
- m_prog->setStatus( "waiting" );
+ m_prog->settqStatus( "waiting" );
m_prog->setTotalSteps( 100 );
m_item = item;
m_id = m_item.Owner->ID;
/* if (item.Owner->FileSize > 0)
- setText( 1, SizeToStr( item.Owner->FileSize ).c_str() + QString( "B" ) ); */
+ setText( 1, SizeToStr( item.Owner->FileSize ).c_str() + TQString( "B" ) ); */
setText( 1, u8( item.Description ) );
// cerr << "create: id = " << item . Owner -> ID << ", myId = " << m_item . Owner -> ID << endl;
if (hit) {
- m_prog->setStatus( "hit" );
+ m_prog->settqStatus( "hit" );
} else
- m_prog->setStatus( "waiting" );
- // QString (SizeToStr (Itm.Owner -> FileSize) . c_str ()) + QString ("B"),
- // /* QString (Itm . Owner -> ID) + */ QString (Itm.Description . c_str ()));
+ m_prog->settqStatus( "waiting" );
+ // TQString (SizeToStr (Itm.Owner -> FileSize) . c_str ()) + TQString ("B"),
+ // /* TQString (Itm . Owner -> ID) + */ TQString (Itm.Description . c_str ()));
}
-AcqStatus::Item::~Item ()
+AcqtqStatus::Item::~Item ()
{
delete m_prog;
}
-int AcqStatus::Item::compare (QListViewItem *i, int /*col*/, bool /*ascend*/) const
+int AcqtqStatus::Item::compare (TQListViewItem *i, int /*col*/, bool /*ascend*/) const
{
int id1 = m_id;
int id2 = ((Item *) i) -> m_id;
return (id2 >= id1) - (id2 <= id1);
}
-void AcqStatus::Item::pulse (pkgAcquire::Worker *w)
+void AcqtqStatus::Item::pulse (pkgAcquire::Worker *w)
{
if (w) {
if (w->TotalSize)
- setStatus( "progress", long( double(
+ settqStatus( "progress", long( double(
w -> CurrentSize * 100.0)
/ double( w->TotalSize ) ) );
else
- setStatus( "downloading", 0 );
+ settqStatus( "downloading", 0 );
}
}
-void AcqStatus::Item::setStatus( const std::string &s, int i )
+void AcqtqStatus::Item::settqStatus( const std::string &s, int i )
{
- m_prog->setStatus( s, i );
+ m_prog->settqStatus( s, i );
}
-void AcqStatus::Item::paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment )
+void AcqtqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment )
{
- QColorGroup _cg( cg );
- QColor c = _cg.text();
+ TQColorGroup _cg( cg );
+ TQColor c = _cg.text();
if ( column == m_pbcol ) {
- const QRect bar = QRect( 0, 0, width, height() );
+ const TQRect bar = TQRect( 0, 0, width, height() );
m_prog->resize( width, height() );
- QPixmap pm = QPixmap::grabWidget( m_prog );
+ TQPixmap pm = TQPixmap::grabWidget( m_prog );
// p->fillRect( bar, listView()->paletteBackgroundColor() );
p->drawPixmap( bar.x(), bar.y(), pm );
} else {
- QPixmap pm( width, height() );
- QPainter _p( &pm );
- _cg.setColor( QColorGroup::Text, c );
- KListViewItem::paintCell( &_p, _cg, column, width, alignment );
+ TQPixmap pm( width, height() );
+ TQPainter _p( &pm );
+ _cg.setColor( TQColorGroup::Text, c );
+ KListViewItem::paintCell( &_p, _cg, column, width, tqalignment );
p->drawPixmap( 0, 0, pm );
}
}
-AcqStatus::Item *AcqStatus::findItem (pkgAcquire::ItemDesc &Itm)
+AcqtqStatus::Item *AcqtqStatus::findItem (pkgAcquire::ItemDesc &Itm)
{
if ( Itm.Owner->ID < m_idOffset )
return 0;
@@ -109,8 +109,8 @@ AcqStatus::Item *AcqStatus::findItem (pkgAcquire::ItemDesc &Itm)
return m_items[ Itm.Owner->ID - m_idOffset ];
}
-AcqStatus::AcqStatus(QWidget *parent, const char *name)
- : KListView (parent, name), m_idOffset( 0 ), m_continue( true )
+AcqtqStatus::AcqtqStatus(TQWidget *tqparent, const char *name)
+ : KListView (tqparent, name), m_idOffset( 0 ), m_continue( true )
{
// m_lastItem = 0;
addColumn( i18n( "Progress" ) );
@@ -122,41 +122,41 @@ AcqStatus::AcqStatus(QWidget *parent, const char *name)
ID = 0;
}
-void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
+void AcqtqStatus::Done (pkgAcquire::ItemDesc &Itm)
{
Item *i = findItem (Itm);
if (i) {
- i->setStatus( "done" );
+ i->settqStatus( "done" );
}
emit statusChanged( StWaiting );
triggerUpdate();
KApplication::kApplication()->processEvents();
}
-void AcqStatus::clear()
+void AcqtqStatus::clear()
{
KListView::clear();
m_idOffset += m_items.size();
m_items.clear(); // got deleted by klistview already
}
-void AcqStatus::Start()
+void AcqtqStatus::Start()
{
clear();
pkgAcquireStatus::Start();
- kdDebug() << "AcqStatus::Start ()" << endl;
+ kdDebug() << "AcqtqStatus::Start ()" << endl;
_config -> Set ("APT::Fetcher::Select-Timeout-Usec", 100000);
emit statusChanged( StWaiting );
triggerUpdate();
KApplication::kApplication()->processEvents();
}
-void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
+void AcqtqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
{
Itm.Owner->ID = ID++;
Item *i = new Item( this, Itm, true );
// ensureItemVisible( i );
- i->setStatus( "hit" );
+ i->settqStatus( "hit" );
m_items.push_back( i );
kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl;
@@ -164,7 +164,7 @@ void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
KApplication::kApplication()->processEvents();
};
-void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
+void AcqtqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
// an item started to download
{
Update = true;
@@ -183,7 +183,7 @@ void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
KApplication::kApplication()->processEvents();
};
-void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
+void AcqtqStatus::Fail(pkgAcquire::ItemDesc &Itm)
// item failed to download
{
kdDebug() << "fail, status = " << Itm.Owner->Status
@@ -199,16 +199,16 @@ void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
if (! i)
return;
if (Itm.Owner->Status == pkgAcquire::Item::StatDone) {
- i->setStatus( "ignored" );
+ i->settqStatus( "ignored" );
} else {
- i->setStatus( "error" );
+ i->settqStatus( "error" );
}
triggerUpdate();
KApplication::kApplication()->processEvents();
};
-void AcqStatus::Stop()
+void AcqtqStatus::Stop()
{
pkgAcquireStatus::Stop();
emit statusChanged( StDone );
@@ -216,7 +216,7 @@ void AcqStatus::Stop()
KApplication::kApplication()->processEvents();
}
-bool AcqStatus::Pulse(pkgAcquire *Owner)
+bool AcqtqStatus::Pulse(pkgAcquire *Owner)
{
pkgAcquireStatus::Pulse(Owner);
@@ -230,7 +230,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
}
triggerUpdate ();
- // repaint ();
+ // tqrepaint ();
if (TotalBytes > 0)
emit totalProgress(
@@ -248,43 +248,43 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
return false;
}
-bool AcqStatus::MediaChange(string Media,string Drive)
+bool AcqtqStatus::MediaChange(string Media,string Drive)
{
int res = KMessageBox::warningContinueCancel(
this, i18n( "Please insert the disc "
"labeled '%1' in the drive "
- "'%2' and press enter" ).arg(
- u8( Media ) ).arg( u8( Drive ) ),
+ "'%2' and press enter" ).tqarg(
+ u8( Media ) ).tqarg( u8( Drive ) ),
i18n( "Media Change" ) );
if ( res == KMessageBox::Cancel )
cancel();
return true;
}
-void AcqStatus::cancel()
+void AcqtqStatus::cancel()
{
m_continue = false;
}
-AcqStatusDialog::AcqStatusDialog (QWidget *parent, const char *name, bool modal)
- : KDialogBase( parent, name, modal,
+AcqStatusDialog::AcqStatusDialog (TQWidget *tqparent, const char *name, bool modal)
+ : KDialogBase( tqparent, name, modal,
u8( "progress dialog (FIXME: waiting for headers, done)" ),
Ok|Cancel, Cancel, true )
{
- m_status = new AcqStatus (this, "");
+ m_status = new AcqtqStatus (this, "");
setMainWidget( m_status.data() );
enableButton (Ok, false);
- connect (m_status.data(), SIGNAL (statusChanged (AcqStatus::Status)),
- this, SLOT (statusChange (AcqStatus::Status)));
+ connect (m_status.data(), TQT_SIGNAL (statusChanged (AcqtqStatus::tqStatus)),
+ this, TQT_SLOT (statusChange (AcqtqStatus::tqStatus)));
}
-void AcqStatusDialog::statusChange (AcqStatus::Status st)
+void AcqStatusDialog::statusChange (AcqtqStatus::tqStatus st)
{
- if (st == AcqStatus::StDownloading || st == AcqStatus::StWaiting) {
+ if (st == AcqtqStatus::StDownloading || st == AcqtqStatus::StWaiting) {
enableButton (Ok, false);
// XXX: cancel should be true; but needs implementation first
enableButton (Cancel, false);
- } else if (st == AcqStatus::StDone) {
+ } else if (st == AcqtqStatus::StDone) {
enableButton (Ok, true);
enableButton (Cancel, false);
}
diff --git a/adept/adept/acqprogress.h b/adept/adept/acqprogress.h
index 9510825..e6aa258 100644
--- a/adept/adept/acqprogress.h
+++ b/adept/adept/acqprogress.h
@@ -3,8 +3,8 @@
@author Peter Rockai <me@mornfall.net>
*/
-#ifndef ACQPROGRESS_H
-#define ACQPROGRESS_H
+#ifndef ACTQPROGRESS_H
+#define ACTQPROGRESS_H
#include <klocale.h>
#include <kdialogbase.h>
@@ -15,23 +15,24 @@
#include <apt-pkg/acquire.h>
#include <apt-front/progresscallback.h>
-class AcqStatus;
-class QLabel;
-class QProgressBar;
-class QSpacer;
-class QGridLayout;
+class AcqtqStatus;
+class TQLabel;
+class TQProgressBar;
+class TQSpacer;
+class TQGridLayout;
namespace adept {
-class AcqStatus : public KListView, public aptFront::ProgressCallback
+class AcqtqStatus : public KListView, public aptFront::ProgressCallback
{
Q_OBJECT
+ TQ_OBJECT
protected:
class ItemProgress: public KProgress {
public:
- ItemProgress( QWidget *parent, const char *name = 0 )
- : KProgress( parent, name ), m_spin( 0 ) {}
- void setStatus( const std::string &s,
+ ItemProgress( TQWidget *tqparent, const char *name = 0 )
+ : KProgress( tqparent, name ), m_spin( 0 ) {}
+ void settqStatus( const std::string &s,
int prog = 0 ) {
m_status = s;
if (m_status == "hit"
@@ -61,17 +62,17 @@ protected:
pkgAcquire::ItemDesc m_item;
public:
- Item (KListView *parent, pkgAcquire::ItemDesc &item,
+ Item (KListView *tqparent, pkgAcquire::ItemDesc &item,
bool hit = false);
virtual ~Item ();
- virtual void paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment);
+ virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment);
void setProgress (int);
- virtual int compare (QListViewItem *i, int col, bool ascend) const;
+ virtual int compare (TQListViewItem *i, int col, bool ascend) const;
virtual void pulse (pkgAcquire::Worker *);
- void setStatus( const std::string &, int = 0 );
+ void settqStatus( const std::string &, int = 0 );
void setup() {
KListViewItem::setup();
@@ -85,9 +86,9 @@ protected:
public:
- enum Status { StWaiting, StDownloading, StDone };
+ enum tqStatus { StWaiting, StDownloading, StDone };
- AcqStatus (QWidget *parent, const char *name);
+ AcqtqStatus (TQWidget *tqparent, const char *name);
Item *findItem (pkgAcquire::ItemDesc &Itm);
virtual bool MediaChange (string Media,string Drive);
@@ -97,7 +98,7 @@ public:
virtual void Fail (pkgAcquire::ItemDesc &Itm);
virtual void Start ();
virtual void Stop ();
- void addLine (QWidget *l, QWidget *s, QWidget *prog);
+ void addLine (TQWidget *l, TQWidget *s, TQWidget *prog);
void clear();
bool Pulse (pkgAcquire *Owner);
@@ -106,22 +107,23 @@ public slots:
void cancel();
signals:
- void statusChanged (AcqStatus::Status st);
+ void statusChanged (AcqtqStatus::tqStatus st);
void totalProgress (int percent);
- //AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
+ //AcqTexttqStatus(unsigned int &ScreenWidth,unsigned int Quiet);
};
class AcqStatusDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
protected:
- aptFront::SharedPtr<AcqStatus> m_status;
+ aptFront::SharedPtr<AcqtqStatus> m_status;
public:
aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_status.data(); };
- AcqStatusDialog (QWidget *parent, const char *name, bool modal);
+ AcqStatusDialog (TQWidget *tqparent, const char *name, bool modal);
public slots:
- void statusChange (AcqStatus::Status st);
+ void statusChange (AcqtqStatus::tqStatus st);
};
}
#endif
diff --git a/adept/adept/acqprogresswidget.cpp b/adept/adept/acqprogresswidget.cpp
index dd02f03..73cb09e 100644
--- a/adept/adept/acqprogresswidget.cpp
+++ b/adept/adept/acqprogresswidget.cpp
@@ -1,37 +1,37 @@
#include <kprogress.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
#include <klocale.h>
#include "acqprogresswidget.h"
#include "acqprogress.h"
using namespace adept;
-AcqProgressWidget::AcqProgressWidget( QWidget *parent, const char *name )
- : AcqProgressWidgetUi( parent, name )
+AcqProgressWidget::AcqProgressWidget( TQWidget *tqparent, const char *name )
+ : AcqProgressWidgetUi( tqparent, name )
{
m_statusRef = m_status;
m_progress->setTotalSteps( 100 );
m_progress->setProgress( 0 );
- connect(m_status, SIGNAL( totalProgress( int ) ),
- this, SLOT( setProgress( int ) ) );
- connect(m_status, SIGNAL( statusChanged( AcqStatus::Status ) ),
- this, SLOT( statusChange( AcqStatus::Status ) ) );
- connect( m_cancel, SIGNAL( clicked() ),
- m_status, SLOT( cancel() ) );
+ connect(m_status, TQT_SIGNAL( totalProgress( int ) ),
+ this, TQT_SLOT( setProgress( int ) ) );
+ connect(m_status, TQT_SIGNAL( statusChanged( AcqtqStatus::tqStatus ) ),
+ this, TQT_SLOT( statusChange( AcqtqStatus::tqStatus ) ) );
+ connect( m_cancel, TQT_SIGNAL( clicked() ),
+ m_status, TQT_SLOT( cancel() ) );
}
-void AcqProgressWidget::statusChange( AcqStatus::Status s )
+void AcqProgressWidget::statusChange( AcqtqStatus::tqStatus s )
{
- QString t;
+ TQString t;
switch (s) {
- case AcqStatus::StWaiting:
+ case AcqtqStatus::StWaiting:
t = i18n( "Waiting for headers (%p%)" );
break;
- case AcqStatus::StDownloading:
+ case AcqtqStatus::StDownloading:
t = i18n( "Downloading (%p%)" );
break;
- case AcqStatus::StDone:
+ case AcqtqStatus::StDone:
t = i18n( "Done (%p%)" );
m_progress->setProgress( 100 );
break;
diff --git a/adept/adept/acqprogresswidget.h b/adept/adept/acqprogresswidget.h
index 54359c7..faf068a 100644
--- a/adept/adept/acqprogresswidget.h
+++ b/adept/adept/acqprogresswidget.h
@@ -14,14 +14,15 @@ namespace adept {
class AcqProgressWidget : public AcqProgressWidgetUi {
Q_OBJECT
+ TQ_OBJECT
public:
- AcqProgressWidget (QWidget *parent = 0, const char *name = 0);
+ AcqProgressWidget (TQWidget *tqparent = 0, const char *name = 0);
aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); };
public slots:
- void statusChange( AcqStatus::Status );
+ void statusChange( AcqtqStatus::tqStatus );
void setProgress( int );
protected:
- aptFront::SharedPtr<AcqStatus> m_statusRef;
+ aptFront::SharedPtr<AcqtqStatus> m_statusRef;
};
}
diff --git a/adept/adept/acqprogresswidgetui.ui b/adept/adept/acqprogresswidgetui.ui
index 26baa21..8ed1fff 100644
--- a/adept/adept/acqprogresswidgetui.ui
+++ b/adept/adept/acqprogresswidgetui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>adept::AcqProgressWidgetUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>adept::AcqProgressWidgetUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -22,11 +22,11 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="adept::AcqStatus" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="adept::AcqtqStatus" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>m_status</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>300</width>
<height>150</height>
@@ -38,7 +38,7 @@
<cstring>m_progress</cstring>
</property>
</widget>
- <widget class="QPushButton" row="1" column="1">
+ <widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>m_cancel</cstring>
</property>
@@ -50,7 +50,7 @@
</widget>
<customwidgets>
<customwidget>
- <class>adept::AcqStatus</class>
+ <class>adept::AcqtqStatus</class>
<header location="global">acqprogress.h</header>
<sizehint>
<width>-1</width>
@@ -71,7 +71,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>adept/acqprogress.h</includehint>
<includehint>kprogress.h</includehint>
diff --git a/adept/adept/actor.h b/adept/adept/actor.h
index 115b202..a1fe192 100644
--- a/adept/adept/actor.h
+++ b/adept/adept/actor.h
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qobject.h>
+#include <tqobject.h>
#include <apt-front/cache/entity/entity.h>
#include <apt-front/actor.h>
@@ -14,9 +14,10 @@ namespace adept {
using namespace aptFront;
-class EntityActor : public QObject
+class EntityActor : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
EntityActor( actor::Bound< cache::entity::Entity > a )
: m_actor( a ), m_dead( false )
diff --git a/adept/adept/application.cpp b/adept/adept/application.cpp
index 5f2eb2a..e40b0eb 100644
--- a/adept/adept/application.cpp
+++ b/adept/adept/application.cpp
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qprocess.h>
+#include <tqprocess.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kapplication.h>
@@ -20,15 +20,19 @@
#include <adept/progress.h>
#include <adept/utils.h>
+#ifdef Q_MOC_RUN
+#define KUBUNTU
+#endif
+
namespace adept {
using namespace cache;
#ifdef KUBUNTU
-#include <qstringlist.h>
-#define DPKG_FIXER_ARGS QStringList::split(QString(" "), QString("dpkg --configure -a"), false)
+#include <tqstringlist.h>
+#define DPKG_FIXER_ARGS TQStringList::split(TQString(" "), TQString("dpkg --configure -a"), false)
-DpkgFixer::DpkgFixer(struct Application* parent)
- : m_parent(parent)
+DpkgFixer::DpkgFixer(struct Application* tqparent)
+ : m_parent(tqparent)
{
m_fixer = 0;
m_waiter = 0;
@@ -63,20 +67,20 @@ void DpkgFixer::fixDpkgLock()
kdDebug() << "User opted to fix the dpkg database. Trying to run the process..." << endl;
cache::Global::get().close();
// Call the dpkg fixer.
- m_fixer = new QProcess(dynamic_cast<QObject*>(this));
+ m_fixer = new TQProcess(dynamic_cast<TQObject*>(this));
m_fixer->setArguments(DPKG_FIXER_ARGS);
// Handle when the process exits
- connect(dynamic_cast<QObject*>(m_fixer), SIGNAL( processExited() ),
- dynamic_cast<QObject*>(this), SLOT( retryOpen() ));
+ connect(dynamic_cast<TQObject*>(m_fixer), TQT_SIGNAL( processExited() ),
+ dynamic_cast<TQObject*>(this), TQT_SLOT( retryOpen() ));
// Handle when the process has stdout output
- connect(dynamic_cast<QObject*>(m_fixer), SIGNAL( readyReadStdout() ),
- dynamic_cast<QObject*>(this), SLOT( handleStdout() ));
+ connect(dynamic_cast<TQObject*>(m_fixer), TQT_SIGNAL( readyReadStdout() ),
+ dynamic_cast<TQObject*>(this), TQT_SLOT( handleStdout() ));
// Handle when the process has stderr output
- connect(dynamic_cast<QObject*>(m_fixer), SIGNAL( readyReadStderr() ),
- dynamic_cast<QObject*>(this), SLOT( handleStderr() ));
+ connect(dynamic_cast<TQObject*>(m_fixer), TQT_SIGNAL( readyReadStderr() ),
+ dynamic_cast<TQObject*>(this), TQT_SLOT( handleStderr() ));
// Fire off the waiter...
m_waiter = new KProgressDialog(m_parent->mainWindow(), "waiter",
@@ -298,24 +302,24 @@ void Application::redo() {
setHistoryEnabled( true );
}
-QString Application::changeString() {
+TQString Application::changeString() {
component::State &s = cache().state();
return i18n( " Install %1, upgrade %2, remove %3 " )
- .arg( s.newInstallCount() ).arg( s.upgradeCount() )
- .arg( s.removeCount() );
+ .tqarg( s.newInstallCount() ).tqarg( s.upgradeCount() )
+ .tqarg( s.removeCount() );
}
-QString Application::statusString() {
+TQString Application::statusString() {
component::State &s = cache().state();
return i18n( " %1 installed, %2 upgradable, %3 available " )
- .arg( s.installedCount() ).arg( s.upgradableCount() )
- .arg( s.availableCount() );
+ .tqarg( s.installedCount() ).tqarg( s.upgradableCount() )
+ .tqarg( s.availableCount() );
}
-QString Application::sizesString() {
- QString dl = cache().state().downloadSizeString();
- QString inst = cache().state().installSizeString();
- return i18n( " download: %1, installation: %2 " ).arg( dl ).arg( inst );
+TQString Application::sizesString() {
+ TQString dl = cache().state().downloadSizeString();
+ TQString inst = cache().state().installSizeString();
+ return i18n( " download: %1, installation: %2 " ).tqarg( dl ).tqarg( inst );
}
void Application::setStatusBar( KStatusBar *s ) {
diff --git a/adept/adept/application.h b/adept/adept/application.h
index 0416b70..17f1c7d 100644
--- a/adept/adept/application.h
+++ b/adept/adept/application.h
@@ -5,8 +5,8 @@
#include <vector>
-#include <qobject.h>
-#include <qprocess.h>
+#include <tqobject.h>
+#include <tqprocess.h>
#include <kprogress.h>
#include <apt-front/cache/cache.h>
@@ -27,8 +27,9 @@ using cache::Cache;
class Lister;
#ifdef KUBUNTU
-class DpkgFixer : public QObject {
- Q_OBJECT;
+class DpkgFixer : public TQObject {
+ Q_OBJECT
+ TQ_OBJECT
public:
DpkgFixer(struct Application* app);
~DpkgFixer();
@@ -45,9 +46,9 @@ protected slots:
void handleStderr();
protected:
- QProcess* m_fixer;
+ TQProcess* m_fixer;
Application* m_parent;
- QString m_output;
+ TQString m_output;
KProgressDialog* m_waiter;
bool m_done;
};
@@ -64,7 +65,7 @@ struct Application : cache::Observer {
void cacheOpenedNowFinishInit();
void initKDEDebconf();
void initHistory();
- void setMainWidget( QWidget *w ) { m_main = w; }
+ void setMainWidget( TQWidget *w ) { m_main = w; }
void setStatusBar( KStatusBar *s );
void updateStatusbar();
virtual void initFinished() { return; };
@@ -76,10 +77,10 @@ struct Application : cache::Observer {
virtual void notifyPostChange( cache::component::Base * );
- QString changeString();
- QString statusString();
- QString sizesString();
- QWidget* mainWindow() { return m_main; };
+ TQString changeString();
+ TQString statusString();
+ TQString sizesString();
+ TQWidget* mainWindow() { return m_main; };
unsigned openFlags() { return m_flags; };
protected:
@@ -88,7 +89,7 @@ protected:
virtual History *history() { return m_history; }
bool m_acceptReadOnly;
unsigned m_flags;
- QWidget *m_main;
+ TQWidget *m_main;
KStatusBar *m_statusBar;
History *m_history;
diff --git a/adept/adept/changelog.cpp b/adept/adept/changelog.cpp
index 5dd47ed..4a3ed27 100644
--- a/adept/adept/changelog.cpp
+++ b/adept/adept/changelog.cpp
@@ -1,8 +1,8 @@
/* -*- C++ -*- */
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qhttp.h>
-#include <qbuffer.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqhttp.h>
+#include <tqbuffer.h>
#include <kdebug.h>
@@ -17,8 +17,8 @@ using namespace adept;
#ifdef KUBUNTU
ItemChangelog::ItemChangelog() {
- connect(this, SIGNAL( changelogNeeded() ),
- this, SLOT( requestChangelog() ));
+ connect(this, TQT_SIGNAL( changelogNeeded() ),
+ this, TQT_SLOT( requestChangelog() ));
m_http = 0;
m_content_catcher = 0;
}
@@ -37,19 +37,19 @@ ItemChangelog::~ItemChangelog() {
* changelog repository. If you want to modify this to meet the needs
* of another distro, you may want to implement your own method here.
*/
-QString ItemChangelog::changelogUrl() {
+TQString ItemChangelog::changelogUrl() {
// The list of known sections...
- QStringList knownSections(QString("main"));
- knownSections += QString("multiverse");
- knownSections += QString("restricted");
- knownSections += QString("universe");
+ TQStringList knownSections(TQString("main"));
+ knownSections += TQString("multiverse");
+ knownSections += TQString("restricted");
+ knownSections += TQString("universe");
// The parts of the package that form the URL...
- QStringList pkgParts( QString(BASE_CHANGELOG_URL) );
- QStringList sectionParts;
- QString section;
- QString urlBase;
- QString pkgName;
+ TQStringList pkgParts( TQString(BASE_CHANGELOG_URL) );
+ TQStringList sectionParts;
+ TQString section;
+ TQString urlBase;
+ TQString pkgName;
bool found = false;
try {
@@ -61,16 +61,16 @@ QString ItemChangelog::changelogUrl() {
throw 0;
}
//// Get the section
- section = QString( theSection );
+ section = TQString( theSection );
/* now convert the section into something
usable for the changelog URL. */
- sectionParts = QStringList::split(QString("/"), section);
+ sectionParts = TQStringList::split(TQString("/"), section);
/* If we have more than one piece, that means we've got a
non-main repo. Let's make sure it's one we can use. */
if (sectionParts.size() > 1) {
// Walk through known sections
- for (QStringList::Iterator it = knownSections.begin();
+ for (TQStringList::Iterator it = knownSections.begin();
it != knownSections.end(); ++it) {
// If we found it, let's say we found it.
if (sectionParts[0] == *it) {
@@ -80,33 +80,33 @@ QString ItemChangelog::changelogUrl() {
}
}
if (!found) {
- return QString::null; // didn't find the repo!
+ return TQString(); // didn't find the repo!
}
} else {
- pkgParts += QString("main");
+ pkgParts += TQString("main");
}
//// Get the package name and prefix
- pkgName += QString( m_pkg.source() );
- pkgParts += QString(pkgName[0]);
+ pkgName += TQString( m_pkg.source() );
+ pkgParts += TQString(pkgName[0]);
pkgParts += pkgName;
//// Get the version string.
- QString version = QString( m_pkg.candidateVersion().versionString() );
- int epoch = version.find(':');
+ TQString version = TQString( m_pkg.candidateVersion().versionString() );
+ int epoch = version.tqfind(':');
if (epoch > -1) {
version = version.mid(epoch + 1);
}
pkgName += "_" + version;
pkgParts += pkgName;
- pkgParts += QString("changelog");
+ pkgParts += TQString("changelog");
- return pkgParts.join(QString("/"));
+ return pkgParts.join(TQString("/"));
} catch (...) {
kdDebug() << "GOT ME AN EXCEPTION!!!! THIS IS NOT GOOD!!!!";
}
- return QString::null;
+ return TQString();
}
void ItemChangelog::requestChangelog() {
@@ -115,26 +115,26 @@ void ItemChangelog::requestChangelog() {
// return;
/* Removing temporarilly */
- m_http = new QHttp(QString(BASE_CHANGELOG_HOST),
+ m_http = new TQHttp(TQString(BASE_CHANGELOG_HOST),
BASE_CHANGELOG_PORT,
this, "changelog_loader");
- connect(dynamic_cast<QObject*>(m_http), SIGNAL( requestFinished(int,bool) ),
- dynamic_cast<QObject*>(this), SLOT( contentReady(int,bool) ));
- m_content_catcher = new QBuffer();
- QString theUrl( changelogUrl() );
+ connect(dynamic_cast<TQObject*>(m_http), TQT_SIGNAL( requestFinished(int,bool) ),
+ dynamic_cast<TQObject*>(this), TQT_SLOT( contentReady(int,bool) ));
+ m_content_catcher = new TQBuffer();
+ TQString theUrl( changelogUrl() );
- if ( theUrl == QString::null ) {
- emit changelogReady(QString("No change log found."));
+ if ( theUrl == TQString() ) {
+ emit changelogReady(TQString("No change log found."));
} else {
- m_http->get( changelogUrl(), dynamic_cast<QIODevice*>(m_content_catcher) );
+ m_http->get( changelogUrl(), dynamic_cast<TQIODevice*>(m_content_catcher) );
}
}
void ItemChangelog::contentReady( int id, bool error ) {
- QString msg("Unable to fetch the Developer Changelog.");
+ TQString msg("Unable to fetch the Developer Changelog.");
if (!error) {
- msg = QString( m_content_catcher->buffer() );
+ msg = TQString( m_content_catcher->buffer() );
} else {
msg += ": " + m_http->errorString();
}
diff --git a/adept/adept/changelog.h b/adept/adept/changelog.h
index 8db861b..764ad28 100644
--- a/adept/adept/changelog.h
+++ b/adept/adept/changelog.h
@@ -2,13 +2,17 @@
#ifndef CHANGELOG_H
#define CHANGELOG_H
-#include <qobject.h>
-#include <qstring.h>
-#include <qhttp.h>
-#include <qbuffer.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqhttp.h>
+#include <tqbuffer.h>
#include <adept/lister.h>
+#ifdef Q_MOC_RUN
+#define KUBUNTU
+#endif
+
#ifdef KUBUNTU
#define BASE_CHANGELOG_HOST "changelogs.ubuntu.com"
#define BASE_CHANGELOG_PORT 80
@@ -16,18 +20,19 @@
namespace adept {
- class ItemChangelog : public QObject {
+ class ItemChangelog : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
ItemChangelog();
~ItemChangelog();
// Give me the changelog's URL
- QString changelogUrl();
- void setParent(entity::Package parent) { m_pkg = parent; }
+ TQString changelogUrl();
+ void setParent(entity::Package tqparent) { m_pkg = tqparent; }
signals:
void changelogNeeded();
- void changelogReady(QString content);
+ void changelogReady(TQString content);
protected slots:
// Give me the changelog's text
@@ -36,8 +41,8 @@ namespace adept {
protected:
entity::Package m_pkg;
- QHttp* m_http;
- QBuffer* m_content_catcher;
+ TQHttp* m_http;
+ TQBuffer* m_content_catcher;
};
}
diff --git a/adept/adept/commitprogress.cpp b/adept/adept/commitprogress.cpp
index 9322e27..488fb61 100644
--- a/adept/adept/commitprogress.cpp
+++ b/adept/adept/commitprogress.cpp
@@ -1,11 +1,11 @@
#include <cassert>
-#include <qwidgetstack.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
+#include <tqwidgetstack.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
#include <kprogress.h>
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kdebug.h>
@@ -25,23 +25,23 @@ void CommitProgress::initSystem() {
CommitProgress::s_system = new PkgSystem();
}
-CommitProgress::CommitProgress( QWidget *p, const char *n )
+CommitProgress::CommitProgress( TQWidget *p, const char *n )
: CommitProgressUi( p, n )
{
assert( s_system );
m_konsoleFrame->installEventFilter( this );
loadKonsole();
- connect( s_system, SIGNAL( statusChanged( int, QString ) ),
- this, SLOT( updateProgress( int, QString ) ) );
- connect( m_details, SIGNAL( clicked() ),
- this, SLOT( toggleDetails() ) );
+ connect( s_system, TQT_SIGNAL( statusChanged( int, TQString ) ),
+ this, TQT_SLOT( updateProgress( int, TQString ) ) );
+ connect( m_details, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( toggleDetails() ) );
m_progress->setTotalSteps( 100 );
}
-bool CommitProgress::eventFilter( QObject *o, QEvent *e ) {
+bool CommitProgress::eventFilter( TQObject *o, TQEvent *e ) {
// o == m_konsoleFrame
- if ( e->type() == QEvent::Resize ) {
- QResizeEvent *re = dynamic_cast< QResizeEvent * >( e );
+ if ( e->type() == TQEvent::Resize ) {
+ TQResizeEvent *re = dynamic_cast< TQResizeEvent * >( e );
if ( !re ) return false;
m_konsole->widget()->setGeometry( 0, 0, re->size().width(), re->size().height() );
m_occlude->setGeometry( 0, 0, re->size().width(), re->size().height() );
@@ -56,18 +56,18 @@ void CommitProgress::toggleDetails()
// m_stack->raiseWidget( m_emptyPage );
m_occlude->show();
m_occlude->setFocus();
- m_bottomSpace->changeSize( 10, 10, QSizePolicy::Fixed, QSizePolicy::Expanding );
+ m_bottomSpace->changeSize( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::Expanding );
m_details->setText( i18n( "Show Details" ) );
} else { // show
m_occlude->hide();
m_konsole->widget()->setFocus();
// m_stack->raiseWidget( m_konsole->widget() );
- m_bottomSpace->changeSize( 10, 10, QSizePolicy::Fixed, QSizePolicy::Fixed );
+ m_bottomSpace->changeSize( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed );
m_details->setText( i18n( "Hide Details" ) );
}
}
-void CommitProgress::updateProgress( int p, QString msg )
+void CommitProgress::updateProgress( int p, TQString msg )
{
m_operation->setText( msg );
m_progress->setProgress( p );
@@ -86,13 +86,13 @@ void CommitProgress::loadKonsole()
delete m_occlude;
m_konsole = static_cast<KParts::Part*>(
- factory->create( m_konsoleFrame, "konsolepart", "QObject",
+ factory->create( TQT_TQOBJECT(m_konsoleFrame), "konsolepart", TQOBJECT_OBJECT_NAME_STRING,
u8( "KParts::ReadOnlyPart" ) ) );
- // m_konsole->widget()->setGeometry( QRect( 0, 0, 40, 40 ) );
+ // m_konsole->widget()->setGeometry( TQRect( 0, 0, 40, 40 ) );
- m_occlude = new QFrame( m_konsoleFrame, "m_occlude" );
- // m_occlude->setGeometry( QRect( 0, 0, 10, 10 ) );
- m_occlude->setFrameShape( QFrame::NoFrame );
+ m_occlude = new TQFrame( m_konsoleFrame, "m_occlude" );
+ // m_occlude->setGeometry( TQRect( 0, 0, 10, 10 ) );
+ m_occlude->setFrameShape( TQFrame::NoFrame );
assert( terminal() );
@@ -100,7 +100,7 @@ void CommitProgress::loadKonsole()
terminal()->setAutoStartShell( false );
// m_stack->addWidget( m_konsole->widget() );
- QStrList l; l.append( "echo" ); l.append( "-n" );
+ TQStrList l; l.append( "echo" ); l.append( "-n" );
terminal()->startProgram( u8( "/bin/echo" ), l );
s_system->setTerminal( m_konsole );
@@ -109,9 +109,9 @@ void CommitProgress::loadKonsole()
// m_konsole->widget()->show();
// m_stack->raiseWidget( m_emptyPage );
m_operation->setText( i18n( "Idle" ) );
- QTimer::singleShot( 0, this, SLOT( toggleDetails() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( toggleDetails() ) );
if ( DEFAULT_KONSOLE_HIDDEN )
- QTimer::singleShot( 0, this, SLOT( toggleDetails() ) );
- QTimer::singleShot( 0, this, SLOT( hide() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( toggleDetails() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( hide() ) );
}
diff --git a/adept/adept/commitprogress.h b/adept/adept/commitprogress.h
index ed557d7..123dc61 100644
--- a/adept/adept/commitprogress.h
+++ b/adept/adept/commitprogress.h
@@ -14,8 +14,9 @@ namespace adept {
class CommitProgress : public CommitProgressUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- CommitProgress( QWidget *p = 0, const char *n = 0 );
+ CommitProgress( TQWidget *p = 0, const char *n = 0 );
ExtTerminalInterface *terminal() {
return static_cast<ExtTerminalInterface*>(
@@ -24,10 +25,10 @@ public:
// needs to be called before aptFront::init() :'((
static void initSystem();
- virtual bool eventFilter( QObject *o, QEvent *e );
+ virtual bool eventFilter( TQObject *o, TQEvent *e );
public slots:
- void updateProgress( int p, QString msg );
+ void updateProgress( int p, TQString msg );
void toggleDetails();
protected:
void loadKonsole();
diff --git a/adept/adept/commitprogressui.ui b/adept/adept/commitprogressui.ui
index 5ccecbf..da30273 100644
--- a/adept/adept/commitprogressui.ui
+++ b/adept/adept/commitprogressui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>adept::CommitProgressUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CommitProgressUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -22,7 +22,7 @@
<property name="margin">
<number>1</number>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>m_konsoleFrame</cstring>
</property>
@@ -40,11 +40,11 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>m_occlude</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>40</x>
<y>10</y>
@@ -70,16 +70,16 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@@ -95,22 +95,22 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton" row="1" column="1">
+ <widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>m_details</cstring>
</property>
@@ -123,7 +123,7 @@
<cstring>m_progress</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>m_operation</cstring>
</property>
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>80</height>
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>32</height>
@@ -190,7 +190,7 @@
</widget>
<customwidgets>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kprogress.h</includehint>
</includehints>
diff --git a/adept/adept/desktopentryui.ui b/adept/adept/desktopentryui.ui
index a40c766..9a6405e 100644
--- a/adept/adept/desktopentryui.ui
+++ b/adept/adept/desktopentryui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>DesktopEntryUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>5</number>
</property>
- <widget class="QLabel" row="0" column="1" rowspan="2" colspan="1">
+ <widget class="TQLabel" row="0" column="1" rowspan="2" colspan="1">
<property name="name">
<cstring>m_icon</cstring>
</property>
@@ -37,7 +37,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -47,7 +47,7 @@
<string></string>
</property>
</widget>
- <widget class="QCheckBox" row="0" column="0" rowspan="2" colspan="1">
+ <widget class="TQCheckBox" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>m_check</cstring>
</property>
@@ -63,7 +63,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="0" column="3">
+ <widget class="TQLabel" row="0" column="3">
<property name="name">
<cstring>m_name</cstring>
</property>
@@ -79,14 +79,14 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel" row="1" column="3">
+ <widget class="TQLabel" row="1" column="3">
<property name="name">
<cstring>m_description</cstring>
</property>
<property name="text">
<string>(description)</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>6</width>
<height>20</height>
@@ -112,5 +112,5 @@
<includes>
<include location="global" impldecl="in declaration">adept/extendablelist.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/adept/desktoplist.cpp b/adept/adept/desktoplist.cpp
index de64f11..8e8cb8a 100644
--- a/adept/adept/desktoplist.cpp
+++ b/adept/adept/desktoplist.cpp
@@ -3,10 +3,10 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qimage.h>
-#include <qlabel.h>
-#include <qcursor.h>
-#include <qcheckbox.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqcursor.h>
+#include <tqcheckbox.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kapplication.h>
@@ -18,7 +18,7 @@
namespace adept {
-DesktopEntry::DesktopEntry( QWidget *p, const char *n )
+DesktopEntry::DesktopEntry( TQWidget *p, const char *n )
: DesktopEntryUi( p, n )
{
adjustFontSize( m_description, -1 );
@@ -27,18 +27,18 @@ DesktopEntry::DesktopEntry( QWidget *p, const char *n )
void DesktopEntry::resize( int w, int h )
{
// kdDebug() << "DesktopEntry::resize( " << w << ", " << h << " )" << endl;
- int margin = layout()->margin() + layout()->spacing() * 2
+ int margin = tqlayout()->margin() + tqlayout()->spacing() * 2
+ 6 /* spacer */ + m_icon->width() + m_check->width();
- if ( m_check->isVisible() ) margin += m_check->width() + layout()->spacing();
+ if ( m_check->isVisible() ) margin += m_check->width() + tqlayout()->spacing();
int hFW1 = m_name->heightForWidth( w - margin );
int hFW2 = m_description->heightForWidth( w - margin );
/* kdDebug() << "margin = " << margin << ", hFW1 = " << hFW1 << ", hFW2 = "
<< hFW2 << endl; */
- int height = 2 * layout()->margin() + layout()->spacing() + hFW1 + hFW2;
- if ( height < 32 + 2*layout()->margin() /* icon size + margin */ )
- height = 32 + 2*layout()->margin();
+ int height = 2 * tqlayout()->margin() + tqlayout()->spacing() + hFW1 + hFW2;
+ if ( height < 32 + 2*tqlayout()->margin() /* icon size + margin */ )
+ height = 32 + 2*tqlayout()->margin();
// m_description->resize( w - margin, m_description->heightForWidth( w - margin ) );
- QWidget::resize( w, height );
+ TQWidget::resize( w, height );
}
void DesktopEntry::setItem( ExtendableItem *i ) {
@@ -52,34 +52,34 @@ void DesktopEntry::setItem( ExtendableItem *i ) {
if ( !package().valid() || !package().hasVersion() ) {
setEnabled( false );
} else {
- connect( m_check, SIGNAL( toggled( bool ) ),
- this, SLOT( toggled() ) );
+ connect( m_check, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( toggled() ) );
notifyPostChange();
}
}
-void DesktopEntry::mousePressEvent( QMouseEvent *e ) {
+void DesktopEntry::mousePressEvent( TQMouseEvent *e ) {
kdDebug() << "DesktopEntry::mousePressEvent" << endl;
e->ignore();
}
-void DesktopEntry::mouseReleaseEvent( QMouseEvent *e ) {
+void DesktopEntry::mouseReleaseEvent( TQMouseEvent *e ) {
kdDebug() << "DesktopEntry::mouseReleaseEvent" << endl;
e->ignore();
}
-void DesktopEntry::showEvent( QShowEvent *e ) {
+void DesktopEntry::showEvent( TQShowEvent *e ) {
DesktopEntryUi::showEvent( e );
// DesktopEntryUi::polish();
if ( m_polished ) return;
item()->list()->polishing();
kdDebug() << "polish for " << entity().name() << endl;
- QImage icon( KGlobal::iconLoader()->iconPath( entity().icon(), -32, true ) );
+ TQImage icon( KGlobal::iconLoader()->iconPath( entity().icon(), -32, true ) );
if ( icon.isNull() ) {
- icon = QImage( KGlobal::dirs()->findResource( "desktopicon", entity().icon() ) );
+ icon = TQImage( KGlobal::dirs()->findResource( "desktopicon", entity().icon() ) );
}
m_icon->setPixmap( icon.isNull() ? item()->list()->emptyIcon() :
- QPixmap( icon.smoothScale( 32, 32, QImage::ScaleMin ) ) );
+ TQPixmap( icon.smoothScale( 32, 32, TQ_ScaleMin ) ) );
item()->list()->polished();
m_polished = true;
}
@@ -109,7 +109,7 @@ void DesktopEntry::toggled() {
void DesktopList::polishing() {
if ( m_polishing == 0 )
- QApplication::setOverrideCursor( QCursor( Qt::BusyCursor ) );
+ TQApplication::setOverrideCursor( TQCursor( TQt::BusyCursor ) );
m_polishing++;
if ( m_polishing % 10 == 0 )
kapp->processEvents();
@@ -117,7 +117,7 @@ void DesktopList::polishing() {
void DesktopList::polished() {
if ( m_polishing == childCount() )
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
}
void DesktopList::notifyPostChange( component::Base * ) {
@@ -138,23 +138,23 @@ void DesktopEntry::notifyPostChange() {
m_check->blockSignals( false );
}
-DesktopList::DesktopList( QWidget *parent, const char *name )
- : ExtendableList( parent, name ), m_polishing( 0 ), m_displayCheckboxes( true )
+DesktopList::DesktopList( TQWidget *tqparent, const char *name )
+ : ExtendableList( tqparent, name ), m_polishing( 0 ), m_displayCheckboxes( true )
{
observeComponent< component::State >();
addColumn( i18n( "Application" ) );
setResizeMode( LastColumn );
setToggleColumn( -1 ); // no toggling, thanks
setExtenderHighlight( true );
- m_emptyIcon = QPixmap(
- QImage(
+ m_emptyIcon = TQPixmap(
+ TQImage(
KGlobal::iconLoader()->iconPath( u8( "exec" ), -32, false )
- ).smoothScale( 32, 32, QImage::ScaleMin ) );
- connect( this, SIGNAL( clicked( QListViewItem *, const QPoint &, int ) ),
- this, SLOT( processClick( QListViewItem *, const QPoint &, int ) ) );
+ ).smoothScale( 32, 32, TQ_ScaleMin ) );
+ connect( this, TQT_SIGNAL( clicked( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQT_SLOT( processClick( TQListViewItem *, const TQPoint &, int ) ) );
}
-void DesktopList::processClick( QListViewItem *it, const QPoint &, int ) {
+void DesktopList::processClick( TQListViewItem *it, const TQPoint &, int ) {
kdDebug() << "DesktopList::processClick..." << endl;
DesktopItem *i = dynamic_cast< DesktopItem * >( it );
if ( !i ) return;
@@ -165,7 +165,7 @@ void DesktopList::insertRange( Range r ) {
m_range = r;
DesktopItem *last = 0;
int i = 0;
- QApplication::setOverrideCursor( QCursor( Qt::BusyCursor ) );
+ TQApplication::setOverrideCursor( TQCursor( TQt::BusyCursor ) );
for( ; r != r.end(); r.advance() ) {
if ( i % 20 == 0 )
kapp->processEvents();
@@ -176,7 +176,7 @@ void DesktopList::insertRange( Range r ) {
i->setEntity( *r );
++ i;
}
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
}
ItemExtender *DesktopItem::createExtender() {
diff --git a/adept/adept/desktoplist.h b/adept/adept/desktoplist.h
index 207b9a7..f072869 100644
--- a/adept/adept/desktoplist.h
+++ b/adept/adept/desktoplist.h
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qimage.h>
+#include <tqimage.h>
#include <klocale.h>
#include <apt-front/cache/entity/desktop.h>
@@ -13,7 +13,7 @@
#ifndef EPT_DESKTOPLIST_H
#define EPT_DESKTOPLIST_H
-class QPopupMenu;
+class TQPopupMenu;
namespace adept {
using namespace aptFront;
@@ -24,15 +24,16 @@ class DesktopItem;
class DesktopList : public ExtendableList, public cache::Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef utils::Range< entity::Desktop > Range;
- DesktopList( QWidget *parent = 0, const char *name = 0 );
+ DesktopList( TQWidget *tqparent = 0, const char *name = 0 );
void insertRange( Range );
- QPixmap emptyIcon() { return m_emptyIcon; }
+ TQPixmap emptyIcon() { return m_emptyIcon; }
void polishing();
void polished();
- void setTitle( QString s ) {
+ void setTitle( TQString s ) {
setColumnText( 0, i18n( "Application (" ) + s + i18n( ")" ) );
}
@@ -43,13 +44,13 @@ public:
emit request( p, a );
}
protected slots:
- void processClick( QListViewItem *, const QPoint &, int );
+ void processClick( TQListViewItem *, const TQPoint &, int );
signals:
void request( cache::entity::Package, cache::component::State::Action );
void showDescription( cache::entity::Desktop );
protected:
Range m_range;
- QPixmap m_emptyIcon;
+ TQPixmap m_emptyIcon;
int m_polishing;
bool m_displayCheckboxes;
};
@@ -57,8 +58,9 @@ protected:
class DesktopEntry : public DesktopEntryUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- DesktopEntry( QWidget * = 0, const char * = 0 );
+ DesktopEntry( TQWidget * = 0, const char * = 0 );
DesktopItem *item() const;
entity::Desktop entity() const;
void setItem( ExtendableItem * );
@@ -69,9 +71,9 @@ public:
public slots:
void toggled();
protected:
- virtual void mousePressEvent( QMouseEvent *e );
- virtual void mouseReleaseEvent( QMouseEvent *e );
- virtual void showEvent( QShowEvent * );
+ virtual void mousePressEvent( TQMouseEvent *e );
+ virtual void mouseReleaseEvent( TQMouseEvent *e );
+ virtual void showEvent( TQShowEvent * );
bool m_polished;
};
@@ -98,7 +100,7 @@ public:
DesktopList *list() { return dynamic_cast< DesktopList * >( listView() ); }
- QString text( int ) const { return QString( "you shouldn't see this" ); }
+ TQString text( int ) const { return TQString( "you shouldn't see this" ); }
entity::Desktop entity() const { return m_entity; }
void setEntity( entity::Desktop e ) { m_entity = e; }
diff --git a/adept/adept/dpkgpm-gui.cpp b/adept/adept/dpkgpm-gui.cpp
index 828d18f..9a3fae8 100644
--- a/adept/adept/dpkgpm-gui.cpp
+++ b/adept/adept/dpkgpm-gui.cpp
@@ -6,7 +6,7 @@
#include <fcntl.h>
#include <iostream>
-#include <qstrlist.h>
+#include <tqstrlist.h>
#include <kapplication.h>
#include <klistbox.h>
#include <klocale.h>
@@ -43,8 +43,8 @@ pkgPackageManager *PkgSystem::CreatePM( pkgDepCache *c ) const
{
std::cerr << "kapture::PkgSystem::CreatePM()" << std::endl;
adept::DPkgPM *pm = new adept::DPkgPM( c, m_terminalPart );
- connect( pm, SIGNAL( statusChanged( int, QString ) ),
- this, SIGNAL( statusChanged( int, QString ) ) );
+ connect( pm, TQT_SIGNAL( statusChanged( int, TQString ) ),
+ this, TQT_SIGNAL( statusChanged( int, TQString ) ) );
return pm;
}
@@ -57,17 +57,17 @@ bool DPkgPM::forkDpkg( char *const argv[] )
{
bool ok = true;
std::cerr << "adept::DPkgPM::forkDpkg ()" << std::endl;
- QStrList l;
+ TQStrList l;
for (int i = 0; argv[i]; i ++)
l.append( argv[i] );
m_processRunning = true;
- connect( m_terminalPart, SIGNAL( processExited( KProcess * ) ),
- this, SLOT( processExit( KProcess * ) ) );
- connect( m_terminalPart, SIGNAL( processExited( const KProcess * ) ),
- this, SLOT( processExitC( const KProcess * ) ) );
- connect( m_terminalPart, SIGNAL( forkedChild() ),
- this, SLOT( setupDpkgChild() ) );
+ connect( m_terminalPart, TQT_SIGNAL( processExited( KProcess * ) ),
+ this, TQT_SLOT( processExit( KProcess * ) ) );
+ connect( m_terminalPart, TQT_SIGNAL( processExited( const KProcess * ) ),
+ this, TQT_SLOT( processExitC( const KProcess * ) ) );
+ connect( m_terminalPart, TQT_SIGNAL( forkedChild() ),
+ this, TQT_SLOT( setupDpkgChild() ) );
terminal()->startProgram( u8( argv[0] ), l );
@@ -110,19 +110,19 @@ bool DPkgPM::forkScript (const char *cmd, bool fP)
SetCloseExec (m_scriptPipe[0], true);
SetCloseExec (m_scriptPipe[1], true);
}
- QStrList l;
+ TQStrList l;
l.append ("/bin/sh");
l.append ("-c");
l.append (cmd);
if (fP) {
- connect( m_terminalPart, SIGNAL( forkedChild() ),
- this, SLOT( setupScriptPipe() ) );
+ connect( m_terminalPart, TQT_SIGNAL( forkedChild() ),
+ this, TQT_SLOT( setupScriptPipe() ) );
}
- connect( m_terminalPart, SIGNAL( processExited( KProcess * ) ),
- this, SLOT( processExit( KProcess * ) ) );
- connect( m_terminalPart, SIGNAL( processExited( const KProcess * ) ),
- this, SLOT( processExitC( const KProcess * ) ) );
+ connect( m_terminalPart, TQT_SIGNAL( processExited( KProcess * ) ),
+ this, TQT_SLOT( processExit( KProcess * ) ) );
+ connect( m_terminalPart, TQT_SIGNAL( processExited( const KProcess * ) ),
+ this, TQT_SLOT( processExitC( const KProcess * ) ) );
m_processRunning = true;
terminal()->startProgram( u8( "/bin/sh" ), l);
@@ -183,7 +183,7 @@ bool DPkgPM::Go( int )
std::cerr << "kapture::DPkgPM::Go ()" << std::endl;
statusChanged( 0, i18n( "Preparing..." ) );
bool ret = aptFront::DPkgPM::Go(-1);
- QStrList l;
+ TQStrList l;
l.append("echo");
l.append("dpkg run finished!");
terminal()->startProgram( u8( "echo" ), l );
@@ -197,10 +197,10 @@ void DPkgPM::dpkgMonitor ()
kapp->processEvents();
}
-void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
+void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
{
std::string op, msg;
- aptFront::DPkgPM::updateStatus( pkg, ev, r );
+ aptFront::DPkgPM::updatetqStatus( pkg, ev, r );
entity::Package p = cache::Global::get().packages().packageByName( pkg );
if ( m_currentOp == OInstall ) {
@@ -245,12 +245,12 @@ void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
msg = u8( i18n( "Purged %1" ) );
}
- std::cerr << "updateStatus( " << pkg << ", " << ev << ", " << r << ")" << std::endl;
- std::cerr << "updateStatus: msg = " << msg << std::endl;
- std::cerr << "updateStatus: seen = " << m_seenOpCount
+ std::cerr << "updatetqStatus( " << pkg << ", " << ev << ", " << r << ")" << std::endl;
+ std::cerr << "updatetqStatus: msg = " << msg << std::endl;
+ std::cerr << "updatetqStatus: seen = " << m_seenOpCount
<< ", total = " << m_totalOpCount << std::endl;
statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount,
- u8( msg ).arg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
+ u8( msg ).tqarg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
}
}
diff --git a/adept/adept/dpkgpm-gui.h b/adept/adept/dpkgpm-gui.h
index 435ee7f..0c3ce26 100644
--- a/adept/adept/dpkgpm-gui.h
+++ b/adept/adept/dpkgpm-gui.h
@@ -19,9 +19,10 @@ class Part;
namespace adept {
-class PkgSystem : public QObject, public debSystem
+class PkgSystem : public TQObject, public debSystem
{
Q_OBJECT
+ TQ_OBJECT
public:
PkgSystem ();
virtual pkgPackageManager *CreatePM( pkgDepCache *Cache ) const;
@@ -32,12 +33,13 @@ public:
protected:
KParts::Part *m_terminalPart;
signals:
- void statusChanged( int p, QString m );
+ void statusChanged( int p, TQString m );
};
-class DPkgPM : public QObject, public aptFront::DPkgPM
+class DPkgPM : public TQObject, public aptFront::DPkgPM
{
Q_OBJECT
+ TQ_OBJECT
public:
DPkgPM (pkgDepCache *c, KParts::Part *t);
virtual bool forkDpkg (char *const argv[]);
@@ -45,7 +47,7 @@ public:
virtual bool Go (int);
virtual bool forkScript (const char *, bool);
ExtTerminalInterface *terminal();
- virtual void updateStatus( std::string pkg, std::string ev, std::string r );
+ virtual void updatetqStatus( std::string pkg, std::string ev, std::string r );
public slots:
void processExitC(const KProcess *p);
@@ -54,7 +56,7 @@ public slots:
void setupDpkgChild();
signals:
- void statusChanged( int p, QString m );
+ void statusChanged( int p, TQString m );
protected:
KParts::Part *m_terminalPart;
diff --git a/adept/adept/dpkgpm.cpp b/adept/adept/dpkgpm.cpp
index f4b4f0d..b229e54 100644
--- a/adept/adept/dpkgpm.cpp
+++ b/adept/adept/dpkgpm.cpp
@@ -111,9 +111,9 @@ bool DPkgPM::forkDpkg (char *const argv[])
close( m_dpkgPipe[1] );
fcntl( m_dpkgPipe[0], F_SETFL, O_NONBLOCK );
- int Status = 0;
+ int tqStatus = 0;
int ret = 0;
- while ((ret = waitpid (Child, &Status, WNOHANG)) != Child) {
+ while ((ret = waitpid (Child, &tqStatus, WNOHANG)) != Child) {
if (errno == EINTR || ret == 0) {
dpkgMonitor ();
usleep (200000); // 0.2 second hang
@@ -130,14 +130,14 @@ bool DPkgPM::forkDpkg (char *const argv[])
signal(SIGINT,old_SIGINT);
// Check for an error code.
- if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
+ if (WIFEXITED(tqStatus) == 0 || WEXITSTATUS(tqStatus) != 0)
{
runScripts ("DPkg::Post-Invoke", false);
- if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV)
+ if (WIFSIGNALED(tqStatus) != 0 && WTERMSIG(tqStatus) == SIGSEGV)
return _error->Error("Sub-process %s received a segmentation fault.", argv [0]);
- if (WIFEXITED(Status) != 0)
- return _error->Error("Sub-process %s returned an error code (%u)", argv[0], WEXITSTATUS(Status));
+ if (WIFEXITED(tqStatus) != 0)
+ return _error->Error("Sub-process %s returned an error code (%u)", argv[0], WEXITSTATUS(tqStatus));
return _error->Error("Sub-process %s exited unexpectedly", argv[0]);
}
@@ -312,7 +312,7 @@ void DPkgPM::dpkgMonitor ()
r = "";
else
r = string( r, colon + 2, string::npos );
- updateStatus( p, e, r );
+ updatetqStatus( p, e, r );
}
b = string( b, nl + 1, string::npos );
@@ -322,9 +322,9 @@ void DPkgPM::dpkgMonitor ()
}
}
-void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
+void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
{
- //std::cerr << "DPkgPM::updateStatus " << pkg << " " << ev << " " << r
+ //std::cerr << "DPkgPM::updatetqStatus " << pkg << " " << ev << " " << r
// << std::endl;
if (ev.find("error") != string::npos) {
char* list[5];
@@ -335,7 +335,7 @@ void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
return;
}
- OpAndStatus os = std::make_pair( m_currentOp, ev );
+ OpAndtqStatus os = std::make_pair( m_currentOp, ev );
if ( m_seenOps[ std::make_pair( os, pkg ) ] == 0 ) {
m_seenOpCount++;
m_seenOps[ std::make_pair( os, pkg ) ] = 1;
diff --git a/adept/adept/dpkgpm.h b/adept/adept/dpkgpm.h
index b899693..37e9001 100644
--- a/adept/adept/dpkgpm.h
+++ b/adept/adept/dpkgpm.h
@@ -21,8 +21,8 @@ protected:
int m_scriptPipe[2];
unsigned m_version;
std::string m_statusBuffer;
- typedef std::pair< Op, std::string > OpAndStatus;
- typedef std::map< std::pair< OpAndStatus, std::string >, int > SeenOps;
+ typedef std::pair< Op, std::string > OpAndtqStatus;
+ typedef std::map< std::pair< OpAndtqStatus, std::string >, int > SeenOps;
SeenOps m_seenOps;
int m_totalOpCount;
int m_seenOpCount;
@@ -39,7 +39,7 @@ public:
virtual void dpkgMonitor (void);
virtual bool SendV1Pkgs (FILE *);
virtual bool feedPackages (void);
- virtual void updateStatus( std::string pkg, std::string ev, std::string r );
+ virtual void updatetqStatus( std::string pkg, std::string ev, std::string r );
};
}
diff --git a/adept/adept/easytagfilter.cpp b/adept/adept/easytagfilter.cpp
index 3049d60..d651a04 100644
--- a/adept/adept/easytagfilter.cpp
+++ b/adept/adept/easytagfilter.cpp
@@ -2,14 +2,14 @@
#include <apt-front/predicate/factory.h>
#include <klocale.h>
#include <kdebug.h>
-#include <qcombobox.h>
-#include <qpushbutton.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
#include "easytagfilter.h"
using namespace aptFront;
using namespace adept;
-static void fillCombo( QComboBox *c, const std::string f ) {
+static void fillCombo( TQComboBox *c, const std::string f ) {
Cache &cache = cache::Global::get(); // FIXME?
std::set< ept::debtags::Tag > t;
t = cache.tags().tags( f );
@@ -18,30 +18,30 @@ static void fillCombo( QComboBox *c, const std::string f ) {
}
}
-EasyTagFilterWidget::EasyTagFilterWidget( QWidget *parent, const char *name )
- : EasyTagFilterUi( parent, name )
+EasyTagFilterWidget::EasyTagFilterWidget( TQWidget *tqparent, const char *name )
+ : EasyTagFilterUi( tqparent, name )
{
fillCombo( m_use, "use" );
fillCombo( m_interface, "interface" );
fillCombo( m_worksWith, "works-with" );
fillCombo( m_role, "role" );
- connect( m_use, SIGNAL( activated( int ) ),
- this, SLOT( widgetsChanged() ) );
- connect( m_interface, SIGNAL( activated( int ) ),
- this, SLOT( widgetsChanged() ) );
- connect( m_worksWith, SIGNAL( activated( int ) ),
- this, SLOT( widgetsChanged() ) );
- connect( m_role, SIGNAL( activated( int ) ),
- this, SLOT( widgetsChanged() ) );
- connect( m_reset, SIGNAL( clicked() ),
- this, SLOT( reset() ) );
+ connect( m_use, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( m_interface, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( m_worksWith, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( m_role, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( m_reset, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( reset() ) );
}
-static void setFacet( QComboBox *c, const std::string fac,
+static void setFacet( TQComboBox *c, const std::string fac,
EasyTagFilter< entity::Package > &f )
{
if (c->currentItem())
- f.set( fac, c->currentText() );
+ f.set( fac, c->currentText().ascii() );
}
EasyTagFilterWidget::Predicate EasyTagFilterWidget::predicate()
@@ -54,7 +54,7 @@ EasyTagFilterWidget::Predicate EasyTagFilterWidget::predicate()
return predicate::adapt< entity::Entity >( f );
}
-static void setCombo( QComboBox *c, const std::string &t ) {
+static void setCombo( TQComboBox *c, const std::string &t ) {
c->blockSignals( true );
if (t == "")
c->setCurrentItem( 0 );
diff --git a/adept/adept/easytagfilter.h b/adept/adept/easytagfilter.h
index 66977d5..dbee168 100644
--- a/adept/adept/easytagfilter.h
+++ b/adept/adept/easytagfilter.h
@@ -4,7 +4,7 @@
*/
#include <klocale.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <apt-front/cache/entity/entity.h>
@@ -80,8 +80,9 @@ protected:
class EasyTagFilterWidget : public EasyTagFilterUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- EasyTagFilterWidget( QWidget *parent, const char *name = 0 );
+ EasyTagFilterWidget( TQWidget *tqparent, const char *name = 0 );
virtual Predicate predicate();
public slots:
void predicateChanged();
diff --git a/adept/adept/easytagfilterui.ui b/adept/adept/easytagfilterui.ui
index 998bf2b..f1e40d5 100644
--- a/adept/adept/easytagfilterui.ui
+++ b/adept/adept/easytagfilterui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>EasyTagFilterUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>1</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_title</cstring>
</property>
@@ -41,9 +41,9 @@
<string>&lt;b&gt;Easy Tag Filter&lt;/b&gt;</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -59,22 +59,22 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="2">
+ <widget class="TQLabel" row="1" column="2">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -82,7 +82,7 @@
<string>Works With:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -90,7 +90,7 @@
<string>Role:</string>
</property>
</widget>
- <widget class="QComboBox" row="1" column="3">
+ <widget class="TQComboBox" row="1" column="3">
<item>
<property name="text">
<string>Anything</string>
@@ -100,7 +100,7 @@
<cstring>m_worksWith</cstring>
</property>
</widget>
- <widget class="QPushButton" row="1" column="4">
+ <widget class="TQPushButton" row="1" column="4">
<property name="name">
<cstring>m_reset</cstring>
</property>
@@ -108,7 +108,7 @@
<string>Reset Filter</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="3">
+ <widget class="TQComboBox" row="0" column="3">
<item>
<property name="text">
<string>Any</string>
@@ -118,7 +118,7 @@
<cstring>m_interface</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -126,7 +126,7 @@
<string>Use:</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>Any</string>
@@ -136,7 +136,7 @@
<cstring>m_use</cstring>
</property>
</widget>
- <widget class="QComboBox" row="1" column="1">
+ <widget class="TQComboBox" row="1" column="1">
<item>
<property name="text">
<string>Any</string>
@@ -146,7 +146,7 @@
<cstring>m_role</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -197,5 +197,5 @@
<includes>
<include location="global" impldecl="in declaration">adept/filterlist.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/adept/extendablelist.cpp b/adept/adept/extendablelist.cpp
index c3abf1d..a80f19a 100644
--- a/adept/adept/extendablelist.cpp
+++ b/adept/adept/extendablelist.cpp
@@ -1,8 +1,8 @@
#include <kdebug.h>
-#include <qtimer.h>
-#include <qobjectlist.h>
-#include <qpainter.h>
-#include <qimage.h>
+#include <tqtimer.h>
+#include <tqobjectlist.h>
+#include <tqpainter.h>
+#include <tqimage.h>
#include <kiconeffect.h>
#include <kiconloader.h>
@@ -11,7 +11,7 @@
using namespace adept;
-ExtendableList::ExtendableList( QWidget *p, const char *n )
+ExtendableList::ExtendableList( TQWidget *p, const char *n )
: KListView( p, n ),
m_toggleColumn( 0 ), m_inDtor( false ),
m_extenderUpdateScheduled( false ),
@@ -19,44 +19,44 @@ ExtendableList::ExtendableList( QWidget *p, const char *n )
m_extenderHighlight( false )
{
// kdDebug() << "connecting processClick har har" << endl;
- connect( this, SIGNAL( clicked( QListViewItem *,
- const QPoint &, int ) ),
- this, SLOT( processClick( QListViewItem *,
- const QPoint &, int ) ) );
- connect( this, SIGNAL( moved() ),
- this, SLOT( delayedUpdateExtenders() ) );
- connect( this, SIGNAL( collapsed( QListViewItem * ) ),
- this, SLOT( delayedUpdateExtenders() ) );
- connect( this, SIGNAL( expanded( QListViewItem * ) ),
- this, SLOT( delayedUpdateExtenders() ) );
+ connect( this, TQT_SIGNAL( clicked( TQListViewItem *,
+ const TQPoint &, int ) ),
+ this, TQT_SLOT( processClick( TQListViewItem *,
+ const TQPoint &, int ) ) );
+ connect( this, TQT_SIGNAL( moved() ),
+ this, TQT_SLOT( delayedUpdateExtenders() ) );
+ connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
+ this, TQT_SLOT( delayedUpdateExtenders() ) );
+ connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ),
+ this, TQT_SLOT( delayedUpdateExtenders() ) );
setTreeStepSize( 15 );
m_baseIcon = SmallIcon( u8( "extender_closed" ) );
m_extendedIcon = SmallIcon( u8( "extender_opened" ) );
- QImage img;
+ TQImage img;
img = m_baseIcon;
KIconEffect::toGray( img, 1.0 );
- m_unextendableIcon = QPixmap( img );
+ m_unextendableIcon = TQPixmap( img );
}
-void ExtendableList::keyPressEvent( QKeyEvent *e ) {
+void ExtendableList::keyPressEvent( TQKeyEvent *e ) {
ExtendableItem *item = dynamic_cast< ExtendableItem* >( currentItem() );
if ( item ) {
if ( item->extendable() ) {
- if ( item->extender() && e->key() == Qt::Key_Left ) {
+ if ( item->extender() && e->key() == TQt::Key_Left ) {
return item->hideExtender();
- } else if ( !item->extender() && e->key() == Qt::Key_Right ) {
+ } else if ( !item->extender() && e->key() == TQt::Key_Right ) {
return item->showExtender();
}
}
KListView::keyPressEvent( e );
- if ( e->key() == Qt::Key_Left || e->key() == Qt::Key_Right )
+ if ( e->key() == TQt::Key_Left || e->key() == TQt::Key_Right )
item->updateIcon();
} else return KListView::keyPressEvent( e );
}
void ExtendableList::openToplevel() {
- QListViewItem *i;
+ TQListViewItem *i;
for ( i = firstChild(); i != 0; i = i->nextSibling() ) {
i->setOpen( true );
}
@@ -77,11 +77,11 @@ int ExtendableList::extenderOffset( ExtendableItem *i )
x += i->pixmap( m_toggleColumn )->width();
if ( rootIsDecorated() )
x += treeStepSize();
- if ( i->parent() )
+ if ( i->tqparent() )
x += treeStepSize();
}
- return x + 2; // + 2 = icon margin, apparently... gnah
+ return x + 2; // + 2 = icon margin, aptqparently... gnah
}
void ExtendableList::updateExtender( ExtendableItem *i )
@@ -89,16 +89,16 @@ void ExtendableList::updateExtender( ExtendableItem *i )
// setUpdatesEnabled( false );
// since updateGeometries is private, we use this dirty trick to
- // get at it (since setContentsPos in QListView calls it
+ // get at it (since setContentsPos in TQListView calls it
setContentsPos( contentsX(), contentsY() );
- if ( !i->isVisible() || ( i->parent() && !i->parent()->isOpen() ) ) {
+ if ( !i->isVisible() || ( i->tqparent() && !i->tqparent()->isOpen() ) ) {
kdDebug() << "hiding invisible item's extender" << endl;
i->hideExtender();
return;
}
- // QRect rect = itemRect( i );
+ // TQRect rect = tqitemRect( i );
addChild( i->extender(), extenderOffset( i ), itemPos( i ) );
// addChild( i->extender(), x, rect.y() );
i->extender()->show();
@@ -106,15 +106,15 @@ void ExtendableList::updateExtender( ExtendableItem *i )
i->extender()->height() );
if ( i->height() != i->extender()->frameSize().height() ) {
i->setHeight( i->extender()->frameSize().height() );
- delayedUpdateExtenders(); // re-update since we broke layout
+ delayedUpdateExtenders(); // re-update since we broke tqlayout
}
i->extender()->setupColors();
// setUpdatesEnabled( true );
// addChild( i->extender(), x, itemPos( i ) );
- // QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) );
- // QTimer::singleShot( 0, i->extender(), SLOT( setupColors() ) );
+ // TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) );
+ // TQTimer::singleShot( 0, i->extender(), TQT_SLOT( setupColors() ) );
}
void ExtendableList::delayedUpdateExtenders()
@@ -123,7 +123,7 @@ void ExtendableList::delayedUpdateExtenders()
return;
m_extenderUpdateScheduled = true;
// kdDebug() << "ExtendableList::delayedUpdateExtenders()" << endl;
- QTimer::singleShot( 0, this, SLOT( updateExtenders() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateExtenders() ) );
}
void ExtendableList::clear()
@@ -139,13 +139,13 @@ void ExtendableList::show()
updateExtenders();
}
-void ExtendableList::showEvent( QShowEvent *e )
+void ExtendableList::showEvent( TQShowEvent *e )
{
KListView::showEvent( e );
updateExtenders();
}
-void ExtendableList::resizeEvent( QResizeEvent *e )
+void ExtendableList::resizeEvent( TQResizeEvent *e )
{
KListView::resizeEvent( e );
updateExtenders();
@@ -158,7 +158,7 @@ void ExtendableList::updateExtenders()
setUpdatesEnabled( false );
// updateGeometries();
// since updateGeometries is private, we use this dirty trick to
- // get at it (since setContentsPos in QListView calls it
+ // get at it (since setContentsPos in TQListView calls it
setContentsPos( contentsX(), contentsY() );
extendersChanged();
kdDebug() << "ExtendableList::updateExtenders(); count = "
@@ -175,10 +175,10 @@ void ExtendableList::updateExtenders()
setUpdatesEnabled( true );
// triggerUpdate();
if ( !m_extenderUpdateScheduled )
- QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) );
/* if ( m_extenders.empty() )
- QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) ); */
- // QTimer::singleShot( 0, this, SIGNAL( extendersChanged() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); */
+ // TQTimer::singleShot( 0, this, TQT_SIGNAL( extendersChanged() ) );
}
void ExtendableList::addExtender( ExtendableItem *item )
@@ -201,8 +201,8 @@ void ExtendableList::removeExtender( ExtendableItem *i )
delayedUpdateExtenders();
}
-void ExtendableList::processClick( QListViewItem *it,
- const QPoint &pt, int c )
+void ExtendableList::processClick( TQListViewItem *it,
+ const TQPoint &pt, int c )
{
// if (! it) return;
ExtendableItem *item = dynamic_cast< ExtendableItem* >( it );
@@ -235,14 +235,14 @@ bool ExtendableItem::s_less(
return a->less( b );
}
-int ExtendableItem::compare( QListViewItem *i, int c, bool asc ) const
+int ExtendableItem::compare( TQListViewItem *i, int c, bool asc ) const
{
ExtendableItem *o = dynamic_cast< ExtendableItem * >( i );
return int( o->less( this ) ) - int( less( o ) );
}
void ExtendableItem::updateIcon() {
- QPixmap p;
+ TQPixmap p;
if ( !extender() ) {
p = list()->baseIcon();
if ( !extendable() && !firstChild() ) {
@@ -257,8 +257,8 @@ void ExtendableItem::updateIcon() {
setUpdatedIcon(p);
// umm hack
- if ( dynamic_cast< ExtendableItem * >( parent() ) )
- dynamic_cast< ExtendableItem * >( parent() )->updateIcon();
+ if ( dynamic_cast< ExtendableItem * >( tqparent() ) )
+ dynamic_cast< ExtendableItem * >( tqparent() )->updateIcon();
}
@@ -283,8 +283,8 @@ void ExtendableItem::toggleExtender()
updateIcon();
}
-void ExtendableItem::paintBranches( QPainter *p,
- const QColorGroup &cg, int w, int y, int h )
+void ExtendableItem::paintBranches( TQPainter *p,
+ const TQColorGroup &cg, int w, int y, int h )
{
/* if (!isAlternate())
p->setBackgroundColor(
@@ -293,34 +293,34 @@ void ExtendableItem::paintBranches( QPainter *p,
p->eraseRect( 0, 0, w, h );
}
-/* void ExtendableItem::paintCell( QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment )
+/* void ExtendableItem::paintCell( TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment )
{
- QPixmap pm( width, height() );
- QPainter _p( &pm );
- KListViewItem::paintCell( &_p, cg, column, width, alignment );
+ TQPixmap pm( width, height() );
+ TQPainter _p( &pm );
+ KListViewItem::paintCell( &_p, cg, column, width, tqalignment );
p->drawPixmap( 0, 0, pm );
} */
-static void setcolor( QWidget *w, ExtendableItem *i ) {
+static void setcolor( TQWidget *w, ExtendableItem *i ) {
if ( i->isSelected() && i->list()->extenderHighlight() )
- w->setPaletteBackgroundColor( w->colorGroup().highlight() );
+ w->setPaletteBackgroundColor( w->tqcolorGroup().highlight() );
else if ( i->isAlternate() )
w->setPaletteBackgroundColor(
KGlobalSettings::alternateBackgroundColor() );
else
- w->setPaletteBackgroundColor( w->colorGroup().base() );
- // w->setBackgroundMode( QWidget::PaletteBase );
+ w->setPaletteBackgroundColor( w->tqcolorGroup().base() );
+ // w->setBackgroundMode( TQWidget::PaletteBase );
}
void ItemExtender::setupColors()
{
if ( !item() ) return;
setcolor( this, item() );
- QObjectList *chld = queryList( "QWidget" );
- QObjectListIt it( *chld );
- QWidget *o;
- while ((o = dynamic_cast< QWidget * >( it.current() )) != 0) {
+ TQObjectList *chld = queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectListIt it( *chld );
+ TQWidget *o;
+ while ((o = dynamic_cast< TQWidget * >( it.current() )) != 0) {
setcolor( o, item() );
++it;
}
diff --git a/adept/adept/extendablelist.h b/adept/adept/extendablelist.h
index e95df03..e8e6cdf 100644
--- a/adept/adept/extendablelist.h
+++ b/adept/adept/extendablelist.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
#include <klistview.h>
-#include <qpixmap.h>
-#include <qlayout.h>
+#include <tqpixmap.h>
+#include <tqlayout.h>
#include <kglobalsettings.h>
#include <vector>
@@ -19,14 +19,15 @@ class ItemExtender;
class ExtendableList : public KListView {
Q_OBJECT
+ TQ_OBJECT
public:
typedef bool(*ItemCompare)( const ExtendableItem *,
const ExtendableItem * );
- ExtendableList( QWidget *p = 0, const char *n = 0 );
+ ExtendableList( TQWidget *p = 0, const char *n = 0 );
virtual ~ExtendableList();
- QPixmap extendedIcon() { return m_extendedIcon; }
- QPixmap baseIcon() { return m_baseIcon; }
- QPixmap unextendableIcon() { return m_unextendableIcon; }
+ TQPixmap extendedIcon() { return m_extendedIcon; }
+ TQPixmap baseIcon() { return m_baseIcon; }
+ TQPixmap unextendableIcon() { return m_unextendableIcon; }
int extenderOffset( ExtendableItem *i );
void setExtenderHighlight( bool e ) { m_extenderHighlight = e; }
bool extenderHighlight() { return m_extenderHighlight; }
@@ -46,17 +47,17 @@ public slots:
return utils::range( m_extenders.begin(), m_extenders.end() ); }
void openToplevel();
protected slots:
- void processClick( QListViewItem *, const QPoint &, int );
+ void processClick( TQListViewItem *, const TQPoint &, int );
signals:
void extendersChanged();
protected:
- virtual void resizeEvent( QResizeEvent * );
- virtual void showEvent( QShowEvent * );
- virtual void keyPressEvent( QKeyEvent * );
+ virtual void resizeEvent( TQResizeEvent * );
+ virtual void showEvent( TQShowEvent * );
+ virtual void keyPressEvent( TQKeyEvent * );
std::vector< ExtendableItem * > m_extenders;
- QPixmap m_extendedIcon;
- QPixmap m_baseIcon;
- QPixmap m_unextendableIcon;
+ TQPixmap m_extendedIcon;
+ TQPixmap m_baseIcon;
+ TQPixmap m_unextendableIcon;
int m_toggleColumn;
bool m_inDtor:1;
bool m_extenderUpdateScheduled:1;
@@ -106,14 +107,14 @@ public:
ExtendableList *list();
virtual void updateIcon();
- virtual void setUpdatedIcon(QPixmap& pm) { return; };
+ virtual void setUpdatedIcon(TQPixmap& pm) { return; };
- virtual void paintBranches( QPainter *, const QColorGroup &, int, int, int );
+ virtual void paintBranches( TQPainter *, const TQColorGroup &, int, int, int );
virtual ItemExtender *createExtender() = 0;
virtual bool extendable() const { return false; }
virtual bool less( const ExtendableItem * ) const = 0;
- virtual int compare( QListViewItem *other, int col, bool ascending ) const;
+ virtual int compare( TQListViewItem *other, int col, bool ascending ) const;
virtual ~ExtendableItem();
virtual void setHeight( int h ) { KListViewItem::setHeight( h ); }
@@ -121,12 +122,13 @@ protected:
ItemExtender *m_extender;
};
-class ItemExtender : public QWidget {
+class ItemExtender : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
// ItemExtender( ExtendableItem *item );
- ItemExtender( QWidget *parent, const char *n )
- : QWidget( parent, n ), m_item( 0 )
+ ItemExtender( TQWidget *tqparent, const char *n )
+ : TQWidget( tqparent, n ), m_item( 0 )
{}
virtual void setItem( ExtendableItem *i ) {
@@ -143,19 +145,19 @@ public:
void resize( int w, int h ) {
setUpdatesEnabled( false );
- QWidget::resize( w, h );
+ TQWidget::resize( w, h );
setUpdatesEnabled( true );
- QWidget::resize( w, layout()->minimumSize().height() );
+ TQWidget::resize( w, tqlayout()->tqminimumSize().height() );
}
- void resize( const QSize &s ) {
+ void resize( const TQSize &s ) {
resize( s.width(), s.height() );
}
public slots:
void setupColors();
protected:
- virtual void mouseReleaseEvent( QMouseEvent *e ) {
+ virtual void mouseReleaseEvent( TQMouseEvent *e ) {
e->accept();
} // throw away mouse clicks :-)
ExtendableItem *m_item;
diff --git a/adept/adept/filterlist.cpp b/adept/adept/filterlist.cpp
index bb798cd..864f332 100644
--- a/adept/adept/filterlist.cpp
+++ b/adept/adept/filterlist.cpp
@@ -1,6 +1,6 @@
#include <kdebug.h>
-#include <qpopupmenu.h>
-#include <qheader.h>
+#include <tqpopupmenu.h>
+#include <tqheader.h>
#include <klineedit.h>
//#include <tagcoll/InputMerger.h>
@@ -36,7 +36,7 @@ public:
};
*/
-PredicateInterface::PredicateInterface( QWidget *w, const char *n )
+PredicateInterface::PredicateInterface( TQWidget *w, const char *n )
: ItemExtender( w, n )
{
}
@@ -49,8 +49,8 @@ void PredicateInterface::widgetsChanged() {
downcast< FilterItem >( item() ).setPredicate( m_pred );
}
-FilterList::FilterList( QWidget *parent, const char *name )
- : ExtendableList( parent, name ),
+FilterList::FilterList( TQWidget *tqparent, const char *name )
+ : ExtendableList( tqparent, name ),
m_pred( predicate::True< entity::Entity >() ),
m_hidden( predicate::True< entity::Entity >() )
{
@@ -65,13 +65,13 @@ FilterList::FilterList( QWidget *parent, const char *name )
setAllColumnsShowFocus (true);
resize( 240, 180 );
- connect( this, SIGNAL(
- contextMenuRequested( QListViewItem *, const QPoint
+ connect( this, TQT_SIGNAL(
+ contextMenuRequested( TQListViewItem *, const TQPoint
&, int ) ),
- this, SLOT( contextMenu( QListViewItem *, const
- QPoint &, int) ) );
- connect( this, SIGNAL( extendersChanged() ),
- this, SLOT( updateHeight() ) );
+ this, TQT_SLOT( contextMenu( TQListViewItem *, const
+ TQPoint &, int) ) );
+ connect( this, TQT_SIGNAL( extendersChanged() ),
+ this, TQT_SLOT( updateHeight() ) );
}
void FilterList::emitPredicateChanged() {
@@ -80,7 +80,7 @@ void FilterList::emitPredicateChanged() {
void FilterList::updateHeight() {
int h = header()->height() + 4;
- for ( QListViewItem *i = firstChild(); i != 0; i = i->nextSibling() ) {
+ for ( TQListViewItem *i = firstChild(); i != 0; i = i->nextSibling() ) {
h += i->totalHeight();
}
// int h = contentsHeight() + header()->height() + 4; // magic constant
@@ -88,7 +88,7 @@ void FilterList::updateHeight() {
setMaximumHeight( h );
}
-void FilterList::drawContents( QPainter *p, int a, int b, int c, int d ) {
+void FilterList::drawContents( TQPainter *p, int a, int b, int c, int d ) {
if ( m_itemsSeen != childCount() ) {
m_itemsSeen = childCount();
updateHeight();
@@ -98,8 +98,8 @@ void FilterList::drawContents( QPainter *p, int a, int b, int c, int d ) {
void FilterList::plugLister( Lister *l ) {
m_lister = l;
- connect( this, SIGNAL( predicateChanged( ListerPredicate ) ),
- l, SLOT( baseSet( ListerPredicate ) ) );
+ connect( this, TQT_SIGNAL( predicateChanged( ListerPredicate ) ),
+ l, TQT_SLOT( baseSet( ListerPredicate ) ) );
}
void FilterList::setPredicate( Predicate p ) {
@@ -143,13 +143,13 @@ void FilterList::appendPredicate( Predicate p ) {
}
}
-void FilterList::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
+void FilterList::contextMenu( TQListViewItem *it, const TQPoint &pt, int /*c*/ )
{
std::cerr << "FilterList::contextMenu(p);" << std::endl;
FilterItem *i = dynamic_cast< FilterItem * >( it );
if (! i)
return;
- QPopupMenu *m = new QPopupMenu( this );
+ TQPopupMenu *m = new TQPopupMenu( this );
m->insertItem( i18n( "Reset Filter" ), 1 );
m->insertItem( i18n( "Remove Filter" ), 0 );
m->insertSeparator();
@@ -159,7 +159,7 @@ void FilterList::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
m->insertItem( i18n( "Add Easy Tag Filter" ), 11 );
// m->insertItem( "Add Tag Filter", tagMenu() );
m_context = i;
- connect(m, SIGNAL(activated(int)), this, SLOT(contextActivated(int)));
+ connect(m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(contextActivated(int)));
m->exec(pt);
delete m;
}
@@ -216,15 +216,15 @@ ItemExtender *FilterItem::createExtender()
}
if (o) {
o->setPredicate( m_pred );
- QObject::connect( o, SIGNAL( predicateAdd( Predicate ) ),
- list(), SLOT( editorPredicateAdd( Predicate ) ) );
- QObject::connect( o, SIGNAL( predicateDrop( Predicate ) ),
- list(), SLOT( editorPredicateDrop( Predicate ) ) );
+ TQObject::connect( o, TQT_SIGNAL( predicateAdd( Predicate ) ),
+ list(), TQT_SLOT( editorPredicateAdd( Predicate ) ) );
+ TQObject::connect( o, TQT_SIGNAL( predicateDrop( Predicate ) ),
+ list(), TQT_SLOT( editorPredicateDrop( Predicate ) ) );
}
return o;
}
-QString FilterItem::text( int c ) const {
+TQString FilterItem::text( int c ) const {
InterfacingPredicate &ip = downcast< InterfacingPredicate >( m_pred.impl() );
if (c == 0)
return ip.summary();
diff --git a/adept/adept/filterlist.h b/adept/adept/filterlist.h
index 212ab5a..a8a6acf 100644
--- a/adept/adept/filterlist.h
+++ b/adept/adept/filterlist.h
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <kdebug.h>
#include <apt-front/predicate/matchers.h>
@@ -19,13 +19,18 @@
#ifndef EPT_FILTERLIST_H
#define EPT_FILTERLIST_H
-class QPopupMenu;
+class TQPopupMenu;
namespace adept {
using namespace aptFront;
using namespace aptFront::cache;
class Lister;
+// MOC_SKIP_BEGIN
+#ifdef Q_MOC_RUN
+struct InterfacingPredicate;
+#else
+// MOC_SKIP_END
struct InterfacingPredicate
{
public:
@@ -34,14 +39,17 @@ public:
signals:
void changed();
};
-
+// MOC_SKIP_BEGIN
+#endif
+// MOC_SKIP_END
class PredicateInterface: public ItemExtender
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef predicate::Predicate< entity::Entity > Predicate;
- PredicateInterface( QWidget *w = 0, const char *n = 0 );
+ PredicateInterface( TQWidget *w = 0, const char *n = 0 );
virtual Predicate predicate() = 0;
signals:
void predicateAdd( Predicate );
@@ -62,11 +70,12 @@ class FilterItem;
class FilterList : public ExtendableList
{
Q_OBJECT
+ TQ_OBJECT
public:
friend class FilterItem;
typedef predicate::Predicate< entity::Entity > Predicate;
// typedef std::map< KListViewItem *, Predicate > Map;
- FilterList( QWidget *parent = 0, const char *name = 0 );
+ FilterList( TQWidget *tqparent = 0, const char *name = 0 );
typedef predicate::And< entity::Entity > And;
void appendPredicate( Predicate p );
void plugLister( Lister *l );
@@ -79,13 +88,13 @@ public slots:
protected slots:
void editorPredicateDrop( Predicate );
void editorPredicateAdd( Predicate );
- void contextMenu( QListViewItem *, const QPoint &, int );
- // QPopupMenu *tagMenu();
+ void contextMenu( TQListViewItem *, const TQPoint &, int );
+ // TQPopupMenu *tagMenu();
void contextActivated( int );
// void tagMenuActivated( int );
void updateHeight();
protected:
- void drawContents( QPainter *, int, int, int, int );
+ void drawContents( TQPainter *, int, int, int, int );
Predicate m_pred;
Predicate m_hidden;
FilterItem *m_context;
@@ -111,7 +120,7 @@ public:
showExtender();
}
- QString text( int ) const;
+ TQString text( int ) const;
virtual bool less( const ExtendableItem *other ) const {
const FilterItem *o = dynamic_cast< const FilterItem * >( other );
diff --git a/adept/adept/filtersidebar.h b/adept/adept/filtersidebar.h
index 0fac201..f9e9c66 100644
--- a/adept/adept/filtersidebar.h
+++ b/adept/adept/filtersidebar.h
@@ -13,8 +13,9 @@ namespace adept {
class FilterSidebar : public FilterSidebarUi {
Q_OBJECT
+ TQ_OBJECT
public:
- FilterSidebar( QWidget *p = 0, const char *n = 0 )
+ FilterSidebar( TQWidget *p = 0, const char *n = 0 )
: FilterSidebarUi( p, n )
{}
public slots:
diff --git a/adept/adept/filtersidebarui.ui b/adept/adept/filtersidebarui.ui
index 0f2efb4..798680b 100644
--- a/adept/adept/filtersidebarui.ui
+++ b/adept/adept/filtersidebarui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>adept::FilterSidebarUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>adept::FilterSidebarUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,11 +25,11 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QTabWidget" row="0" column="0">
+ <widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>m_tabs</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab0</cstring>
</property>
@@ -50,7 +50,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab1</cstring>
</property>
@@ -71,7 +71,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab2</cstring>
</property>
@@ -112,7 +112,7 @@
</sizepolicy>
</customwidget>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>adept/tagchooser.h</includehint>
</includehints>
diff --git a/adept/adept/filterwidget.cpp b/adept/adept/filterwidget.cpp
index f294327..1adf827 100644
--- a/adept/adept/filterwidget.cpp
+++ b/adept/adept/filterwidget.cpp
@@ -8,12 +8,12 @@ using namespace aptFront;
using namespace adept;
void FilterWidget::connectLister( Lister *l ) {
- connect( this, SIGNAL( drop( ListerPredicate ) ),
- l, SLOT( interactiveDrop( ListerPredicate ) ) );
- connect( this, SIGNAL( changed( ListerPredicate ) ),
- l, SLOT( interactiveAnd( ListerPredicate ) ) );
- connect( this, SIGNAL( apply( ListerPredicate ) ),
- l, SLOT( baseAnd( ListerPredicate ) ) );
+ connect( this, TQT_SIGNAL( drop( ListerPredicate ) ),
+ l, TQT_SLOT( interactiveDrop( ListerPredicate ) ) );
+ connect( this, TQT_SIGNAL( changed( ListerPredicate ) ),
+ l, TQT_SLOT( interactiveAnd( ListerPredicate ) ) );
+ connect( this, TQT_SIGNAL( apply( ListerPredicate ) ),
+ l, TQT_SLOT( baseAnd( ListerPredicate ) ) );
}
diff --git a/adept/adept/filterwidget.h b/adept/adept/filterwidget.h
index 78b0c38..ba7141e 100644
--- a/adept/adept/filterwidget.h
+++ b/adept/adept/filterwidget.h
@@ -14,12 +14,13 @@ class KLineEdit;
namespace adept {
-class FilterWidget : public QWidget
+class FilterWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- FilterWidget( QWidget *parent = 0, const char *n = 0 )
- : QWidget( parent, n ) {}
+ FilterWidget( TQWidget *tqparent = 0, const char *n = 0 )
+ : TQWidget( tqparent, n ) {}
virtual ListerPredicate predicate() = 0;
void connectLister( Lister *l );
protected slots:
diff --git a/adept/adept/groupeddesktopselector.cpp b/adept/adept/groupeddesktopselector.cpp
index 68afa98..3edc87d 100644
--- a/adept/adept/groupeddesktopselector.cpp
+++ b/adept/adept/groupeddesktopselector.cpp
@@ -3,10 +3,10 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qobjectlist.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qtimer.h>
+#include <tqobjectlist.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <kseparator.h>
@@ -22,15 +22,15 @@ using namespace cache;
namespace adept {
-GroupedDesktopSelector::GroupedDesktopSelector( QWidget *p, const char *n )
+GroupedDesktopSelector::GroupedDesktopSelector( TQWidget *p, const char *n )
: KJanusWidget( p, n, IconList ), m_policy( 0 )
{
observeComponent< cache::component::Packages >();
- m_pages.push_back( addPage( QString( "Initializing..." ) ) );
- QObjectList *chld = queryList( "QWidget" );
- QObjectListIt it( *chld ); QWidget *o;
- while ((o = dynamic_cast< QWidget * >( it.current() )) != 0) {
- if ( dynamic_cast< QLabel * >( o ) != 0 )
+ m_pages.push_back( addPage( TQString( "Initializing..." ) ) );
+ TQObjectList *chld = queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectListIt it( *chld ); TQWidget *o;
+ while ((o = dynamic_cast< TQWidget * >( it.current() )) != 0) {
+ if ( dynamic_cast< TQLabel * >( o ) != 0 )
o->hide();
if ( dynamic_cast< KSeparator * >( o ) != 0 )
o->hide();
@@ -38,10 +38,10 @@ GroupedDesktopSelector::GroupedDesktopSelector( QWidget *p, const char *n )
} // *hack*
// AAAA hack
- QLayoutIterator li = layout()->iterator();
- QHBoxLayout *hbox = 0;
+ TQLayoutIterator li = tqlayout()->iterator();
+ TQHBoxLayout *hbox = 0;
while ( li.current() != 0 ) {
- hbox = dynamic_cast< QHBoxLayout * >( li.current() );
+ hbox = dynamic_cast< TQHBoxLayout * >( li.current() );
if ( hbox ) break;
++li;
}
@@ -49,7 +49,7 @@ GroupedDesktopSelector::GroupedDesktopSelector( QWidget *p, const char *n )
if ( hbox ) {
li = hbox->iterator();
while ( li.current() != 0 ) {
- QSpacerItem *spacer = dynamic_cast< QSpacerItem * >( li.current() );
+ TQSpacerItem *spacer = dynamic_cast< TQSpacerItem * >( li.current() );
if ( spacer ) {
hbox->removeItem( spacer );
delete spacer;
@@ -64,7 +64,7 @@ void GroupedDesktopSelector::notifyPreRebuild( component::Base * ) {
}
void GroupedDesktopSelector::notifyPostRebuild( component::Base * ) {
- // QTimer::singleShot( 0, this, SLOT( fill() ) );
+ // TQTimer::singleShot( 0, this, TQT_SLOT( fill() ) );
}
void GroupedDesktopSelector::clear()
@@ -88,7 +88,7 @@ void GroupedDesktopSelector::fill( component::Desktop::EntityRange r )
{
component::Desktop &d = cache::Global::get().component< component::Desktop >();
utils::Range< std::string > gr;
- QString last = pageTitle( activePageIndex() );
+ TQString last = pageTitle( activePageIndex() );
clear();
@@ -97,25 +97,25 @@ void GroupedDesktopSelector::fill( component::Desktop::EntityRange r )
for ( gr = d.availableGroups( r ); gr != gr.end(); gr.advance() ) {
component::Desktop::EntityRange cr = d.group( *gr );
- QString name = u8( *gr );
+ TQString name = u8( *gr );
std::cerr << "group for " << cr->name() << ": " << r->group() << std::endl;
name = ( name != u8( "" ) ? name : u8( "Legacy" ) );
- QPixmap icon( KGlobal::iconLoader()->iconPath(
+ TQPixmap icon( KGlobal::iconLoader()->iconPath(
policy() ? policy()->iconForGroup( name ) : u8( "" ), -32 ) );
- QVBox *b = addVBoxPage( name, name, icon );
+ TQVBox *b = addVBoxPage( name, name, icon );
m_pages.push_back( b );
std::cerr << "creating list for " << *gr << std::endl;
DesktopList *l = new DesktopList( b );
l->setTitle( name );
- connect( l, SIGNAL( request( cache::entity::Package,
+ connect( l, TQT_SIGNAL( request( cache::entity::Package,
cache::component::State::Action ) ),
- this, SIGNAL( request( cache::entity::Package,
+ this, TQT_SIGNAL( request( cache::entity::Package,
cache::component::State::Action ) ) );
- connect( l, SIGNAL( showDescription( cache::entity::Desktop ) ),
- this, SIGNAL( showDescription( cache::entity::Desktop ) ) );
+ connect( l, TQT_SIGNAL( showDescription( cache::entity::Desktop ) ),
+ this, TQT_SIGNAL( showDescription( cache::entity::Desktop ) ) );
l->insertRange( intersectionRange( r, cr ) );
// l->insertRange( cr );
@@ -129,7 +129,7 @@ void GroupedDesktopSelector::fill( component::Desktop::EntityRange r )
}
if ( m_pages.empty() )
- m_pages.push_back( addPage( QString( "No Results" ) ) );
+ m_pages.push_back( addPage( TQString( "No Results" ) ) );
if ( !shown )
showPage( pageIndex( m_pages.front() ) );
}
diff --git a/adept/adept/groupeddesktopselector.h b/adept/adept/groupeddesktopselector.h
index a54f7aa..95a7dc6 100644
--- a/adept/adept/groupeddesktopselector.h
+++ b/adept/adept/groupeddesktopselector.h
@@ -14,11 +14,12 @@ using namespace aptFront::cache;
class GroupedDesktopSelector : public KJanusWidget, cache::Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
struct IconPolicy {
- virtual QString iconForGroup( QString group ) { return group; }
+ virtual TQString iconForGroup( TQString group ) { return group; }
};
- GroupedDesktopSelector( QWidget *p = 0, const char *n = 0 );
+ GroupedDesktopSelector( TQWidget *p = 0, const char *n = 0 );
void fill( component::Desktop::EntityRange r );
void setPolicy( IconPolicy *p ) { m_policy = p; }
IconPolicy *policy() { return m_policy; }
@@ -32,7 +33,7 @@ signals:
void showDescription( cache::entity::Desktop );
protected:
IconPolicy *m_policy;
- std::vector< QWidget * > m_pages;
+ std::vector< TQWidget * > m_pages;
// IconPolicy m_defaultPolicy;
};
diff --git a/adept/adept/installerview.cpp b/adept/adept/installerview.cpp
index 052fa41..ce99ae8 100644
--- a/adept/adept/installerview.cpp
+++ b/adept/adept/installerview.cpp
@@ -1,7 +1,7 @@
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qtextbrowser.h>
-#include <qcheckbox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqtextbrowser.h>
+#include <tqcheckbox.h>
#include <klocale.h>
#include <kconfig.h>
@@ -22,7 +22,7 @@ void InstallerView::rebuild()
{
typedef predicate::Factory< entity::Desktop > Factory;
if ( m_inRebuild ) {
- QTimer::singleShot( 500, this, SLOT( rebuild() ) );
+ TQTimer::singleShot( 500, this, TQT_SLOT( rebuild() ) );
return;
}
m_inRebuild = true;
@@ -64,17 +64,17 @@ void InstallerView::rebuild()
m_inRebuild = false;
}
-InstallerView::InstallerView( QWidget *p , const char *n )
+InstallerView::InstallerView( TQWidget *p , const char *n )
: InstallerViewUi( p, n ), m_inRebuild( false )
{
- connect( m_search, SIGNAL( textChanged( const QString & ) ),
- this, SLOT( textChanged() ) );
- connect( &timer, SIGNAL( timeout() ), this, SLOT( rebuild() ) );
- connect( m_suite, SIGNAL( activated( int ) ), this, SLOT( rebuild() ) );
- connect( m_unsupported, SIGNAL( toggled( bool ) ), this, SLOT( rebuild() ) );
- connect( m_nonfree, SIGNAL( toggled( bool ) ), this, SLOT( rebuild() ) );
- connect( selector(), SIGNAL( showDescription( cache::entity::Desktop ) ),
- this, SLOT( showDescription( cache::entity::Desktop ) ) );
+ connect( m_search, TQT_SIGNAL( textChanged( const TQString & ) ),
+ this, TQT_SLOT( textChanged() ) );
+ connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( rebuild() ) );
+ connect( m_suite, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( rebuild() ) );
+ connect( m_unsupported, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( rebuild() ) );
+ connect( m_nonfree, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( rebuild() ) );
+ connect( selector(), TQT_SIGNAL( showDescription( cache::entity::Desktop ) ),
+ this, TQT_SLOT( showDescription( cache::entity::Desktop ) ) );
}
void InstallerView::textChanged() {
@@ -84,9 +84,9 @@ void InstallerView::textChanged() {
void InstallerView::showDescription( entity::Desktop e )
{
kdDebug() << "InstallerView::showDescription..." << endl;
- QString file("/usr/share/app-install/desktop/" + e.package().name() + ".desktop");
- KConfig desktopFile(QString("/usr/share/app-install/desktop/" + e.package().name() + ".desktop"), false, false);
- QString name(desktopFile.name());
+ TQString file("/usr/share/app-install/desktop/" + e.package().name() + ".desktop");
+ KConfig desktopFile(TQString("/usr/share/app-install/desktop/" + e.package().name() + ".desktop"), false, false);
+ TQString name(desktopFile.name());
desktopFile.setGroup("Desktop Entry");
int popularity = desktopFile.readNumEntry("X-AppInstall-Popcon");
@@ -97,12 +97,12 @@ void InstallerView::showDescription( entity::Desktop e )
rank = (int)(5.0* log(popularity) / log(popcon_max+1));
}
- QString rankText(" ");
+ TQString rankText(" ");
for (int i = 0; i < rank; i++) {
rankText = rankText + "<img src='/usr/share/icons/crystalsvg/16x16/actions/bookmark.png' />";
}
- QString l = u8(e.package().longDescription(
+ TQString l = u8(e.package().longDescription(
u8( i18n( "No long description available" ) ) ) );
m_description->setText( u8( "<b>" ) + e.name() + u8( "</b>" )
diff --git a/adept/adept/installerview.h b/adept/adept/installerview.h
index ed955dc..5fcc5ff 100644
--- a/adept/adept/installerview.h
+++ b/adept/adept/installerview.h
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qtimer.h>
+#include <tqtimer.h>
#include <adept/installerviewui.h>
#include <adept/groupeddesktopselector.h>
@@ -14,9 +14,10 @@ namespace adept {
class InstallerView : public InstallerViewUi
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef predicate::Predicate< entity::Desktop > Predicate;
- InstallerView( QWidget *p = 0, const char *n = 0 );
+ InstallerView( TQWidget *p = 0, const char *n = 0 );
GroupedDesktopSelector *selector() { return m_selector; }
protected slots:
void textChanged();
@@ -25,7 +26,7 @@ public slots:
void rebuild();
protected:
bool m_inRebuild;
- QTimer timer;
+ TQTimer timer;
};
}
diff --git a/adept/adept/installerviewui.ui b/adept/adept/installerviewui.ui
index b289650..77262e9 100644
--- a/adept/adept/installerviewui.ui
+++ b/adept/adept/installerviewui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>InstallerViewUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>InstallerViewUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,9 +25,9 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@@ -36,7 +36,7 @@
<property name="margin">
<number>4</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -52,7 +52,7 @@
<string>Search:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_search</cstring>
</property>
@@ -65,7 +65,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<item>
<property name="text">
<string>KDE</string>
@@ -106,14 +106,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -121,7 +121,7 @@
<string>Show:</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_unsupported</cstring>
</property>
@@ -132,7 +132,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_nonfree</cstring>
</property>
@@ -158,7 +158,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QTextBrowser" row="1" column="1">
+ <widget class="TQTextBrowser" row="1" column="1">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -196,7 +196,7 @@
<data format="PNG" length="1122">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082</data>
</image>
</images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>adept/groupeddesktopselector.h</includehint>
</includehints>
diff --git a/adept/adept/lister.cpp b/adept/adept/lister.cpp
index ddd70d8..254b0bc 100644
--- a/adept/adept/lister.cpp
+++ b/adept/adept/lister.cpp
@@ -1,12 +1,12 @@
// -*- Mode: C++; c-basic-offset: 4; -*-
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qpushbutton.h>
-#include <qthread.h>
-#include <qtextbrowser.h>
-#include <qpixmap.h>
-#include <qheader.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
+#include <tqpushbutton.h>
+#include <tqthread.h>
+#include <tqtextbrowser.h>
+#include <tqpixmap.h>
+#include <tqheader.h>
#include <kpopupmenu.h>
#include <kdebug.h>
@@ -36,12 +36,12 @@ using namespace aptFront::utils;
using namespace adept;
#ifdef KUBUNTU
-QPixmap* main_icon = 0;
-QPixmap* non_main_icon = 0;
+TQPixmap* main_icon = 0;
+TQPixmap* non_main_icon = 0;
#endif
-Lister::Lister( QWidget *parent, const char *name )
- : ExtendableList( parent, name ),
+Lister::Lister( TQWidget *tqparent, const char *name )
+ : ExtendableList( tqparent, name ),
m_rangeProvider( 0 ),
m_baseF( predicate::True< entity::Entity >() ),
m_interactiveF( True<entity::Entity>() ), m_itemCount( -1 ),
@@ -71,7 +71,7 @@ Lister::Lister( QWidget *parent, const char *name )
setSorting( -1 );
// addColumn(" ", 40);
// addColumn(" ", 18);
- QFontMetrics met( font() );
+ TQFontMetrics met( font() );
// BE SURE TO UPDATE THE Column ENUM WHEN YOU UPDATE HERE!
addColumn( i18n( "Package" ), 180);
@@ -79,21 +79,21 @@ Lister::Lister( QWidget *parent, const char *name )
addColumn( i18n( " " ), 18); // This column is for identifying
// main packages. (manchicken)
#endif
- addColumn( i18n( "Status" ), met.width( i18n( "not installed" ) ) + 10 );
+ addColumn( i18n( "tqStatus" ), met.width( i18n( "not installed" ) ) + 10 );
addColumn( i18n( "Requested" ), met.width( i18n( "Requested" ) ) + 10 );
addColumn( i18n( "Description" ), 300);
setToggleColumn( Lister::ColFirst );
for ( int col = ColFirst; col < ColLast; ++col )
- setColumnAlignment( col, Qt::AlignLeft | Qt::AlignVCenter );
+ setColumnAlignment( col, TQt::AlignLeft | TQt::AlignVCenter );
setResizeMode( LastColumn );
- connect( this, SIGNAL( selectionChanged() ), SLOT( updateActions() ) );
+ connect( this, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateActions() ) );
connect( this,
- SIGNAL( contextMenuRequested( QListViewItem *,
- const QPoint &, int ) ),
- this, SLOT(
- contextMenu( QListViewItem *, const QPoint &, int) ) );
+ TQT_SIGNAL( contextMenuRequested( TQListViewItem *,
+ const TQPoint &, int ) ),
+ this, TQT_SLOT(
+ contextMenu( TQListViewItem *, const TQPoint &, int) ) );
m_tip = 0;
// m_tip = new ListerTooltip( viewport(), this );
}
@@ -107,7 +107,7 @@ void Lister::scheduleRebuild()
{
if (!m_rebuildScheduled) {
// kdDebug() << "Lister scheduling rebuild" << endl;
- QTimer::singleShot( 0, this, SLOT( rebuild() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( rebuild() ) );
}
m_rebuildScheduled = true;
}
@@ -179,7 +179,7 @@ void Lister::cleanRebuild()
}
Lister::CreateItem::CreateItem( Lister *_l, ListerItem *p )
- : l( _l ), time( 0 ), items( 0 ), last( 0 ), parent( p )
+ : l( _l ), time( 0 ), items( 0 ), last( 0 ), tqparent( p )
{
}
@@ -204,19 +204,19 @@ Lister::Map::value_type Lister::CreateItem::operator()( entity::Entity e )
}
if ( last ) {
- if ( parent )
- last = new ListerItem( parent, last, e );
+ if ( tqparent )
+ last = new ListerItem( tqparent, last, e );
else
last = new ListerItem( l, last, e );
} else {
- if ( parent )
- last = new ListerItem( parent, e );
+ if ( tqparent )
+ last = new ListerItem( tqparent, e );
else
last = new ListerItem( l, e );
}
l->m_rebuildMutex.unlock();
if ( e.is< entity::Relation >() )
- // this should be safe because the parent thread is waiting
+ // this should be safe because the tqparent thread is waiting
// for us and ensures that universe (libapt-front) is kept
// unchanged while we run
l->insertRangeInternal( InsertRangePair(
@@ -271,7 +271,7 @@ void Lister::rebuild()
emit rebuildStarted();
- c.progress().OverallProgress( 0, 0, 0, i18n( "Filtering" ) );
+ c.progress().OverallProgress( 0, 0, 0, i18n( "Filtering" ).ascii() );
kdDebug() << "rebuild running" << endl;
clock_t _c = clock(), C;
for ( Cardinality::iterator i = m_cardinality.begin();
@@ -291,16 +291,16 @@ void Lister::rebuild()
m_items.clear();
kdDebug() << "asyncCall to rebuildInsertRange..." << endl;
- QThread *t = asyncCall( std::bind2nd(
+ TQThread *t = asyncCall( std::bind2nd(
std::mem_fun( &Lister::insertRangeInternal ),
InsertRangePair( 0, r ) ),
this );
kdDebug() << "starting the thread..." << endl;
- QTimer timer;
- connect( &timer, SIGNAL( timeout() ),
- this, SLOT( reallyUpdate() ) );
+ TQTimer timer;
+ connect( &timer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( reallyUpdate() ) );
timer.start( 0 );
m_rebuildMutex.unlock();
@@ -394,7 +394,7 @@ Lister::VectorRange Lister::content()
return ret;
}
-QString ListerItem::text( int column ) const
+TQString ListerItem::text( int column ) const
{
// if (column == 0) return ""; // until we redo paintcell for the col
if (entity().is<entity::Package>()) {
@@ -402,7 +402,7 @@ QString ListerItem::text( int column ) const
switch (column) {
case Lister::ColPackage: return u8( p.name( u8( i18n( "n/a" ) ) ) );
- case Lister::ColStatus: return u8( p.statusString( u8( i18n( "n/a" ) ) ) );
+ case Lister::ColtqStatus: return u8( p.statusString( u8( i18n( "n/a" ) ) ) );
case Lister::ColRequested: return u8( p.actionString( u8( i18n( "n/a" ) ) ) );
case Lister::ColDescription: return u8( p.shortDescription( u8( i18n( "n/a" ) ) ) );
// case 2: return p.candidateVersion().versionString();
@@ -414,7 +414,7 @@ QString ListerItem::text( int column ) const
}
#ifdef KUBUNTU
-const QPixmap* ListerItem::pixmap( int column ) const
+const TQPixmap* ListerItem::pixmap( int column ) const
{
if (entity().is<entity::Package>()) {
entity::Package p = entity();
@@ -425,18 +425,18 @@ const QPixmap* ListerItem::pixmap( int column ) const
// Load the icon if it hasn't been created.
if (main_icon == 0) {
- main_icon = new QPixmap(SmallIcon(u8("adept_main_indicator")));
+ main_icon = new TQPixmap(SmallIcon(u8("adept_main_indicator")));
}
// Return the icon...
return main_icon;
} else if (column == Lister::ColFirst) {
- return static_cast<const QPixmap*>(&m_pixmap);
+ return static_cast<const TQPixmap*>(&m_pixmap);
}
}
if (non_main_icon == 0) {
- non_main_icon = new QPixmap();
+ non_main_icon = new TQPixmap();
}
return non_main_icon;
@@ -447,20 +447,20 @@ ListerItem::~ListerItem()
{
}
-void ListerItem::paintCell ( QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment )
+void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment )
{
if ( width <= 0 )
return;
- QColorGroup _cg( cg );
- QColor c = _cg.text();
- QPixmap pm( width, height() );
- QPainter _p( &pm );
+ TQColorGroup _cg( cg );
+ TQColor c = _cg.text();
+ TQPixmap pm( width, height() );
+ TQPainter _p( &pm );
if ( entity().is<entity::Package>() ) {
entity::Package p = entity();
// Paint the status column
- if ( column == Lister::ColStatus ) {
+ if ( column == Lister::ColtqStatus ) {
c = statusColor( p );
}
@@ -469,18 +469,18 @@ void ListerItem::paintCell ( QPainter *p, const QColorGroup &cg,
c = actionColor( p );
}
}
- _cg.setColor( QColorGroup::Text, c );
+ _cg.setColor( TQColorGroup::Text, c );
if ( extender() ) { // make the icon appear at top... this
// probably breaks big-text displays?
// --> somewhat, but not too badly
- alignment &= ~AlignVertical_Mask;
- alignment |= AlignTop;
+ tqalignment &= ~AlignVertical_Mask;
+ tqalignment |= AlignTop;
}
- KListViewItem::paintCell( &_p, _cg, column, width, alignment );
+ KListViewItem::paintCell( &_p, _cg, column, width, tqalignment );
p->drawPixmap( 0, 0, pm );
}
-void Lister::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
+void Lister::contextMenu( TQListViewItem *it, const TQPoint &pt, int /*c*/ )
{
if (! it) // check for actor when we have one...
return;
@@ -493,7 +493,7 @@ void Lister::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
try {
for (; r != r.end(); ++r) {
m->insertItem( SmallIconSet( m_icons[ u8( r->name() ) ] ),
- i18n(QString(r->prettyName()).ascii()), id );
+ i18n(TQString(r->prettyName()).ascii()), id );
m->setItemEnabled(
id, r->possible( utils::upcastRange< entity::Package >( sel ) ) );
++id;
@@ -503,7 +503,7 @@ void Lister::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
bool open = m_context->extender();
m->insertItem( open ? i18n( "Hide details" ) :
i18n( "Show details" ), open ? 1 : 0 );
- connect(m, SIGNAL(activated(int)), this, SLOT(contextActivated(int)));
+ connect(m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(contextActivated(int)));
m->exec(pt);
delete m;
}
@@ -535,16 +535,16 @@ ListerItemExtender::~ListerItemExtender()
{
}
-ListerItemExtender::ListerItemExtender( QWidget *parent, const char * n)
- : ListerItemExtenderUi( parent, n )
+ListerItemExtender::ListerItemExtender( TQWidget *tqparent, const char * n)
+ : ListerItemExtenderUi( tqparent, n )
{
observeComponent< component::State >();
adjustFontSize( m_description, -1 );
- connect( m_details, SIGNAL( clicked() ),
- this, SLOT( detailsClicked() ) );
+ connect( m_details, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( detailsClicked() ) );
m_packageInfo->adjustFontSize( -1 );
- m_packageInfo->hideStatus();
+ m_packageInfo->hidetqStatus();
}
void ListerItemExtender::detailsClicked() {
@@ -556,9 +556,9 @@ ListerItem *ListerItemExtender::item()
return dynamic_cast< ListerItem * >( m_item );
}
-void ListerItemExtender::mouseReleaseEvent( QMouseEvent *e ) {
+void ListerItemExtender::mouseReleaseEvent( TQMouseEvent *e ) {
e->ignore();
- if ( childAt( e->pos() ) != static_cast< QWidget * >( m_name ) )
+ if ( tqchildAt( e->pos() ) != static_cast< TQWidget * >( m_name ) )
e->accept();
}
void ListerItemExtender::setItem( ExtendableItem *i )
@@ -570,8 +570,8 @@ void ListerItemExtender::setItem( ExtendableItem *i )
m_indicator->setMinimumWidth(18);
kdDebug() << "ListerItemExtender::setItem connecting" << endl;
- connect( this, SIGNAL( detailsRequested( Lister::Entity ) ),
- item()->list(), SIGNAL( detailsRequested( Lister::Entity ) ) );
+ connect( this, TQT_SIGNAL( detailsRequested( Lister::Entity ) ),
+ item()->list(), TQT_SIGNAL( detailsRequested( Lister::Entity ) ) );
entity::Version v;
entity::Package p;
@@ -593,12 +593,12 @@ void ListerItemExtender::setItem( ExtendableItem *i )
return;
}
- m_name->setText( /* QString( "<b>" ) + */
+ m_name->setText( /* TQString( "<b>" ) + */
v.package().name( std::string( "oops" ) ) /* + "</b>" */ );
- QString l = u8( v.longDescription(
+ TQString l = u8( v.longDescription(
u8( i18n( "No long description available" ) ) ) );
- m_description->setText( QString( "<qt>" )
+ m_description->setText( TQString( "<qt>" )
+ formatLongDescription( l ) + "</qt>" );
m_description->adjustSize();
m_description->installEventFilter( this );
@@ -618,7 +618,7 @@ void ListerItemExtender::notifyPostChange( component::Base * )
// without the timer to break it, there could be a loop where
// we connect the clicked() signal to a slot which would be
// invoked right away when we return -> evil
- QTimer::singleShot( 0, this, SLOT( updateLogical() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateLogical() ) );
}
void ListerItemExtender::updateLogical() {
@@ -646,8 +646,8 @@ void ListerItemExtender::updateLogical() {
if (a) {
m_logical->setText( u8( a->actor().prettyName() ) );
- connect( m_logical, SIGNAL( clicked() ),
- a, SLOT( destructiveAct() ) );
+ connect( m_logical, TQT_SIGNAL( clicked() ),
+ a, TQT_SLOT( destructiveAct() ) );
} else {
m_logical->setText( i18n( "Immutable" ) );
m_logical->setEnabled( false );
@@ -655,11 +655,11 @@ void ListerItemExtender::updateLogical() {
}
-bool ListerItemExtender::eventFilter( QObject *o, QEvent *e )
+bool ListerItemExtender::eventFilter( TQObject *o, TQEvent *e )
{
- if (o == m_description && e->type() == QEvent::Wheel) {
+ if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_description) && e->type() == TQEvent::Wheel) {
// kdDebug() << "discarding wheel event..." << endl;
- QApplication::sendEvent( this, e );
+ TQApplication::sendEvent( this, e );
return true;
}
return false;
@@ -669,23 +669,23 @@ void ListerItemExtender::resize( int w, int h )
{
// XXX the magic constants are probably style-dependent... AW
int namew = - item()->lister()->extenderOffset( item() )
- - layout()->margin()
- - layout()->spacing()
+ - tqlayout()->margin()
+ - tqlayout()->spacing()
+ item()->lister()->columnWidth( 0 );
- int statw = item()->lister()->columnWidth( Lister::ColStatus )
- - layout()->spacing();
+ int statw = item()->lister()->columnWidth( Lister::ColtqStatus )
+ - tqlayout()->spacing();
int chw = item()->lister()->columnWidth( Lister::ColRequested )
- - layout()->spacing() - 3; // wth...
+ - tqlayout()->spacing() - 3; // wth...
m_name->setMinimumWidth( namew );
m_status->setMinimumWidth( statw );
m_change->setMinimumWidth( chw );
m_packageInfo->adjustSize();
m_leftHeight = m_name->height() + m_packageInfo->height()
+ m_logical->height() + 20;
- QWidget::resize( w, 500 );
- QWidget::resize(
+ TQWidget::resize( w, 500 );
+ TQWidget::resize(
w,
- QMAX( m_description->contentsHeight() + 16,
+ TQMAX( m_description->contentsHeight() + 16,
m_leftHeight ) );
}
@@ -739,15 +739,15 @@ bool ListerItem::keepLess( const ListerItem *o ) const
return false;
}
-QString ListerTooltip::format( const QString &what,
- const QString &txt, bool nobr )
+TQString ListerTooltip::format( const TQString &what,
+ const TQString &txt, bool nobr )
{
- QString ret = "<b>" + what + "</b>&nbsp;" + (nobr ? "<nobr>" : "")
+ TQString ret = "<b>" + what + "</b>&nbsp;" + (nobr ? "<nobr>" : "")
+ txt + (nobr ? "</nobr>" : "") + "<br>";
return ret;
}
-void ListerTooltip::maybeTip( const QPoint &pt )
+void ListerTooltip::maybeTip( const TQPoint &pt )
{
if ( !m_parent )
return;
@@ -757,8 +757,8 @@ void ListerTooltip::maybeTip( const QPoint &pt )
return;
if ( x->extender() )
return; // no tips for extended items, thank you
- QString str = u8( "<qt>" );
- QString descr, cand, cur;
+ TQString str = u8( "<qt>" );
+ TQString descr, cand, cur;
descr = cand = cur = i18n( "<i>Not available</i>" );
entity::Package p( x->entity() );
descr = p.shortDescription( std::string(
@@ -776,10 +776,10 @@ void ListerTooltip::maybeTip( const QPoint &pt )
str += format( i18n( "Candidate&nbsp;Version:" ), cand );
str.append( u8( "</qt>" ) );
- tip( m_parent->itemRect( x ), str );
+ tip( m_parent->tqitemRect( x ), str );
}
-void ListerItemTooltip::maybeTip(const QPoint& pt) {
+void ListerItemTooltip::maybeTip(const TQPoint& pt) {
if (!m_parent) {
return;
}
@@ -791,7 +791,7 @@ void ListerItemTooltip::maybeTip(const QPoint& pt) {
}
// Grab the item
- const QListViewItem* item = m_parent->itemAt(pt);
+ const TQListViewItem* item = m_parent->itemAt(pt);
if (!item) {
return;
} else if (item->pixmap(col) != main_icon) {
@@ -800,19 +800,19 @@ void ListerItemTooltip::maybeTip(const QPoint& pt) {
}
// Grab the item rectangle
- const QRect irect = m_parent->itemRect(item);
+ const TQRect irect = m_parent->tqitemRect(item);
if (!irect.isValid()) {
return;
}
// Grab the header rectangle
- const QRect hrect = m_parent->header()->sectionRect(col);
+ const TQRect hrect = m_parent->header()->sectionRect(col);
if (!hrect.isValid()) {
return;
}
// Grab the cell rectangle
- const QRect cell(hrect.left(), irect.top(),
+ const TQRect cell(hrect.left(), irect.top(),
hrect.width(), irect.height());
tip(cell, i18n("This logo indicates that this package is officially supported by the Kubuntu development and support teams."));
}
diff --git a/adept/adept/lister.h b/adept/adept/lister.h
index 6270c42..3a6c66e 100644
--- a/adept/adept/lister.h
+++ b/adept/adept/lister.h
@@ -5,11 +5,11 @@
#define KUBUNTU
-#include <qtooltip.h>
-#include <qmap.h>
-#include <qmutex.h>
+#include <tqtooltip.h>
+#include <tqmap.h>
+#include <tqmutex.h>
#include <set>
-#include <qpixmap.h>
+#include <tqpixmap.h>
#include <apt-front/cache/entity/entity.h>
#include <apt-front/cache/entity/package.h>
@@ -44,17 +44,18 @@ struct entityLess {
class Lister: public ExtendableList, public Observer
{
- Q_OBJECT;
+ Q_OBJECT
+ TQ_OBJECT
public:
static const int ColPackage = 0;
#ifdef KUBUNTU
static const int ColIcon = 1;
- static const int ColStatus = 2;
+ static const int ColtqStatus = 2;
static const int ColRequested = 3;
static const int ColDescription = 4;
static const int ColLast = 4;
#else
- static const int ColStatus = 1;
+ static const int ColtqStatus = 1;
static const int ColRequested = 2;
static const int ColDescription = 3;
static const int ColLast = 3;
@@ -73,7 +74,7 @@ public:
virtual Range listerRange() = 0;
};
- Lister (QWidget *parent = 0, const char *name = 0);
+ Lister (TQWidget *tqparent = 0, const char *name = 0);
~Lister();
void setSource();
virtual void notifyPostChange( component::Base * );
@@ -90,7 +91,7 @@ public:
bool busy() { return m_rebuildScheduled || m_inRebuild; }
signals:
- // this is adept::Lister because of braindead moc
+ // this is adept::Lister because of braindead tqmoc
void actionsChanged( adept::Lister * );
void cardinalityChanged( const Lister::Cardinality & );
void detailsRequested( Lister::Entity );
@@ -109,7 +110,7 @@ public slots:
virtual void scheduleRebuild();
virtual void reallyUpdate();
protected slots:
- void contextMenu( QListViewItem *, const QPoint &, int );
+ void contextMenu( TQListViewItem *, const TQPoint &, int );
void contextActivated( int );
protected:
typedef std::pair< ListerItem *, Range > InsertRangePair;
@@ -127,14 +128,14 @@ protected:
int time;
int items;
ListerItem *last;
- ListerItem *parent;
+ ListerItem *tqparent;
};
bool cancelRebuild();
void rebuildInsertRange( Range );
ListerItem *m_context;
- QMap< QString, QString > m_icons;
+ TQMap< TQString, TQString > m_icons;
Map m_items;
Vector m_all;
RangeProvider *m_rangeProvider;
@@ -145,36 +146,37 @@ protected:
bool m_cancelRebuild:1;
bool m_openToplevel:1;
Cardinality m_cardinality;
- QMutex m_rebuildMutex;
+ TQMutex m_rebuildMutex;
};
-class ListerTooltip : public QToolTip
+class ListerTooltip : public TQToolTip
{
public:
- ListerTooltip (QWidget *v, Lister *p) : QToolTip (v, 0), m_parent (p) {};
- ListerTooltip(Lister*p) : QToolTip(p,0), m_parent(p) {};
+ ListerTooltip (TQWidget *v, Lister *p) : TQToolTip (v, 0), m_parent (p) {};
+ ListerTooltip(Lister*p) : TQToolTip(p,0), m_parent(p) {};
protected:
- QString format( const QString &, const QString &, bool = true );
- virtual void maybeTip (const QPoint &p);
+ TQString format( const TQString &, const TQString &, bool = true );
+ virtual void maybeTip (const TQPoint &p);
Lister *m_parent;
};
-class ListerItemTooltip : public QToolTip {
+class ListerItemTooltip : public TQToolTip {
public:
- ListerItemTooltip(const Lister* parent) :
- QToolTip(parent->viewport(),0),
- m_parent(parent) {};
+ ListerItemTooltip(const Lister* tqparent) :
+ TQToolTip(tqparent->viewport(),0),
+ m_parent(tqparent) {};
protected:
const Lister* m_parent;
- virtual void maybeTip (const QPoint& p);
+ virtual void maybeTip (const TQPoint& p);
};
class ListerItemExtender : public ListerItemExtenderUi,
public cache::Observer {
Q_OBJECT
+ TQ_OBJECT
public:
- ListerItemExtender( QWidget *parent = 0, const char * n = 0 );
+ ListerItemExtender( TQWidget *tqparent = 0, const char * n = 0 );
~ListerItemExtender();
virtual void resize( int w, int h );
void setItem( ExtendableItem *i );
@@ -188,8 +190,8 @@ protected slots:
signals:
void detailsRequested( Lister::Entity );
protected:
- bool eventFilter( QObject *o, QEvent *e );
- void mouseReleaseEvent( QMouseEvent *e );
+ bool eventFilter( TQObject *o, TQEvent *e );
+ void mouseReleaseEvent( TQMouseEvent *e );
entity::Entity m_entity;
unsigned m_leftHeight;
};
@@ -221,22 +223,22 @@ public:
return 0;
}
- /* virtual void updateIcon( const QPixmap &p ) {
+ /* virtual void updateIcon( const TQPixmap &p ) {
if ( m_entity.is< entity::Package >()
|| m_entity.is< entity::Version >() )
return ExtendableItem::updateIcon( p );
- setPixmap( list()->toggleColumn(), QPixmap() );
+ setPixmap( list()->toggleColumn(), TQPixmap() );
} */
- virtual QString text( int column ) const;
+ virtual TQString text( int column ) const;
#ifdef KUBUNTU
- virtual void setUpdatedIcon(QPixmap& pm) { m_pixmap=pm; };
- virtual const QPixmap* pixmap( int column ) const;
+ virtual void setUpdatedIcon(TQPixmap& pm) { m_pixmap=pm; };
+ virtual const TQPixmap* pixmap( int column ) const;
#endif
entity::Entity entity() { return m_entity; }
const entity::Entity entity() const { return m_entity; }
- virtual void paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment);
+ virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment);
virtual bool less( const ExtendableItem * ) const;
Lister *lister() {
return dynamic_cast< Lister* >( listView() );
@@ -252,7 +254,7 @@ public:
protected:
ListerItem *m_previous;
entity::Entity m_entity;
- QPixmap m_pixmap;
+ TQPixmap m_pixmap;
// ListerItemTooltip* m_tip;
};
diff --git a/adept/adept/listerextenderui.ui b/adept/adept/listerextenderui.ui
index 3f89eaf..4a38508 100644
--- a/adept/adept/listerextenderui.ui
+++ b/adept/adept/listerextenderui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ListerItemExtenderrUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -35,7 +35,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>4</width>
<height>4</height>
@@ -52,22 +52,22 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>4</width>
<height>4</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_name</cstring>
</property>
@@ -85,11 +85,11 @@
<property name="text">
<string>name</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_indicator</cstring>
</property>
@@ -105,7 +105,7 @@
<number>0</number>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_status</cstring>
</property>
@@ -123,11 +123,11 @@
<property name="text">
<string>status</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_change</cstring>
</property>
@@ -148,13 +148,13 @@
<property name="text">
<string>change</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
</hbox>
</widget>
- <widget class="QTextBrowser" row="0" column="2" rowspan="4" colspan="1">
+ <widget class="TQTextBrowser" row="0" column="2" rowspan="4" colspan="1">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -180,9 +180,9 @@
<string>description...</string>
</property>
</widget>
- <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -204,14 +204,14 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_logical</cstring>
</property>
@@ -219,7 +219,7 @@
<string>logical</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_details</cstring>
</property>
@@ -237,7 +237,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -250,7 +250,7 @@
<property name="name">
<cstring>m_packageInfo</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>80</height>
@@ -267,7 +267,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>1</width>
<height>20</height>
@@ -302,7 +302,7 @@
<includes>
<include location="global" impldecl="in declaration">adept/extendablelist.h</include>
</includes>
-<layoutdefaults spacing="0" margin="4"/>
+<tqlayoutdefaults spacing="0" margin="4"/>
<includehints>
<includehint>adept/packageinfo.h</includehint>
</includehints>
diff --git a/adept/adept/packagedetails.cpp b/adept/adept/packagedetails.cpp
index 56dd80b..4f1908a 100644
--- a/adept/adept/packagedetails.cpp
+++ b/adept/adept/packagedetails.cpp
@@ -1,9 +1,9 @@
-#include <qtoolbutton.h>
-#include <qtextbrowser.h>
-#include <qlabel.h>
+#include <tqtoolbutton.h>
+#include <tqtextbrowser.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
#include <ktoolbar.h>
#include <ktoolbarbutton.h>
@@ -24,7 +24,7 @@ using namespace adept;
ItemChangelog* global_changelog = new ItemChangelog();
-PackageDetails::PackageDetails( QWidget *w, const char *n )
+PackageDetails::PackageDetails( TQWidget *w, const char *n )
: PackageDetailsUi( w, n ),
m_thread( 0 ),
m_qtMutex( true ),
@@ -44,16 +44,16 @@ PackageDetails::PackageDetails( QWidget *w, const char *n )
m_lister->setRangeProvider( this ); // wee
// m_lister->setOpenToplevel( true );
- m_description->setPaper( QBrush( colorGroup().background() ) );
+ m_description->setPaper( TQBrush( tqcolorGroup().background() ) );
- connect( m_toolbar->getButton( BShow ), SIGNAL( clicked() ),
- this, SIGNAL( showList() ) );
- connect( m_toolbar->getButton( BBack ), SIGNAL( clicked() ),
- this, SIGNAL( back() ) );
- connect( m_toolbar->getButton( BForward ), SIGNAL( clicked() ),
- this, SIGNAL( forward() ) );
- connect( m_lister, SIGNAL( detailsRequested( Lister::Entity ) ),
- this, SIGNAL( detailsRequested( Lister::Entity ) ) );
+ connect( m_toolbar->getButton( BShow ), TQT_SIGNAL( clicked() ),
+ this, TQT_SIGNAL( showList() ) );
+ connect( m_toolbar->getButton( BBack ), TQT_SIGNAL( clicked() ),
+ this, TQT_SIGNAL( back() ) );
+ connect( m_toolbar->getButton( BForward ), TQT_SIGNAL( clicked() ),
+ this, TQT_SIGNAL( forward() ) );
+ connect( m_lister, TQT_SIGNAL( detailsRequested( Lister::Entity ) ),
+ this, TQT_SIGNAL( detailsRequested( Lister::Entity ) ) );
observeComponent< component::State >();
@@ -110,8 +110,8 @@ void PackageDetails::notifyPreRebuild( component::Base * ) {
Threads::wait();
m_logical->setEnabled( false );
m_remove->setEnabled( false );
- m_logical->disconnect( SIGNAL( clicked() ) );
- m_remove->disconnect( SIGNAL( clicked() ) );
+ m_logical->disconnect( TQT_SIGNAL( clicked() ) );
+ m_remove->disconnect( TQT_SIGNAL( clicked() ) );
delete m_logicalAct;
delete m_removeAct;
kdDebug() << "PackageDetails::notifyPreRebuild() done" << endl;
@@ -120,7 +120,7 @@ void PackageDetails::notifyPreRebuild( component::Base * ) {
void PackageDetails::loadFileList() {
Cache &c = cache::Global::get( m_cache );
if ( m_fileListRunning || !c.isOpen() ) {
- QTimer::singleShot( 100, this, SLOT( loadFileList() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( loadFileList() ) );
return;
}
@@ -136,7 +136,7 @@ void PackageDetails::loadFileList() {
m_qtMutex.lock();
m_fileList->KFileView::clear();
- c.progress().OverallProgress( 0, 0, 0, i18n( "Loading filelist..." ) );
+ c.progress().OverallProgress( 0, 0, 0, i18n( "Loading filelist..." ).ascii() );
m_qtMutex.unlock();
Threads::enqueue( m_thread, &m_qtMutex );
@@ -150,12 +150,12 @@ void PackageDetails::setPackage( cache::entity::Package p )
{
kdDebug() << "PackageDetails::setPackage()" << endl;
m_package = p.stable();
- m_name->setText( QString( "<b>" ) +
+ m_name->setText( TQString( "<b>" ) +
p.name( std::string( "No package" ) ) + "</b>" );
m_info->setPackage( p );
- QString l = u8( p.longDescription(
+ TQString l = u8( p.longDescription(
std::string( i18n( "No long description available" ).local8Bit() ) ) );
- m_description->setText( QString( "<qt>" )
+ m_description->setText( TQString( "<qt>" )
+ formatLongDescription( l ) + "</qt>" );
std::string na = u8( i18n( "not available" ) );
@@ -173,10 +173,10 @@ void PackageDetails::setPackage( cache::entity::Package p )
try {
global_changelog->setParent(p);
m_changelog->setText(i18n("Loading..."));
- connect(dynamic_cast<QObject*>(global_changelog), SIGNAL( changelogReady(QString) ),
- dynamic_cast<QObject*>(this), SLOT( changelogDisplay(QString) ));
- connect(dynamic_cast<QObject*>(this), SIGNAL( requestTheChangelog() ),
- dynamic_cast<QObject*>(global_changelog), SIGNAL( changelogNeeded() ));
+ connect(dynamic_cast<TQObject*>(global_changelog), TQT_SIGNAL( changelogReady(TQString) ),
+ dynamic_cast<TQObject*>(this), TQT_SLOT( changelogDisplay(TQString) ));
+ connect(dynamic_cast<TQObject*>(this), TQT_SIGNAL( requestTheChangelog() ),
+ dynamic_cast<TQObject*>(global_changelog), TQT_SIGNAL( changelogNeeded() ));
emit requestTheChangelog();
} catch (...) {};
#endif /* KUBUNTU */
@@ -186,7 +186,7 @@ void PackageDetails::setPackage( cache::entity::Package p )
loadFileList();
}
-void PackageDetails::changelogDisplay( QString content ) {
+void PackageDetails::changelogDisplay( TQString content ) {
m_changelog->setText(content);
}
@@ -196,7 +196,7 @@ void PackageDetails::notifyPostChange( cache::component::Base * )
// without the timer to break it, there could be a loop where
// we connect the clicked() signal to a slot which would be
// invoked right away when we return -> evil
- QTimer::singleShot( 0, this, SLOT( updateLogical() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateLogical() ) );
}
void PackageDetails::notifyPostRebuild( cache::component::Base *b )
@@ -204,8 +204,8 @@ void PackageDetails::notifyPostRebuild( cache::component::Base *b )
kdDebug() << "PackageDetails::notifyPostRebuild( " << b << " )" << endl;
// can't call directly because stable entities are not guaranteed
// to be stabilised at this point yet
- QTimer::singleShot( 0, this, SLOT( updateLogical() ) );
- QTimer::singleShot( 0, this, SLOT( loadFileList() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateLogical() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( loadFileList() ) );
m_lister->cleanRebuild();
}
@@ -213,7 +213,7 @@ void PackageDetails::updateLogical()
{
Cache &c = cache::Global::get( m_cache );
if ( !c.isOpen() ) {
- QTimer::singleShot( 100, this, SLOT( updateLogical() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( updateLogical() ) );
return;
}
kdDebug() << "PackageDetails::updateLogical()" << endl;
@@ -238,8 +238,8 @@ void PackageDetails::updateLogical()
if ( a ) {
m_logical->setEnabled( true );
m_logical->setText( u8( a->actor().prettyName() ) );
- connect( m_logical, SIGNAL( clicked() ),
- a, SLOT( destructiveAct() ) );
+ connect( m_logical, TQT_SIGNAL( clicked() ),
+ a, TQT_SLOT( destructiveAct() ) );
} else {
m_logical->setText( i18n( "Install" ) );
m_logical->setEnabled( false );
@@ -248,8 +248,8 @@ void PackageDetails::updateLogical()
if ( b ) {
m_remove->setEnabled( true );
m_remove->setText( u8( b->actor().prettyName() ) );
- connect( m_remove, SIGNAL( clicked() ),
- b, SLOT( destructiveAct() ) );
+ connect( m_remove, TQT_SIGNAL( clicked() ),
+ b, TQT_SLOT( destructiveAct() ) );
} else {
m_remove->setText( i18n( "Remove" ) );
m_remove->setEnabled( false );
diff --git a/adept/adept/packagedetails.h b/adept/adept/packagedetails.h
index 6d15185..dc887aa 100644
--- a/adept/adept/packagedetails.h
+++ b/adept/adept/packagedetails.h
@@ -6,14 +6,14 @@
#include <adept/lister.h>
#include <adept/changelog.h>
-#include <qmutex.h>
-#include <qguardedptr.h>
+#include <tqmutex.h>
+#include <tqguardedptr.h>
#ifndef EPT_PACKGEDETAILS_H
#define EPT_PACKGEDETAILS_H
class KToolBarButton;
-class QThread;
+class TQThread;
namespace adept {
@@ -23,9 +23,10 @@ class PackageDetails : public PackageDetailsUi, public Lister::RangeProvider,
public cache::Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ButtonID { BForward, BBack, BShow };
- PackageDetails( QWidget *p = 0, const char *n = 0 );
+ PackageDetails( TQWidget *p = 0, const char *n = 0 );
void setPackage( cache::entity::Package );
void setHasForward( bool );
void setHasBack( bool );
@@ -42,13 +43,13 @@ signals:
protected slots:
void loadFileList();
void updateLogical();
- void changelogDisplay(QString content);
+ void changelogDisplay(TQString content);
protected:
void loadFileListWorker();
cache::entity::StablePackage m_package;
- QMutex m_qtMutex;
- QThread *m_thread;
- QGuardedPtr< EntityActor > m_logicalAct, m_removeAct;
+ TQMutex m_qtMutex;
+ TQThread *m_thread;
+ TQGuardedPtr< EntityActor > m_logicalAct, m_removeAct;
int m_fileListRunning;
};
diff --git a/adept/adept/packagedetailsui.ui b/adept/adept/packagedetailsui.ui
index 06e436a..b40c289 100644
--- a/adept/adept/packagedetailsui.ui
+++ b/adept/adept/packagedetailsui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>PackageDetailsUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>PackageDetailsUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -30,7 +30,7 @@
<cstring>m_toolbar</cstring>
</property>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame3</cstring>
</property>
@@ -55,7 +55,7 @@
<property name="spacing">
<number>2</number>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>m_name</cstring>
</property>
@@ -83,7 +83,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>75</height>
@@ -100,14 +100,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QPushButton" row="3" column="2">
+ <widget class="TQPushButton" row="3" column="2">
<property name="name">
<cstring>m_remove</cstring>
</property>
@@ -125,14 +125,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton" row="3" column="1">
+ <widget class="TQPushButton" row="3" column="1">
<property name="name">
<cstring>m_logical</cstring>
</property>
@@ -150,14 +150,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QTextBrowser" row="0" column="4" rowspan="4" colspan="1">
+ <widget class="TQTextBrowser" row="0" column="4" rowspan="4" colspan="1">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -193,7 +193,7 @@
</widget>
</grid>
</widget>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>tabWidget2</cstring>
</property>
@@ -205,7 +205,7 @@
<verstretch>16</verstretch>
</sizepolicy>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -231,7 +231,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>120</height>
@@ -240,7 +240,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -261,7 +261,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>TabPage</cstring>
</property>
@@ -284,16 +284,16 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<vbox>
<property name="name">
@@ -302,7 +302,7 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_source</cstring>
</property>
@@ -310,7 +310,7 @@
<string>source</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_architecture</cstring>
</property>
@@ -326,7 +326,7 @@
<string>architecture</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_filename</cstring>
</property>
@@ -334,7 +334,7 @@
<string>file</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_md5</cstring>
</property>
@@ -352,7 +352,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>61</height>
@@ -363,7 +363,7 @@
</widget>
</hbox>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>changelog_tab</cstring>
</property>
@@ -377,7 +377,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QTextBrowser" row="0" column="0">
+ <widget class="TQTextBrowser" row="0" column="0">
<property name="name">
<cstring>m_changelog</cstring>
</property>
@@ -495,7 +495,7 @@
<data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
</image>
</images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktoolbar.h</includehint>
<includehint>adept/packageinfo.h</includehint>
diff --git a/adept/adept/packageinfo.cpp b/adept/adept/packageinfo.cpp
index dac788b..9ed85bf 100644
--- a/adept/adept/packageinfo.cpp
+++ b/adept/adept/packageinfo.cpp
@@ -3,9 +3,9 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qcolor.h>
-#include <qlabel.h>
-#include <qregexp.h>
+#include <tqcolor.h>
+#include <tqlabel.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <klocale.h>
@@ -15,7 +15,7 @@
using namespace adept;
using namespace cache;
-PackageInfo::PackageInfo( QWidget *p, const char *n )
+PackageInfo::PackageInfo( TQWidget *p, const char *n )
: PackageInfoUi( p, n ), m_specificVersion( false )
{
observeComponent< component::State >();
@@ -31,75 +31,75 @@ void PackageInfo::adjustFontSize( int s ) {
adept::adjustFontSize( m_installedVer, s );
}
-void PackageInfo::hideStatus() {
+void PackageInfo::hidetqStatus() {
m_status->hide();
m_change->hide();
}
namespace adept {
-QColor statusColor( entity::Package p )
+TQColor statusColor( entity::Package p )
{
if ( !p.valid() )
- return Qt::black;
+ return TQt::black;
- QColor c = Qt::blue;
+ TQColor c = TQt::blue;
if (p.isInstalled())
- c = Qt::darkGreen;
+ c = TQt::darkGreen;
if (p.isUpgradable())
- c = Qt::darkYellow;
+ c = TQt::darkYellow;
if (p.isBroken())
- c = Qt::red;
+ c = TQt::red;
return c;
}
-QColor actionColor( entity::Package p )
+TQColor actionColor( entity::Package p )
{
if ( !p.valid() )
- return Qt::black;
+ return TQt::black;
- QColor c = Qt::blue;
+ TQColor c = TQt::blue;
if (p.markedNewInstall())
- c = Qt::darkGreen;
+ c = TQt::darkGreen;
if (p.markedUpgrade())
- c = Qt::darkYellow;
+ c = TQt::darkYellow;
if (p.markedReInstall())
- c = Qt::darkYellow;
+ c = TQt::darkYellow;
if (p.markedRemove())
- c = Qt::darkRed;
+ c = TQt::darkRed;
if (p.markedPurge())
- c = Qt::red;
+ c = TQt::red;
if (p.willBreak())
- c = Qt::red;
+ c = TQt::red;
return c;
}
-/* QString hexColor( QColor c )
+/* TQString hexColor( TQColor c )
{
- QString r( "#%1%2%3" );
- return r.arg( c.red(), -2, 16 ).arg( c.green(), -2, 16 ).arg( c.blue(), -2, 16 );
+ TQString r( "#%1%2%3" );
+ return r.tqarg( c.red(), -2, 16 ).tqarg( c.green(), -2, 16 ).tqarg( c.blue(), -2, 16 );
} */
-QString colorify( QColor c, QString s )
+TQString colorify( TQColor c, TQString s )
{
- return QString( "<font color=\"" ) + c.name()
+ return TQString( "<font color=\"" ) + c.name()
+ "\">" + s + "</font>";
}
-QString formatLongDescription( QString l )
+TQString formatLongDescription( TQString l )
{
- QRegExp rx( u8( "^(.*)\n" ) );
+ TQRegExp rx( u8( "^(.*)\n" ) );
rx.setMinimal( true );
- l.replace( rx, u8( "\\1</p><p>" ) );
- rx = QRegExp( u8( "\\n[ ]*\\.\\n" ) );
- l.replace( rx, u8( "</p><p>" ) );
- rx = QRegExp( u8( "\n " ) );
- l.replace( rx, u8( " " ) );
- rx = QRegExp( u8( "\n - (.*)(\n|$)" ) );
+ l.tqreplace( rx, u8( "\\1</p><p>" ) );
+ rx = TQRegExp( u8( "\\n[ ]*\\.\\n" ) );
+ l.tqreplace( rx, u8( "</p><p>" ) );
+ rx = TQRegExp( u8( "\n " ) );
+ l.tqreplace( rx, u8( " " ) );
+ rx = TQRegExp( u8( "\n - (.*)(\n|$)" ) );
rx.setMinimal( true );
- l.replace( rx, u8( "\n<li>\\1</li>\n" ) );
- l.replace( rx, u8( "\n<li>\\1</li>\n" ) );
- return QString( "<p>" ) + l + u8( "</p>" );
+ l.tqreplace( rx, u8( "\n<li>\\1</li>\n" ) );
+ l.tqreplace( rx, u8( "\n<li>\\1</li>\n" ) );
+ return TQString( "<p>" ) + l + u8( "</p>" );
}
void PackageInfo::setPackage( entity::Package p )
@@ -133,7 +133,7 @@ void PackageInfo::notifyPostChange( component::Base * )
if ( !m_version.valid() ) return;
entity::Version v = m_version;
entity::Package p = v.package();
- QString cv = i18n( "n/a" ), iv = i18n( "n/a" ), is = i18n( "n/a" ), status, action;
+ TQString cv = i18n( "n/a" ), iv = i18n( "n/a" ), is = i18n( "n/a" ), status, action;
if (p.valid()) {
entity::Version _cv = p.candidateVersion();
@@ -158,7 +158,7 @@ void PackageInfo::notifyPostChange( component::Base * )
u8( p.actionString( unk ) ) ) + i18n( "
requested</nobr>" ) ); */
m_status->setText(
- labelFormat( i18n( "Status:" ), colorify(
+ labelFormat( i18n( "tqStatus:" ), colorify(
statusColor( p ),
u8( p.statusString( u8( i18n( "Unknown" ) ) ) ) ) ) );
m_change->setText(
diff --git a/adept/adept/packageinfo.h b/adept/adept/packageinfo.h
index 1a83c0d..4b2e8a3 100644
--- a/adept/adept/packageinfo.h
+++ b/adept/adept/packageinfo.h
@@ -15,8 +15,9 @@ using namespace aptFront;
class PackageInfo : public PackageInfoUi, public cache::Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
- PackageInfo( QWidget *p, const char *n = 0 );
+ PackageInfo( TQWidget *p, const char *n = 0 );
public slots:
void setVersion( cache::entity::Version v, bool = true );
void setPackage( cache::entity::Package v );
@@ -24,25 +25,25 @@ public slots:
public:
void notifyPostChange( cache::component::Base * );
void notifyPostRebuild( cache::component::Base * );
- void hideStatus();
+ void hidetqStatus();
protected:
cache::entity::StableVersion m_version;
bool m_specificVersion;
};
-inline QString labelFormat( const QString &what,
- const QString &txt, bool nobr = true )
+inline TQString labelFormat( const TQString &what,
+ const TQString &txt, bool nobr = true )
{
- QString ret = "<b><nobr>" + what + "</nobr></b>&nbsp;" + (nobr ? "<nobr>" : "")
+ TQString ret = "<b><nobr>" + what + "</nobr></b>&nbsp;" + (nobr ? "<nobr>" : "")
+ txt + (nobr ? "</nobr>" : "");
return ret;
}
-QColor actionColor( cache::entity::Package p );
-QColor statusColor( cache::entity::Package p );
+TQColor actionColor( cache::entity::Package p );
+TQColor statusColor( cache::entity::Package p );
-QString formatLongDescription( QString in );
-QString colorify( QColor c, QString s );
+TQString formatLongDescription( TQString in );
+TQString colorify( TQColor c, TQString s );
}
diff --git a/adept/adept/packageinfoui.ui b/adept/adept/packageinfoui.ui
index d7d5dc5..ff733d0 100644
--- a/adept/adept/packageinfoui.ui
+++ b/adept/adept/packageinfoui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>PackageInfoUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>details</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_indent</cstring>
</property>
@@ -37,13 +37,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>16</width>
<height>5</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>16</width>
<height>5</height>
@@ -53,7 +53,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="4" column="1">
+ <widget class="TQLabel" row="4" column="1">
<property name="name">
<cstring>m_maintainer</cstring>
</property>
@@ -65,7 +65,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -74,11 +74,11 @@
<property name="text">
<string>maintainer</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignBottom</set>
</property>
</widget>
- <widget class="QLabel" row="5" column="1">
+ <widget class="TQLabel" row="5" column="1">
<property name="name">
<cstring>m_candidateVer</cstring>
</property>
@@ -94,7 +94,7 @@
<string>candidate version</string>
</property>
</widget>
- <widget class="QLabel" row="6" column="1">
+ <widget class="TQLabel" row="6" column="1">
<property name="name">
<cstring>m_installedVer</cstring>
</property>
@@ -110,7 +110,7 @@
<string>installed version</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="1">
+ <widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>m_section</cstring>
</property>
@@ -126,7 +126,7 @@
<string>section</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="1">
+ <widget class="TQLabel" row="3" column="1">
<property name="name">
<cstring>m_installedSize</cstring>
</property>
@@ -142,7 +142,7 @@
<string>installed size</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>m_status</cstring>
</property>
@@ -158,7 +158,7 @@
<string>status</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="1">
+ <widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>m_change</cstring>
</property>
@@ -176,5 +176,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/adept/progress.cpp b/adept/adept/progress.cpp
index 60a3bd3..24ce649 100644
--- a/adept/adept/progress.cpp
+++ b/adept/adept/progress.cpp
@@ -1,5 +1,5 @@
#include <kapplication.h>
-#include <qcursor.h>
+#include <tqcursor.h>
#include <kdebug.h>
#include <adept/progress.h>
#include <adept/utils.h>
@@ -29,7 +29,7 @@ void Progress::Update ()
}
if (MajorChange) {
if ( !m_busy ) {
- QApplication::setOverrideCursor( QCursor( Qt::BusyCursor ) );
+ TQApplication::setOverrideCursor( TQCursor( TQt::BusyCursor ) );
m_busy = true;
}
m_sbar->message( u8( Op + "..." ) );
@@ -46,7 +46,7 @@ void Progress::Done ()
{
kdDebug() << "Progress::Done()" << endl;
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
m_busy = false;
if (m_sbar)
diff --git a/adept/adept/quickfilter.cpp b/adept/adept/quickfilter.cpp
index 2cb0577..3e99a58 100644
--- a/adept/adept/quickfilter.cpp
+++ b/adept/adept/quickfilter.cpp
@@ -1,44 +1,44 @@
#include <apt-front/predicate/combinators.h>
#include <apt-front/predicate/factory.h>
-#include <qobjectlist.h>
+#include <tqobjectlist.h>
#include <klocale.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include "quickfilter.h"
using namespace aptFront;
using namespace adept;
-QuickFilterWidget::QuickFilterWidget( QWidget *parent, const char *name )
- : QuickFilterUi( parent, name )
+QuickFilterWidget::QuickFilterWidget( TQWidget *tqparent, const char *name )
+ : QuickFilterUi( tqparent, name )
{
setFocusProxy( m_match );
- connect( m_match, SIGNAL( textChanged( const QString & ) ),
- this, SLOT( textChanged( const QString & ) ) );
- /* connect( m_reset, SIGNAL( clicked() ),
- this, SLOT( reset() ) ); */
- connect( m_match, SIGNAL( returnPressed() ),
- this, SLOT( widgetsChanged() ) );
- connect( &timer, SIGNAL( timeout() ),
- this, SLOT( widgetsChanged() ) );
+ connect( m_match, TQT_SIGNAL( textChanged( const TQString & ) ),
+ this, TQT_SLOT( textChanged( const TQString & ) ) );
+ /* connect( m_reset, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( reset() ) ); */
+ connect( m_match, TQT_SIGNAL( returnPressed() ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( &timer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( widgetsChanged() ) );
- QObjectList *chld = queryList( "QCheckBox" );
- QObjectListIt it( *chld );
+ TQObjectList *chld = queryList( TQCHECKBOX_OBJECT_NAME_STRING );
+ TQObjectListIt it( *chld );
while( it.current() != 0 ) {
- connect( it.current(), SIGNAL( toggled( bool ) ),
- this, SLOT( widgetsChanged() ) );
+ connect( it.current(), TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
++it;
}
}
-void QuickFilterWidget::mouseReleaseEvent( QMouseEvent *e ) {
+void QuickFilterWidget::mouseReleaseEvent( TQMouseEvent *e ) {
m_match->setFocus();
QuickFilterUi::mouseReleaseEvent( e );
}
-void QuickFilterWidget::textChanged( const QString & )
+void QuickFilterWidget::textChanged( const TQString & )
{
kdDebug() << "QuickFilterWidget::textChanged" << endl;
timer.start( 1000, true );
@@ -58,7 +58,7 @@ QuickFilterWidget::Predicate QuickFilterWidget::predicate()
return predicate::adapt< entity::Entity >( f );
}
-static void blockedSet( QCheckBox *b, bool v ) {
+static void blockedSet( TQCheckBox *b, bool v ) {
b->blockSignals( true );
b->setChecked( v );
b->blockSignals( false );
diff --git a/adept/adept/quickfilter.h b/adept/adept/quickfilter.h
index 788c9da..615454d 100644
--- a/adept/adept/quickfilter.h
+++ b/adept/adept/quickfilter.h
@@ -4,8 +4,8 @@
*/
#include <klocale.h>
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <apt-front/cache/entity/entity.h>
#include <apt-front/cache/entity/package.h>
@@ -15,8 +15,8 @@
#include <adept/lister.h>
#include <adept/utils.h>
-#ifndef EPT_QUICKFILTER_H
-#define EPT_QUICKFILTER_H
+#ifndef EPT_TQUICKFILTER_H
+#define EPT_TQUICKFILTER_H
class KLineEdit;
@@ -102,16 +102,17 @@ protected:
class QuickFilterWidget : public QuickFilterUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- QuickFilterWidget( QWidget *parent, const char *name = 0 );
+ QuickFilterWidget( TQWidget *tqparent, const char *name = 0 );
virtual Predicate predicate();
public slots:
void predicateChanged();
protected slots:
- void textChanged( const QString & );
+ void textChanged( const TQString & );
protected:
- void mouseReleaseEvent( QMouseEvent *e );
- QTimer timer;
+ void mouseReleaseEvent( TQMouseEvent *e );
+ TQTimer timer;
};
}
diff --git a/adept/adept/quickfilterui.ui b/adept/adept/quickfilterui.ui
index d45c154..ad9bf63 100644
--- a/adept/adept/quickfilterui.ui
+++ b/adept/adept/quickfilterui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>QuickFilterUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>1</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_title</cstring>
</property>
@@ -33,7 +33,7 @@
<string>&lt;b&gt;Search:&amp;nbsp;&lt;/b&gt;</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_match</cstring>
</property>
@@ -45,7 +45,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -62,14 +62,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -80,7 +80,7 @@
<enum>AutoText</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_name</cstring>
</property>
@@ -88,7 +88,7 @@
<string>package name,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -96,7 +96,7 @@
<string>description,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_maintainer</cstring>
</property>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -126,5 +126,5 @@
<includes>
<include location="global" impldecl="in declaration">adept/filterlist.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/adept/sourceseditor.cpp b/adept/adept/sourceseditor.cpp
index 3b04cf6..28a9d8e 100644
--- a/adept/adept/sourceseditor.cpp
+++ b/adept/adept/sourceseditor.cpp
@@ -1,9 +1,9 @@
#include <fstream>
#include <iostream>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qpainter.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpainter.h>
#include <kdebug.h>
#include <kpopupmenu.h>
@@ -15,24 +15,24 @@
using namespace aptFront;
using namespace adept;
-SourcesEditor::SourcesEditor( std::string f, QWidget *p, const char *n )
+SourcesEditor::SourcesEditor( std::string f, TQWidget *p, const char *n )
: SourcesEditorUi( p, n ), m_filename( f )
{
m_list->setSorting( -1 );
m_list->setAcceptDrops( true );
- connect( m_close, SIGNAL( clicked() ),
- this, SIGNAL( close() ) );
- connect( m_apply, SIGNAL( clicked() ),
- this, SLOT( save() ) );
- connect( m_reset, SIGNAL( clicked() ),
- this, SLOT( reset() ) );
+ connect( m_close, TQT_SIGNAL( clicked() ),
+ this, TQT_SIGNAL( close() ) );
+ connect( m_apply, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( save() ) );
+ connect( m_reset, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( reset() ) );
- connect( m_list, SIGNAL( contextMenuRequested(
- QListViewItem *, const QPoint &, int) ),
- this, SLOT( contextMenu( QListViewItem *, const QPoint & ) ) );
+ connect( m_list, TQT_SIGNAL( contextMenuRequested(
+ TQListViewItem *, const TQPoint &, int) ),
+ this, TQT_SLOT( contextMenu( TQListViewItem *, const TQPoint & ) ) );
- connect( m_newAdd, SIGNAL( clicked() ),
- this, SLOT( newAdd() ) );
+ connect( m_newAdd, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( newAdd() ) );
reset();
}
@@ -40,22 +40,22 @@ SourcesEditor::SourcesEditor( std::string f, QWidget *p, const char *n )
void SourcesEditor::newAdd()
{
Sources::Entry e( true, Sources::Entry::Binary );
- std::string s = m_newLine->text();
+ std::string s = m_newLine->text().ascii();
std::istringstream i( s );
i >> e;
new EntryItem( e, m_list );
m_newLine->setText( u8( "" ) );
}
-void SourcesEditor::contextMenu( QListViewItem *, const QPoint &pt ) {
+void SourcesEditor::contextMenu( TQListViewItem *, const TQPoint &pt ) {
EntryItem *s = dynamic_cast< EntryItem * >( m_list->selectedItem() );
if (!s) return;
KPopupMenu *m = new KPopupMenu (this);
m->insertItem( s->entry().enabled() ? i18n( "Disable" ) : i18n( "Enable" ), 0 );
m->insertItem( i18n( "Clone" ), 1 );
m->insertItem( i18n( "Remove" ), 2 );
- connect( m, SIGNAL( activated( int ) ),
- this, SLOT( contextMenuActivated( int ) ) );
+ connect( m, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( contextMenuActivated( int ) ) );
m->exec( pt );
delete m;
}
@@ -112,7 +112,7 @@ void SourcesEditor::save() {
}
} */
-QString EntryItem::text( int c ) const {
+TQString EntryItem::text( int c ) const {
if (entry().type() == Sources::Entry::Comment) {
if (c == 0)
if (entry().comment() == "")
@@ -131,12 +131,12 @@ QString EntryItem::text( int c ) const {
return u8( "" );
}
-void EntryItem::setText( int c, const QString &_s )
+void EntryItem::setText( int c, const TQString &_s )
{
kdDebug() << "setText on column " << c << endl;
Sources::Entry e = entry();
std::string s;
- s = _s.local8Bit();
+ s = _s.local8Bit().data();
if (c == 0) e.setTypeString( s );
if (c == 1)
if (entry().type() == Sources::Entry::Comment)
@@ -149,16 +149,16 @@ void EntryItem::setText( int c, const QString &_s )
KListViewItem::setText( c, _s ); // stop qlistview from looping infinitely
}
-void EntryItem::paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment )
+void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment )
{
- QColorGroup _cg( cg );
- QColor c = _cg.text();
- QPixmap pm( width, height() );
- QPainter _p( &pm );
+ TQColorGroup _cg( cg );
+ TQColor c = _cg.text();
+ TQPixmap pm( width, height() );
+ TQPainter _p( &pm );
if (!entry().enabled())
- c = Qt::gray;
- _cg.setColor( QColorGroup::Text, c );
+ c = TQt::gray;
+ _cg.setColor( TQColorGroup::Text, c );
KListViewItem::paintCell( &_p, _cg, column, width, AlignTop );
p->drawPixmap( 0, 0, pm );
}
diff --git a/adept/adept/sourceseditor.h b/adept/adept/sourceseditor.h
index 32b474f..780b40c 100644
--- a/adept/adept/sourceseditor.h
+++ b/adept/adept/sourceseditor.h
@@ -14,13 +14,14 @@ using namespace aptFront;
class SourcesEditor : public SourcesEditorUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- SourcesEditor( std::string f, QWidget *p = 0, const char *n = 0 );
+ SourcesEditor( std::string f, TQWidget *p = 0, const char *n = 0 );
public slots:
void save();
void reset();
protected slots:
- void contextMenu( QListViewItem *, const QPoint & );
+ void contextMenu( TQListViewItem *, const TQPoint & );
void contextMenuActivated( int );
void newAdd();
signals:
@@ -52,10 +53,10 @@ public:
setRenameEnabled( 2, true );
setRenameEnabled( 3, true );
}
- QString text( int c ) const;
- void setText( int c, const QString &s );
- virtual void paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment);
+ TQString text( int c ) const;
+ void setText( int c, const TQString &s );
+ virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment);
protected:
Sources::Entry m_entry;
};
diff --git a/adept/adept/sourceseditorui.ui b/adept/adept/sourceseditorui.ui
index 43397d3..f8b537b 100644
--- a/adept/adept/sourceseditorui.ui
+++ b/adept/adept/sourceseditorui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>adept::SourcesEditorUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>adept::SourcesEditorUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -86,15 +86,15 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -102,7 +102,7 @@
<string>New Repository:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_newLine</cstring>
</property>
@@ -110,7 +110,7 @@
<string>Write or paste a normal sources.list line here to add it to your sources</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_newAdd</cstring>
</property>
@@ -120,15 +120,15 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_reset</cstring>
</property>
@@ -136,7 +136,7 @@
<string>Reset</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_apply</cstring>
</property>
@@ -144,7 +144,7 @@
<string>Apply</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_close</cstring>
</property>
@@ -166,7 +166,7 @@
<tabstop>m_close</tabstop>
<tabstop>m_list</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/adept/adept/statefilter.cpp b/adept/adept/statefilter.cpp
index 45ee470..46913da 100644
--- a/adept/adept/statefilter.cpp
+++ b/adept/adept/statefilter.cpp
@@ -2,21 +2,21 @@
#include <apt-front/predicate/factory.h>
#include <klocale.h>
#include <kdebug.h>
-#include <qcheckbox.h>
-#include <qobjectlist.h>
+#include <tqcheckbox.h>
+#include <tqobjectlist.h>
#include "statefilter.h"
using namespace aptFront;
using namespace adept;
-StateFilterWidget::StateFilterWidget( QWidget *parent, const char *name )
- : StateFilterUi( parent, name )
+StateFilterWidget::StateFilterWidget( TQWidget *tqparent, const char *name )
+ : StateFilterUi( tqparent, name )
{
- QObjectList *chld = queryList( "QCheckBox" );
- QObjectListIt it( *chld );
+ TQObjectList *chld = queryList( TQCHECKBOX_OBJECT_NAME_STRING );
+ TQObjectListIt it( *chld );
while( it.current() != 0 ) {
- connect( it.current(), SIGNAL( toggled( bool ) ),
- this, SLOT( widgetsChanged() ) );
+ connect( it.current(), TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
++it;
}
}
@@ -24,21 +24,21 @@ StateFilterWidget::StateFilterWidget( QWidget *parent, const char *name )
StateFilterWidget::Predicate StateFilterWidget::predicate()
{
typedef StateFilter< entity::Package > F;
- unsigned mask = 0;
- if (m_installed->isChecked()) mask |= F::Installed;
- if (m_notInstalled->isChecked()) mask |= F::NotInstalled;
- if (m_upgradable->isChecked()) mask |= F::Upgradable;
- if (m_keep->isChecked()) mask |= F::Keep;
- if (m_install->isChecked()) mask |= F::Install;
- if (m_remove->isChecked()) mask |= F::Remove;
- if (m_upgrade->isChecked()) mask |= F::Upgrade;
+ unsigned tqmask = 0;
+ if (m_installed->isChecked()) tqmask |= F::Installed;
+ if (m_notInstalled->isChecked()) tqmask |= F::NotInstalled;
+ if (m_upgradable->isChecked()) tqmask |= F::Upgradable;
+ if (m_keep->isChecked()) tqmask |= F::Keep;
+ if (m_install->isChecked()) tqmask |= F::Install;
+ if (m_remove->isChecked()) tqmask |= F::Remove;
+ if (m_upgrade->isChecked()) tqmask |= F::Upgrade;
StateFilter< entity::Package > f;
- f.setMask( mask );
+ f.setMask( tqmask );
return predicate::adapt< entity::Entity >( f );
}
-static void blockedSet( QCheckBox *b, bool v ) {
+static void blockedSet( TQCheckBox *b, bool v ) {
b->blockSignals( true );
b->setChecked( v );
b->blockSignals( false );
@@ -48,13 +48,13 @@ void StateFilterWidget::predicateChanged()
{
typedef StateFilter< entity::Package > F;
F f = downcast< F >( m_pred );
- unsigned mask = f.mask();
- blockedSet( m_installed, mask & F::Installed );
- blockedSet( m_notInstalled, mask & F::NotInstalled );
- blockedSet( m_upgradable, mask & F::Upgradable );
- blockedSet( m_keep, mask & F::Keep );
- blockedSet( m_install, mask & F::Install );
- blockedSet( m_upgrade, mask & F::Upgrade );
- blockedSet( m_remove, mask & F::Remove );
+ unsigned tqmask = f.tqmask();
+ blockedSet( m_installed, tqmask & F::Installed );
+ blockedSet( m_notInstalled, tqmask & F::NotInstalled );
+ blockedSet( m_upgradable, tqmask & F::Upgradable );
+ blockedSet( m_keep, tqmask & F::Keep );
+ blockedSet( m_install, tqmask & F::Install );
+ blockedSet( m_upgrade, tqmask & F::Upgrade );
+ blockedSet( m_remove, tqmask & F::Remove );
}
diff --git a/adept/adept/statefilter.h b/adept/adept/statefilter.h
index 570edb1..ddea502 100644
--- a/adept/adept/statefilter.h
+++ b/adept/adept/statefilter.h
@@ -12,7 +12,7 @@
#include <adept/lister.h>
#include <klocale.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <iostream>
#include <sstream>
@@ -36,7 +36,7 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
Upgrade = 1 << 6 };
StateFilter()
- : m_mask( 0xff ) {
+ : m_tqmask( 0xff ) {
setupPredicate();
}
@@ -44,21 +44,21 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
predicate::Predicate< T >
p0 = not predicate::True< T >(),
p1 = not predicate::True< T >();
- if (m_mask & Installed)
+ if (m_tqmask & Installed)
p0 = p0 or (predicate::Factory< T >::member( &T::isInstalled )
and not predicate::Factory< T >::member( &T::isUpgradable ) );
- if (m_mask & NotInstalled)
+ if (m_tqmask & NotInstalled)
p0 = p0 or not predicate::Factory< T >::member( &T::isInstalled );
- if (m_mask & Upgradable)
+ if (m_tqmask & Upgradable)
p0 = p0 or predicate::Factory< T >::member( &T::isUpgradable );
- if (m_mask & Install)
+ if (m_tqmask & Install)
p1 = p1 or predicate::Factory< T >::member( &T::markedNewInstall );
- if (m_mask & Remove)
+ if (m_tqmask & Remove)
p1 = p1 or predicate::Factory< T >::member( &T::markedRemove );
- if (m_mask & Keep)
+ if (m_tqmask & Keep)
p1 = p1 or predicate::Factory< T >::member( &T::markedKeep );
- if (m_mask & Upgrade)
+ if (m_tqmask & Upgrade)
p1 = p1 or predicate::Factory< T >::member( &T::markedUpgrade );
m_op = p0 and p1;
@@ -68,44 +68,44 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
std::ostringstream s;
std::vector< std::string > r;
s << "State filter: ";
- if (m_mask & Installed && m_mask & NotInstalled && m_mask & Upgradable)
+ if (m_tqmask & Installed && m_tqmask & NotInstalled && m_tqmask & Upgradable)
r.push_back( "Any State" );
else {
- if (m_mask & Installed)
- r.push_back( i18n( "Installed" ) );
- if (m_mask & NotInstalled)
- r.push_back( i18n( "Not Installed" ) );
- if (m_mask & Upgradable)
- r.push_back( i18n( "Upgradable" ) );
+ if (m_tqmask & Installed)
+ r.push_back( i18n( "Installed" ).ascii() );
+ if (m_tqmask & NotInstalled)
+ r.push_back( i18n( "Not Installed" ).ascii() );
+ if (m_tqmask & Upgradable)
+ r.push_back( i18n( "Upgradable" ).ascii() );
}
std::copy( r.begin(), r.end(),
std::ostream_iterator< std::string >( s, " " ) );
s << "; ";
r.clear();
- if (m_mask & Install && m_mask & Remove
- && m_mask & Keep && m_mask & Upgrade)
- r.push_back( i18n( "Any Action" ) );
+ if (m_tqmask & Install && m_tqmask & Remove
+ && m_tqmask & Keep && m_tqmask & Upgrade)
+ r.push_back( i18n( "Any Action" ).ascii() );
else {
- if (m_mask & Install)
- r.push_back( i18n( "Install" ) );
- if (m_mask & Remove)
- r.push_back( i18n( "Remove" ) );
- if (m_mask & Keep)
- r.push_back( i18n( "Keep" ) );
- if (m_mask & Upgrade)
- r.push_back( i18n( "Upgrade" ) );
+ if (m_tqmask & Install)
+ r.push_back( i18n( "Install" ).ascii() );
+ if (m_tqmask & Remove)
+ r.push_back( i18n( "Remove" ).ascii() );
+ if (m_tqmask & Keep)
+ r.push_back( i18n( "Keep" ).ascii() );
+ if (m_tqmask & Upgrade)
+ r.push_back( i18n( "Upgrade" ).ascii() );
}
std::copy( r.begin(), r.end(),
std::ostream_iterator< std::string >( s, " " ) );
return s.str();
}
- unsigned mask() const {
- return m_mask;
+ unsigned tqmask() const {
+ return m_tqmask;
}
void setMask( unsigned m ) {
- m_mask = m;
+ m_tqmask = m;
setupPredicate();
}
@@ -120,20 +120,21 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
}
virtual void reset() {
- m_mask = 0xff;
+ m_tqmask = 0xff;
setupPredicate();
}
protected:
- unsigned m_mask;
+ unsigned m_tqmask;
predicate::Predicate< T > m_op;
};
class StateFilterWidget : public StateFilterUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- StateFilterWidget( QWidget *parent, const char *name = 0 );
+ StateFilterWidget( TQWidget *tqparent, const char *name = 0 );
virtual Predicate predicate();
public slots:
void predicateChanged();
diff --git a/adept/adept/statefilterui.ui b/adept/adept/statefilterui.ui
index 1ef19e0..9eeca56 100644
--- a/adept/adept/statefilterui.ui
+++ b/adept/adept/statefilterui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>StateFilterUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,26 +25,26 @@
<property name="spacing">
<number>1</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_title</cstring>
</property>
<property name="text">
<string>Show: </string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter</set>
</property>
</widget>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_notInstalled</cstring>
</property>
@@ -52,7 +52,7 @@
<string>not installed,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_installed</cstring>
</property>
@@ -60,7 +60,7 @@
<string>installed,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_upgradable</cstring>
</property>
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>195</width>
<height>16</height>
@@ -87,15 +87,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="1" column="1">
+ <widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_keep</cstring>
</property>
@@ -103,7 +103,7 @@
<string>no changes,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_install</cstring>
</property>
@@ -111,7 +111,7 @@
<string>install,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_remove</cstring>
</property>
@@ -119,7 +119,7 @@
<string>removal,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_upgrade</cstring>
</property>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>195</width>
<height>16</height>
@@ -146,14 +146,14 @@
</spacer>
</hbox>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
<property name="text">
<string>with: </string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -162,5 +162,5 @@
<includes>
<include location="global" impldecl="in declaration">adept/filterlist.h</include>
</includes>
-<layoutdefaults spacing="3" margin="11"/>
+<tqlayoutdefaults spacing="3" margin="11"/>
</UI>
diff --git a/adept/adept/tagchooser.cpp b/adept/adept/tagchooser.cpp
index d596133..49d0265 100644
--- a/adept/adept/tagchooser.cpp
+++ b/adept/adept/tagchooser.cpp
@@ -1,5 +1,5 @@
#include <klocale.h>
-#include <qdragobject.h>
+#include <tqdragobject.h>
#include <ept/debtags/vocabulary.h>
#include <apt-front/cache/component/packagetags.h>
@@ -17,7 +17,7 @@ FacetItem::FacetItem( TagChooser *t )
void FacetItem::removeTag( TagItem::Tag t ) {
// kdDebug() << "removing tag " << t.fullname() << endl;
- for ( QListViewItem *n, *i = firstChild(); i != 0; i = n ) {
+ for ( TQListViewItem *n, *i = firstChild(); i != 0; i = n ) {
n = i->nextSibling();
if ( dynamic_cast< TagItem * >( i )->tag() == t )
delete i;
@@ -34,13 +34,13 @@ TagItem::TagItem( TagChooser *l )
{
}
-QString TagItem::text( int c ) const
+TQString TagItem::text( int c ) const
{
if (c != 0) return u8( "" );
- return QString( "[" ) + m_tag.name() + "] " + m_tag.shortDescription("");
+ return TQString( "[" ) + m_tag.name() + "] " + m_tag.shortDescription("");
}
-TagChooser::TagChooser( QWidget *p, const char *n )
+TagChooser::TagChooser( TQWidget *p, const char *n )
: KListView( p, n )
{
observeComponent< cache::component::PackageTags >();
@@ -55,44 +55,44 @@ TagChooser::TagChooser( QWidget *p, const char *n )
}
void TagChooser::openToplevel() {
- QListViewItem *i;
+ TQListViewItem *i;
for ( i = firstChild(); i != 0; i = i->nextSibling() ) {
i->setOpen( true );
}
}
-QDragObject *TagChooser::dragObject()
+TQDragObject *TagChooser::dragObject()
{
TagItem *sel = dynamic_cast< TagItem * >( selectedItem() );
if (sel)
- return new QTextDrag( sel->tag().fullname(), this );
+ return new TQTextDrag( sel->tag().fullname(), this );
return 0;
}
-void TagChooser::dragEnterEvent( QDragEnterEvent *e )
+void TagChooser::dragEnterEvent( TQDragEnterEvent *e )
{
// hmmmmm :-)
kdDebug() << "TagChooser::dragEnterEvent" << endl;
e->accept( dynamic_cast< TagList * >( e->source() )
- && QTextDrag::canDecode( e ) );
+ && TQTextDrag::canDecode( e ) );
kdDebug() << dynamic_cast< TagList * >( e->source() )
- << "; can decode " << QTextDrag::canDecode( e ) << endl;
+ << "; can decode " << TQTextDrag::canDecode( e ) << endl;
}
-void TagChooser::dropEvent( QDropEvent* e )
+void TagChooser::dropEvent( TQDropEvent* e )
{
using namespace wibble::operators;
TagList *tl = dynamic_cast< TagList * >( e->source() );
- QString tag;
- QTextDrag::decode( e, tag );
+ TQString tag;
+ TQTextDrag::decode( e, tag );
tl->setTags( tl->tags() - cache::Global::get().tags().tagByName(
static_cast< const char * >( tag.local8Bit() ) ) );
}
-QString FacetItem::text( int column ) const
+TQString FacetItem::text( int column ) const
{
if ( column == 0 )
- return QString( "[" ) + m_facet.name() + "] " + m_facet.shortDescription( "" );
+ return TQString( "[" ) + m_facet.name() + "] " + m_facet.shortDescription( "" );
return u8( "" );
}
diff --git a/adept/adept/tagchooser.h b/adept/adept/tagchooser.h
index f6c6e2e..35cafad 100644
--- a/adept/adept/tagchooser.h
+++ b/adept/adept/tagchooser.h
@@ -2,7 +2,7 @@
written by Peter Rockai <me@mornfall.net> */
#include <kdebug.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <apt-front/utils/range.h>
#include <apt-front/cache/cache.h>
@@ -25,7 +25,7 @@ class TagChooser;
class TagItem : public KListViewItem {
public:
typedef ept::debtags::Tag Tag;
- virtual QString text( int ) const;
+ virtual TQString text( int ) const;
TagItem( TagChooser *t );
TagItem( FacetItem *t );
void setTag( Tag t ) { m_tag = t; }
@@ -39,7 +39,7 @@ class FacetItem : public KListViewItem
{
public:
typedef ept::debtags::Facet Facet;
- virtual QString text( int ) const;
+ virtual TQString text( int ) const;
FacetItem( TagChooser *t );
void setFacet( Facet f ) { m_facet = f; }
void removeTag( TagItem::Tag );
@@ -50,30 +50,31 @@ protected:
class TagChooser : public KListView, public cache::Observer // ExtendableList
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef ept::debtags::Tag Tag;
typedef ept::debtags::Facet Facet;
- TagChooser( QWidget *p = 0, const char *n = 0 );
+ TagChooser( TQWidget *p = 0, const char *n = 0 );
virtual void notifyPreRebuild( cache::component::Base * );
public slots:
virtual void setTags( TagChooser::Tag::Set );
- void setTitle( QString s ) {
+ void setTitle( TQString s ) {
setColumnText( 0, s );
}
void openToplevel();
protected:
- virtual void dragEnterEvent( QDragEnterEvent *e );
- virtual void dropEvent( QDropEvent* e );
- virtual void contentsDragEnterEvent( QDragEnterEvent *e ) {
+ virtual void dragEnterEvent( TQDragEnterEvent *e );
+ virtual void dropEvent( TQDropEvent* e );
+ virtual void contentsDragEnterEvent( TQDragEnterEvent *e ) {
kdDebug() << "TagChooser::contentsDragEnterEvent" << endl;
dragEnterEvent( e );
}
- virtual void contentsDropEvent( QDropEvent *e ) {
+ virtual void contentsDropEvent( TQDropEvent *e ) {
kdDebug() << "TagChooser::contentsDropEvent" << endl;
dropEvent( e );
}
- virtual QDragObject *dragObject();
+ virtual TQDragObject *dragObject();
Tag::Set m_tags;
std::map< Facet, FacetItem * > m_facets;
};
diff --git a/adept/adept/tagfilter.cpp b/adept/adept/tagfilter.cpp
index fb17f8c..5b8dd7d 100644
--- a/adept/adept/tagfilter.cpp
+++ b/adept/adept/tagfilter.cpp
@@ -1,25 +1,25 @@
/* -*- C++ -*- libapt/tagfilter.h
written by Peter Rockai <me@mornfall.net> */
-#include <qpopupmenu.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqpushbutton.h>
+#include <tqtoolbutton.h>
#include <adept/tagfilter.h>
#include <adept/taglist.h>
using namespace adept;
-TagFilterWidget::TagFilterWidget( QWidget *w, const char *n )
+TagFilterWidget::TagFilterWidget( TQWidget *w, const char *n )
: TagFilterUi( w, n )
{
m_wanted->setName( i18n( "Tags I Want (drop tags here)" ) );
m_unwanted->setName( i18n( "Tags I Do Not Want (drop tags here)" ) );
- connect( m_wanted, SIGNAL( tagsChanged( TagList::Tag::Set ) ),
- this, SLOT( wantedChanged() ) );
- connect( m_unwanted, SIGNAL( tagsChanged( TagList::Tag::Set ) ),
- this, SLOT( unwantedChanged() ) );
+ connect( m_wanted, TQT_SIGNAL( tagsChanged( TagList::Tag::Set ) ),
+ this, TQT_SLOT( wantedChanged() ) );
+ connect( m_unwanted, TQT_SIGNAL( tagsChanged( TagList::Tag::Set ) ),
+ this, TQT_SLOT( unwantedChanged() ) );
}
TagFilterWidget::Predicate TagFilterWidget::predicate()
diff --git a/adept/adept/tagfilter.h b/adept/adept/tagfilter.h
index 5ff8e47..a75c42b 100644
--- a/adept/adept/tagfilter.h
+++ b/adept/adept/tagfilter.h
@@ -2,9 +2,9 @@
written by Peter Rockai <me@mornfall.net> */
#include <klocale.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qpoint.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
+#include <tqpoint.h>
#include <apt-front/cache/entity/entity.h>
#include <apt-front/cache/entity/package.h>
@@ -93,8 +93,9 @@ protected:
class TagFilterWidget : public TagFilterUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- TagFilterWidget( QWidget *p, const char *n );
+ TagFilterWidget( TQWidget *p, const char *n );
virtual Predicate predicate();
public slots:
void predicateChanged();
diff --git a/adept/adept/tagfilterui.ui b/adept/adept/tagfilterui.ui
index 1f78b8a..05cf236 100644
--- a/adept/adept/tagfilterui.ui
+++ b/adept/adept/tagfilterui.ui
@@ -7,7 +7,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>90</height>
@@ -88,7 +88,7 @@
<includes>
<include location="global" impldecl="in declaration">adept/filterlist.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>adept/taglist.h</includehint>
</includehints>
diff --git a/adept/adept/taglist.cpp b/adept/adept/taglist.cpp
index c27d74f..1e5d1e1 100644
--- a/adept/adept/taglist.cpp
+++ b/adept/adept/taglist.cpp
@@ -1,11 +1,11 @@
/* -*- C++ -*- adept/taglist.cpp
written by Peter Rockai <me@mornfall.net> */
-#include <qlabel.h>
-#include <qtimer.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
#include <kdebug.h>
-#include <qdragobject.h>
-#include <qevent.h>
+#include <tqdragobject.h>
+#include <tqevent.h>
#include <klocale.h>
#include <apt-front/cache/cache.h>
@@ -16,38 +16,38 @@
using namespace adept;
-TagLabel::TagLabel( Tag t, TagList *l, QWidget *p, const char *n )
- : QHBox( p, n ), m_tag( t ), m_list( l )
+TagLabel::TagLabel( Tag t, TagList *l, TQWidget *p, const char *n )
+ : TQHBox( p, n ), m_tag( t ), m_list( l )
{
if ( t == Tag() ) {
- m_description = new QLabel( QString( " " ) + i18n( "[none]" ), this );
+ m_description = new TQLabel( TQString( " " ) + i18n( "[none]" ), this );
} else {
- m_remove = new QLabel( this );
+ m_remove = new TQLabel( this );
m_remove->setPixmap( SmallIcon( u8( "cancel" ) ) );
- m_remove->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
- m_description = new QLabel( QString( " [" ) + t.fullname( "n/a" ) + "] "
+ m_remove->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ m_description = new TQLabel( TQString( " [" ) + t.fullname( "n/a" ) + "] "
+ t.shortDescription( "n/a" ), this );
}
}
-void TagLabel::mouseReleaseEvent( QMouseEvent *e ) {
+void TagLabel::mouseReleaseEvent( TQMouseEvent *e ) {
using namespace wibble::operators;
if ( e->button() == Qt::LeftButton &&
- dynamic_cast< QLabel * >( childAt( e->pos() ) ) == m_remove )
+ dynamic_cast< TQLabel * >( tqchildAt( e->pos() ) ) == m_remove )
m_list->setTags( m_list->tags() - m_tag );
}
-TagList::TagList( QWidget *p, const char *n )
- : QVBox( p, n )
+TagList::TagList( TQWidget *p, const char *n )
+ : TQVBox( p, n )
{
- m_name = new QLabel( this );
- m_tagBox = new QVBox( this );
- m_tagBox->setFrameShape( QFrame::Panel );
- m_tagBox->setFrameShadow( QFrame::Sunken );
+ m_name = new TQLabel( this );
+ m_tagBox = new TQVBox( this );
+ m_tagBox->setFrameShape( TQFrame::Panel );
+ m_tagBox->setFrameShadow( TQFrame::Sunken );
m_updateScheduled = false;
setAcceptDrops( true );
scheduleUpdateList();
- m_tagSpacer = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
+ m_tagSpacer = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
}
void TagList::setTags( Tag::Set t )
@@ -67,7 +67,7 @@ void TagList::addTag( Tag t )
emit tagsChanged( m_tags );
}
-void TagList::setName( QString n )
+void TagList::setName( TQString n )
{
m_name->setText( n );
}
@@ -76,7 +76,7 @@ void TagList::scheduleUpdateList()
{
if (! m_updateScheduled) {
kdDebug() << "TagList: scheduling update" << endl;
- QTimer::singleShot( 0, this, SLOT( updateList() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateList() ) );
m_updateScheduled = true;
}
}
@@ -92,9 +92,9 @@ void TagList::updateList()
appendLabel( new TagLabel( *i, this, m_tagBox ) );
}
}
- m_tagBox->layout()->addItem( m_tagSpacer );
+ m_tagBox->tqlayout()->addItem( m_tagSpacer );
update();
- parentWidget()->adjustSize();
+ tqparentWidget()->adjustSize();
m_updateScheduled = false;
}
@@ -104,23 +104,23 @@ void TagList::appendLabel( TagLabel *l )
l->show();
}
-void TagList::mouseMoveEvent( QMouseEvent *e ) {
- TagLabel *child = dynamic_cast< TagLabel * >( childAt( e->pos() )->parentWidget() );
+void TagList::mouseMoveEvent( TQMouseEvent *e ) {
+ TagLabel *child = dynamic_cast< TagLabel * >( tqchildAt( e->pos() )->tqparentWidget() );
if ( !child )
return;
- QDragObject *d = new QTextDrag( child->tag().fullname( "" ), this );
+ TQDragObject *d = new TQTextDrag( child->tag().fullname( "" ), this );
d->dragCopy();
}
-void TagList::dragEnterEvent( QDragEnterEvent *e ) {
+void TagList::dragEnterEvent( TQDragEnterEvent *e ) {
kdDebug() << "TagList::dragEnterEvent" << endl;
- e->accept( QTextDrag::canDecode( e ) );
+ e->accept( TQTextDrag::canDecode( e ) );
}
-void TagList::dropEvent( QDropEvent* e ) {
- QString tag;
+void TagList::dropEvent( TQDropEvent* e ) {
+ TQString tag;
kdDebug() << "TagList: drop event" << endl;
- QTextDrag::decode( e, tag );
+ TQTextDrag::decode( e, tag );
try {
addTag( aptFront::cache::Global::get().tags().tagByName(
static_cast< const char * >( tag.local8Bit() ) ) );
@@ -134,5 +134,5 @@ void TagList::clearList()
delete *i;
}
m_list.clear();
- m_tagBox->layout()->removeItem( m_tagSpacer );
+ m_tagBox->tqlayout()->removeItem( m_tagSpacer );
}
diff --git a/adept/adept/taglist.h b/adept/adept/taglist.h
index 3f652a9..c325c5e 100644
--- a/adept/adept/taglist.h
+++ b/adept/adept/taglist.h
@@ -3,11 +3,11 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
#include <kiconloader.h>
#include <vector>
#include <ept/debtags/tag.h>
@@ -15,54 +15,56 @@
#ifndef EPT_TAGLIST_H
#define EPT_TAGLIST_H
-class QLabel;
+class TQLabel;
namespace adept {
class TagList;
-class TagLabel : public QHBox
+class TagLabel : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef ept::debtags::Tag Tag;
- TagLabel( Tag t, TagList *l, QWidget *p = 0, const char *n = 0 );
+ TagLabel( Tag t, TagList *l, TQWidget *p = 0, const char *n = 0 );
Tag tag() { return m_tag; }
protected:
- void mouseReleaseEvent( QMouseEvent *e );
+ void mouseReleaseEvent( TQMouseEvent *e );
Tag m_tag;
- QLabel *m_remove;
- QLabel *m_description;
+ TQLabel *m_remove;
+ TQLabel *m_description;
TagList *m_list;
};
-class TagList : public QVBox
+class TagList : public TQVBox
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef ept::debtags::Tag Tag;
- TagList( QWidget *p = 0, const char *n = 0 );
+ TagList( TQWidget *p = 0, const char *n = 0 );
void setTags( Tag::Set t );
void addTag( Tag t );
Tag::Set tags() { return m_tags; }
- void setName( QString n );
+ void setName( TQString n );
public slots:
void scheduleUpdateList();
void updateList();
signals:
void tagsChanged( TagList::Tag::Set );
protected:
- void mouseMoveEvent( QMouseEvent *e );
- void dropEvent( QDropEvent * );
- void dragEnterEvent( QDragEnterEvent * );
+ void mouseMoveEvent( TQMouseEvent *e );
+ void dropEvent( TQDropEvent * );
+ void dragEnterEvent( TQDragEnterEvent * );
void appendLabel( TagLabel * );
void clearList();
bool m_updateScheduled;
Tag::Set m_tags;
- QLabel *m_name;
- QVBox *m_tagBox;
- QSpacerItem *m_tagSpacer;
+ TQLabel *m_name;
+ TQVBox *m_tagBox;
+ TQSpacerItem *m_tagSpacer;
typedef std::vector< TagLabel * > List;
List m_list;
};
diff --git a/adept/adept/threadutils.cpp b/adept/adept/threadutils.cpp
index 722f75d..791a077 100644
--- a/adept/adept/threadutils.cpp
+++ b/adept/adept/threadutils.cpp
@@ -8,13 +8,13 @@
namespace adept {
-QMutex Threads::serialize;
+TQMutex Threads::serialize;
Threads::Queue Threads::threads;
void Threads::wait() {
- static std::map< QMutex *, int > locked;
+ static std::map< TQMutex *, int > locked;
while ( !threads.empty() ) {
- QThread *current = threads.front().first;
+ TQThread *current = threads.front().first;
if ( current->finished() ) {
delete current;
threads.pop_front();
@@ -35,7 +35,7 @@ void Threads::wait() {
}
}
-void Threads::enqueue( QThread *t, QMutex *m )
+void Threads::enqueue( TQThread *t, TQMutex *m )
{
threads.push_back( std::make_pair( t, m ) );
t->start();
diff --git a/adept/adept/utils.h b/adept/adept/utils.h
index 6c3a3d3..9eee06c 100644
--- a/adept/adept/utils.h
+++ b/adept/adept/utils.h
@@ -3,8 +3,8 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qthread.h>
-#include <qstring.h>
+#include <tqthread.h>
+#include <tqstring.h>
#include <kapplication.h>
#include <string>
#include <queue>
@@ -15,28 +15,28 @@
namespace adept {
-inline QString u8( std::string s ) {
- return QString::fromUtf8( s.c_str() );
+inline TQString u8( std::string s ) {
+ return TQString::fromUtf8( s.c_str() );
}
-inline std::string u8( QString s ) {
+inline std::string u8( TQString s ) {
return std::string( s.utf8() );
}
-inline QString u8( const char *s ) {
- return QString::fromUtf8( s );
+inline TQString u8( const char *s ) {
+ return TQString::fromUtf8( s );
}
struct Threads {
- static QMutex serialize;
- typedef std::deque< std::pair< QThread *, QMutex * > > Queue;
+ static TQMutex serialize;
+ typedef std::deque< std::pair< TQThread *, TQMutex * > > Queue;
static Queue threads;
- static void enqueue( QThread *t, QMutex *m );
+ static void enqueue( TQThread *t, TQMutex *m );
static void wait();
};
template< typename F, typename P >
-struct AsyncCall : public QThread
+struct AsyncCall : public TQThread
{
AsyncCall( F f, P p ) : func( f ), param( p ) {}
virtual void run()
@@ -59,8 +59,8 @@ template< typename F, typename P > AsyncCall< F, P > *asyncCall( F f, P p ) {
return new AsyncCall< F, P >( f, p );
}
-inline static void adjustFontSize( QWidget *w, int off ) {
- QFont f = w->font();
+inline static void adjustFontSize( TQWidget *w, int off ) {
+ TQFont f = w->font();
f.setPointSize( f.pointSize() + off ); // a bit smaller font...
w->setFont( f );
w->updateGeometry();
diff --git a/adept/adept/view.cpp b/adept/adept/view.cpp
index 207277c..4424c93 100644
--- a/adept/adept/view.cpp
+++ b/adept/adept/view.cpp
@@ -11,19 +11,19 @@
using namespace adept;
-View::View( QWidget *p, const char *n )
- : QSplitter( p, n )
+View::View( TQWidget *p, const char *n )
+ : TQSplitter( p, n )
{
setOrientation( Qt::Vertical );
m_flist = new FilterList( this );
- m_bottom = new QSplitter( this );
+ m_bottom = new TQSplitter( this );
m_bottom->setOrientation( Qt::Horizontal );
m_lister = new Lister( m_bottom );
m_flist->plugLister( m_lister );
m_sidebar = new FilterSidebar( m_bottom );
- connect( m_lister, SIGNAL( cardinalityChanged( const Lister::Cardinality & ) ),
- m_sidebar, SLOT( setCardinality( const Lister::Cardinality & ) ) );
+ connect( m_lister, TQT_SIGNAL( cardinalityChanged( const Lister::Cardinality & ) ),
+ m_sidebar, TQT_SLOT( setCardinality( const Lister::Cardinality & ) ) );
m_flist->setHiddenPredicate(
predicate::adapt< entity::Entity >(
@@ -40,7 +40,7 @@ View::View( QWidget *p, const char *n )
m_lister->setRangeProvider( this );
- QTimer::singleShot( 0, this, SLOT( delayed() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( delayed() ) );
}
Lister::Range View::listerRange() {
@@ -50,13 +50,13 @@ Lister::Range View::listerRange() {
}
void View::hideTags() {
- QValueList< int > szl;
+ TQValueList< int > szl;
szl.append( 0 ); szl.append( 1 );
setSizes( szl );
}
void View::hideFilters() {
- QValueList< int > szl;
+ TQValueList< int > szl;
szl.append( 1 ); szl.append( 0 );
m_bottom->setSizes( szl );
}
@@ -89,22 +89,22 @@ void View::delayed()
// cleanRebuild();
}
-Browser::Browser( QWidget *p, const char *n )
- : QWidgetStack( p, n ), m_currentValid( false )
+Browser::Browser( TQWidget *p, const char *n )
+ : TQWidgetStack( p, n ), m_currentValid( false )
{
m_current = entity::Entity();
addWidget( m_view = new View( this ) );
addWidget( m_details = new PackageDetails( this ) );
- connect( m_view->lister(), SIGNAL( detailsRequested( Lister::Entity ) ),
- this, SLOT( show( Lister::Entity ) ) );
- connect( m_details, SIGNAL( showList() ),
- this, SLOT( showList() ) );
- connect( m_details, SIGNAL( back() ),
- this, SLOT( back() ) );
- connect( m_details, SIGNAL( forward() ),
- this, SLOT( forward() ) );
- connect( m_details, SIGNAL( detailsRequested( Lister::Entity ) ),
- this, SLOT( show( Lister::Entity ) ) );
+ connect( m_view->lister(), TQT_SIGNAL( detailsRequested( Lister::Entity ) ),
+ this, TQT_SLOT( show( Lister::Entity ) ) );
+ connect( m_details, TQT_SIGNAL( showList() ),
+ this, TQT_SLOT( showList() ) );
+ connect( m_details, TQT_SIGNAL( back() ),
+ this, TQT_SLOT( back() ) );
+ connect( m_details, TQT_SIGNAL( forward() ),
+ this, TQT_SLOT( forward() ) );
+ connect( m_details, TQT_SIGNAL( detailsRequested( Lister::Entity ) ),
+ this, TQT_SLOT( show( Lister::Entity ) ) );
}
void Browser::showList()
diff --git a/adept/adept/view.h b/adept/adept/view.h
index ea6c6f5..fc284f9 100644
--- a/adept/adept/view.h
+++ b/adept/adept/view.h
@@ -2,8 +2,8 @@
#include <deque>
-#include <qsplitter.h>
-#include <qwidgetstack.h>
+#include <tqsplitter.h>
+#include <tqwidgetstack.h>
#include <adept/lister.h>
#include <adept/filterlist.h>
@@ -11,17 +11,18 @@
#ifndef EPT_VIEW_H
#define EPT_VIEW_H
-class QSplitter;
+class TQSplitter;
namespace adept {
class FilterSidebar;
class PackageDetails;
-class View: public QSplitter, public Lister::RangeProvider {
+class View: public TQSplitter, public Lister::RangeProvider {
Q_OBJECT
+ TQ_OBJECT
public:
- View( QWidget *p = 0, const char *n = 0 );
+ View( TQWidget *p = 0, const char *n = 0 );
FilterList *filterList() { return m_flist; }
Lister *lister() { return m_lister; }
virtual Lister::Range listerRange();
@@ -35,16 +36,17 @@ protected slots:
void delayed();
protected:
predicate::Predicate< entity::Entity > previewPredicate();
- QSplitter *m_bottom;
+ TQSplitter *m_bottom;
FilterList *m_flist;
Lister *m_lister;
FilterSidebar *m_sidebar;
};
-class Browser : public QWidgetStack {
+class Browser : public TQWidgetStack {
Q_OBJECT
+ TQ_OBJECT
public:
- Browser( QWidget *p = 0, const char *n = 0 );
+ Browser( TQWidget *p = 0, const char *n = 0 );
View *searchView() const { return m_view; }
public slots:
void forward();
diff --git a/adept/batch/app.cpp b/adept/batch/app.cpp
index dd99ec1..140e4d6 100644
--- a/adept/batch/app.cpp
+++ b/adept/batch/app.cpp
@@ -1,8 +1,8 @@
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qsplitter.h>
-#include <qtimer.h>
-#include <qwidgetstack.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqsplitter.h>
+#include <tqtimer.h>
+#include <tqwidgetstack.h>
#include <kpushbutton.h>
#include <klocale.h>
@@ -39,12 +39,12 @@ using namespace adept;
App::App( KCmdLineArgs *args ) {
setMainWidget( this );
initialize();
- QString qs_pkgname;
+ TQString qs_pkgname;
updating = false;
enum { None, Remove, Install } m = None;
for(int i = 0; i < args->count(); i++) {
- QCString a = args->arg( i );
+ TQCString a = args->arg( i );
if (m == None ||
cache().packages().packageByName( std::string( a ) ).valid()) {
@@ -67,7 +67,7 @@ App::App( KCmdLineArgs *args ) {
qs_pkgname = a;
kdDebug() << "The package '"<<a<<"' could not be found." << endl;
KMessageBox::sorry(
- this, i18n( "The package '%1' could not be found." ).arg(u8(qs_pkgname)),
+ this, i18n( "The package '%1' could not be found." ).tqarg(u8(qs_pkgname)),
i18n( "Could not commit changes" ) );
exit(1);
}
@@ -79,14 +79,14 @@ App::App( KCmdLineArgs *args ) {
observeComponent< component::State >();
- m_all = new QVBox( this );
- m_stack = new QWidgetStack( m_all );
+ m_all = new TQVBox( this );
+ m_stack = new TQWidgetStack( m_all );
m_stack->addWidget( m_progress = new adept::AcqProgressWidget( m_stack ) );
m_stack->addWidget( m_commitProgress = new CommitProgress( m_stack ) );
- connect(this, SIGNAL( imDone() ),
- this, SLOT( handleDone() ));
+ connect(this, TQT_SIGNAL( imDone() ),
+ this, TQT_SLOT( handleDone() ));
setStandardToolBarMenuEnabled( false );
createStandardStatusBarAction();
@@ -95,9 +95,9 @@ App::App( KCmdLineArgs *args ) {
Application::setStatusBar( statusBar() );
- QTimer::singleShot(
+ TQTimer::singleShot(
0, this,
- SLOT( delayed() ) );
+ TQT_SLOT( delayed() ) );
m_stack->raiseWidget( m_progress );
setCentralWidget( m_all );
diff --git a/adept/batch/app.h b/adept/batch/app.h
index 604a5a2..f6fb729 100644
--- a/adept/batch/app.h
+++ b/adept/batch/app.h
@@ -15,9 +15,9 @@
#include <adept/acqprogresswidget.h>
-class QVBox;
-class QWidgetStack;
-class QSplitter;
+class TQVBox;
+class TQWidgetStack;
+class TQSplitter;
class KAction;
class KPushButton;
namespace adept {
@@ -29,6 +29,7 @@ using namespace adept;
class App : public KMainWindow, Application {
Q_OBJECT
+ TQ_OBJECT
public:
void setupActions();
ExtTerminalInterface *terminal();
@@ -41,8 +42,8 @@ protected slots:
protected:
friend class WaitForLister;
- QWidgetStack *m_stack;
- QVBox *m_all;
+ TQWidgetStack *m_stack;
+ TQVBox *m_all;
// stacked widgets
adept::AcqProgressWidget *m_progress;
diff --git a/adept/batch/main.cpp b/adept/batch/main.cpp
index 7521f6c..49e7c07 100644
--- a/adept/batch/main.cpp
+++ b/adept/batch/main.cpp
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
{
KLocale::setMainCatalogue("adept");
- QString description = i18n("Adept Batch");
+ TQString description = i18n("Adept Batch");
KAboutData aboutData( "adept_batch",
I18N_NOOP("Adept Batch"),
@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
KApplication app;
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- KGlobal::locale()->insertCatalogue(QString::fromUtf8("libept"));
+ KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept"));
App *ta = new App( args );
diff --git a/adept/installer/app.cpp b/adept/installer/app.cpp
index 7c82421..00cf4ca 100644
--- a/adept/installer/app.cpp
+++ b/adept/installer/app.cpp
@@ -1,9 +1,9 @@
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qpopupmenu.h>
-#include <qsplitter.h>
-#include <qtimer.h>
-#include <qwidgetstack.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqpopupmenu.h>
+#include <tqsplitter.h>
+#include <tqtimer.h>
+#include <tqwidgetstack.h>
#include <kpushbutton.h>
#include <klocale.h>
@@ -79,38 +79,38 @@ std::string GroupPolicy::groupForCategories( Range< std::string > r ) {
return "Others";
}
-QString IconPolicy::iconForGroup( QString g ) {
+TQString IconPolicy::iconForGroup( TQString g ) {
if ( g == u8( "Office" ) ) return u8( "package_wordprocessing" );
if ( g == u8( "Internet" ) ) return u8( "package_network" );
if ( g == u8( "Science" ) ) return u8( "edu_science" );
if ( g == u8( "Accessibility" ) ) return u8( "access" );
if ( g == u8( "Others" ) ) return u8( "package" );
- return QString( "package_" ) + g.lower();
+ return TQString( "package_" ) + g.lower();
}
void WaitForLister::waiting()
{
kdDebug() << "WaitForLister::waiting()" << endl;
/* if (app->m_list->lister()->busy())
- QTimer::singleShot( 100, this, SLOT( waiting() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( waiting() ) );
else */ {
- QTimer::singleShot( 0, app, slot );
+ TQTimer::singleShot( 0, app, slot );
deleteLater();
}
}
App::App() {
- m_all = new QVBox( this );
- m_stack = new QWidgetStack( m_all );
+ m_all = new TQVBox( this );
+ m_stack = new TQWidgetStack( m_all );
- m_stack->addWidget( m_loading = new QLabel( i18n( "Loading, please wait..." ), m_stack ) );
- m_loading->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+ m_stack->addWidget( m_loading = new TQLabel( i18n( "Loading, please wait..." ), m_stack ) );
+ m_loading->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
- m_buttons = new QHBox( m_all );
+ m_buttons = new TQHBox( m_all );
m_editSources = new KPushButton( i18n( "Edit Software Sources" ), m_buttons );
m_reviewChanges = new KPushButton( i18n( "Review Changes" ), m_buttons );
- QLabel *space = new QLabel( m_buttons ); // spacing
+ TQLabel *space = new TQLabel( m_buttons ); // spacing
m_next = new KPushButton( i18n( "Next" ), m_buttons );
m_quit = new KPushButton( i18n( "Quit" ), m_buttons );
m_editSources->setEnabled( false );
@@ -120,13 +120,13 @@ App::App() {
m_buttons->setSpacing( 2 );
m_buttons->setMargin( 2 );
- QSizePolicy buttons( QSizePolicy::Preferred, QSizePolicy::Fixed, false );
- m_buttons->setSizePolicy( buttons );
- m_next->setSizePolicy( buttons );
- m_quit->setSizePolicy( buttons );
- space->setSizePolicy( QSizePolicy(
- QSizePolicy::Expanding,
- QSizePolicy::Fixed, false ) );
+ TQSizePolicy buttons( TQSizePolicy::Preferred, TQSizePolicy::Fixed, false );
+ m_buttons->tqsetSizePolicy( buttons );
+ m_next->tqsetSizePolicy( buttons );
+ m_quit->tqsetSizePolicy( buttons );
+ space->tqsetSizePolicy( TQSizePolicy(
+ TQSizePolicy::Expanding,
+ TQSizePolicy::Fixed, false ) );
setStandardToolBarMenuEnabled( false );
createStandardStatusBarAction();
@@ -137,9 +137,9 @@ App::App() {
Application::setStatusBar( statusBar() );
- QTimer::singleShot(
+ TQTimer::singleShot(
0, this,
- SLOT( delayed() ) );
+ TQT_SLOT( delayed() ) );
setCentralWidget( m_all );
setMinimumSize( 400, 300 );
@@ -157,30 +157,30 @@ void App::delayed() {
cache().component< component::Desktop >().loadDirectory(
INSTALLER_DATA "/desktop/" );
- QFile file(QString("/usr/bin/software-properties-kde"));
+ TQFile file(TQString("/usr/bin/software-properties-kde"));
if (file.exists()) {
- connect( m_editSources, SIGNAL( clicked() ), this, SLOT( editSources() ) );
+ connect( m_editSources, TQT_SIGNAL( clicked() ), this, TQT_SLOT( editSources() ) );
m_editSources->setEnabled( true );
}
- connect( m_reviewChanges, SIGNAL( clicked() ), this, SLOT( togglePreview() ) );
+ connect( m_reviewChanges, TQT_SIGNAL( clicked() ), this, TQT_SLOT( togglePreview() ) );
m_reviewChanges->setEnabled( true );
- connect( m_quit, SIGNAL( clicked() ), this, SLOT( close() ) );
+ connect( m_quit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
m_quit->setEnabled( true );
m_stack->addWidget( m_view = new InstallerView( m_stack ) );
- connect( m_view->selector(), SIGNAL( request( cache::entity::Package,
+ connect( m_view->selector(), TQT_SIGNAL( request( cache::entity::Package,
cache::component::State::Action ) ),
- this, SLOT( request( cache::entity::Package,
+ this, TQT_SLOT( request( cache::entity::Package,
cache::component::State::Action ) ) );
m_stack->addWidget( m_preview = new Browser( m_stack ) );
m_preview->searchView()->setPreviewMode();
m_view->selector()->setPolicy( new IconPolicy() );
m_stack->addWidget(
- m_bye = new QLabel( i18n( "Installation Complete!" ), m_stack ) );
- m_bye->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+ m_bye = new TQLabel( i18n( "Installation Complete!" ), m_stack ) );
+ m_bye->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_stack->addWidget( m_progress = new adept::AcqProgressWidget( m_stack ) );
m_stack->addWidget( m_commitProgress = new CommitProgress( m_stack ) );
@@ -198,7 +198,7 @@ bool App::confirmRequest( entity::Package p, component::State::Action a )
typedef predicate::AttributeAdaptor< entity::Desktop,
predicate::match::Exact< entity::Package > > Adaptor;
- QString t;
+ TQString t;
if ( a == component::State::ARemove )
t = i18n( "You selected to remove a program. Following applications "
@@ -210,27 +210,27 @@ bool App::confirmRequest( entity::Package p, component::State::Action a )
KDialogBase *db = new KDialogBase( KDialogBase::Plain, i18n( "Confirm action" ),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, this );
- QVBoxLayout *layout = new QVBoxLayout( db->plainPage() );
- layout->setSpacing( 4 );
- // db->plainPage()->setLayout( layout = new QVBoxLayout( db->plainPage() ) );
- // QVBox *vb = new QVBox( db );
- QLabel *txt = new QLabel( db->plainPage() );
- txt->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( db->plainPage() );
+ tqlayout->setSpacing( 4 );
+ // db->plainPage()->setLayout( tqlayout = new TQVBoxLayout( db->plainPage() ) );
+ // TQVBox *vb = new TQVBox( db );
+ TQLabel *txt = new TQLabel( db->plainPage() );
+ txt->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak );
txt->setMinimumWidth( 500 );
txt->setText( t );
txt->setFixedHeight( txt->heightForWidth( 320 ) );
- txt->setSizePolicy( QSizePolicy(
- QSizePolicy::Expanding, QSizePolicy::Fixed, false ) );
+ txt->tqsetSizePolicy( TQSizePolicy(
+ TQSizePolicy::Expanding, TQSizePolicy::Fixed, false ) );
DesktopList *l = new DesktopList( db->plainPage() );
l->setMinimumHeight( 220 );
l->setMinimumWidth( 320 );
l->setDisplayCheckboxes( false );
- layout->addWidget( txt );
- layout->addWidget( l );
+ tqlayout->addWidget( txt );
+ tqlayout->addWidget( l );
l->insertRange( filteredRange( d.entries(),
Adaptor( &entity::Desktop::package, p ) ) );
db->adjustSize();
- connect( db, SIGNAL( okClicked() ), this, SLOT( requestOk() ) );
+ connect( db, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( requestOk() ) );
m_currentRequestOk = false;
db->exec();
return m_currentRequestOk;
@@ -269,12 +269,12 @@ bool App::consistent() {
void App::setupActions()
{
- KStdAction::quit( kapp, SLOT( quit() ), actionCollection() );
- m_undo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
- m_redo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() );
+ m_undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), actionCollection() );
+ m_redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), actionCollection() );
m_previewAction = new KToggleAction(
i18n( "Review Changes" ), u8( "adept_preview" ),
- 0, this, SLOT( togglePreview() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( togglePreview() ), actionCollection(),
"review" );
setHistoryEnabled( false );
@@ -292,7 +292,7 @@ void App::togglePreview()
} else {
setState( Preview );
m_stack->raiseWidget( m_preview );
- setNext( i18n( "Back to Program Selection" ), SLOT( togglePreview() ) );
+ setNext( i18n( "Back to Program Selection" ), TQT_SLOT( togglePreview() ) );
m_previewAction->setChecked( true );
m_preview->searchView()->lister()->scheduleRebuild();
m_reviewChanges->setEnabled(false);
@@ -303,7 +303,7 @@ void App::inspect()
{
m_state = Inspect;
m_stack->raiseWidget( m_preview );
- setNext( i18n( "Changes are OK, proceed" ), SLOT( commit() ) );
+ setNext( i18n( "Changes are OK, proceed" ), TQT_SLOT( commit() ) );
m_preview->searchView()->lister()->scheduleRebuild();
}
@@ -335,19 +335,19 @@ void App::notifyPostChange( component::Base *b )
if ( m_state == Select ) {
if ( cache().state().changed() )
if ( consistent() )
- setNext( i18n( "Apply Changes" ), SLOT( commit() ) );
+ setNext( i18n( "Apply Changes" ), TQT_SLOT( commit() ) );
else
- setNext( i18n( "Inspect Changes" ), SLOT( inspect() ) );
+ setNext( i18n( "Inspect Changes" ), TQT_SLOT( inspect() ) );
else
disableNext();
}
}
-void App::setNext( QString s, const char *slot ) {
+void App::setNext( TQString s, const char *slot ) {
m_next->setText( s );
m_next->setEnabled( true );
m_next->disconnect( this );
- connect( m_next, SIGNAL( clicked() ),
+ connect( m_next, TQT_SIGNAL( clicked() ),
this, slot );
m_quit->setEnabled( true );
}
@@ -355,7 +355,7 @@ void App::setNext( QString s, const char *slot ) {
void App::disableNext() {
m_next->setText( i18n( "Next" ) );
m_next->setEnabled( false );
- disconnect( m_next, SIGNAL( clicked() ), 0, 0 );
+ disconnect( m_next, TQT_SIGNAL( clicked() ), 0, 0 );
}
void App::disableButtons() {
@@ -364,7 +364,7 @@ void App::disableButtons() {
}
void App::editSources() {
- KProcess* softwarePropertiesProcess = new KProcess(this);
+ KProcess* softwarePropertiesProcess = new KProcess(TQT_TQOBJECT(this));
*softwarePropertiesProcess << "/usr/bin/software-properties-kde";
softwarePropertiesProcess->start();
}
@@ -405,12 +405,12 @@ void App::commit() {
cache().component< component::Desktop >().setPolicy( new GroupPolicy() );
cache().component< component::Desktop >().loadDirectory(
INSTALLER_DATA "/desktop/" );
- QTimer::singleShot( 500, m_view, SLOT( rebuild() ) );
+ TQTimer::singleShot( 500, m_view, TQT_SLOT( rebuild() ) );
m_stack->raiseWidget( m_bye );
m_quit->setText( i18n( "Quit" ) );
- setNext( i18n( "Back to Program Selection" ), SLOT( start() ) );
- // setNext( i18n( "Done: Quit" ), SLOT( close() ) );
+ setNext( i18n( "Back to Program Selection" ), TQT_SLOT( start() ) );
+ // setNext( i18n( "Done: Quit" ), TQT_SLOT( close() ) );
}
#include "app.moc"
diff --git a/adept/installer/app.h b/adept/installer/app.h
index 02ce2e0..931658d 100644
--- a/adept/installer/app.h
+++ b/adept/installer/app.h
@@ -14,9 +14,9 @@
#include <adept/installerview.h>
#include <adept/application.h>
-class QVBox;
-class QWidgetStack;
-class QSplitter;
+class TQVBox;
+class TQWidgetStack;
+class TQSplitter;
class KAction;
class KPushButton;
class KProcess;
@@ -32,11 +32,12 @@ struct GroupPolicy : cache::component::Desktop::GroupPolicy {
};
struct IconPolicy : GroupedDesktopSelector::IconPolicy {
- virtual QString iconForGroup( QString );
+ virtual TQString iconForGroup( TQString );
};
class App : public KMainWindow, Application {
Q_OBJECT
+ TQ_OBJECT
public:
enum State { Select, Preview, Inspect, Commit };
void setupActions();
@@ -63,7 +64,7 @@ protected slots:
void disableNext();
void disableButtons();
- void setNext( QString str, const char *slot );
+ void setNext( TQString str, const char *slot );
void togglePreview();
void editSources();
@@ -81,10 +82,10 @@ protected:
virtual void notifyPostChange( cache::component::Base * );
virtual void notifyPreChange( cache::component::Base * );
- QWidgetStack *m_stack;
- QVBox *m_all;
- QHBox *m_buttons;
- QLabel *m_bye, *m_loading;
+ TQWidgetStack *m_stack;
+ TQVBox *m_all;
+ TQHBox *m_buttons;
+ TQLabel *m_bye, *m_loading;
KPushButton *m_next, *m_quit;
KPushButton *m_editSources, *m_reviewChanges;
@@ -97,7 +98,7 @@ protected:
// other stuff
std::vector<KAction *> m_actions;
- QMap< QString, QString > m_icons;
+ TQMap< TQString, TQString > m_icons;
KAction *m_undo, *m_redo;
KToggleAction *m_previewAction;
State m_state, m_lastState;
@@ -109,8 +110,9 @@ protected:
bool m_currentRequestOk;
};
-class WaitForLister : public QObject {
+class WaitForLister : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
WaitForLister( App *a, const char *s )
: app( a ), slot( s )
diff --git a/adept/installer/main.cpp b/adept/installer/main.cpp
index 079cb19..b07406c 100644
--- a/adept/installer/main.cpp
+++ b/adept/installer/main.cpp
@@ -16,8 +16,8 @@ int main(int argc, char *argv[])
KLocale::setMainCatalogue("adept_installer");
- putenv( "QT_IM_MODULE=xim" );
- QString description = i18n("Adept Installer");
+ putenv( "TQT_IM_MODULE=xim" );
+ TQString description = i18n("Adept Installer");
KAboutData aboutData( "adept_installer",
I18N_NOOP("Adept Installer"),
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- KGlobal::locale()->insertCatalogue(QString::fromUtf8("libept"));
+ KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept"));
App *ta = new App();
diff --git a/adept/kubuntu_upgrader/errordialog.cpp b/adept/kubuntu_upgrader/errordialog.cpp
index 0a1feb0..10a988d 100644
--- a/adept/kubuntu_upgrader/errordialog.cpp
+++ b/adept/kubuntu_upgrader/errordialog.cpp
@@ -18,12 +18,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <qlabel.h>
+#include <tqlabel.h>
#include "errordialog.h"
-ErrorDialog::ErrorDialog(QWidget* parent, QString error_text, const char* name, bool modal, WFlags fl )
- : ErrorDialogDlg(parent,name, modal,fl)
+ErrorDialog::ErrorDialog(TQWidget* tqparent, TQString error_text, const char* name, bool modal, WFlags fl )
+ : ErrorDialogDlg(tqparent,name, modal,fl)
{
errorLabel->setText( error_text );
}
@@ -34,12 +34,12 @@ ErrorDialog::~ErrorDialog()
/*$SPECIALIZATION$*/
void ErrorDialog::reject()
{
- QDialog::reject();
+ TQDialog::reject();
}
void ErrorDialog::accept()
{
- QDialog::accept();
+ TQDialog::accept();
}
diff --git a/adept/kubuntu_upgrader/errordialog.h b/adept/kubuntu_upgrader/errordialog.h
index cdb7d14..0872f61 100644
--- a/adept/kubuntu_upgrader/errordialog.h
+++ b/adept/kubuntu_upgrader/errordialog.h
@@ -23,14 +23,15 @@
#include "errordialogbase.h"
-class QString;
+class TQString;
class ErrorDialog : public ErrorDialogDlg
{
Q_OBJECT
+ TQ_OBJECT
public:
- ErrorDialog(QWidget* parent = 0, QString error_text = QString::null, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ ErrorDialog(TQWidget* tqparent = 0, TQString error_text = TQString(), const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~ErrorDialog();
/*$PUBLIC_FUNCTIONS$*/
diff --git a/adept/kubuntu_upgrader/errordialogbase.ui b/adept/kubuntu_upgrader/errordialogbase.ui
index 21af975..7108aa8 100644
--- a/adept/kubuntu_upgrader/errordialogbase.ui
+++ b/adept/kubuntu_upgrader/errordialogbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ErrorDialogDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>errorform</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -22,7 +22,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>errorLabel</cstring>
</property>
@@ -35,11 +35,11 @@
<property name="text">
<string>&lt;p align="center"&gt;&lt;/p&gt;</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QPushButton" row="1" column="1">
+ <widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>exitButton</cstring>
</property>
@@ -50,7 +50,7 @@
<string>Alt+X</string>
</property>
</widget>
- <widget class="QPushButton" row="1" column="0">
+ <widget class="TQPushButton" row="1" column="0">
<property name="name">
<cstring>retryButton</cstring>
</property>
@@ -63,5 +63,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/kubuntu_upgrader/upgradewizard.cpp b/adept/kubuntu_upgrader/upgradewizard.cpp
index 48e5a88..717c0b0 100644
--- a/adept/kubuntu_upgrader/upgradewizard.cpp
+++ b/adept/kubuntu_upgrader/upgradewizard.cpp
@@ -27,20 +27,20 @@
#include <ktar.h>
#include <kdebug.h>
-#include <qwizard.h>
-#include <qwidget.h>
-#include <qpushbutton.h>
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qtextbrowser.h>
-#include <qmime.h>
-#include <qstring.h>
-#include <qdialog.h>
-#include <qlabel.h>
-#include <qdatetime.h>
-#include <qtextstream.h>
-#include <qptrlist.h>
-#include <qdir.h>
+#include <tqwizard.h>
+#include <tqwidget.h>
+#include <tqpushbutton.h>
+#include <tqtextstream.h>
+#include <tqfile.h>
+#include <tqtextbrowser.h>
+#include <tqmime.h>
+#include <tqstring.h>
+#include <tqdialog.h>
+#include <tqlabel.h>
+#include <tqdatetime.h>
+#include <tqtextstream.h>
+#include <tqptrlist.h>
+#include <tqdir.h>
#include <iostream>
#include <cstdlib>
@@ -48,7 +48,7 @@
#include "upgradewizard.h"
#include "errordialog.h"
-DistroEntry::DistroEntry(QString *d_field)
+DistroEntry::DistroEntry(TQString *d_field)
{
dist_field = d_field;
supported_field = false;
@@ -74,25 +74,25 @@ DistroEntry::~DistroEntry() {
free( upgrade_tool_sig_url );
}
-UpgradeWizard::UpgradeWizard(QWidget* parent, const char* name, bool modal, WFlags fl)
- : UpgradeWizardDlg(parent,name, modal,fl)
+UpgradeWizard::UpgradeWizard(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+ : UpgradeWizardDlg(tqparent,name, modal,fl)
{
err_dlg = NULL;
for(int i=0; i<pageCount(); i++) {
- QWidget* p = page( i );
+ TQWidget* p = page( i );
setHelpEnabled( p, false );
}
- QWidget *p = page( pageCount()-1 );
+ TQWidget *p = page( pageCount()-1 );
setBackEnabled( p, false );
textLabel3->hide();
p = page( pageCount()-2 );
setNextEnabled( p, false );
- QPushButton *fin = finishButton();
- connect(fin, SIGNAL( clicked() ), this, SLOT( launchDistUpdater() ) );
+ TQPushButton *fin = finishButton();
+ connect(fin, TQT_SIGNAL( clicked() ), this, TQT_SLOT( launchDistUpdater() ) );
}
@@ -101,20 +101,20 @@ UpgradeWizard::~UpgradeWizard()
// ** FUNCTIONS ** //
-void UpgradeWizard::removeDirectory(QString directoryName)
+void UpgradeWizard::removeDirectory(TQString directoryName)
{
// recursively delete a directory structure
// Mar-22-2007 Billy Pollifrone
- QDir dir(directoryName);
- QStringList files(dir.entryList());
- for (QStringList::Iterator i=files.begin(); i!=files.end(); i++) {
- QString fileName(*(i));
- if (fileName == QString(".") || fileName == QString("..")) continue;
- QFileInfo fileInfo(directoryName, fileName);
+ TQDir dir(directoryName);
+ TQStringList files(dir.entryList());
+ for (TQStringList::Iterator i=files.begin(); i!=files.end(); i++) {
+ TQString fileName(*(i));
+ if (fileName == TQString(".") || fileName == TQString("..")) continue;
+ TQFileInfo fileInfo(directoryName, fileName);
if (fileInfo.isDir()) {
removeDirectory(fileInfo.absFilePath());
} else {
- QFile file(fileInfo.absFilePath());
+ TQFile file(fileInfo.absFilePath());
file.remove();
}
}
@@ -126,55 +126,55 @@ void UpgradeWizard::removeOldUpgradeTool()
// remove old files from dist-upgrade when we check if there is a knew one since
// adept kills us before we have a chance on the same run.
// Mar-22-2007 Billy Pollifrone
- QString directoryName("/tmp/kde-root");
- QString directoryFilter("adept_*.tmp*");
- QDir dir(directoryName, directoryFilter);
- QStringList files(dir.entryList());
- for (QStringList::Iterator i=files.begin(); i!=files.end(); i++) {
- QString fileName(*(i));
- QFileInfo fileInfo(directoryName, fileName);
+ TQString directoryName("/tmp/kde-root");
+ TQString directoryFilter("adept_*.tmp*");
+ TQDir dir(directoryName, directoryFilter);
+ TQStringList files(dir.entryList());
+ for (TQStringList::Iterator i=files.begin(); i!=files.end(); i++) {
+ TQString fileName(*(i));
+ TQFileInfo fileInfo(directoryName, fileName);
if (fileInfo.isDir()) {
removeDirectory(fileInfo.absFilePath());
} else {
- QFile file(fileInfo.absFilePath());
+ TQFile file(fileInfo.absFilePath());
file.remove();
}
}
}
-bool UpgradeWizard::checkForDistUpgrade(QString url, bool developmentVersion) {
+bool UpgradeWizard::checkForDistUpgrade(TQString url, bool developmentVersion) {
removeOldUpgradeTool();
std::cout << "UpgradeWizard::checkForDistUpgrade" << std::endl;
- if (url == QString("")) {
- url = QString("http://changelogs.ubuntu.com/meta-release");
+ if (url == TQString("")) {
+ url = TQString("http://changelogs.ubuntu.com/meta-release");
}
bool upgrade_available = false;
KConfig* config = KGlobal::config();
config->setGroup("General Settings");
- QString upgradeURL;
- upgradeURL = config->readEntry(QString("upgradeURL"), url);
+ TQString upgradeURL;
+ upgradeURL = config->readEntry(TQString("upgradeURL"), url);
KURL metafile_url( upgradeURL );
- QString temp_file_location;
+ TQString temp_file_location;
if( KIO::NetAccess::download( metafile_url, temp_file_location, NULL ) ) {
- QFile temp_file( temp_file_location );
+ TQFile temp_file( temp_file_location );
temp_file.open( IO_ReadOnly );
- QTextIStream *temp_file_stream = new QTextIStream( temp_file.readAll() );
+ TQTextIStream *temp_file_stream = new TQTextIStream( temp_file.readAll() );
// need to spawn a process to call lsb_release -c -s
// to find out which version of kubuntu we are using
KProcess *proc = new KProcess;
*proc << "lsb_release";
*proc << "-c" << "-s";
- connect(proc, SIGNAL( receivedStdout( KProcess*, char *, int ) ),
- this, SLOT( receiveDistroName( KProcess*, char *, int ) ) );
+ connect(proc, TQT_SIGNAL( receivedStdout( KProcess*, char *, int ) ),
+ this, TQT_SLOT( receiveDistroName( KProcess*, char *, int ) ) );
proc->start( KProcess::Block, KProcess::Stdout );
current_dist = 0;
- QPtrList<DistroEntry> *entry_list = parseMetafile( temp_file_stream, distro_name );
+ TQPtrList<DistroEntry> *entry_list = parseMetafile( temp_file_stream, distro_name );
upgrade_dist = entry_list->last();
DistroEntry* entry;
@@ -218,7 +218,7 @@ bool UpgradeWizard::checkForDistUpgrade(QString url, bool developmentVersion) {
std::cout << "Dist: " << *entry->dist_field->latin1() << std::endl;
std::cout << "Name: " << *entry->name_field->latin1() << std::endl;
std::cout << "Version: " << *entry->version_field->latin1() << std::endl;
- std::cout << "Date: " << entry->date_field->toString( QString( "ddd, dd MMM yyyy hh:mm:ss UTC" ) ).latin1() << std::endl;
+ std::cout << "Date: " << entry->date_field->toString( TQString( "ddd, dd MMM yyyy hh:mm:ss UTC" ) ).latin1() << std::endl;
//std::cout << "Supported: " << entry->supported_field.latin1() << std::endl;
std::cout << "Description: " << *entry->desc_field->latin1() << std::endl;
std::cout << "Release-File: " << entry->release_file_url->prettyURL().latin1() << std::endl;
@@ -242,25 +242,25 @@ bool UpgradeWizard::checkForDistUpgrade(QString url, bool developmentVersion) {
return upgrade_available;
}
-QPtrList<DistroEntry> *UpgradeWizard::parseMetafile( QTextIStream *text_stream,
- QString my_distro_name )
+TQPtrList<DistroEntry> *UpgradeWizard::parseMetafile( TQTextIStream *text_stream,
+ TQString my_distro_name )
{
- QPtrList<DistroEntry> *metafile_entries = new QPtrList<DistroEntry>();
+ TQPtrList<DistroEntry> *metafile_entries = new TQPtrList<DistroEntry>();
DistroEntry *entry = NULL;
while( !text_stream->atEnd() ) {
- QStringList line = QStringList::split( QChar(':'), text_stream->readLine() );
+ TQStringList line = TQStringList::split( TQChar(':'), text_stream->readLine() );
if( !line.isEmpty() ) {
- QString first = line.first();
- if( QString::compare( first, QString( "Dist" ) ) == 0 ) {
+ TQString first = line.first();
+ if( TQString::compare( first, TQString( "Dist" ) ) == 0 ) {
// we've encountered a new entry:
// first save the old one
if( entry != NULL ) {
// if this entry is for the current version we are running,
// then add it at the start of the list
- if( QString::compare( *entry->dist_field, my_distro_name ) == 0) {
+ if( TQString::compare( *entry->dist_field, my_distro_name ) == 0) {
current_dist = entry;
metafile_entries->prepend( entry );
} else {
@@ -269,105 +269,105 @@ QPtrList<DistroEntry> *UpgradeWizard::parseMetafile( QTextIStream *text_stream,
}
// now create a new entry
line.pop_front();
- entry = new DistroEntry( new QString( line.first().stripWhiteSpace() ) );
+ entry = new DistroEntry( new TQString( line.first().stripWhiteSpace() ) );
}
- else if( QString::compare( first, QString( "Name" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "Name" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
- entry->name_field = new QString( line.first().stripWhiteSpace() );
+ entry->name_field = new TQString( line.first().stripWhiteSpace() );
}
}
- else if( QString::compare( first, QString( "Version" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "Version" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
- entry->version_field = new QString( line.first().stripWhiteSpace() );
+ entry->version_field = new TQString( line.first().stripWhiteSpace() );
}
}
- else if( QString::compare( first, QString( "Date" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "Date" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
- QString temp = line.join( QChar(' ') ).stripWhiteSpace();
+ TQString temp = line.join( TQChar(' ') ).stripWhiteSpace();
// get the day(verbal)
- line = QStringList::split( QChar(' '), temp );
- QString day_verbal = line.first();
+ line = TQStringList::split( TQChar(' '), temp );
+ TQString day_verbal = line.first();
day_verbal.truncate(3);
// get the date
line.pop_front();
- QString date = line.first();
+ TQString date = line.first();
// get the month(verbal)
line.pop_front();
- QString month_verbal = line.first();
+ TQString month_verbal = line.first();
// get the year
line.pop_front();
- QString year = line.first();
+ TQString year = line.first();
// get the time
line.pop_front();
- QString time = line.first() + ":";
+ TQString time = line.first() + ":";
line.pop_front();
time += line.first() + ":";
line.pop_front();
time += line.first();
- QDate the_date( QDate::fromString( day_verbal + " " + month_verbal + " " + date + " " + year) );
- QTime the_time( QTime::fromString( time ) );
+ TQDate the_date( TQDate::fromString( day_verbal + " " + month_verbal + " " + date + " " + year) );
+ TQTime the_time( TQTime::fromString( time ) );
- entry->date_field = new QDateTime( the_date, the_time );
+ entry->date_field = new TQDateTime( the_date, the_time );
}
}
- else if( QString::compare( first, QString( "Supported" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "Supported" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
entry->supported_field = line.first().stripWhiteSpace().toInt();
}
}
- else if( QString::compare( first, QString( "Description" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "Description" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
- entry->desc_field = new QString( line.first().stripWhiteSpace() );
+ entry->desc_field = new TQString( line.first().stripWhiteSpace() );
}
}
- else if( QString::compare( first, QString( "Release-File" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "Release-File" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
- QString http_part = line.first().stripWhiteSpace() + ":";
+ TQString http_part = line.first().stripWhiteSpace() + ":";
line.pop_front();
- QString complete_url = http_part + line.first().stripWhiteSpace();
+ TQString complete_url = http_part + line.first().stripWhiteSpace();
entry->release_file_url = new KURL( complete_url );
}
}
- else if( QString::compare( first, QString( "ReleaseNotes" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "ReleaseNotes" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
- QString http_part = line.first().stripWhiteSpace() + ":";
+ TQString http_part = line.first().stripWhiteSpace() + ":";
line.pop_front();
- QString complete_url = http_part + line.first().stripWhiteSpace();
+ TQString complete_url = http_part + line.first().stripWhiteSpace();
entry->release_notes_url = new KURL( complete_url );
}
}
- else if( QString::compare( first, QString( "UpgradeTool" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "UpgradeTool" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
- QString http_part = line.first().stripWhiteSpace() + ":";
+ TQString http_part = line.first().stripWhiteSpace() + ":";
line.pop_front();
- QString complete_url = http_part + line.first().stripWhiteSpace();
+ TQString complete_url = http_part + line.first().stripWhiteSpace();
entry->upgrade_tool_url = new KURL( complete_url );
}
}
- else if( QString::compare( first, QString( "UpgradeToolSignature" ) ) == 0 ) {
+ else if( TQString::compare( first, TQString( "UpgradeToolSignature" ) ) == 0 ) {
if( entry != NULL ) {
line.pop_front();
- QString http_part = line.first().stripWhiteSpace() + ":";
+ TQString http_part = line.first().stripWhiteSpace() + ":";
line.pop_front();
- QString complete_url = http_part + line.first().stripWhiteSpace();
+ TQString complete_url = http_part + line.first().stripWhiteSpace();
entry->upgrade_tool_sig_url = new KURL( complete_url );
}
}
@@ -378,7 +378,7 @@ QPtrList<DistroEntry> *UpgradeWizard::parseMetafile( QTextIStream *text_stream,
// add the last one
// if this entry is for the current version we are running,
// then add it at the start of the list
- if( QString::compare( *entry->dist_field, my_distro_name ) == 0 ) {
+ if( TQString::compare( *entry->dist_field, my_distro_name ) == 0 ) {
current_dist = entry;
metafile_entries->prepend( entry );
} else {
@@ -391,14 +391,14 @@ QPtrList<DistroEntry> *UpgradeWizard::parseMetafile( QTextIStream *text_stream,
// ** SLOTS ** //
void UpgradeWizard::receiveDistroName( KProcess*, char *buffer, int buflen ) {
- distro_name = QString::fromAscii( buffer, buflen-1 );
+ distro_name = TQString::fromAscii( buffer, buflen-1 );
}
void UpgradeWizard::launchDistUpdater() {
- QDir dir;
+ TQDir dir;
dir.mkdir(upgrade_tool_location+"-extract");
- KTar tarFile(upgrade_tool_location, QString("application/x-gzip"));
+ KTar tarFile(upgrade_tool_location, TQString("application/x-gzip"));
tarFile.open(IO_ReadOnly);
//KArchiveDirectory* tarDirectory = tarFile.directory();
//tarDirectory->copyTo(upgrade_tool_location+"-extract");
@@ -411,11 +411,11 @@ void UpgradeWizard::launchDistUpdater() {
proc->start( KProcess::DontCare );
// don't kill adept, it stops the app from running
- // parentWidget()->close();
+ // tqparentWidget()->close();
}
void UpgradeWizard::fetchReleaseAnnounce() {
- QString temp_file_location;
+ TQString temp_file_location;
bool result = false;
if (upgrade_dist->release_notes_url == NULL) {
@@ -428,17 +428,17 @@ void UpgradeWizard::fetchReleaseAnnounce() {
if( result ) {
emit killErrorDialog();
err_dlg = NULL;
- textBrowser1->mimeSourceFactory()->setExtensionType( QString("tmp"), "text/plain" );
+ textBrowser1->mimeSourceFactory()->setExtensionType( TQString("tmp"), "text/plain" );
textBrowser1->setSource( temp_file_location );
- QWidget *p = page( pageCount()-2 );
+ TQWidget *p = page( pageCount()-2 );
setNextEnabled( p, true );
} else {
if(err_dlg == NULL ) {
err_dlg = new ErrorDialog( this, i18n( "Could not download the release announcement. Please check that your Internet connection is active." ), 0, 1 );
- connect( err_dlg->retryButton, SIGNAL( clicked() ), this, SLOT( fetchReleaseAnnounce() ) );
- connect( err_dlg->exitButton, SIGNAL( clicked() ), err_dlg, SLOT( close() ) );
- connect( err_dlg->exitButton, SIGNAL( clicked() ), this, SLOT( close() ) );
- connect( this, SIGNAL( killErrorDialog() ), err_dlg, SLOT( close() ) );
+ connect( err_dlg->retryButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( fetchReleaseAnnounce() ) );
+ connect( err_dlg->exitButton, TQT_SIGNAL( clicked() ), err_dlg, TQT_SLOT( close() ) );
+ connect( err_dlg->exitButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
+ connect( this, TQT_SIGNAL( killErrorDialog() ), err_dlg, TQT_SLOT( close() ) );
err_dlg->show();
}
}
@@ -457,10 +457,10 @@ void UpgradeWizard::fetchUpgradeTool() {
} else {
if(err_dlg == NULL ) {
err_dlg = new ErrorDialog( this, i18n( "Could not download the upgrade tool. Please check that your Internet connection is active." ), 0, 1 );
- connect( err_dlg->retryButton, SIGNAL( clicked() ), this, SLOT( fetchUpgradeTool() ) );
- connect( err_dlg->exitButton, SIGNAL( clicked() ), err_dlg, SLOT( close() ) );
- connect( err_dlg->exitButton, SIGNAL( clicked() ), this, SLOT( close() ) );
- connect( this, SIGNAL( killErrorDialog() ), err_dlg, SLOT( close() ) );
+ connect( err_dlg->retryButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( fetchUpgradeTool() ) );
+ connect( err_dlg->exitButton, TQT_SIGNAL( clicked() ), err_dlg, TQT_SLOT( close() ) );
+ connect( err_dlg->exitButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
+ connect( this, TQT_SIGNAL( killErrorDialog() ), err_dlg, TQT_SLOT( close() ) );
err_dlg->show();
}
}
@@ -475,10 +475,10 @@ void UpgradeWizard::fetchUpgradeToolSig() {
} else {
if(err_dlg == NULL ) {
err_dlg = new ErrorDialog( this, i18n( "Could not download the upgrade tool's GPG signature. Please check that your Internet connection is active." ), 0, 1 );
- connect( err_dlg->retryButton, SIGNAL( clicked() ), this, SLOT( fetchUpgradeToolSig() ) );
- connect( err_dlg->exitButton, SIGNAL( clicked() ), err_dlg, SLOT( close() ) );
- connect( err_dlg->exitButton, SIGNAL( clicked() ), this, SLOT( close() ) );
- connect( this, SIGNAL( killErrorDialog() ), err_dlg, SLOT( close() ) );
+ connect( err_dlg->retryButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( fetchUpgradeToolSig() ) );
+ connect( err_dlg->exitButton, TQT_SIGNAL( clicked() ), err_dlg, TQT_SLOT( close() ) );
+ connect( err_dlg->exitButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
+ connect( this, TQT_SIGNAL( killErrorDialog() ), err_dlg, TQT_SLOT( close() ) );
err_dlg->show();
}
}
@@ -497,17 +497,17 @@ void UpgradeWizard::verifyUpgradeTool() {
err_dlg = NULL;
// remove the signature file
KIO::file_delete( KURL( upgrade_tool_sig_location ), false );
- QWidget *p = page( pageCount()-1 );
+ TQWidget *p = page( pageCount()-1 );
setFinishEnabled( p, true );
textLabel3->show();
} else {
if(err_dlg == NULL ) {
err_dlg = new ErrorDialog( this, i18n( "Could not verify the integrity of the upgrader application. This program will now exit." ), 0, 1 );
- //connect( err_dlg->retryButton, SIGNAL( clicked() ), this, SLOT( verify_upgrade_tool() ) );
+ //connect( err_dlg->retryButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( verify_upgrade_tool() ) );
err_dlg->retryButton->setEnabled( false );
- connect( err_dlg->exitButton, SIGNAL( clicked() ), err_dlg, SLOT( close() ) );
- connect( err_dlg->exitButton, SIGNAL( clicked() ), this, SLOT( close() ) );
- connect( this, SIGNAL( killErrorDialog() ), err_dlg, SLOT( close() ) );
+ connect( err_dlg->exitButton, TQT_SIGNAL( clicked() ), err_dlg, TQT_SLOT( close() ) );
+ connect( err_dlg->exitButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
+ connect( this, TQT_SIGNAL( killErrorDialog() ), err_dlg, TQT_SLOT( close() ) );
err_dlg->show();
}
}
@@ -515,12 +515,12 @@ void UpgradeWizard::verifyUpgradeTool() {
void UpgradeWizard::back()
{
- QWizard::back();
+ TQWizard::back();
}
void UpgradeWizard::next()
{
- QWizard::next();
+ TQWizard::next();
// page 1: d/l release announcement
// and display it on page1
diff --git a/adept/kubuntu_upgrader/upgradewizard.h b/adept/kubuntu_upgrader/upgradewizard.h
index 382de5f..3597de8 100644
--- a/adept/kubuntu_upgrader/upgradewizard.h
+++ b/adept/kubuntu_upgrader/upgradewizard.h
@@ -23,9 +23,9 @@
#include <adept/kubuntu_upgrader/upgradewizardbase.h>
-class QString;
-class QTextIStream;
-class QDateTime;
+class TQString;
+class TQTextIStream;
+class TQDateTime;
class KProcess;
class KURL;
class ErrorDialog;
@@ -33,14 +33,14 @@ class ErrorDialog;
// ** Represents an entry in the metafile ** //
class DistroEntry {
public:
- DistroEntry(QString *d_field);
+ DistroEntry(TQString *d_field);
~DistroEntry();
- QString *dist_field;
- QString *name_field;
- QString *version_field;
- QDateTime *date_field;
+ TQString *dist_field;
+ TQString *name_field;
+ TQString *version_field;
+ TQDateTime *date_field;
bool supported_field;
- QString *desc_field;
+ TQString *desc_field;
KURL *release_file_url;
KURL *release_notes_url;
KURL *upgrade_tool_url;
@@ -50,15 +50,16 @@ class DistroEntry {
class UpgradeWizard : public UpgradeWizardDlg
{
Q_OBJECT
+ TQ_OBJECT
public:
- UpgradeWizard(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ UpgradeWizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~UpgradeWizard();
/*$PUBLIC_FUNCTIONS$*/
- bool checkForDistUpgrade(QString url=QString(""), bool developmentVersion = false);
- QPtrList<DistroEntry> *parseMetafile( QTextIStream *text_stream,
- QString my_distro_name );
+ bool checkForDistUpgrade(TQString url=TQString(""), bool developmentVersion = false);
+ TQPtrList<DistroEntry> *parseMetafile( TQTextIStream *text_stream,
+ TQString my_distro_name );
public slots:
/*$PUBLIC_SLOTS$*/
@@ -76,7 +77,7 @@ public slots:
protected:
/*$PROTECTED_FUNCTIONS$*/
void removeOldUpgradeTool();
- void removeDirectory(QString directoryName);
+ void removeDirectory(TQString directoryName);
protected slots:
/*$PROTECTED_SLOTS$*/
@@ -84,9 +85,9 @@ protected slots:
virtual void next();
private:
- QString upgrade_tool_location;
- QString upgrade_tool_sig_location;
- QString distro_name;
+ TQString upgrade_tool_location;
+ TQString upgrade_tool_sig_location;
+ TQString distro_name;
DistroEntry* upgrade_dist;
DistroEntry* current_dist;
ErrorDialog* err_dlg;
diff --git a/adept/kubuntu_upgrader/upgradewizardbase.ui b/adept/kubuntu_upgrader/upgradewizardbase.ui
index c2d1eee..cb869f2 100644
--- a/adept/kubuntu_upgrader/upgradewizardbase.ui
+++ b/adept/kubuntu_upgrader/upgradewizardbase.ui
@@ -1,11 +1,11 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>UpgradeWizardDlg</class>
<author>Vladimir Stefan</author>
-<widget class="QWizard">
+<widget class="TQWizard">
<property name="name">
<cstring>upgrade_wizard</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -16,7 +16,7 @@
<property name="caption">
<string>Upgrade Wizard</string>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>WizardPage</cstring>
</property>
@@ -27,14 +27,14 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="text">
<string>A new distribution version is available! Click next if you wish to upgrade now.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>271</height>
@@ -57,7 +57,7 @@
</spacer>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>WizardPage</cstring>
</property>
@@ -68,7 +68,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -76,7 +76,7 @@
<string>Release Announcement:</string>
</property>
</widget>
- <widget class="QTextBrowser" row="1" column="0">
+ <widget class="TQTextBrowser" row="1" column="0">
<property name="name">
<cstring>textBrowser1</cstring>
</property>
@@ -86,7 +86,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>WizardPage</cstring>
</property>
@@ -97,7 +97,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
@@ -105,7 +105,7 @@
<string>Downloading and verifying the upgrade tool ...</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -115,7 +115,7 @@
<property name="text">
<string>Ready to upgrade! Click finish to close the Adept Package Manager and launch the distribution upgrade tool.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>231</height>
@@ -139,5 +139,5 @@
</grid>
</widget>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/libadept/acqprogress.cpp b/adept/libadept/acqprogress.cpp
index 4b0643f..21e4046 100644
--- a/adept/libadept/acqprogress.cpp
+++ b/adept/libadept/acqprogress.cpp
@@ -1,11 +1,11 @@
// -*- C++ -*-
-#include <qprogressbar.h>
+#include <tqprogressbar.h>
#include <klistview.h>
#include <kapplication.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqstyle.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kdebug.h>
@@ -29,78 +29,78 @@ using namespace std;
namespace adept {
-AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit)
-: KListViewItem( parent )
+AcqtqStatus::Item::Item (KListView *tqparent, pkgAcquire::ItemDesc &item, bool hit)
+: KListViewItem( tqparent )
{
m_pbcol = 0;
m_prog = new ItemProgress( 0, 0 );
- m_prog->setStatus( "waiting" );
+ m_prog->settqStatus( "waiting" );
m_prog->setTotalSteps( 100 );
m_item = item;
m_id = m_item.Owner->ID;
/* if (item.Owner->FileSize > 0)
- setText( 1, SizeToStr( item.Owner->FileSize ).c_str() + QString( "B" ) ); */
+ setText( 1, SizeToStr( item.Owner->FileSize ).c_str() + TQString( "B" ) ); */
setText( 1, u8( item.Description ) );
// cerr << "create: id = " << item . Owner -> ID << ", myId = " << m_item . Owner -> ID << endl;
if (hit) {
- m_prog->setStatus( "hit" );
+ m_prog->settqStatus( "hit" );
} else
- m_prog->setStatus( "waiting" );
- // QString (SizeToStr (Itm.Owner -> FileSize) . c_str ()) + QString ("B"),
- // /* QString (Itm . Owner -> ID) + */ QString (Itm.Description . c_str ()));
+ m_prog->settqStatus( "waiting" );
+ // TQString (SizeToStr (Itm.Owner -> FileSize) . c_str ()) + TQString ("B"),
+ // /* TQString (Itm . Owner -> ID) + */ TQString (Itm.Description . c_str ()));
}
-AcqStatus::Item::~Item ()
+AcqtqStatus::Item::~Item ()
{
delete m_prog;
}
-int AcqStatus::Item::compare (QListViewItem *i, int /*col*/, bool /*ascend*/) const
+int AcqtqStatus::Item::compare (TQListViewItem *i, int /*col*/, bool /*ascend*/) const
{
int id1 = m_id;
int id2 = ((Item *) i) -> m_id;
return (id2 >= id1) - (id2 <= id1);
}
-void AcqStatus::Item::pulse (pkgAcquire::Worker *w)
+void AcqtqStatus::Item::pulse (pkgAcquire::Worker *w)
{
if (w) {
if (w->TotalSize)
- setStatus( "progress", long( double(
+ settqStatus( "progress", long( double(
w -> CurrentSize * 100.0)
/ double( w->TotalSize ) ) );
else
- setStatus( "downloading", 0 );
+ settqStatus( "downloading", 0 );
}
}
-void AcqStatus::Item::setStatus( const std::string &s, int i )
+void AcqtqStatus::Item::settqStatus( const std::string &s, int i )
{
- m_prog->setStatus( s, i );
+ m_prog->settqStatus( s, i );
}
-void AcqStatus::Item::paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment )
+void AcqtqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment )
{
- QColorGroup _cg( cg );
- QColor c = _cg.text();
+ TQColorGroup _cg( cg );
+ TQColor c = _cg.text();
if ( column == m_pbcol ) {
- const QRect bar = QRect( 0, 0, width, height() );
+ const TQRect bar = TQRect( 0, 0, width, height() );
m_prog->resize( width, height() );
- QPixmap pm = QPixmap::grabWidget( m_prog );
+ TQPixmap pm = TQPixmap::grabWidget( m_prog );
// p->fillRect( bar, listView()->paletteBackgroundColor() );
p->drawPixmap( bar.x(), bar.y(), pm );
} else {
- QPixmap pm( width, height() );
- QPainter _p( &pm );
- _cg.setColor( QColorGroup::Text, c );
- KListViewItem::paintCell( &_p, _cg, column, width, alignment );
+ TQPixmap pm( width, height() );
+ TQPainter _p( &pm );
+ _cg.setColor( TQColorGroup::Text, c );
+ KListViewItem::paintCell( &_p, _cg, column, width, tqalignment );
p->drawPixmap( 0, 0, pm );
}
}
-AcqStatus::Item *AcqStatus::findItem (pkgAcquire::ItemDesc &Itm)
+AcqtqStatus::Item *AcqtqStatus::findItem (pkgAcquire::ItemDesc &Itm)
{
if ( Itm.Owner->ID < m_idOffset )
return 0;
@@ -109,8 +109,8 @@ AcqStatus::Item *AcqStatus::findItem (pkgAcquire::ItemDesc &Itm)
return m_items[ Itm.Owner->ID - m_idOffset ];
}
-AcqStatus::AcqStatus(QWidget *parent, const char *name)
- : KListView (parent, name), m_idOffset( 0 ), m_continue( true )
+AcqtqStatus::AcqtqStatus(TQWidget *tqparent, const char *name)
+ : KListView (tqparent, name), m_idOffset( 0 ), m_continue( true )
{
// m_lastItem = 0;
addColumn( i18n( "Progress" ) );
@@ -122,41 +122,41 @@ AcqStatus::AcqStatus(QWidget *parent, const char *name)
ID = 0;
}
-void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
+void AcqtqStatus::Done (pkgAcquire::ItemDesc &Itm)
{
Item *i = findItem (Itm);
if (i) {
- i->setStatus( "done" );
+ i->settqStatus( "done" );
}
emit statusChanged( StWaiting );
triggerUpdate();
KApplication::kApplication()->processEvents();
}
-void AcqStatus::clear()
+void AcqtqStatus::clear()
{
KListView::clear();
m_idOffset += m_items.size();
m_items.clear(); // got deleted by klistview already
}
-void AcqStatus::Start()
+void AcqtqStatus::Start()
{
clear();
pkgAcquireStatus::Start();
- kdDebug() << "AcqStatus::Start ()" << endl;
+ kdDebug() << "AcqtqStatus::Start ()" << endl;
_config -> Set ("APT::Fetcher::Select-Timeout-Usec", 100000);
emit statusChanged( StWaiting );
triggerUpdate();
KApplication::kApplication()->processEvents();
}
-void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
+void AcqtqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
{
Itm.Owner->ID = ID++;
Item *i = new Item( this, Itm, true );
// ensureItemVisible( i );
- i->setStatus( "hit" );
+ i->settqStatus( "hit" );
m_items.push_back( i );
kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl;
@@ -164,7 +164,7 @@ void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
KApplication::kApplication()->processEvents();
};
-void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
+void AcqtqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
// an item started to download
{
Update = true;
@@ -183,13 +183,13 @@ void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
KApplication::kApplication()->processEvents();
};
-void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
+void AcqtqStatus::Fail(pkgAcquire::ItemDesc &Itm)
// item failed to download
{
- kdDebug() << "fail, status = " << Itm.Owner->Status
+ kdDebug() << "fail, status = " << Itm.Owner->tqStatus
<< " ID = " << Itm.Owner->ID << endl;
// Ignore certain kinds of transient failures (bad code)
- if (Itm.Owner->Status == pkgAcquire::Item::StatIdle) {
+ if (Itm.Owner->tqStatus == pkgAcquire::Item::StatIdle) {
kdDebug() << "fail with StatIdle, ignoring" << endl;
return;
}
@@ -198,17 +198,17 @@ void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
kdDebug() << "fail, i = " << i << endl;
if (! i)
return;
- if (Itm.Owner->Status == pkgAcquire::Item::StatDone) {
- i->setStatus( "ignored" );
+ if (Itm.Owner->tqStatus == pkgAcquire::Item::StatDone) {
+ i->settqStatus( "ignored" );
} else {
- i->setStatus( "error" );
+ i->settqStatus( "error" );
}
triggerUpdate();
KApplication::kApplication()->processEvents();
};
-void AcqStatus::Stop()
+void AcqtqStatus::Stop()
{
pkgAcquireStatus::Stop();
emit statusChanged( StDone );
@@ -216,7 +216,7 @@ void AcqStatus::Stop()
KApplication::kApplication()->processEvents();
}
-bool AcqStatus::Pulse(pkgAcquire *Owner)
+bool AcqtqStatus::Pulse(pkgAcquire *Owner)
{
pkgAcquireStatus::Pulse(Owner);
@@ -230,7 +230,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
}
triggerUpdate ();
- // repaint ();
+ // tqrepaint ();
if (TotalBytes > 0)
emit totalProgress(
@@ -248,43 +248,43 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
return false;
}
-bool AcqStatus::MediaChange(string Media,string Drive)
+bool AcqtqStatus::MediaChange(string Media,string Drive)
{
int res = KMessageBox::warningContinueCancel(
this, i18n( "Please insert the disc "
"labeled '%1' in the drive "
- "'%2' and press enter" ).arg(
- u8( Media ) ).arg( u8( Drive ) ),
+ "'%2' and press enter" ).tqarg(
+ u8( Media ) ).tqarg( u8( Drive ) ),
i18n( "Media Change" ) );
if ( res == KMessageBox::Cancel )
cancel();
return true;
}
-void AcqStatus::cancel()
+void AcqtqStatus::cancel()
{
m_continue = false;
}
-AcqStatusDialog::AcqStatusDialog (QWidget *parent, const char *name, bool modal)
- : KDialogBase( parent, name, modal,
+AcqStatusDialog::AcqStatusDialog (TQWidget *tqparent, const char *name, bool modal)
+ : KDialogBase( tqparent, name, modal,
u8( "progress dialog (FIXME: waiting for headers, done)" ),
Ok|Cancel, Cancel, true )
{
- m_status = new AcqStatus (this, "");
+ m_status = new AcqtqStatus (this, "");
setMainWidget( m_status.data() );
enableButton (Ok, false);
- connect (m_status.data(), SIGNAL (statusChanged (AcqStatus::Status)),
- this, SLOT (statusChange (AcqStatus::Status)));
+ connect (m_status.data(), TQT_SIGNAL (statusChanged (AcqtqStatus::tqStatus)),
+ this, TQT_SLOT (statusChange (AcqtqStatus::tqStatus)));
}
-void AcqStatusDialog::statusChange (AcqStatus::Status st)
+void AcqStatusDialog::statusChange (AcqtqStatus::tqStatus st)
{
- if (st == AcqStatus::StDownloading || st == AcqStatus::StWaiting) {
+ if (st == AcqtqStatus::StDownloading || st == AcqtqStatus::StWaiting) {
enableButton (Ok, false);
// XXX: cancel should be true; but needs implementation first
enableButton (Cancel, false);
- } else if (st == AcqStatus::StDone) {
+ } else if (st == AcqtqStatus::StDone) {
enableButton (Ok, true);
enableButton (Cancel, false);
}
diff --git a/adept/libadept/acqprogress.h b/adept/libadept/acqprogress.h
index 9510825..e6aa258 100644
--- a/adept/libadept/acqprogress.h
+++ b/adept/libadept/acqprogress.h
@@ -3,8 +3,8 @@
@author Peter Rockai <me@mornfall.net>
*/
-#ifndef ACQPROGRESS_H
-#define ACQPROGRESS_H
+#ifndef ACTQPROGRESS_H
+#define ACTQPROGRESS_H
#include <klocale.h>
#include <kdialogbase.h>
@@ -15,23 +15,24 @@
#include <apt-pkg/acquire.h>
#include <apt-front/progresscallback.h>
-class AcqStatus;
-class QLabel;
-class QProgressBar;
-class QSpacer;
-class QGridLayout;
+class AcqtqStatus;
+class TQLabel;
+class TQProgressBar;
+class TQSpacer;
+class TQGridLayout;
namespace adept {
-class AcqStatus : public KListView, public aptFront::ProgressCallback
+class AcqtqStatus : public KListView, public aptFront::ProgressCallback
{
Q_OBJECT
+ TQ_OBJECT
protected:
class ItemProgress: public KProgress {
public:
- ItemProgress( QWidget *parent, const char *name = 0 )
- : KProgress( parent, name ), m_spin( 0 ) {}
- void setStatus( const std::string &s,
+ ItemProgress( TQWidget *tqparent, const char *name = 0 )
+ : KProgress( tqparent, name ), m_spin( 0 ) {}
+ void settqStatus( const std::string &s,
int prog = 0 ) {
m_status = s;
if (m_status == "hit"
@@ -61,17 +62,17 @@ protected:
pkgAcquire::ItemDesc m_item;
public:
- Item (KListView *parent, pkgAcquire::ItemDesc &item,
+ Item (KListView *tqparent, pkgAcquire::ItemDesc &item,
bool hit = false);
virtual ~Item ();
- virtual void paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment);
+ virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment);
void setProgress (int);
- virtual int compare (QListViewItem *i, int col, bool ascend) const;
+ virtual int compare (TQListViewItem *i, int col, bool ascend) const;
virtual void pulse (pkgAcquire::Worker *);
- void setStatus( const std::string &, int = 0 );
+ void settqStatus( const std::string &, int = 0 );
void setup() {
KListViewItem::setup();
@@ -85,9 +86,9 @@ protected:
public:
- enum Status { StWaiting, StDownloading, StDone };
+ enum tqStatus { StWaiting, StDownloading, StDone };
- AcqStatus (QWidget *parent, const char *name);
+ AcqtqStatus (TQWidget *tqparent, const char *name);
Item *findItem (pkgAcquire::ItemDesc &Itm);
virtual bool MediaChange (string Media,string Drive);
@@ -97,7 +98,7 @@ public:
virtual void Fail (pkgAcquire::ItemDesc &Itm);
virtual void Start ();
virtual void Stop ();
- void addLine (QWidget *l, QWidget *s, QWidget *prog);
+ void addLine (TQWidget *l, TQWidget *s, TQWidget *prog);
void clear();
bool Pulse (pkgAcquire *Owner);
@@ -106,22 +107,23 @@ public slots:
void cancel();
signals:
- void statusChanged (AcqStatus::Status st);
+ void statusChanged (AcqtqStatus::tqStatus st);
void totalProgress (int percent);
- //AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
+ //AcqTexttqStatus(unsigned int &ScreenWidth,unsigned int Quiet);
};
class AcqStatusDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
protected:
- aptFront::SharedPtr<AcqStatus> m_status;
+ aptFront::SharedPtr<AcqtqStatus> m_status;
public:
aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_status.data(); };
- AcqStatusDialog (QWidget *parent, const char *name, bool modal);
+ AcqStatusDialog (TQWidget *tqparent, const char *name, bool modal);
public slots:
- void statusChange (AcqStatus::Status st);
+ void statusChange (AcqtqStatus::tqStatus st);
};
}
#endif
diff --git a/adept/libadept/acqprogresswidget.cpp b/adept/libadept/acqprogresswidget.cpp
index dd02f03..73cb09e 100644
--- a/adept/libadept/acqprogresswidget.cpp
+++ b/adept/libadept/acqprogresswidget.cpp
@@ -1,37 +1,37 @@
#include <kprogress.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
#include <klocale.h>
#include "acqprogresswidget.h"
#include "acqprogress.h"
using namespace adept;
-AcqProgressWidget::AcqProgressWidget( QWidget *parent, const char *name )
- : AcqProgressWidgetUi( parent, name )
+AcqProgressWidget::AcqProgressWidget( TQWidget *tqparent, const char *name )
+ : AcqProgressWidgetUi( tqparent, name )
{
m_statusRef = m_status;
m_progress->setTotalSteps( 100 );
m_progress->setProgress( 0 );
- connect(m_status, SIGNAL( totalProgress( int ) ),
- this, SLOT( setProgress( int ) ) );
- connect(m_status, SIGNAL( statusChanged( AcqStatus::Status ) ),
- this, SLOT( statusChange( AcqStatus::Status ) ) );
- connect( m_cancel, SIGNAL( clicked() ),
- m_status, SLOT( cancel() ) );
+ connect(m_status, TQT_SIGNAL( totalProgress( int ) ),
+ this, TQT_SLOT( setProgress( int ) ) );
+ connect(m_status, TQT_SIGNAL( statusChanged( AcqtqStatus::tqStatus ) ),
+ this, TQT_SLOT( statusChange( AcqtqStatus::tqStatus ) ) );
+ connect( m_cancel, TQT_SIGNAL( clicked() ),
+ m_status, TQT_SLOT( cancel() ) );
}
-void AcqProgressWidget::statusChange( AcqStatus::Status s )
+void AcqProgressWidget::statusChange( AcqtqStatus::tqStatus s )
{
- QString t;
+ TQString t;
switch (s) {
- case AcqStatus::StWaiting:
+ case AcqtqStatus::StWaiting:
t = i18n( "Waiting for headers (%p%)" );
break;
- case AcqStatus::StDownloading:
+ case AcqtqStatus::StDownloading:
t = i18n( "Downloading (%p%)" );
break;
- case AcqStatus::StDone:
+ case AcqtqStatus::StDone:
t = i18n( "Done (%p%)" );
m_progress->setProgress( 100 );
break;
diff --git a/adept/libadept/acqprogresswidget.h b/adept/libadept/acqprogresswidget.h
index 54359c7..faf068a 100644
--- a/adept/libadept/acqprogresswidget.h
+++ b/adept/libadept/acqprogresswidget.h
@@ -14,14 +14,15 @@ namespace adept {
class AcqProgressWidget : public AcqProgressWidgetUi {
Q_OBJECT
+ TQ_OBJECT
public:
- AcqProgressWidget (QWidget *parent = 0, const char *name = 0);
+ AcqProgressWidget (TQWidget *tqparent = 0, const char *name = 0);
aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); };
public slots:
- void statusChange( AcqStatus::Status );
+ void statusChange( AcqtqStatus::tqStatus );
void setProgress( int );
protected:
- aptFront::SharedPtr<AcqStatus> m_statusRef;
+ aptFront::SharedPtr<AcqtqStatus> m_statusRef;
};
}
diff --git a/adept/libadept/acqprogresswidgetui.ui b/adept/libadept/acqprogresswidgetui.ui
index 26baa21..8ed1fff 100644
--- a/adept/libadept/acqprogresswidgetui.ui
+++ b/adept/libadept/acqprogresswidgetui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>adept::AcqProgressWidgetUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>adept::AcqProgressWidgetUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -22,11 +22,11 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="adept::AcqStatus" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="adept::AcqtqStatus" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>m_status</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>300</width>
<height>150</height>
@@ -38,7 +38,7 @@
<cstring>m_progress</cstring>
</property>
</widget>
- <widget class="QPushButton" row="1" column="1">
+ <widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>m_cancel</cstring>
</property>
@@ -50,7 +50,7 @@
</widget>
<customwidgets>
<customwidget>
- <class>adept::AcqStatus</class>
+ <class>adept::AcqtqStatus</class>
<header location="global">acqprogress.h</header>
<sizehint>
<width>-1</width>
@@ -71,7 +71,7 @@
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
</image>
</images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>adept/acqprogress.h</includehint>
<includehint>kprogress.h</includehint>
diff --git a/adept/libadept/actor.h b/adept/libadept/actor.h
index 115b202..a1fe192 100644
--- a/adept/libadept/actor.h
+++ b/adept/libadept/actor.h
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qobject.h>
+#include <tqobject.h>
#include <apt-front/cache/entity/entity.h>
#include <apt-front/actor.h>
@@ -14,9 +14,10 @@ namespace adept {
using namespace aptFront;
-class EntityActor : public QObject
+class EntityActor : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
EntityActor( actor::Bound< cache::entity::Entity > a )
: m_actor( a ), m_dead( false )
diff --git a/adept/libadept/application.cpp b/adept/libadept/application.cpp
index 8388fa2..92470a3 100644
--- a/adept/libadept/application.cpp
+++ b/adept/libadept/application.cpp
@@ -33,10 +33,10 @@ using namespace cache;
}
if ( listers.empty() ) done = false;
if ( done ) {
- QTimer::singleShot( 0, app, slot );
+ TQTimer::singleShot( 0, app, slot );
deleteLater();
} else {
- QTimer::singleShot( 100, this, SLOT( waiting() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( waiting() ) );
}
} */
@@ -150,24 +150,24 @@ void Application::redo() {
setHistoryEnabled( true );
}
-QString Application::changeString() {
+TQString Application::changeString() {
component::State &s = cache().state();
return i18n( " Install %1, upgrade %2, remove %3 " )
- .arg( s.newInstallCount() ).arg( s.upgradeCount() )
- .arg( s.removeCount() );
+ .tqarg( s.newInstallCount() ).tqarg( s.upgradeCount() )
+ .tqarg( s.removeCount() );
}
-QString Application::statusString() {
+TQString Application::statusString() {
component::State &s = cache().state();
return i18n( " %1 installed, %2 upgradable, %3 available " )
- .arg( s.installedCount() ).arg( s.upgradableCount() )
- .arg( s.availableCount() );
+ .tqarg( s.installedCount() ).tqarg( s.upgradableCount() )
+ .tqarg( s.availableCount() );
}
-QString Application::sizesString() {
- QString dl = cache().state().downloadSizeString();
- QString inst = cache().state().installSizeString();
- return i18n( " download: %1, installation: %2 " ).arg( dl ).arg( inst );
+TQString Application::sizesString() {
+ TQString dl = cache().state().downloadSizeString();
+ TQString inst = cache().state().installSizeString();
+ return i18n( " download: %1, installation: %2 " ).tqarg( dl ).tqarg( inst );
}
void Application::setStatusBar( KStatusBar *s ) {
diff --git a/adept/libadept/application.h b/adept/libadept/application.h
index 74e9506..080a6d4 100644
--- a/adept/libadept/application.h
+++ b/adept/libadept/application.h
@@ -5,7 +5,7 @@
#include <vector>
-#include <qobject.h>
+#include <tqobject.h>
#include <apt-front/cache/cache.h>
#include <apt-front/cache/component/state.h>
@@ -31,7 +31,7 @@ struct Application : cache::Observer {
void initialize();
void initKDEDebconf();
void initHistory();
- void setMainWidget( QWidget *w ) { m_main = w; }
+ void setMainWidget( TQWidget *w ) { m_main = w; }
void setStatusBar( KStatusBar *s );
virtual void checkpoint();
virtual void undo();
@@ -39,23 +39,24 @@ struct Application : cache::Observer {
virtual void notifyPostChange( cache::component::Base * );
- QString changeString();
- QString statusString();
- QString sizesString();
+ TQString changeString();
+ TQString statusString();
+ TQString sizesString();
protected:
virtual void setHistoryEnabled( bool ) {}
typedef cache::component::History< cache::component::State > History;
virtual History *history() { return m_history; }
bool m_acceptReadOnly;
- QWidget *m_main;
+ TQWidget *m_main;
KStatusBar *m_statusBar;
History *m_history;
};
-/* class WaitForLister : public QObject {
+/* class WaitForLister : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
- WaitForLister( QObject *a, const char *s )
+ WaitForLister( TQObject *a, const char *s )
: obj( a ), slot( s )
{
waiting();
@@ -64,7 +65,7 @@ public:
protected slots:
void waiting();
protected:
- QObject *obj;
+ TQObject *obj;
const char *slot;
typedef std::vector< Lister * > Vector;
Vector listers;
diff --git a/adept/libadept/commitprogress.cpp b/adept/libadept/commitprogress.cpp
index 9100d9b..6db8a6f 100644
--- a/adept/libadept/commitprogress.cpp
+++ b/adept/libadept/commitprogress.cpp
@@ -1,11 +1,11 @@
#include <cassert>
-#include <qwidgetstack.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
+#include <tqwidgetstack.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
#include <kprogress.h>
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kdebug.h>
@@ -25,23 +25,23 @@ void CommitProgress::initSystem() {
CommitProgress::s_system = new PkgSystem();
}
-CommitProgress::CommitProgress( QWidget *p, const char *n )
+CommitProgress::CommitProgress( TQWidget *p, const char *n )
: CommitProgressUi( p, n )
{
assert( s_system );
m_konsoleFrame->installEventFilter( this );
loadKonsole();
- connect( s_system, SIGNAL( statusChanged( int, QString ) ),
- this, SLOT( updateProgress( int, QString ) ) );
- connect( m_details, SIGNAL( clicked() ),
- this, SLOT( toggleDetails() ) );
+ connect( s_system, TQT_SIGNAL( statusChanged( int, TQString ) ),
+ this, TQT_SLOT( updateProgress( int, TQString ) ) );
+ connect( m_details, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( toggleDetails() ) );
m_progress->setTotalSteps( 100 );
}
-bool CommitProgress::eventFilter( QObject *o, QEvent *e ) {
+bool CommitProgress::eventFilter( TQObject *o, TQEvent *e ) {
// o == m_konsoleFrame
- if ( e->type() == QEvent::Resize ) {
- QResizeEvent *re = dynamic_cast< QResizeEvent * >( e );
+ if ( e->type() == TQEvent::Resize ) {
+ TQResizeEvent *re = dynamic_cast< TQResizeEvent * >( e );
if ( !re ) return false;
m_konsole->widget()->setGeometry( 0, 0, re->size().width(), re->size().height() );
m_occlude->setGeometry( 0, 0, re->size().width(), re->size().height() );
@@ -55,17 +55,17 @@ void CommitProgress::toggleDetails()
// if ( m_stack->visibleWidget() == m_konsole->widget() ) { // hide
// m_stack->raiseWidget( m_emptyPage );
m_occlude->show();
- m_bottomSpace->changeSize( 10, 10, QSizePolicy::Fixed, QSizePolicy::Expanding );
+ m_bottomSpace->changeSize( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::Expanding );
m_details->setText( i18n( "Show Details" ) );
} else { // show
m_occlude->hide();
// m_stack->raiseWidget( m_konsole->widget() );
- m_bottomSpace->changeSize( 10, 10, QSizePolicy::Fixed, QSizePolicy::Fixed );
+ m_bottomSpace->changeSize( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed );
m_details->setText( i18n( "Hide Details" ) );
}
}
-void CommitProgress::updateProgress( int p, QString msg )
+void CommitProgress::updateProgress( int p, TQString msg )
{
m_operation->setText( msg );
m_progress->setProgress( p );
@@ -84,13 +84,13 @@ void CommitProgress::loadKonsole()
delete m_occlude;
m_konsole = static_cast<KParts::Part*>(
- factory->create( m_konsoleFrame, "konsolepart", "QObject",
+ factory->create( m_konsoleFrame, "konsolepart", TQOBJECT_OBJECT_NAME_STRING,
u8( "KParts::ReadOnlyPart" ) ) );
- // m_konsole->widget()->setGeometry( QRect( 0, 0, 40, 40 ) );
+ // m_konsole->widget()->setGeometry( TQRect( 0, 0, 40, 40 ) );
- m_occlude = new QFrame( m_konsoleFrame, "m_occlude" );
- // m_occlude->setGeometry( QRect( 0, 0, 10, 10 ) );
- m_occlude->setFrameShape( QFrame::NoFrame );
+ m_occlude = new TQFrame( m_konsoleFrame, "m_occlude" );
+ // m_occlude->setGeometry( TQRect( 0, 0, 10, 10 ) );
+ m_occlude->setFrameShape( TQFrame::NoFrame );
assert( terminal() );
@@ -98,7 +98,7 @@ void CommitProgress::loadKonsole()
terminal()->setAutoStartShell( false );
// m_stack->addWidget( m_konsole->widget() );
- QStrList l; l.append( "echo" ); l.append( "-n" );
+ TQStrList l; l.append( "echo" ); l.append( "-n" );
terminal()->startProgram( u8( "/bin/echo" ), l );
s_system->setTerminal( m_konsole );
@@ -107,9 +107,9 @@ void CommitProgress::loadKonsole()
// m_konsole->widget()->show();
// m_stack->raiseWidget( m_emptyPage );
m_operation->setText( i18n( "Idle" ) );
- QTimer::singleShot( 0, this, SLOT( toggleDetails() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( toggleDetails() ) );
if ( DEFAULT_KONSOLE_HIDDEN )
- QTimer::singleShot( 0, this, SLOT( toggleDetails() ) );
- QTimer::singleShot( 0, this, SLOT( hide() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( toggleDetails() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( hide() ) );
}
diff --git a/adept/libadept/commitprogress.h b/adept/libadept/commitprogress.h
index ed557d7..123dc61 100644
--- a/adept/libadept/commitprogress.h
+++ b/adept/libadept/commitprogress.h
@@ -14,8 +14,9 @@ namespace adept {
class CommitProgress : public CommitProgressUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- CommitProgress( QWidget *p = 0, const char *n = 0 );
+ CommitProgress( TQWidget *p = 0, const char *n = 0 );
ExtTerminalInterface *terminal() {
return static_cast<ExtTerminalInterface*>(
@@ -24,10 +25,10 @@ public:
// needs to be called before aptFront::init() :'((
static void initSystem();
- virtual bool eventFilter( QObject *o, QEvent *e );
+ virtual bool eventFilter( TQObject *o, TQEvent *e );
public slots:
- void updateProgress( int p, QString msg );
+ void updateProgress( int p, TQString msg );
void toggleDetails();
protected:
void loadKonsole();
diff --git a/adept/libadept/commitprogressui.ui b/adept/libadept/commitprogressui.ui
index 5ccecbf..da30273 100644
--- a/adept/libadept/commitprogressui.ui
+++ b/adept/libadept/commitprogressui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>adept::CommitProgressUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>CommitProgressUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -22,7 +22,7 @@
<property name="margin">
<number>1</number>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>m_konsoleFrame</cstring>
</property>
@@ -40,11 +40,11 @@
<property name="frameShadow">
<enum>Raised</enum>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>m_occlude</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>40</x>
<y>10</y>
@@ -70,16 +70,16 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@@ -95,22 +95,22 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton" row="1" column="1">
+ <widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>m_details</cstring>
</property>
@@ -123,7 +123,7 @@
<cstring>m_progress</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>m_operation</cstring>
</property>
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>80</height>
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>32</height>
@@ -190,7 +190,7 @@
</widget>
<customwidgets>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kprogress.h</includehint>
</includehints>
diff --git a/adept/libadept/desktopentryui.ui b/adept/libadept/desktopentryui.ui
index a40c766..9a6405e 100644
--- a/adept/libadept/desktopentryui.ui
+++ b/adept/libadept/desktopentryui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>DesktopEntryUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>5</number>
</property>
- <widget class="QLabel" row="0" column="1" rowspan="2" colspan="1">
+ <widget class="TQLabel" row="0" column="1" rowspan="2" colspan="1">
<property name="name">
<cstring>m_icon</cstring>
</property>
@@ -37,7 +37,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>32</width>
<height>32</height>
@@ -47,7 +47,7 @@
<string></string>
</property>
</widget>
- <widget class="QCheckBox" row="0" column="0" rowspan="2" colspan="1">
+ <widget class="TQCheckBox" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>m_check</cstring>
</property>
@@ -63,7 +63,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="0" column="3">
+ <widget class="TQLabel" row="0" column="3">
<property name="name">
<cstring>m_name</cstring>
</property>
@@ -79,14 +79,14 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel" row="1" column="3">
+ <widget class="TQLabel" row="1" column="3">
<property name="name">
<cstring>m_description</cstring>
</property>
<property name="text">
<string>(description)</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>6</width>
<height>20</height>
@@ -112,5 +112,5 @@
<includes>
<include location="global" impldecl="in declaration">adept/extendablelist.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/libadept/desktoplist.cpp b/adept/libadept/desktoplist.cpp
index de64f11..8e8cb8a 100644
--- a/adept/libadept/desktoplist.cpp
+++ b/adept/libadept/desktoplist.cpp
@@ -3,10 +3,10 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qimage.h>
-#include <qlabel.h>
-#include <qcursor.h>
-#include <qcheckbox.h>
+#include <tqimage.h>
+#include <tqlabel.h>
+#include <tqcursor.h>
+#include <tqcheckbox.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kapplication.h>
@@ -18,7 +18,7 @@
namespace adept {
-DesktopEntry::DesktopEntry( QWidget *p, const char *n )
+DesktopEntry::DesktopEntry( TQWidget *p, const char *n )
: DesktopEntryUi( p, n )
{
adjustFontSize( m_description, -1 );
@@ -27,18 +27,18 @@ DesktopEntry::DesktopEntry( QWidget *p, const char *n )
void DesktopEntry::resize( int w, int h )
{
// kdDebug() << "DesktopEntry::resize( " << w << ", " << h << " )" << endl;
- int margin = layout()->margin() + layout()->spacing() * 2
+ int margin = tqlayout()->margin() + tqlayout()->spacing() * 2
+ 6 /* spacer */ + m_icon->width() + m_check->width();
- if ( m_check->isVisible() ) margin += m_check->width() + layout()->spacing();
+ if ( m_check->isVisible() ) margin += m_check->width() + tqlayout()->spacing();
int hFW1 = m_name->heightForWidth( w - margin );
int hFW2 = m_description->heightForWidth( w - margin );
/* kdDebug() << "margin = " << margin << ", hFW1 = " << hFW1 << ", hFW2 = "
<< hFW2 << endl; */
- int height = 2 * layout()->margin() + layout()->spacing() + hFW1 + hFW2;
- if ( height < 32 + 2*layout()->margin() /* icon size + margin */ )
- height = 32 + 2*layout()->margin();
+ int height = 2 * tqlayout()->margin() + tqlayout()->spacing() + hFW1 + hFW2;
+ if ( height < 32 + 2*tqlayout()->margin() /* icon size + margin */ )
+ height = 32 + 2*tqlayout()->margin();
// m_description->resize( w - margin, m_description->heightForWidth( w - margin ) );
- QWidget::resize( w, height );
+ TQWidget::resize( w, height );
}
void DesktopEntry::setItem( ExtendableItem *i ) {
@@ -52,34 +52,34 @@ void DesktopEntry::setItem( ExtendableItem *i ) {
if ( !package().valid() || !package().hasVersion() ) {
setEnabled( false );
} else {
- connect( m_check, SIGNAL( toggled( bool ) ),
- this, SLOT( toggled() ) );
+ connect( m_check, TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( toggled() ) );
notifyPostChange();
}
}
-void DesktopEntry::mousePressEvent( QMouseEvent *e ) {
+void DesktopEntry::mousePressEvent( TQMouseEvent *e ) {
kdDebug() << "DesktopEntry::mousePressEvent" << endl;
e->ignore();
}
-void DesktopEntry::mouseReleaseEvent( QMouseEvent *e ) {
+void DesktopEntry::mouseReleaseEvent( TQMouseEvent *e ) {
kdDebug() << "DesktopEntry::mouseReleaseEvent" << endl;
e->ignore();
}
-void DesktopEntry::showEvent( QShowEvent *e ) {
+void DesktopEntry::showEvent( TQShowEvent *e ) {
DesktopEntryUi::showEvent( e );
// DesktopEntryUi::polish();
if ( m_polished ) return;
item()->list()->polishing();
kdDebug() << "polish for " << entity().name() << endl;
- QImage icon( KGlobal::iconLoader()->iconPath( entity().icon(), -32, true ) );
+ TQImage icon( KGlobal::iconLoader()->iconPath( entity().icon(), -32, true ) );
if ( icon.isNull() ) {
- icon = QImage( KGlobal::dirs()->findResource( "desktopicon", entity().icon() ) );
+ icon = TQImage( KGlobal::dirs()->findResource( "desktopicon", entity().icon() ) );
}
m_icon->setPixmap( icon.isNull() ? item()->list()->emptyIcon() :
- QPixmap( icon.smoothScale( 32, 32, QImage::ScaleMin ) ) );
+ TQPixmap( icon.smoothScale( 32, 32, TQ_ScaleMin ) ) );
item()->list()->polished();
m_polished = true;
}
@@ -109,7 +109,7 @@ void DesktopEntry::toggled() {
void DesktopList::polishing() {
if ( m_polishing == 0 )
- QApplication::setOverrideCursor( QCursor( Qt::BusyCursor ) );
+ TQApplication::setOverrideCursor( TQCursor( TQt::BusyCursor ) );
m_polishing++;
if ( m_polishing % 10 == 0 )
kapp->processEvents();
@@ -117,7 +117,7 @@ void DesktopList::polishing() {
void DesktopList::polished() {
if ( m_polishing == childCount() )
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
}
void DesktopList::notifyPostChange( component::Base * ) {
@@ -138,23 +138,23 @@ void DesktopEntry::notifyPostChange() {
m_check->blockSignals( false );
}
-DesktopList::DesktopList( QWidget *parent, const char *name )
- : ExtendableList( parent, name ), m_polishing( 0 ), m_displayCheckboxes( true )
+DesktopList::DesktopList( TQWidget *tqparent, const char *name )
+ : ExtendableList( tqparent, name ), m_polishing( 0 ), m_displayCheckboxes( true )
{
observeComponent< component::State >();
addColumn( i18n( "Application" ) );
setResizeMode( LastColumn );
setToggleColumn( -1 ); // no toggling, thanks
setExtenderHighlight( true );
- m_emptyIcon = QPixmap(
- QImage(
+ m_emptyIcon = TQPixmap(
+ TQImage(
KGlobal::iconLoader()->iconPath( u8( "exec" ), -32, false )
- ).smoothScale( 32, 32, QImage::ScaleMin ) );
- connect( this, SIGNAL( clicked( QListViewItem *, const QPoint &, int ) ),
- this, SLOT( processClick( QListViewItem *, const QPoint &, int ) ) );
+ ).smoothScale( 32, 32, TQ_ScaleMin ) );
+ connect( this, TQT_SIGNAL( clicked( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQT_SLOT( processClick( TQListViewItem *, const TQPoint &, int ) ) );
}
-void DesktopList::processClick( QListViewItem *it, const QPoint &, int ) {
+void DesktopList::processClick( TQListViewItem *it, const TQPoint &, int ) {
kdDebug() << "DesktopList::processClick..." << endl;
DesktopItem *i = dynamic_cast< DesktopItem * >( it );
if ( !i ) return;
@@ -165,7 +165,7 @@ void DesktopList::insertRange( Range r ) {
m_range = r;
DesktopItem *last = 0;
int i = 0;
- QApplication::setOverrideCursor( QCursor( Qt::BusyCursor ) );
+ TQApplication::setOverrideCursor( TQCursor( TQt::BusyCursor ) );
for( ; r != r.end(); r.advance() ) {
if ( i % 20 == 0 )
kapp->processEvents();
@@ -176,7 +176,7 @@ void DesktopList::insertRange( Range r ) {
i->setEntity( *r );
++ i;
}
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
}
ItemExtender *DesktopItem::createExtender() {
diff --git a/adept/libadept/desktoplist.h b/adept/libadept/desktoplist.h
index 207b9a7..f072869 100644
--- a/adept/libadept/desktoplist.h
+++ b/adept/libadept/desktoplist.h
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qimage.h>
+#include <tqimage.h>
#include <klocale.h>
#include <apt-front/cache/entity/desktop.h>
@@ -13,7 +13,7 @@
#ifndef EPT_DESKTOPLIST_H
#define EPT_DESKTOPLIST_H
-class QPopupMenu;
+class TQPopupMenu;
namespace adept {
using namespace aptFront;
@@ -24,15 +24,16 @@ class DesktopItem;
class DesktopList : public ExtendableList, public cache::Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef utils::Range< entity::Desktop > Range;
- DesktopList( QWidget *parent = 0, const char *name = 0 );
+ DesktopList( TQWidget *tqparent = 0, const char *name = 0 );
void insertRange( Range );
- QPixmap emptyIcon() { return m_emptyIcon; }
+ TQPixmap emptyIcon() { return m_emptyIcon; }
void polishing();
void polished();
- void setTitle( QString s ) {
+ void setTitle( TQString s ) {
setColumnText( 0, i18n( "Application (" ) + s + i18n( ")" ) );
}
@@ -43,13 +44,13 @@ public:
emit request( p, a );
}
protected slots:
- void processClick( QListViewItem *, const QPoint &, int );
+ void processClick( TQListViewItem *, const TQPoint &, int );
signals:
void request( cache::entity::Package, cache::component::State::Action );
void showDescription( cache::entity::Desktop );
protected:
Range m_range;
- QPixmap m_emptyIcon;
+ TQPixmap m_emptyIcon;
int m_polishing;
bool m_displayCheckboxes;
};
@@ -57,8 +58,9 @@ protected:
class DesktopEntry : public DesktopEntryUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- DesktopEntry( QWidget * = 0, const char * = 0 );
+ DesktopEntry( TQWidget * = 0, const char * = 0 );
DesktopItem *item() const;
entity::Desktop entity() const;
void setItem( ExtendableItem * );
@@ -69,9 +71,9 @@ public:
public slots:
void toggled();
protected:
- virtual void mousePressEvent( QMouseEvent *e );
- virtual void mouseReleaseEvent( QMouseEvent *e );
- virtual void showEvent( QShowEvent * );
+ virtual void mousePressEvent( TQMouseEvent *e );
+ virtual void mouseReleaseEvent( TQMouseEvent *e );
+ virtual void showEvent( TQShowEvent * );
bool m_polished;
};
@@ -98,7 +100,7 @@ public:
DesktopList *list() { return dynamic_cast< DesktopList * >( listView() ); }
- QString text( int ) const { return QString( "you shouldn't see this" ); }
+ TQString text( int ) const { return TQString( "you shouldn't see this" ); }
entity::Desktop entity() const { return m_entity; }
void setEntity( entity::Desktop e ) { m_entity = e; }
diff --git a/adept/libadept/dpkgpm-gui.cpp b/adept/libadept/dpkgpm-gui.cpp
index 828d18f..9a3fae8 100644
--- a/adept/libadept/dpkgpm-gui.cpp
+++ b/adept/libadept/dpkgpm-gui.cpp
@@ -6,7 +6,7 @@
#include <fcntl.h>
#include <iostream>
-#include <qstrlist.h>
+#include <tqstrlist.h>
#include <kapplication.h>
#include <klistbox.h>
#include <klocale.h>
@@ -43,8 +43,8 @@ pkgPackageManager *PkgSystem::CreatePM( pkgDepCache *c ) const
{
std::cerr << "kapture::PkgSystem::CreatePM()" << std::endl;
adept::DPkgPM *pm = new adept::DPkgPM( c, m_terminalPart );
- connect( pm, SIGNAL( statusChanged( int, QString ) ),
- this, SIGNAL( statusChanged( int, QString ) ) );
+ connect( pm, TQT_SIGNAL( statusChanged( int, TQString ) ),
+ this, TQT_SIGNAL( statusChanged( int, TQString ) ) );
return pm;
}
@@ -57,17 +57,17 @@ bool DPkgPM::forkDpkg( char *const argv[] )
{
bool ok = true;
std::cerr << "adept::DPkgPM::forkDpkg ()" << std::endl;
- QStrList l;
+ TQStrList l;
for (int i = 0; argv[i]; i ++)
l.append( argv[i] );
m_processRunning = true;
- connect( m_terminalPart, SIGNAL( processExited( KProcess * ) ),
- this, SLOT( processExit( KProcess * ) ) );
- connect( m_terminalPart, SIGNAL( processExited( const KProcess * ) ),
- this, SLOT( processExitC( const KProcess * ) ) );
- connect( m_terminalPart, SIGNAL( forkedChild() ),
- this, SLOT( setupDpkgChild() ) );
+ connect( m_terminalPart, TQT_SIGNAL( processExited( KProcess * ) ),
+ this, TQT_SLOT( processExit( KProcess * ) ) );
+ connect( m_terminalPart, TQT_SIGNAL( processExited( const KProcess * ) ),
+ this, TQT_SLOT( processExitC( const KProcess * ) ) );
+ connect( m_terminalPart, TQT_SIGNAL( forkedChild() ),
+ this, TQT_SLOT( setupDpkgChild() ) );
terminal()->startProgram( u8( argv[0] ), l );
@@ -110,19 +110,19 @@ bool DPkgPM::forkScript (const char *cmd, bool fP)
SetCloseExec (m_scriptPipe[0], true);
SetCloseExec (m_scriptPipe[1], true);
}
- QStrList l;
+ TQStrList l;
l.append ("/bin/sh");
l.append ("-c");
l.append (cmd);
if (fP) {
- connect( m_terminalPart, SIGNAL( forkedChild() ),
- this, SLOT( setupScriptPipe() ) );
+ connect( m_terminalPart, TQT_SIGNAL( forkedChild() ),
+ this, TQT_SLOT( setupScriptPipe() ) );
}
- connect( m_terminalPart, SIGNAL( processExited( KProcess * ) ),
- this, SLOT( processExit( KProcess * ) ) );
- connect( m_terminalPart, SIGNAL( processExited( const KProcess * ) ),
- this, SLOT( processExitC( const KProcess * ) ) );
+ connect( m_terminalPart, TQT_SIGNAL( processExited( KProcess * ) ),
+ this, TQT_SLOT( processExit( KProcess * ) ) );
+ connect( m_terminalPart, TQT_SIGNAL( processExited( const KProcess * ) ),
+ this, TQT_SLOT( processExitC( const KProcess * ) ) );
m_processRunning = true;
terminal()->startProgram( u8( "/bin/sh" ), l);
@@ -183,7 +183,7 @@ bool DPkgPM::Go( int )
std::cerr << "kapture::DPkgPM::Go ()" << std::endl;
statusChanged( 0, i18n( "Preparing..." ) );
bool ret = aptFront::DPkgPM::Go(-1);
- QStrList l;
+ TQStrList l;
l.append("echo");
l.append("dpkg run finished!");
terminal()->startProgram( u8( "echo" ), l );
@@ -197,10 +197,10 @@ void DPkgPM::dpkgMonitor ()
kapp->processEvents();
}
-void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
+void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
{
std::string op, msg;
- aptFront::DPkgPM::updateStatus( pkg, ev, r );
+ aptFront::DPkgPM::updatetqStatus( pkg, ev, r );
entity::Package p = cache::Global::get().packages().packageByName( pkg );
if ( m_currentOp == OInstall ) {
@@ -245,12 +245,12 @@ void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
msg = u8( i18n( "Purged %1" ) );
}
- std::cerr << "updateStatus( " << pkg << ", " << ev << ", " << r << ")" << std::endl;
- std::cerr << "updateStatus: msg = " << msg << std::endl;
- std::cerr << "updateStatus: seen = " << m_seenOpCount
+ std::cerr << "updatetqStatus( " << pkg << ", " << ev << ", " << r << ")" << std::endl;
+ std::cerr << "updatetqStatus: msg = " << msg << std::endl;
+ std::cerr << "updatetqStatus: seen = " << m_seenOpCount
<< ", total = " << m_totalOpCount << std::endl;
statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount,
- u8( msg ).arg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
+ u8( msg ).tqarg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
}
}
diff --git a/adept/libadept/dpkgpm-gui.h b/adept/libadept/dpkgpm-gui.h
index 435ee7f..0c3ce26 100644
--- a/adept/libadept/dpkgpm-gui.h
+++ b/adept/libadept/dpkgpm-gui.h
@@ -19,9 +19,10 @@ class Part;
namespace adept {
-class PkgSystem : public QObject, public debSystem
+class PkgSystem : public TQObject, public debSystem
{
Q_OBJECT
+ TQ_OBJECT
public:
PkgSystem ();
virtual pkgPackageManager *CreatePM( pkgDepCache *Cache ) const;
@@ -32,12 +33,13 @@ public:
protected:
KParts::Part *m_terminalPart;
signals:
- void statusChanged( int p, QString m );
+ void statusChanged( int p, TQString m );
};
-class DPkgPM : public QObject, public aptFront::DPkgPM
+class DPkgPM : public TQObject, public aptFront::DPkgPM
{
Q_OBJECT
+ TQ_OBJECT
public:
DPkgPM (pkgDepCache *c, KParts::Part *t);
virtual bool forkDpkg (char *const argv[]);
@@ -45,7 +47,7 @@ public:
virtual bool Go (int);
virtual bool forkScript (const char *, bool);
ExtTerminalInterface *terminal();
- virtual void updateStatus( std::string pkg, std::string ev, std::string r );
+ virtual void updatetqStatus( std::string pkg, std::string ev, std::string r );
public slots:
void processExitC(const KProcess *p);
@@ -54,7 +56,7 @@ public slots:
void setupDpkgChild();
signals:
- void statusChanged( int p, QString m );
+ void statusChanged( int p, TQString m );
protected:
KParts::Part *m_terminalPart;
diff --git a/adept/libadept/dpkgpm.cpp b/adept/libadept/dpkgpm.cpp
index b38b5fb..c575a70 100644
--- a/adept/libadept/dpkgpm.cpp
+++ b/adept/libadept/dpkgpm.cpp
@@ -111,9 +111,9 @@ bool DPkgPM::forkDpkg (char *const argv[])
close( m_dpkgPipe[1] );
fcntl( m_dpkgPipe[0], F_SETFL, O_NONBLOCK );
- int Status = 0;
+ int tqStatus = 0;
int ret = 0;
- while ((ret = waitpid (Child, &Status, WNOHANG)) != Child) {
+ while ((ret = waitpid (Child, &tqStatus, WNOHANG)) != Child) {
if (errno == EINTR || ret == 0) {
dpkgMonitor ();
usleep (200000); // 0.2 second hang
@@ -130,14 +130,14 @@ bool DPkgPM::forkDpkg (char *const argv[])
signal(SIGINT,old_SIGINT);
// Check for an error code.
- if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
+ if (WIFEXITED(tqStatus) == 0 || WEXITSTATUS(tqStatus) != 0)
{
runScripts ("DPkg::Post-Invoke", false);
- if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV)
+ if (WIFSIGNALED(tqStatus) != 0 && WTERMSIG(tqStatus) == SIGSEGV)
return _error->Error("Sub-process %s received a segmentation fault.", argv [0]);
- if (WIFEXITED(Status) != 0)
- return _error->Error("Sub-process %s returned an error code (%u)", argv[0], WEXITSTATUS(Status));
+ if (WIFEXITED(tqStatus) != 0)
+ return _error->Error("Sub-process %s returned an error code (%u)", argv[0], WEXITSTATUS(tqStatus));
return _error->Error("Sub-process %s exited unexpectedly", argv[0]);
}
@@ -291,40 +291,40 @@ void DPkgPM::dpkgMonitor ()
// parse status updates from dpkg
while ( true ) {
- std::string::size_type colon, nl = b.find( '\n' );
+ std::string::size_type colon, nl = b.tqfind( '\n' );
m_statusBuffer.append( string( b, 0, nl ) );
if ( nl == std::string::npos )
break;
// cerr << "dpkg status completed line: " << m_statusBuffer << endl;
- colon = m_statusBuffer.find( ": " );
+ colon = m_statusBuffer.tqfind( ": " );
string l( m_statusBuffer, 0, colon );
string r( m_statusBuffer, colon + 2, string::npos );
if ( l == "status" ) {
- colon = r.find( ": " );
+ colon = r.tqfind( ": " );
std::string p( r, 0, colon );
r = string( r, colon + 2, string::npos );
- colon = r.find( ": " );
+ colon = r.tqfind( ": " );
std::string e( r, 0, colon );
if ( colon == string::npos )
r = "";
else
r = string( r, colon + 2, string::npos );
- updateStatus( p, e, r );
+ updatetqStatus( p, e, r );
}
b = string( b, nl + 1, string::npos );
m_statusBuffer = string();
- nl = b.find( '\n' );
+ nl = b.tqfind( '\n' );
}
}
}
-void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
+void DPkgPM::updatetqStatus( std::string pkg, std::string ev, std::string r )
{
- OpAndStatus os = std::make_pair( m_currentOp, ev );
+ OpAndtqStatus os = std::make_pair( m_currentOp, ev );
if ( m_seenOps[ std::make_pair( os, pkg ) ] == 0 ) {
m_seenOpCount++;
m_seenOps[ std::make_pair( os, pkg ) ] = 1;
@@ -348,7 +348,7 @@ bool DPkgPM::runScripts (const char *Cnf, bool sP)
// Determine the protocol version
string OptSec = Opts->Value;
string::size_type Pos;
- if ((Pos = OptSec.find(' ')) == string::npos || Pos == 0)
+ if ((Pos = OptSec.tqfind(' ')) == string::npos || Pos == 0)
Pos = OptSec.length();
OptSec = "DPkg::Tools::Options::" + string(Opts->Value.c_str(),Pos);
diff --git a/adept/libadept/dpkgpm.h b/adept/libadept/dpkgpm.h
index b899693..37e9001 100644
--- a/adept/libadept/dpkgpm.h
+++ b/adept/libadept/dpkgpm.h
@@ -21,8 +21,8 @@ protected:
int m_scriptPipe[2];
unsigned m_version;
std::string m_statusBuffer;
- typedef std::pair< Op, std::string > OpAndStatus;
- typedef std::map< std::pair< OpAndStatus, std::string >, int > SeenOps;
+ typedef std::pair< Op, std::string > OpAndtqStatus;
+ typedef std::map< std::pair< OpAndtqStatus, std::string >, int > SeenOps;
SeenOps m_seenOps;
int m_totalOpCount;
int m_seenOpCount;
@@ -39,7 +39,7 @@ public:
virtual void dpkgMonitor (void);
virtual bool SendV1Pkgs (FILE *);
virtual bool feedPackages (void);
- virtual void updateStatus( std::string pkg, std::string ev, std::string r );
+ virtual void updatetqStatus( std::string pkg, std::string ev, std::string r );
};
}
diff --git a/adept/libadept/easytagfilter.cpp b/adept/libadept/easytagfilter.cpp
index 4fa593b..be44b76 100644
--- a/adept/libadept/easytagfilter.cpp
+++ b/adept/libadept/easytagfilter.cpp
@@ -2,15 +2,15 @@
#include <apt-front/predicate/factory.h>
#include <klocale.h>
#include <kdebug.h>
-#include <qcombobox.h>
-#include <qpushbutton.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
#include "easytagfilter.h"
using namespace aptFront;
using namespace adept;
using namespace Tagcoll;
-static void fillCombo( QComboBox *c, const std::string f ) {
+static void fillCombo( TQComboBox *c, const std::string f ) {
Cache &cache = cache::Global::get(); // FIXME?
OpSet< entity::Tag > t;
t = cache.tags().tags( f );
@@ -19,26 +19,26 @@ static void fillCombo( QComboBox *c, const std::string f ) {
}
}
-EasyTagFilterWidget::EasyTagFilterWidget( QWidget *parent, const char *name )
- : EasyTagFilterUi( parent, name )
+EasyTagFilterWidget::EasyTagFilterWidget( TQWidget *tqparent, const char *name )
+ : EasyTagFilterUi( tqparent, name )
{
fillCombo( m_use, "use" );
fillCombo( m_interface, "interface" );
fillCombo( m_worksWith, "works-with" );
fillCombo( m_role, "role" );
- connect( m_use, SIGNAL( activated( int ) ),
- this, SLOT( widgetsChanged() ) );
- connect( m_interface, SIGNAL( activated( int ) ),
- this, SLOT( widgetsChanged() ) );
- connect( m_worksWith, SIGNAL( activated( int ) ),
- this, SLOT( widgetsChanged() ) );
- connect( m_role, SIGNAL( activated( int ) ),
- this, SLOT( widgetsChanged() ) );
- connect( m_reset, SIGNAL( clicked() ),
- this, SLOT( reset() ) );
+ connect( m_use, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( m_interface, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( m_worksWith, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( m_role, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( m_reset, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( reset() ) );
}
-static void setFacet( QComboBox *c, const std::string fac,
+static void setFacet( TQComboBox *c, const std::string fac,
EasyTagFilter< entity::Package > &f )
{
if (c->currentItem())
@@ -55,7 +55,7 @@ EasyTagFilterWidget::Predicate EasyTagFilterWidget::predicate()
return predicate::adapt< entity::Entity >( f );
}
-static void setCombo( QComboBox *c, const std::string &t ) {
+static void setCombo( TQComboBox *c, const std::string &t ) {
c->blockSignals( true );
if (t == "")
c->setCurrentItem( 0 );
diff --git a/adept/libadept/easytagfilter.h b/adept/libadept/easytagfilter.h
index edbe8b5..a7ed4f2 100644
--- a/adept/libadept/easytagfilter.h
+++ b/adept/libadept/easytagfilter.h
@@ -4,7 +4,7 @@
*/
#include <klocale.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <apt-front/cache/entity/entity.h>
@@ -80,8 +80,9 @@ protected:
class EasyTagFilterWidget : public EasyTagFilterUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- EasyTagFilterWidget( QWidget *parent, const char *name = 0 );
+ EasyTagFilterWidget( TQWidget *tqparent, const char *name = 0 );
virtual Predicate predicate();
public slots:
void predicateChanged();
diff --git a/adept/libadept/easytagfilterui.ui b/adept/libadept/easytagfilterui.ui
index 998bf2b..f1e40d5 100644
--- a/adept/libadept/easytagfilterui.ui
+++ b/adept/libadept/easytagfilterui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>EasyTagFilterUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>1</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_title</cstring>
</property>
@@ -41,9 +41,9 @@
<string>&lt;b&gt;Easy Tag Filter&lt;/b&gt;</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -59,22 +59,22 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="2">
+ <widget class="TQLabel" row="1" column="2">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -82,7 +82,7 @@
<string>Works With:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -90,7 +90,7 @@
<string>Role:</string>
</property>
</widget>
- <widget class="QComboBox" row="1" column="3">
+ <widget class="TQComboBox" row="1" column="3">
<item>
<property name="text">
<string>Anything</string>
@@ -100,7 +100,7 @@
<cstring>m_worksWith</cstring>
</property>
</widget>
- <widget class="QPushButton" row="1" column="4">
+ <widget class="TQPushButton" row="1" column="4">
<property name="name">
<cstring>m_reset</cstring>
</property>
@@ -108,7 +108,7 @@
<string>Reset Filter</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="3">
+ <widget class="TQComboBox" row="0" column="3">
<item>
<property name="text">
<string>Any</string>
@@ -118,7 +118,7 @@
<cstring>m_interface</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -126,7 +126,7 @@
<string>Use:</string>
</property>
</widget>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>Any</string>
@@ -136,7 +136,7 @@
<cstring>m_use</cstring>
</property>
</widget>
- <widget class="QComboBox" row="1" column="1">
+ <widget class="TQComboBox" row="1" column="1">
<item>
<property name="text">
<string>Any</string>
@@ -146,7 +146,7 @@
<cstring>m_role</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -197,5 +197,5 @@
<includes>
<include location="global" impldecl="in declaration">adept/filterlist.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/libadept/extendablelist.cpp b/adept/libadept/extendablelist.cpp
index 55d1013..215c155 100644
--- a/adept/libadept/extendablelist.cpp
+++ b/adept/libadept/extendablelist.cpp
@@ -1,8 +1,8 @@
#include <kdebug.h>
-#include <qtimer.h>
-#include <qobjectlist.h>
-#include <qpainter.h>
-#include <qimage.h>
+#include <tqtimer.h>
+#include <tqobjectlist.h>
+#include <tqpainter.h>
+#include <tqimage.h>
#include <kiconeffect.h>
#include <kiconloader.h>
@@ -11,7 +11,7 @@
using namespace adept;
-ExtendableList::ExtendableList( QWidget *p, const char *n )
+ExtendableList::ExtendableList( TQWidget *p, const char *n )
: KListView( p, n ),
m_toggleColumn( 0 ), m_inDtor( false ),
m_extenderUpdateScheduled( false ),
@@ -19,32 +19,32 @@ ExtendableList::ExtendableList( QWidget *p, const char *n )
m_extenderHighlight( false )
{
// kdDebug() << "connecting processClick har har" << endl;
- connect( this, SIGNAL( clicked( QListViewItem *,
- const QPoint &, int ) ),
- this, SLOT( processClick( QListViewItem *,
- const QPoint &, int ) ) );
- connect( this, SIGNAL( moved() ),
- this, SLOT( delayedUpdateExtenders() ) );
- connect( this, SIGNAL( collapsed( QListViewItem * ) ),
- this, SLOT( delayedUpdateExtenders() ) );
- connect( this, SIGNAL( expanded( QListViewItem * ) ),
- this, SLOT( delayedUpdateExtenders() ) );
+ connect( this, TQT_SIGNAL( clicked( TQListViewItem *,
+ const TQPoint &, int ) ),
+ this, TQT_SLOT( processClick( TQListViewItem *,
+ const TQPoint &, int ) ) );
+ connect( this, TQT_SIGNAL( moved() ),
+ this, TQT_SLOT( delayedUpdateExtenders() ) );
+ connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
+ this, TQT_SLOT( delayedUpdateExtenders() ) );
+ connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ),
+ this, TQT_SLOT( delayedUpdateExtenders() ) );
setTreeStepSize( 15 );
m_baseIcon = SmallIcon( u8( "extender_closed" ) );
m_extendedIcon = SmallIcon( u8( "extender_opened" ) );
- QImage img;
+ TQImage img;
img = m_baseIcon;
KIconEffect::toGray( img, 1.0 );
- m_unextendableIcon = QPixmap( img );
+ m_unextendableIcon = TQPixmap( img );
}
-void ExtendableList::keyPressEvent( QKeyEvent *e ) {
+void ExtendableList::keyPressEvent( TQKeyEvent *e ) {
ExtendableItem *item = dynamic_cast< ExtendableItem* >( currentItem() );
if ( item && item->extendable() ) {
- if ( item->extender() && e->key() == Qt::Key_Left ) {
+ if ( item->extender() && e->key() == TQt::Key_Left ) {
return item->hideExtender();
- } else if ( !item->extender() && e->key() == Qt::Key_Right ) {
+ } else if ( !item->extender() && e->key() == TQt::Key_Right ) {
return item->showExtender();
}
}
@@ -52,7 +52,7 @@ void ExtendableList::keyPressEvent( QKeyEvent *e ) {
}
void ExtendableList::openToplevel() {
- QListViewItem *i;
+ TQListViewItem *i;
for ( i = firstChild(); i != 0; i = i->nextSibling() ) {
i->setOpen( true );
}
@@ -73,7 +73,7 @@ int ExtendableList::extenderOffset( ExtendableItem *i )
x += i->pixmap( m_toggleColumn )->width();
if ( rootIsDecorated() )
x += treeStepSize();
- if ( i->parent() )
+ if ( i->tqparent() )
x += treeStepSize();
}
@@ -85,16 +85,16 @@ void ExtendableList::updateExtender( ExtendableItem *i )
// setUpdatesEnabled( false );
// since updateGeometries is private, we use this dirty trick to
- // get at it (since setContentsPos in QListView calls it
+ // get at it (since setContentsPos in TQListView calls it
setContentsPos( contentsX(), contentsY() );
- if ( !i->isVisible() || ( i->parent() && !i->parent()->isOpen() ) ) {
+ if ( !i->isVisible() || ( i->tqparent() && !i->tqparent()->isOpen() ) ) {
kdDebug() << "hiding invisible item's extender" << endl;
i->hideExtender();
return;
}
- // QRect rect = itemRect( i );
+ // TQRect rect = tqitemRect( i );
addChild( i->extender(), extenderOffset( i ), itemPos( i ) );
// addChild( i->extender(), x, rect.y() );
i->extender()->show();
@@ -102,15 +102,15 @@ void ExtendableList::updateExtender( ExtendableItem *i )
i->extender()->height() );
if ( i->height() != i->extender()->frameSize().height() ) {
i->setHeight( i->extender()->frameSize().height() );
- delayedUpdateExtenders(); // re-update since we broke layout
+ delayedUpdateExtenders(); // re-update since we broke tqlayout
}
i->extender()->setupColors();
// setUpdatesEnabled( true );
// addChild( i->extender(), x, itemPos( i ) );
- // QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) );
- // QTimer::singleShot( 0, i->extender(), SLOT( setupColors() ) );
+ // TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) );
+ // TQTimer::singleShot( 0, i->extender(), TQT_SLOT( setupColors() ) );
}
void ExtendableList::delayedUpdateExtenders()
@@ -119,7 +119,7 @@ void ExtendableList::delayedUpdateExtenders()
return;
m_extenderUpdateScheduled = true;
// kdDebug() << "ExtendableList::delayedUpdateExtenders()" << endl;
- QTimer::singleShot( 0, this, SLOT( updateExtenders() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateExtenders() ) );
}
void ExtendableList::clear()
@@ -135,13 +135,13 @@ void ExtendableList::show()
updateExtenders();
}
-void ExtendableList::showEvent( QShowEvent *e )
+void ExtendableList::showEvent( TQShowEvent *e )
{
KListView::showEvent( e );
updateExtenders();
}
-void ExtendableList::resizeEvent( QResizeEvent *e )
+void ExtendableList::resizeEvent( TQResizeEvent *e )
{
KListView::resizeEvent( e );
updateExtenders();
@@ -154,7 +154,7 @@ void ExtendableList::updateExtenders()
setUpdatesEnabled( false );
// updateGeometries();
// since updateGeometries is private, we use this dirty trick to
- // get at it (since setContentsPos in QListView calls it
+ // get at it (since setContentsPos in TQListView calls it
setContentsPos( contentsX(), contentsY() );
extendersChanged();
kdDebug() << "ExtendableList::updateExtenders(); count = "
@@ -171,10 +171,10 @@ void ExtendableList::updateExtenders()
setUpdatesEnabled( true );
// triggerUpdate();
if ( !m_extenderUpdateScheduled )
- QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) );
/* if ( m_extenders.empty() )
- QTimer::singleShot( 0, this, SLOT( triggerUpdate() ) ); */
- // QTimer::singleShot( 0, this, SIGNAL( extendersChanged() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( triggerUpdate() ) ); */
+ // TQTimer::singleShot( 0, this, TQT_SIGNAL( extendersChanged() ) );
}
void ExtendableList::addExtender( ExtendableItem *item )
@@ -197,8 +197,8 @@ void ExtendableList::removeExtender( ExtendableItem *i )
delayedUpdateExtenders();
}
-void ExtendableList::processClick( QListViewItem *it,
- const QPoint &pt, int c )
+void ExtendableList::processClick( TQListViewItem *it,
+ const TQPoint &pt, int c )
{
// if (! it) return;
ExtendableItem *item = dynamic_cast< ExtendableItem* >( it );
@@ -231,14 +231,14 @@ bool ExtendableItem::s_less(
return a->less( b );
}
-int ExtendableItem::compare( QListViewItem *i, int c, bool asc ) const
+int ExtendableItem::compare( TQListViewItem *i, int c, bool asc ) const
{
ExtendableItem *o = dynamic_cast< ExtendableItem * >( i );
return int( o->less( this ) ) - int( less( o ) );
}
void ExtendableItem::updateIcon() {
- QPixmap p;
+ TQPixmap p;
if ( !extender() ) {
p = list()->baseIcon();
if ( !extendable() && !firstChild() ) {
@@ -250,8 +250,8 @@ void ExtendableItem::updateIcon() {
setPixmap( list()->toggleColumn(), p );
// umm hack
- if ( dynamic_cast< ExtendableItem * >( parent() ) )
- dynamic_cast< ExtendableItem * >( parent() )->updateIcon();
+ if ( dynamic_cast< ExtendableItem * >( tqparent() ) )
+ dynamic_cast< ExtendableItem * >( tqparent() )->updateIcon();
}
@@ -276,8 +276,8 @@ void ExtendableItem::toggleExtender()
updateIcon();
}
-void ExtendableItem::paintBranches( QPainter *p,
- const QColorGroup &cg, int w, int y, int h )
+void ExtendableItem::paintBranches( TQPainter *p,
+ const TQColorGroup &cg, int w, int y, int h )
{
/* if (!isAlternate())
p->setBackgroundColor(
@@ -286,34 +286,34 @@ void ExtendableItem::paintBranches( QPainter *p,
p->eraseRect( 0, 0, w, h );
}
-/* void ExtendableItem::paintCell( QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment )
+/* void ExtendableItem::paintCell( TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment )
{
- QPixmap pm( width, height() );
- QPainter _p( &pm );
- KListViewItem::paintCell( &_p, cg, column, width, alignment );
+ TQPixmap pm( width, height() );
+ TQPainter _p( &pm );
+ KListViewItem::paintCell( &_p, cg, column, width, tqalignment );
p->drawPixmap( 0, 0, pm );
} */
-static void setcolor( QWidget *w, ExtendableItem *i ) {
+static void setcolor( TQWidget *w, ExtendableItem *i ) {
if ( i->isSelected() && i->list()->extenderHighlight() )
- w->setPaletteBackgroundColor( w->colorGroup().highlight() );
+ w->setPaletteBackgroundColor( w->tqcolorGroup().highlight() );
else if ( i->isAlternate() )
w->setPaletteBackgroundColor(
KGlobalSettings::alternateBackgroundColor() );
else
- w->setPaletteBackgroundColor( w->colorGroup().base() );
- // w->setBackgroundMode( QWidget::PaletteBase );
+ w->setPaletteBackgroundColor( w->tqcolorGroup().base() );
+ // w->setBackgroundMode( TQWidget::PaletteBase );
}
void ItemExtender::setupColors()
{
if ( !item() ) return;
setcolor( this, item() );
- QObjectList *chld = queryList( "QWidget" );
- QObjectListIt it( *chld );
- QWidget *o;
- while ((o = dynamic_cast< QWidget * >( it.current() )) != 0) {
+ TQObjectList *chld = queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectListIt it( *chld );
+ TQWidget *o;
+ while ((o = dynamic_cast< TQWidget * >( it.current() )) != 0) {
setcolor( o, item() );
++it;
}
diff --git a/adept/libadept/extendablelist.h b/adept/libadept/extendablelist.h
index 53a901b..8836fbe 100644
--- a/adept/libadept/extendablelist.h
+++ b/adept/libadept/extendablelist.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
#include <klistview.h>
-#include <qpixmap.h>
-#include <qlayout.h>
+#include <tqpixmap.h>
+#include <tqlayout.h>
#include <kglobalsettings.h>
#include <vector>
@@ -19,14 +19,15 @@ class ItemExtender;
class ExtendableList : public KListView {
Q_OBJECT
+ TQ_OBJECT
public:
typedef bool(*ItemCompare)( const ExtendableItem *,
const ExtendableItem * );
- ExtendableList( QWidget *p = 0, const char *n = 0 );
+ ExtendableList( TQWidget *p = 0, const char *n = 0 );
virtual ~ExtendableList();
- QPixmap extendedIcon() { return m_extendedIcon; }
- QPixmap baseIcon() { return m_baseIcon; }
- QPixmap unextendableIcon() { return m_unextendableIcon; }
+ TQPixmap extendedIcon() { return m_extendedIcon; }
+ TQPixmap baseIcon() { return m_baseIcon; }
+ TQPixmap unextendableIcon() { return m_unextendableIcon; }
int extenderOffset( ExtendableItem *i );
void setExtenderHighlight( bool e ) { m_extenderHighlight = e; }
bool extenderHighlight() { return m_extenderHighlight; }
@@ -46,17 +47,17 @@ public slots:
return utils::range( m_extenders.begin(), m_extenders.end() ); }
void openToplevel();
protected slots:
- void processClick( QListViewItem *, const QPoint &, int );
+ void processClick( TQListViewItem *, const TQPoint &, int );
signals:
void extendersChanged();
protected:
- virtual void resizeEvent( QResizeEvent * );
- virtual void showEvent( QShowEvent * );
- virtual void keyPressEvent( QKeyEvent * );
+ virtual void resizeEvent( TQResizeEvent * );
+ virtual void showEvent( TQShowEvent * );
+ virtual void keyPressEvent( TQKeyEvent * );
std::vector< ExtendableItem * > m_extenders;
- QPixmap m_extendedIcon;
- QPixmap m_baseIcon;
- QPixmap m_unextendableIcon;
+ TQPixmap m_extendedIcon;
+ TQPixmap m_baseIcon;
+ TQPixmap m_unextendableIcon;
int m_toggleColumn;
bool m_inDtor:1;
bool m_extenderUpdateScheduled:1;
@@ -107,12 +108,12 @@ public:
virtual void updateIcon();
- virtual void paintBranches( QPainter *, const QColorGroup &, int, int, int );
+ virtual void paintBranches( TQPainter *, const TQColorGroup &, int, int, int );
virtual ItemExtender *createExtender() = 0;
virtual bool extendable() const { return false; }
virtual bool less( const ExtendableItem * ) const = 0;
- virtual int compare( QListViewItem *other, int col, bool ascending ) const;
+ virtual int compare( TQListViewItem *other, int col, bool ascending ) const;
virtual ~ExtendableItem();
virtual void setHeight( int h ) { KListViewItem::setHeight( h ); }
@@ -120,12 +121,13 @@ protected:
ItemExtender *m_extender;
};
-class ItemExtender : public QWidget {
+class ItemExtender : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
// ItemExtender( ExtendableItem *item );
- ItemExtender( QWidget *parent, const char *n )
- : QWidget( parent, n ), m_item( 0 )
+ ItemExtender( TQWidget *tqparent, const char *n )
+ : TQWidget( tqparent, n ), m_item( 0 )
{}
virtual void setItem( ExtendableItem *i ) {
@@ -142,19 +144,19 @@ public:
void resize( int w, int h ) {
setUpdatesEnabled( false );
- QWidget::resize( w, h );
+ TQWidget::resize( w, h );
setUpdatesEnabled( true );
- QWidget::resize( w, layout()->minimumSize().height() );
+ TQWidget::resize( w, tqlayout()->tqminimumSize().height() );
}
- void resize( const QSize &s ) {
+ void resize( const TQSize &s ) {
resize( s.width(), s.height() );
}
public slots:
void setupColors();
protected:
- virtual void mouseReleaseEvent( QMouseEvent *e ) {
+ virtual void mouseReleaseEvent( TQMouseEvent *e ) {
e->accept();
} // throw away mouse clicks :-)
ExtendableItem *m_item;
diff --git a/adept/libadept/filterlist.cpp b/adept/libadept/filterlist.cpp
index 7d4a1b0..fa054e1 100644
--- a/adept/libadept/filterlist.cpp
+++ b/adept/libadept/filterlist.cpp
@@ -1,6 +1,6 @@
#include <kdebug.h>
-#include <qpopupmenu.h>
-#include <qheader.h>
+#include <tqpopupmenu.h>
+#include <tqheader.h>
#include <klineedit.h>
#include <tagcoll/InputMerger.h>
@@ -35,7 +35,7 @@ public:
}
};
-PredicateInterface::PredicateInterface( QWidget *w, const char *n )
+PredicateInterface::PredicateInterface( TQWidget *w, const char *n )
: ItemExtender( w, n )
{
}
@@ -48,8 +48,8 @@ void PredicateInterface::widgetsChanged() {
downcast< FilterItem >( item() ).setPredicate( m_pred );
}
-FilterList::FilterList( QWidget *parent, const char *name )
- : ExtendableList( parent, name ),
+FilterList::FilterList( TQWidget *tqparent, const char *name )
+ : ExtendableList( tqparent, name ),
m_pred( predicate::True< entity::Entity >() ),
m_hidden( predicate::True< entity::Entity >() )
{
@@ -64,13 +64,13 @@ FilterList::FilterList( QWidget *parent, const char *name )
setAllColumnsShowFocus (true);
resize( 240, 180 );
- connect( this, SIGNAL(
- contextMenuRequested( QListViewItem *, const QPoint
+ connect( this, TQT_SIGNAL(
+ contextMenuRequested( TQListViewItem *, const TQPoint
&, int ) ),
- this, SLOT( contextMenu( QListViewItem *, const
- QPoint &, int) ) );
- connect( this, SIGNAL( extendersChanged() ),
- this, SLOT( updateHeight() ) );
+ this, TQT_SLOT( contextMenu( TQListViewItem *, const
+ TQPoint &, int) ) );
+ connect( this, TQT_SIGNAL( extendersChanged() ),
+ this, TQT_SLOT( updateHeight() ) );
}
void FilterList::emitPredicateChanged() {
@@ -79,7 +79,7 @@ void FilterList::emitPredicateChanged() {
void FilterList::updateHeight() {
int h = header()->height() + 4;
- for ( QListViewItem *i = firstChild(); i != 0; i = i->nextSibling() ) {
+ for ( TQListViewItem *i = firstChild(); i != 0; i = i->nextSibling() ) {
h += i->totalHeight();
}
// int h = contentsHeight() + header()->height() + 4; // magic constant
@@ -87,7 +87,7 @@ void FilterList::updateHeight() {
setMaximumHeight( h );
}
-void FilterList::drawContents( QPainter *p, int a, int b, int c, int d ) {
+void FilterList::drawContents( TQPainter *p, int a, int b, int c, int d ) {
if ( m_itemsSeen != childCount() ) {
m_itemsSeen = childCount();
updateHeight();
@@ -97,8 +97,8 @@ void FilterList::drawContents( QPainter *p, int a, int b, int c, int d ) {
void FilterList::plugLister( Lister *l ) {
m_lister = l;
- connect( this, SIGNAL( predicateChanged( ListerPredicate ) ),
- l, SLOT( baseSet( ListerPredicate ) ) );
+ connect( this, TQT_SIGNAL( predicateChanged( ListerPredicate ) ),
+ l, TQT_SLOT( baseSet( ListerPredicate ) ) );
}
void FilterList::setPredicate( Predicate p ) {
@@ -142,13 +142,13 @@ void FilterList::appendPredicate( Predicate p ) {
}
}
-void FilterList::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
+void FilterList::contextMenu( TQListViewItem *it, const TQPoint &pt, int /*c*/ )
{
std::cerr << "FilterList::contextMenu(p);" << std::endl;
FilterItem *i = dynamic_cast< FilterItem * >( it );
if (! i)
return;
- QPopupMenu *m = new QPopupMenu( this );
+ TQPopupMenu *m = new TQPopupMenu( this );
m->insertItem( i18n( "Reset Filter" ), 1 );
m->insertItem( i18n( "Remove Filter" ), 0 );
m->insertSeparator();
@@ -158,7 +158,7 @@ void FilterList::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
m->insertItem( i18n( "Add Easy Tag Filter" ), 11 );
// m->insertItem( "Add Tag Filter", tagMenu() );
m_context = i;
- connect(m, SIGNAL(activated(int)), this, SLOT(contextActivated(int)));
+ connect(m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(contextActivated(int)));
m->exec(pt);
delete m;
}
@@ -215,15 +215,15 @@ ItemExtender *FilterItem::createExtender()
}
if (o) {
o->setPredicate( m_pred );
- QObject::connect( o, SIGNAL( predicateAdd( Predicate ) ),
- list(), SLOT( editorPredicateAdd( Predicate ) ) );
- QObject::connect( o, SIGNAL( predicateDrop( Predicate ) ),
- list(), SLOT( editorPredicateDrop( Predicate ) ) );
+ TQObject::connect( o, TQT_SIGNAL( predicateAdd( Predicate ) ),
+ list(), TQT_SLOT( editorPredicateAdd( Predicate ) ) );
+ TQObject::connect( o, TQT_SIGNAL( predicateDrop( Predicate ) ),
+ list(), TQT_SLOT( editorPredicateDrop( Predicate ) ) );
}
return o;
}
-QString FilterItem::text( int c ) const {
+TQString FilterItem::text( int c ) const {
InterfacingPredicate &ip = downcast< InterfacingPredicate >( m_pred.impl() );
if (c == 0)
return ip.summary();
diff --git a/adept/libadept/filterlist.h b/adept/libadept/filterlist.h
index f904bc7..bf95c49 100644
--- a/adept/libadept/filterlist.h
+++ b/adept/libadept/filterlist.h
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qtooltip.h>
+#include <tqtooltip.h>
#include <kdebug.h>
#include <apt-front/predicate/matchers.h>
@@ -19,7 +19,7 @@
#ifndef EPT_FILTERLIST_H
#define EPT_FILTERLIST_H
-class QPopupMenu;
+class TQPopupMenu;
namespace adept {
using namespace aptFront;
@@ -39,9 +39,10 @@ signals:
class PredicateInterface: public ItemExtender
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef predicate::Predicate< entity::Entity > Predicate;
- PredicateInterface( QWidget *w = 0, const char *n = 0 );
+ PredicateInterface( TQWidget *w = 0, const char *n = 0 );
virtual Predicate predicate() = 0;
signals:
void predicateAdd( Predicate );
@@ -62,11 +63,12 @@ class FilterItem;
class FilterList : public ExtendableList
{
Q_OBJECT
+ TQ_OBJECT
public:
friend class FilterItem;
typedef predicate::Predicate< entity::Entity > Predicate;
// typedef std::map< KListViewItem *, Predicate > Map;
- FilterList( QWidget *parent = 0, const char *name = 0 );
+ FilterList( TQWidget *tqparent = 0, const char *name = 0 );
typedef predicate::And< entity::Entity > And;
void appendPredicate( Predicate p );
void plugLister( Lister *l );
@@ -79,13 +81,13 @@ public slots:
protected slots:
void editorPredicateDrop( Predicate );
void editorPredicateAdd( Predicate );
- void contextMenu( QListViewItem *, const QPoint &, int );
- // QPopupMenu *tagMenu();
+ void contextMenu( TQListViewItem *, const TQPoint &, int );
+ // TQPopupMenu *tagMenu();
void contextActivated( int );
// void tagMenuActivated( int );
void updateHeight();
protected:
- void drawContents( QPainter *, int, int, int, int );
+ void drawContents( TQPainter *, int, int, int, int );
Predicate m_pred;
Predicate m_hidden;
FilterItem *m_context;
@@ -111,7 +113,7 @@ public:
showExtender();
}
- QString text( int ) const;
+ TQString text( int ) const;
virtual bool less( const ExtendableItem *other ) const {
const FilterItem *o = dynamic_cast< const FilterItem * >( other );
diff --git a/adept/libadept/filtersidebar.h b/adept/libadept/filtersidebar.h
index 0fac201..f9e9c66 100644
--- a/adept/libadept/filtersidebar.h
+++ b/adept/libadept/filtersidebar.h
@@ -13,8 +13,9 @@ namespace adept {
class FilterSidebar : public FilterSidebarUi {
Q_OBJECT
+ TQ_OBJECT
public:
- FilterSidebar( QWidget *p = 0, const char *n = 0 )
+ FilterSidebar( TQWidget *p = 0, const char *n = 0 )
: FilterSidebarUi( p, n )
{}
public slots:
diff --git a/adept/libadept/filtersidebarui.ui b/adept/libadept/filtersidebarui.ui
index 0f2efb4..798680b 100644
--- a/adept/libadept/filtersidebarui.ui
+++ b/adept/libadept/filtersidebarui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>adept::FilterSidebarUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>adept::FilterSidebarUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,11 +25,11 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QTabWidget" row="0" column="0">
+ <widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>m_tabs</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab0</cstring>
</property>
@@ -50,7 +50,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab1</cstring>
</property>
@@ -71,7 +71,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab2</cstring>
</property>
@@ -112,7 +112,7 @@
</sizepolicy>
</customwidget>
</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>adept/tagchooser.h</includehint>
</includehints>
diff --git a/adept/libadept/filterwidget.cpp b/adept/libadept/filterwidget.cpp
index f294327..1adf827 100644
--- a/adept/libadept/filterwidget.cpp
+++ b/adept/libadept/filterwidget.cpp
@@ -8,12 +8,12 @@ using namespace aptFront;
using namespace adept;
void FilterWidget::connectLister( Lister *l ) {
- connect( this, SIGNAL( drop( ListerPredicate ) ),
- l, SLOT( interactiveDrop( ListerPredicate ) ) );
- connect( this, SIGNAL( changed( ListerPredicate ) ),
- l, SLOT( interactiveAnd( ListerPredicate ) ) );
- connect( this, SIGNAL( apply( ListerPredicate ) ),
- l, SLOT( baseAnd( ListerPredicate ) ) );
+ connect( this, TQT_SIGNAL( drop( ListerPredicate ) ),
+ l, TQT_SLOT( interactiveDrop( ListerPredicate ) ) );
+ connect( this, TQT_SIGNAL( changed( ListerPredicate ) ),
+ l, TQT_SLOT( interactiveAnd( ListerPredicate ) ) );
+ connect( this, TQT_SIGNAL( apply( ListerPredicate ) ),
+ l, TQT_SLOT( baseAnd( ListerPredicate ) ) );
}
diff --git a/adept/libadept/filterwidget.h b/adept/libadept/filterwidget.h
index 78b0c38..ba7141e 100644
--- a/adept/libadept/filterwidget.h
+++ b/adept/libadept/filterwidget.h
@@ -14,12 +14,13 @@ class KLineEdit;
namespace adept {
-class FilterWidget : public QWidget
+class FilterWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- FilterWidget( QWidget *parent = 0, const char *n = 0 )
- : QWidget( parent, n ) {}
+ FilterWidget( TQWidget *tqparent = 0, const char *n = 0 )
+ : TQWidget( tqparent, n ) {}
virtual ListerPredicate predicate() = 0;
void connectLister( Lister *l );
protected slots:
diff --git a/adept/libadept/groupeddesktopselector.cpp b/adept/libadept/groupeddesktopselector.cpp
index 68afa98..3edc87d 100644
--- a/adept/libadept/groupeddesktopselector.cpp
+++ b/adept/libadept/groupeddesktopselector.cpp
@@ -3,10 +3,10 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qobjectlist.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qtimer.h>
+#include <tqobjectlist.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <kseparator.h>
@@ -22,15 +22,15 @@ using namespace cache;
namespace adept {
-GroupedDesktopSelector::GroupedDesktopSelector( QWidget *p, const char *n )
+GroupedDesktopSelector::GroupedDesktopSelector( TQWidget *p, const char *n )
: KJanusWidget( p, n, IconList ), m_policy( 0 )
{
observeComponent< cache::component::Packages >();
- m_pages.push_back( addPage( QString( "Initializing..." ) ) );
- QObjectList *chld = queryList( "QWidget" );
- QObjectListIt it( *chld ); QWidget *o;
- while ((o = dynamic_cast< QWidget * >( it.current() )) != 0) {
- if ( dynamic_cast< QLabel * >( o ) != 0 )
+ m_pages.push_back( addPage( TQString( "Initializing..." ) ) );
+ TQObjectList *chld = queryList( TQWIDGET_OBJECT_NAME_STRING );
+ TQObjectListIt it( *chld ); TQWidget *o;
+ while ((o = dynamic_cast< TQWidget * >( it.current() )) != 0) {
+ if ( dynamic_cast< TQLabel * >( o ) != 0 )
o->hide();
if ( dynamic_cast< KSeparator * >( o ) != 0 )
o->hide();
@@ -38,10 +38,10 @@ GroupedDesktopSelector::GroupedDesktopSelector( QWidget *p, const char *n )
} // *hack*
// AAAA hack
- QLayoutIterator li = layout()->iterator();
- QHBoxLayout *hbox = 0;
+ TQLayoutIterator li = tqlayout()->iterator();
+ TQHBoxLayout *hbox = 0;
while ( li.current() != 0 ) {
- hbox = dynamic_cast< QHBoxLayout * >( li.current() );
+ hbox = dynamic_cast< TQHBoxLayout * >( li.current() );
if ( hbox ) break;
++li;
}
@@ -49,7 +49,7 @@ GroupedDesktopSelector::GroupedDesktopSelector( QWidget *p, const char *n )
if ( hbox ) {
li = hbox->iterator();
while ( li.current() != 0 ) {
- QSpacerItem *spacer = dynamic_cast< QSpacerItem * >( li.current() );
+ TQSpacerItem *spacer = dynamic_cast< TQSpacerItem * >( li.current() );
if ( spacer ) {
hbox->removeItem( spacer );
delete spacer;
@@ -64,7 +64,7 @@ void GroupedDesktopSelector::notifyPreRebuild( component::Base * ) {
}
void GroupedDesktopSelector::notifyPostRebuild( component::Base * ) {
- // QTimer::singleShot( 0, this, SLOT( fill() ) );
+ // TQTimer::singleShot( 0, this, TQT_SLOT( fill() ) );
}
void GroupedDesktopSelector::clear()
@@ -88,7 +88,7 @@ void GroupedDesktopSelector::fill( component::Desktop::EntityRange r )
{
component::Desktop &d = cache::Global::get().component< component::Desktop >();
utils::Range< std::string > gr;
- QString last = pageTitle( activePageIndex() );
+ TQString last = pageTitle( activePageIndex() );
clear();
@@ -97,25 +97,25 @@ void GroupedDesktopSelector::fill( component::Desktop::EntityRange r )
for ( gr = d.availableGroups( r ); gr != gr.end(); gr.advance() ) {
component::Desktop::EntityRange cr = d.group( *gr );
- QString name = u8( *gr );
+ TQString name = u8( *gr );
std::cerr << "group for " << cr->name() << ": " << r->group() << std::endl;
name = ( name != u8( "" ) ? name : u8( "Legacy" ) );
- QPixmap icon( KGlobal::iconLoader()->iconPath(
+ TQPixmap icon( KGlobal::iconLoader()->iconPath(
policy() ? policy()->iconForGroup( name ) : u8( "" ), -32 ) );
- QVBox *b = addVBoxPage( name, name, icon );
+ TQVBox *b = addVBoxPage( name, name, icon );
m_pages.push_back( b );
std::cerr << "creating list for " << *gr << std::endl;
DesktopList *l = new DesktopList( b );
l->setTitle( name );
- connect( l, SIGNAL( request( cache::entity::Package,
+ connect( l, TQT_SIGNAL( request( cache::entity::Package,
cache::component::State::Action ) ),
- this, SIGNAL( request( cache::entity::Package,
+ this, TQT_SIGNAL( request( cache::entity::Package,
cache::component::State::Action ) ) );
- connect( l, SIGNAL( showDescription( cache::entity::Desktop ) ),
- this, SIGNAL( showDescription( cache::entity::Desktop ) ) );
+ connect( l, TQT_SIGNAL( showDescription( cache::entity::Desktop ) ),
+ this, TQT_SIGNAL( showDescription( cache::entity::Desktop ) ) );
l->insertRange( intersectionRange( r, cr ) );
// l->insertRange( cr );
@@ -129,7 +129,7 @@ void GroupedDesktopSelector::fill( component::Desktop::EntityRange r )
}
if ( m_pages.empty() )
- m_pages.push_back( addPage( QString( "No Results" ) ) );
+ m_pages.push_back( addPage( TQString( "No Results" ) ) );
if ( !shown )
showPage( pageIndex( m_pages.front() ) );
}
diff --git a/adept/libadept/groupeddesktopselector.h b/adept/libadept/groupeddesktopselector.h
index a54f7aa..95a7dc6 100644
--- a/adept/libadept/groupeddesktopselector.h
+++ b/adept/libadept/groupeddesktopselector.h
@@ -14,11 +14,12 @@ using namespace aptFront::cache;
class GroupedDesktopSelector : public KJanusWidget, cache::Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
struct IconPolicy {
- virtual QString iconForGroup( QString group ) { return group; }
+ virtual TQString iconForGroup( TQString group ) { return group; }
};
- GroupedDesktopSelector( QWidget *p = 0, const char *n = 0 );
+ GroupedDesktopSelector( TQWidget *p = 0, const char *n = 0 );
void fill( component::Desktop::EntityRange r );
void setPolicy( IconPolicy *p ) { m_policy = p; }
IconPolicy *policy() { return m_policy; }
@@ -32,7 +33,7 @@ signals:
void showDescription( cache::entity::Desktop );
protected:
IconPolicy *m_policy;
- std::vector< QWidget * > m_pages;
+ std::vector< TQWidget * > m_pages;
// IconPolicy m_defaultPolicy;
};
diff --git a/adept/libadept/installerview.cpp b/adept/libadept/installerview.cpp
index eac9dc7..ef9eae3 100644
--- a/adept/libadept/installerview.cpp
+++ b/adept/libadept/installerview.cpp
@@ -1,7 +1,7 @@
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qtextbrowser.h>
-#include <qcheckbox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqtextbrowser.h>
+#include <tqcheckbox.h>
#include <klocale.h>
#include <apt-front/cache/entity/desktop.h>
@@ -19,7 +19,7 @@ void InstallerView::rebuild()
{
typedef predicate::Factory< entity::Desktop > Factory;
if ( m_inRebuild ) {
- QTimer::singleShot( 500, this, SLOT( rebuild() ) );
+ TQTimer::singleShot( 500, this, TQT_SLOT( rebuild() ) );
return;
}
m_inRebuild = true;
@@ -61,17 +61,17 @@ void InstallerView::rebuild()
m_inRebuild = false;
}
-InstallerView::InstallerView( QWidget *p , const char *n )
+InstallerView::InstallerView( TQWidget *p , const char *n )
: InstallerViewUi( p, n ), m_inRebuild( false )
{
- connect( m_search, SIGNAL( textChanged( const QString & ) ),
- this, SLOT( textChanged() ) );
- connect( &timer, SIGNAL( timeout() ), this, SLOT( rebuild() ) );
- connect( m_suite, SIGNAL( activated( int ) ), this, SLOT( rebuild() ) );
- connect( m_unsupported, SIGNAL( toggled( bool ) ), this, SLOT( rebuild() ) );
- connect( m_nonfree, SIGNAL( toggled( bool ) ), this, SLOT( rebuild() ) );
- connect( selector(), SIGNAL( showDescription( cache::entity::Desktop ) ),
- this, SLOT( showDescription( cache::entity::Desktop ) ) );
+ connect( m_search, TQT_SIGNAL( textChanged( const TQString & ) ),
+ this, TQT_SLOT( textChanged() ) );
+ connect( &timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( rebuild() ) );
+ connect( m_suite, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( rebuild() ) );
+ connect( m_unsupported, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( rebuild() ) );
+ connect( m_nonfree, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( rebuild() ) );
+ connect( selector(), TQT_SIGNAL( showDescription( cache::entity::Desktop ) ),
+ this, TQT_SLOT( showDescription( cache::entity::Desktop ) ) );
}
void InstallerView::textChanged() {
diff --git a/adept/libadept/installerview.h b/adept/libadept/installerview.h
index ed955dc..5fcc5ff 100644
--- a/adept/libadept/installerview.h
+++ b/adept/libadept/installerview.h
@@ -3,7 +3,7 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qtimer.h>
+#include <tqtimer.h>
#include <adept/installerviewui.h>
#include <adept/groupeddesktopselector.h>
@@ -14,9 +14,10 @@ namespace adept {
class InstallerView : public InstallerViewUi
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef predicate::Predicate< entity::Desktop > Predicate;
- InstallerView( QWidget *p = 0, const char *n = 0 );
+ InstallerView( TQWidget *p = 0, const char *n = 0 );
GroupedDesktopSelector *selector() { return m_selector; }
protected slots:
void textChanged();
@@ -25,7 +26,7 @@ public slots:
void rebuild();
protected:
bool m_inRebuild;
- QTimer timer;
+ TQTimer timer;
};
}
diff --git a/adept/libadept/installerviewui.ui b/adept/libadept/installerviewui.ui
index 6f8b5d7..26ecb2e 100644
--- a/adept/libadept/installerviewui.ui
+++ b/adept/libadept/installerviewui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>InstallerViewUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>InstallerViewUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,9 +25,9 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@@ -36,7 +36,7 @@
<property name="margin">
<number>4</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -52,7 +52,7 @@
<string>Search:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_search</cstring>
</property>
@@ -65,7 +65,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<item>
<property name="text">
<string>KDE</string>
@@ -103,14 +103,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -118,7 +118,7 @@
<string>Show:</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_unsupported</cstring>
</property>
@@ -126,7 +126,7 @@
<string>unsupported,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_nonfree</cstring>
</property>
@@ -149,7 +149,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QTextBrowser" row="1" column="1">
+ <widget class="TQTextBrowser" row="1" column="1">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -187,7 +187,7 @@
<data format="PNG" length="1122">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082</data>
</image>
</images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>adept/groupeddesktopselector.h</includehint>
</includehints>
diff --git a/adept/libadept/lister.cpp b/adept/libadept/lister.cpp
index 85142c3..fc45699 100644
--- a/adept/libadept/lister.cpp
+++ b/adept/libadept/lister.cpp
@@ -1,10 +1,10 @@
// -*- Mode: C++; c-basic-offset: 4; -*-
-#include <qlabel.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qpushbutton.h>
-#include <qthread.h>
-#include <qtextbrowser.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
+#include <tqpushbutton.h>
+#include <tqthread.h>
+#include <tqtextbrowser.h>
#include <kpopupmenu.h>
#include <kdebug.h>
@@ -33,8 +33,8 @@ using namespace aptFront::cache;
using namespace aptFront::utils;
using namespace adept;
-Lister::Lister( QWidget *parent, const char *name )
- : ExtendableList( parent, name ),
+Lister::Lister( TQWidget *tqparent, const char *name )
+ : ExtendableList( tqparent, name ),
m_rangeProvider( 0 ),
m_baseF( predicate::True< entity::Entity >() ),
m_interactiveF( True<entity::Entity>() ), m_itemCount( -1 ),
@@ -59,18 +59,18 @@ Lister::Lister( QWidget *parent, const char *name )
// addColumn(" ", 40);
// addColumn(" ", 18);
addColumn( i18n( "Package" ), 180);
- addColumn( i18n( "Status" ), 110);
+ addColumn( i18n( "tqStatus" ), 110);
addColumn( i18n( "Requested" ), 90);
addColumn( i18n( "Description" ), 300);
setToggleColumn( 0 );
setResizeMode (LastColumn);
- connect( this, SIGNAL( selectionChanged() ), SLOT( updateActions() ) );
+ connect( this, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( updateActions() ) );
connect( this,
- SIGNAL( contextMenuRequested( QListViewItem *,
- const QPoint &, int ) ),
- this, SLOT(
- contextMenu( QListViewItem *, const QPoint &, int) ) );
+ TQT_SIGNAL( contextMenuRequested( TQListViewItem *,
+ const TQPoint &, int ) ),
+ this, TQT_SLOT(
+ contextMenu( TQListViewItem *, const TQPoint &, int) ) );
m_tip = 0;
// m_tip = new ListerTooltip( viewport(), this );
}
@@ -84,7 +84,7 @@ void Lister::scheduleRebuild()
{
if (!m_rebuildScheduled) {
// kdDebug() << "Lister scheduling rebuild" << endl;
- QTimer::singleShot( 0, this, SLOT( rebuild() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( rebuild() ) );
}
m_rebuildScheduled = true;
}
@@ -156,7 +156,7 @@ void Lister::cleanRebuild()
}
Lister::CreateItem::CreateItem( Lister *_l, ListerItem *p )
- : l( _l ), time( 0 ), items( 0 ), last( 0 ), parent( p )
+ : l( _l ), time( 0 ), items( 0 ), last( 0 ), tqparent( p )
{
}
@@ -181,19 +181,19 @@ Lister::Map::value_type Lister::CreateItem::operator()( entity::Entity e )
}
if ( last ) {
- if ( parent )
- last = new ListerItem( parent, last, e );
+ if ( tqparent )
+ last = new ListerItem( tqparent, last, e );
else
last = new ListerItem( l, last, e );
} else {
- if ( parent )
- last = new ListerItem( parent, e );
+ if ( tqparent )
+ last = new ListerItem( tqparent, e );
else
last = new ListerItem( l, e );
}
l->m_rebuildMutex.unlock();
if ( e.is< entity::Relation >() )
- // this should be safe because the parent thread is waiting
+ // this should be safe because the tqparent thread is waiting
// for us and ensures that universe (libapt-front) is kept
// unchanged while we run
l->insertRangeInternal( InsertRangePair(
@@ -268,16 +268,16 @@ void Lister::rebuild()
m_items.clear();
kdDebug() << "asyncCall to rebuildInsertRange..." << endl;
- QThread *t = asyncCall( std::bind2nd(
+ TQThread *t = asyncCall( std::bind2nd(
std::mem_fun( &Lister::insertRangeInternal ),
InsertRangePair( 0, r ) ),
this );
kdDebug() << "starting the thread..." << endl;
- QTimer timer;
- connect( &timer, SIGNAL( timeout() ),
- this, SLOT( reallyUpdate() ) );
+ TQTimer timer;
+ connect( &timer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( reallyUpdate() ) );
timer.start( 0 );
m_rebuildMutex.unlock();
@@ -371,7 +371,7 @@ Lister::VectorRange Lister::content()
return ret;
}
-QString ListerItem::text( int column ) const
+TQString ListerItem::text( int column ) const
{
// if (column == 0) return ""; // until we redo paintcell for the col
if (entity().is<entity::Package>()) {
@@ -389,15 +389,15 @@ QString ListerItem::text( int column ) const
return u8( "" );
}
-void ListerItem::paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment )
+void ListerItem::paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment )
{
if ( width <= 0 )
return;
- QColorGroup _cg( cg );
- QColor c = _cg.text();
- QPixmap pm( width, height() );
- QPainter _p( &pm );
+ TQColorGroup _cg( cg );
+ TQColor c = _cg.text();
+ TQPixmap pm( width, height() );
+ TQPainter _p( &pm );
if (entity().is<entity::Package>()) {
entity::Package p = entity();
if (column == 1)
@@ -405,12 +405,12 @@ void ListerItem::paintCell (QPainter *p, const QColorGroup &cg,
if (column == 2)
c = actionColor( p );
}
- _cg.setColor( QColorGroup::Text, c );
+ _cg.setColor( TQColorGroup::Text, c );
KListViewItem::paintCell( &_p, _cg, column, width, AlignTop );
p->drawPixmap( 0, 0, pm );
}
-void Lister::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
+void Lister::contextMenu( TQListViewItem *it, const TQPoint &pt, int /*c*/ )
{
if (! it) // check for actor when we have one...
return;
@@ -433,7 +433,7 @@ void Lister::contextMenu( QListViewItem *it, const QPoint &pt, int /*c*/ )
bool open = m_context->extender();
m->insertItem( open ? i18n( "Hide details" ) :
i18n( "Show details" ), open ? 1 : 0 );
- connect(m, SIGNAL(activated(int)), this, SLOT(contextActivated(int)));
+ connect(m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(contextActivated(int)));
m->exec(pt);
delete m;
}
@@ -465,16 +465,16 @@ ListerItemExtender::~ListerItemExtender()
{
}
-ListerItemExtender::ListerItemExtender( QWidget *parent, const char * n)
- : ListerItemExtenderUi( parent, n )
+ListerItemExtender::ListerItemExtender( TQWidget *tqparent, const char * n)
+ : ListerItemExtenderUi( tqparent, n )
{
observeComponent< component::State >();
adjustFontSize( m_description, -1 );
- connect( m_details, SIGNAL( clicked() ),
- this, SLOT( detailsClicked() ) );
+ connect( m_details, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( detailsClicked() ) );
m_packageInfo->adjustFontSize( -1 );
- m_packageInfo->hideStatus();
+ m_packageInfo->hidetqStatus();
}
void ListerItemExtender::detailsClicked() {
@@ -486,9 +486,9 @@ ListerItem *ListerItemExtender::item()
return dynamic_cast< ListerItem * >( m_item );
}
-void ListerItemExtender::mouseReleaseEvent( QMouseEvent *e ) {
+void ListerItemExtender::mouseReleaseEvent( TQMouseEvent *e ) {
e->ignore();
- if ( childAt( e->pos() ) != static_cast< QWidget * >( m_name ) )
+ if ( tqchildAt( e->pos() ) != static_cast< TQWidget * >( m_name ) )
e->accept();
}
void ListerItemExtender::setItem( ExtendableItem *i )
@@ -498,8 +498,8 @@ void ListerItemExtender::setItem( ExtendableItem *i )
// setupColors();
kdDebug() << "ListerItemExtender::setItem connecting" << endl;
- connect( this, SIGNAL( detailsRequested( Lister::Entity ) ),
- item()->list(), SIGNAL( detailsRequested( Lister::Entity ) ) );
+ connect( this, TQT_SIGNAL( detailsRequested( Lister::Entity ) ),
+ item()->list(), TQT_SIGNAL( detailsRequested( Lister::Entity ) ) );
entity::Version v;
entity::Package p;
@@ -521,12 +521,12 @@ void ListerItemExtender::setItem( ExtendableItem *i )
return;
}
- m_name->setText( /* QString( "<b>" ) + */
+ m_name->setText( /* TQString( "<b>" ) + */
v.package().name( std::string( "oops" ) ) /* + "</b>" */ );
- QString l = u8( v.longDescription(
+ TQString l = u8( v.longDescription(
u8( i18n( "No long description available" ) ) ) );
- m_description->setText( QString( "<qt>" )
+ m_description->setText( TQString( "<qt>" )
+ formatLongDescription( l ) + "</qt>" );
m_description->adjustSize();
m_description->installEventFilter( this );
@@ -546,7 +546,7 @@ void ListerItemExtender::notifyPostChange( component::Base * )
// without the timer to break it, there could be a loop where
// we connect the clicked() signal to a slot which would be
// invoked right away when we return -> evil
- QTimer::singleShot( 0, this, SLOT( updateLogical() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateLogical() ) );
}
void ListerItemExtender::updateLogical() {
@@ -574,8 +574,8 @@ void ListerItemExtender::updateLogical() {
if (a) {
m_logical->setText( u8( a->actor().prettyName() ) );
- connect( m_logical, SIGNAL( clicked() ),
- a, SLOT( destructiveAct() ) );
+ connect( m_logical, TQT_SIGNAL( clicked() ),
+ a, TQT_SLOT( destructiveAct() ) );
} else {
m_logical->setText( i18n( "Immutable" ) );
m_logical->setEnabled( false );
@@ -583,11 +583,11 @@ void ListerItemExtender::updateLogical() {
}
-bool ListerItemExtender::eventFilter( QObject *o, QEvent *e )
+bool ListerItemExtender::eventFilter( TQObject *o, TQEvent *e )
{
- if (o == m_description && e->type() == QEvent::Wheel) {
+ if (o == m_description && e->type() == TQEvent::Wheel) {
// kdDebug() << "discarding wheel event..." << endl;
- QApplication::sendEvent( this, e );
+ TQApplication::sendEvent( this, e );
return true;
}
return false;
@@ -596,23 +596,23 @@ bool ListerItemExtender::eventFilter( QObject *o, QEvent *e )
void ListerItemExtender::resize( int w, int h )
{
int namew = - item()->lister()->extenderOffset( item() ) - 2
- - layout()->margin()
- - layout()->spacing()
+ - tqlayout()->margin()
+ - tqlayout()->spacing()
+ item()->lister()->columnWidth( 0 );
int statw = item()->lister()->columnWidth( 1 )
- - layout()->spacing();
+ - tqlayout()->spacing();
int chw = item()->lister()->columnWidth( 2 ) - 2
- - layout()->spacing();
+ - tqlayout()->spacing();
m_name->setMinimumWidth( namew );
m_status->setMinimumWidth( statw );
m_change->setMinimumWidth( chw );
m_packageInfo->adjustSize();
m_leftHeight = m_name->height() + m_packageInfo->height()
+ m_logical->height() + 20;
- QWidget::resize( w, 500 );
- QWidget::resize(
+ TQWidget::resize( w, 500 );
+ TQWidget::resize(
w,
- QMAX( m_description->contentsHeight() + 16,
+ TQMAX( m_description->contentsHeight() + 16,
m_leftHeight ) );
}
@@ -666,15 +666,15 @@ bool ListerItem::keepLess( const ListerItem *o ) const
return false;
}
-QString ListerTooltip::format( const QString &what,
- const QString &txt, bool nobr )
+TQString ListerTooltip::format( const TQString &what,
+ const TQString &txt, bool nobr )
{
- QString ret = "<b>" + what + "</b>&nbsp;" + (nobr ? "<nobr>" : "")
+ TQString ret = "<b>" + what + "</b>&nbsp;" + (nobr ? "<nobr>" : "")
+ txt + (nobr ? "</nobr>" : "") + "<br>";
return ret;
}
-void ListerTooltip::maybeTip( const QPoint &pt )
+void ListerTooltip::maybeTip( const TQPoint &pt )
{
if ( !m_parent )
return;
@@ -684,8 +684,8 @@ void ListerTooltip::maybeTip( const QPoint &pt )
return;
if ( x->extender() )
return; // no tips for extended items, thank you
- QString str = u8( "<qt>" );
- QString descr, cand, cur;
+ TQString str = u8( "<qt>" );
+ TQString descr, cand, cur;
descr = cand = cur = i18n( "<i>Not available</i>" );
entity::Package p( x->entity() );
descr = p.shortDescription( std::string(
@@ -703,5 +703,5 @@ void ListerTooltip::maybeTip( const QPoint &pt )
str += format( i18n( "Candidate&nbsp;Version:" ), cand );
str.append( u8( "</qt>" ) );
- tip( m_parent->itemRect( x ), str );
+ tip( m_parent->tqitemRect( x ), str );
}
diff --git a/adept/libadept/lister.h b/adept/libadept/lister.h
index dede538..1bac3f8 100644
--- a/adept/libadept/lister.h
+++ b/adept/libadept/lister.h
@@ -3,9 +3,9 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qtooltip.h>
-#include <qmap.h>
-#include <qmutex.h>
+#include <tqtooltip.h>
+#include <tqmap.h>
+#include <tqmutex.h>
#include <set>
#include <apt-front/cache/entity/entity.h>
@@ -41,6 +41,7 @@ struct entityLess {
class Lister: public ExtendableList, public Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef entity::Entity Entity;
typedef std::vector< Entity > Vector;
@@ -55,7 +56,7 @@ public:
virtual Range listerRange() = 0;
};
- Lister (QWidget *parent = 0, const char *name = 0);
+ Lister (TQWidget *tqparent = 0, const char *name = 0);
~Lister();
void setSource();
virtual void notifyPostChange( component::Base * );
@@ -72,7 +73,7 @@ public:
bool busy() { return m_rebuildScheduled || m_inRebuild; }
signals:
- // this is adept::Lister because of braindead moc
+ // this is adept::Lister because of braindead tqmoc
void actionsChanged( adept::Lister * );
void cardinalityChanged( const Lister::Cardinality & );
void detailsRequested( Lister::Entity );
@@ -91,7 +92,7 @@ public slots:
virtual void scheduleRebuild();
virtual void reallyUpdate();
protected slots:
- void contextMenu( QListViewItem *, const QPoint &, int );
+ void contextMenu( TQListViewItem *, const TQPoint &, int );
void contextActivated( int );
protected:
typedef std::pair< ListerItem *, Range > InsertRangePair;
@@ -109,14 +110,14 @@ protected:
int time;
int items;
ListerItem *last;
- ListerItem *parent;
+ ListerItem *tqparent;
};
bool cancelRebuild();
void rebuildInsertRange( Range );
ListerItem *m_context;
- QMap< QString, QString > m_icons;
+ TQMap< TQString, TQString > m_icons;
Map m_items;
Vector m_all;
RangeProvider *m_rangeProvider;
@@ -127,24 +128,25 @@ protected:
bool m_cancelRebuild:1;
bool m_openToplevel:1;
Cardinality m_cardinality;
- QMutex m_rebuildMutex;
+ TQMutex m_rebuildMutex;
};
-class ListerTooltip : public QToolTip
+class ListerTooltip : public TQToolTip
{
public:
- ListerTooltip (QWidget *v, Lister *p) : QToolTip (v, 0), m_parent (p) {};
+ ListerTooltip (TQWidget *v, Lister *p) : TQToolTip (v, 0), m_parent (p) {};
protected:
- QString format( const QString &, const QString &, bool = true );
- virtual void maybeTip (const QPoint &p);
+ TQString format( const TQString &, const TQString &, bool = true );
+ virtual void maybeTip (const TQPoint &p);
Lister *m_parent;
};
class ListerItemExtender : public ListerItemExtenderUi,
public cache::Observer {
Q_OBJECT
+ TQ_OBJECT
public:
- ListerItemExtender( QWidget *parent = 0, const char * n = 0 );
+ ListerItemExtender( TQWidget *tqparent = 0, const char * n = 0 );
~ListerItemExtender();
virtual void resize( int w, int h );
void setItem( ExtendableItem *i );
@@ -158,8 +160,8 @@ protected slots:
signals:
void detailsRequested( Lister::Entity );
protected:
- bool eventFilter( QObject *o, QEvent *e );
- void mouseReleaseEvent( QMouseEvent *e );
+ bool eventFilter( TQObject *o, TQEvent *e );
+ void mouseReleaseEvent( TQMouseEvent *e );
entity::Entity m_entity;
unsigned m_leftHeight;
};
@@ -186,18 +188,18 @@ public:
return 0;
}
- /* virtual void updateIcon( const QPixmap &p ) {
+ /* virtual void updateIcon( const TQPixmap &p ) {
if ( m_entity.is< entity::Package >()
|| m_entity.is< entity::Version >() )
return ExtendableItem::updateIcon( p );
- setPixmap( list()->toggleColumn(), QPixmap() );
+ setPixmap( list()->toggleColumn(), TQPixmap() );
} */
- virtual QString text( int column ) const;
+ virtual TQString text( int column ) const;
entity::Entity entity() { return m_entity; }
const entity::Entity entity() const { return m_entity; }
- virtual void paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment);
+ virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment);
virtual bool less( const ExtendableItem * ) const;
Lister *lister() {
return dynamic_cast< Lister* >( listView() );
diff --git a/adept/libadept/listerextenderui.ui b/adept/libadept/listerextenderui.ui
index de2e481..c01098b 100644
--- a/adept/libadept/listerextenderui.ui
+++ b/adept/libadept/listerextenderui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ListerItemExtenderrUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -35,7 +35,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>4</height>
@@ -69,22 +69,22 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>4</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout7</cstring>
+ <cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_name</cstring>
</property>
@@ -102,11 +102,11 @@
<property name="text">
<string>name</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_status</cstring>
</property>
@@ -124,11 +124,11 @@
<property name="text">
<string>status</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_change</cstring>
</property>
@@ -149,13 +149,13 @@
<property name="text">
<string>change</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignTop</set>
</property>
</widget>
</hbox>
</widget>
- <widget class="QTextBrowser" row="0" column="2" rowspan="4" colspan="1">
+ <widget class="TQTextBrowser" row="0" column="2" rowspan="4" colspan="1">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -181,9 +181,9 @@
<string>description...</string>
</property>
</widget>
- <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -205,14 +205,14 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_logical</cstring>
</property>
@@ -220,7 +220,7 @@
<string>logical</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_details</cstring>
</property>
@@ -238,7 +238,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>10</width>
<height>20</height>
@@ -251,7 +251,7 @@
<property name="name">
<cstring>m_packageInfo</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>80</height>
@@ -268,7 +268,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>4</width>
<height>20</height>
@@ -303,7 +303,7 @@
<includes>
<include location="global" impldecl="in declaration">adept/extendablelist.h</include>
</includes>
-<layoutdefaults spacing="0" margin="4"/>
+<tqlayoutdefaults spacing="0" margin="4"/>
<includehints>
<includehint>adept/packageinfo.h</includehint>
</includehints>
diff --git a/adept/libadept/packagedetails.cpp b/adept/libadept/packagedetails.cpp
index 4e97fd4..beb668c 100644
--- a/adept/libadept/packagedetails.cpp
+++ b/adept/libadept/packagedetails.cpp
@@ -1,9 +1,9 @@
-#include <qtoolbutton.h>
-#include <qtextbrowser.h>
-#include <qlabel.h>
+#include <tqtoolbutton.h>
+#include <tqtextbrowser.h>
+#include <tqlabel.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
#include <ktoolbar.h>
#include <ktoolbarbutton.h>
@@ -21,7 +21,7 @@
using namespace adept;
-PackageDetails::PackageDetails( QWidget *w, const char *n )
+PackageDetails::PackageDetails( TQWidget *w, const char *n )
: PackageDetailsUi( w, n ),
m_thread( 0 ),
m_qtMutex( true ),
@@ -41,16 +41,16 @@ PackageDetails::PackageDetails( QWidget *w, const char *n )
m_lister->setRangeProvider( this ); // wee
// m_lister->setOpenToplevel( true );
- m_description->setPaper( QBrush( colorGroup().background() ) );
+ m_description->setPaper( TQBrush( tqcolorGroup().background() ) );
- connect( m_toolbar->getButton( BShow ), SIGNAL( clicked() ),
- this, SIGNAL( showList() ) );
- connect( m_toolbar->getButton( BBack ), SIGNAL( clicked() ),
- this, SIGNAL( back() ) );
- connect( m_toolbar->getButton( BForward ), SIGNAL( clicked() ),
- this, SIGNAL( forward() ) );
- connect( m_lister, SIGNAL( detailsRequested( Lister::Entity ) ),
- this, SIGNAL( detailsRequested( Lister::Entity ) ) );
+ connect( m_toolbar->getButton( BShow ), TQT_SIGNAL( clicked() ),
+ this, TQT_SIGNAL( showList() ) );
+ connect( m_toolbar->getButton( BBack ), TQT_SIGNAL( clicked() ),
+ this, TQT_SIGNAL( back() ) );
+ connect( m_toolbar->getButton( BForward ), TQT_SIGNAL( clicked() ),
+ this, TQT_SIGNAL( forward() ) );
+ connect( m_lister, TQT_SIGNAL( detailsRequested( Lister::Entity ) ),
+ this, TQT_SIGNAL( detailsRequested( Lister::Entity ) ) );
observeComponent< component::State >();
@@ -107,8 +107,8 @@ void PackageDetails::notifyPreRebuild( component::Base * ) {
Threads::wait();
m_logical->setEnabled( false );
m_remove->setEnabled( false );
- m_logical->disconnect( SIGNAL( clicked() ) );
- m_remove->disconnect( SIGNAL( clicked() ) );
+ m_logical->disconnect( TQT_SIGNAL( clicked() ) );
+ m_remove->disconnect( TQT_SIGNAL( clicked() ) );
delete m_logicalAct;
delete m_removeAct;
kdDebug() << "PackageDetails::notifyPreRebuild() done" << endl;
@@ -117,7 +117,7 @@ void PackageDetails::notifyPreRebuild( component::Base * ) {
void PackageDetails::loadFileList() {
Cache &c = cache::Global::get( m_cache );
if ( m_fileListRunning || !c.isOpen() ) {
- QTimer::singleShot( 100, this, SLOT( loadFileList() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( loadFileList() ) );
return;
}
@@ -147,12 +147,12 @@ void PackageDetails::setPackage( cache::entity::Package p )
{
kdDebug() << "PackageDetails::setPackage()" << endl;
m_package = p.stable();
- m_name->setText( QString( "<b>" ) +
+ m_name->setText( TQString( "<b>" ) +
p.name( std::string( "No package" ) ) + "</b>" );
m_info->setPackage( p );
- QString l = p.longDescription(
+ TQString l = p.longDescription(
std::string( i18n( "No long description available" ).local8Bit() ) );
- m_description->setText( QString( "<qt>" )
+ m_description->setText( TQString( "<qt>" )
+ formatLongDescription( l ) + "</qt>" );
std::string na = u8( i18n( "not available" ) );
@@ -176,7 +176,7 @@ void PackageDetails::notifyPostChange( cache::component::Base * )
// without the timer to break it, there could be a loop where
// we connect the clicked() signal to a slot which would be
// invoked right away when we return -> evil
- QTimer::singleShot( 0, this, SLOT( updateLogical() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateLogical() ) );
}
void PackageDetails::notifyPostRebuild( cache::component::Base *b )
@@ -184,8 +184,8 @@ void PackageDetails::notifyPostRebuild( cache::component::Base *b )
kdDebug() << "PackageDetails::notifyPostRebuild( " << b << " )" << endl;
// can't call directly because stable entities are not guaranteed
// to be stabilised at this point yet
- QTimer::singleShot( 0, this, SLOT( updateLogical() ) );
- QTimer::singleShot( 0, this, SLOT( loadFileList() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateLogical() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( loadFileList() ) );
m_lister->cleanRebuild();
}
@@ -193,7 +193,7 @@ void PackageDetails::updateLogical()
{
Cache &c = cache::Global::get( m_cache );
if ( !c.isOpen() ) {
- QTimer::singleShot( 100, this, SLOT( updateLogical() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( updateLogical() ) );
return;
}
kdDebug() << "PackageDetails::updateLogical()" << endl;
@@ -218,8 +218,8 @@ void PackageDetails::updateLogical()
if ( a ) {
m_logical->setEnabled( true );
m_logical->setText( u8( a->actor().prettyName() ) );
- connect( m_logical, SIGNAL( clicked() ),
- a, SLOT( destructiveAct() ) );
+ connect( m_logical, TQT_SIGNAL( clicked() ),
+ a, TQT_SLOT( destructiveAct() ) );
} else {
m_logical->setText( i18n( "Install" ) );
m_logical->setEnabled( false );
@@ -228,8 +228,8 @@ void PackageDetails::updateLogical()
if ( b ) {
m_remove->setEnabled( true );
m_remove->setText( u8( b->actor().prettyName() ) );
- connect( m_remove, SIGNAL( clicked() ),
- b, SLOT( destructiveAct() ) );
+ connect( m_remove, TQT_SIGNAL( clicked() ),
+ b, TQT_SLOT( destructiveAct() ) );
} else {
m_remove->setText( i18n( "Remove" ) );
m_remove->setEnabled( false );
diff --git a/adept/libadept/packagedetails.h b/adept/libadept/packagedetails.h
index 655e226..603a694 100644
--- a/adept/libadept/packagedetails.h
+++ b/adept/libadept/packagedetails.h
@@ -5,14 +5,14 @@
#include <adept/packagedetailsui.h>
#include <adept/lister.h>
-#include <qmutex.h>
-#include <qguardedptr.h>
+#include <tqmutex.h>
+#include <tqguardedptr.h>
#ifndef EPT_PACKGEDETAILS_H
#define EPT_PACKGEDETAILS_H
class KToolBarButton;
-class QThread;
+class TQThread;
namespace adept {
@@ -22,9 +22,10 @@ class PackageDetails : public PackageDetailsUi, public Lister::RangeProvider,
public cache::Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ButtonID { BForward, BBack, BShow };
- PackageDetails( QWidget *p = 0, const char *n = 0 );
+ PackageDetails( TQWidget *p = 0, const char *n = 0 );
void setPackage( cache::entity::Package );
void setHasForward( bool );
void setHasBack( bool );
@@ -43,9 +44,9 @@ protected slots:
protected:
void loadFileListWorker();
cache::entity::StablePackage m_package;
- QMutex m_qtMutex;
- QThread *m_thread;
- QGuardedPtr< EntityActor > m_logicalAct, m_removeAct;
+ TQMutex m_qtMutex;
+ TQThread *m_thread;
+ TQGuardedPtr< EntityActor > m_logicalAct, m_removeAct;
int m_fileListRunning;
};
diff --git a/adept/libadept/packagedetailsui.ui b/adept/libadept/packagedetailsui.ui
index dacf7be..a25d840 100644
--- a/adept/libadept/packagedetailsui.ui
+++ b/adept/libadept/packagedetailsui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>PackageDetailsUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>PackageDetailsUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -30,7 +30,7 @@
<cstring>m_toolbar</cstring>
</property>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame3</cstring>
</property>
@@ -55,7 +55,7 @@
<property name="spacing">
<number>2</number>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>m_name</cstring>
</property>
@@ -83,7 +83,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>75</height>
@@ -100,14 +100,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QPushButton" row="3" column="2">
+ <widget class="TQPushButton" row="3" column="2">
<property name="name">
<cstring>m_remove</cstring>
</property>
@@ -125,14 +125,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton" row="3" column="1">
+ <widget class="TQPushButton" row="3" column="1">
<property name="name">
<cstring>m_logical</cstring>
</property>
@@ -150,14 +150,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QTextBrowser" row="0" column="4" rowspan="4" colspan="1">
+ <widget class="TQTextBrowser" row="0" column="4" rowspan="4" colspan="1">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -193,7 +193,7 @@
</widget>
</grid>
</widget>
- <widget class="QTabWidget">
+ <widget class="TQTabWidget">
<property name="name">
<cstring>tabWidget2</cstring>
</property>
@@ -205,7 +205,7 @@
<verstretch>16</verstretch>
</sizepolicy>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -231,7 +231,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>120</height>
@@ -240,7 +240,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -261,7 +261,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>TabPage</cstring>
</property>
@@ -284,16 +284,16 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<vbox>
<property name="name">
@@ -302,7 +302,7 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_source</cstring>
</property>
@@ -310,7 +310,7 @@
<string>source</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_architecture</cstring>
</property>
@@ -326,7 +326,7 @@
<string>architecture</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_filename</cstring>
</property>
@@ -334,7 +334,7 @@
<string>file</string>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_md5</cstring>
</property>
@@ -352,7 +352,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>61</height>
@@ -453,7 +453,7 @@
<data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
</image>
</images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktoolbar.h</includehint>
<includehint>adept/packageinfo.h</includehint>
diff --git a/adept/libadept/packageinfo.cpp b/adept/libadept/packageinfo.cpp
index dac788b..9ed85bf 100644
--- a/adept/libadept/packageinfo.cpp
+++ b/adept/libadept/packageinfo.cpp
@@ -3,9 +3,9 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qcolor.h>
-#include <qlabel.h>
-#include <qregexp.h>
+#include <tqcolor.h>
+#include <tqlabel.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <klocale.h>
@@ -15,7 +15,7 @@
using namespace adept;
using namespace cache;
-PackageInfo::PackageInfo( QWidget *p, const char *n )
+PackageInfo::PackageInfo( TQWidget *p, const char *n )
: PackageInfoUi( p, n ), m_specificVersion( false )
{
observeComponent< component::State >();
@@ -31,75 +31,75 @@ void PackageInfo::adjustFontSize( int s ) {
adept::adjustFontSize( m_installedVer, s );
}
-void PackageInfo::hideStatus() {
+void PackageInfo::hidetqStatus() {
m_status->hide();
m_change->hide();
}
namespace adept {
-QColor statusColor( entity::Package p )
+TQColor statusColor( entity::Package p )
{
if ( !p.valid() )
- return Qt::black;
+ return TQt::black;
- QColor c = Qt::blue;
+ TQColor c = TQt::blue;
if (p.isInstalled())
- c = Qt::darkGreen;
+ c = TQt::darkGreen;
if (p.isUpgradable())
- c = Qt::darkYellow;
+ c = TQt::darkYellow;
if (p.isBroken())
- c = Qt::red;
+ c = TQt::red;
return c;
}
-QColor actionColor( entity::Package p )
+TQColor actionColor( entity::Package p )
{
if ( !p.valid() )
- return Qt::black;
+ return TQt::black;
- QColor c = Qt::blue;
+ TQColor c = TQt::blue;
if (p.markedNewInstall())
- c = Qt::darkGreen;
+ c = TQt::darkGreen;
if (p.markedUpgrade())
- c = Qt::darkYellow;
+ c = TQt::darkYellow;
if (p.markedReInstall())
- c = Qt::darkYellow;
+ c = TQt::darkYellow;
if (p.markedRemove())
- c = Qt::darkRed;
+ c = TQt::darkRed;
if (p.markedPurge())
- c = Qt::red;
+ c = TQt::red;
if (p.willBreak())
- c = Qt::red;
+ c = TQt::red;
return c;
}
-/* QString hexColor( QColor c )
+/* TQString hexColor( TQColor c )
{
- QString r( "#%1%2%3" );
- return r.arg( c.red(), -2, 16 ).arg( c.green(), -2, 16 ).arg( c.blue(), -2, 16 );
+ TQString r( "#%1%2%3" );
+ return r.tqarg( c.red(), -2, 16 ).tqarg( c.green(), -2, 16 ).tqarg( c.blue(), -2, 16 );
} */
-QString colorify( QColor c, QString s )
+TQString colorify( TQColor c, TQString s )
{
- return QString( "<font color=\"" ) + c.name()
+ return TQString( "<font color=\"" ) + c.name()
+ "\">" + s + "</font>";
}
-QString formatLongDescription( QString l )
+TQString formatLongDescription( TQString l )
{
- QRegExp rx( u8( "^(.*)\n" ) );
+ TQRegExp rx( u8( "^(.*)\n" ) );
rx.setMinimal( true );
- l.replace( rx, u8( "\\1</p><p>" ) );
- rx = QRegExp( u8( "\\n[ ]*\\.\\n" ) );
- l.replace( rx, u8( "</p><p>" ) );
- rx = QRegExp( u8( "\n " ) );
- l.replace( rx, u8( " " ) );
- rx = QRegExp( u8( "\n - (.*)(\n|$)" ) );
+ l.tqreplace( rx, u8( "\\1</p><p>" ) );
+ rx = TQRegExp( u8( "\\n[ ]*\\.\\n" ) );
+ l.tqreplace( rx, u8( "</p><p>" ) );
+ rx = TQRegExp( u8( "\n " ) );
+ l.tqreplace( rx, u8( " " ) );
+ rx = TQRegExp( u8( "\n - (.*)(\n|$)" ) );
rx.setMinimal( true );
- l.replace( rx, u8( "\n<li>\\1</li>\n" ) );
- l.replace( rx, u8( "\n<li>\\1</li>\n" ) );
- return QString( "<p>" ) + l + u8( "</p>" );
+ l.tqreplace( rx, u8( "\n<li>\\1</li>\n" ) );
+ l.tqreplace( rx, u8( "\n<li>\\1</li>\n" ) );
+ return TQString( "<p>" ) + l + u8( "</p>" );
}
void PackageInfo::setPackage( entity::Package p )
@@ -133,7 +133,7 @@ void PackageInfo::notifyPostChange( component::Base * )
if ( !m_version.valid() ) return;
entity::Version v = m_version;
entity::Package p = v.package();
- QString cv = i18n( "n/a" ), iv = i18n( "n/a" ), is = i18n( "n/a" ), status, action;
+ TQString cv = i18n( "n/a" ), iv = i18n( "n/a" ), is = i18n( "n/a" ), status, action;
if (p.valid()) {
entity::Version _cv = p.candidateVersion();
@@ -158,7 +158,7 @@ void PackageInfo::notifyPostChange( component::Base * )
u8( p.actionString( unk ) ) ) + i18n( "
requested</nobr>" ) ); */
m_status->setText(
- labelFormat( i18n( "Status:" ), colorify(
+ labelFormat( i18n( "tqStatus:" ), colorify(
statusColor( p ),
u8( p.statusString( u8( i18n( "Unknown" ) ) ) ) ) ) );
m_change->setText(
diff --git a/adept/libadept/packageinfo.h b/adept/libadept/packageinfo.h
index 1a83c0d..4b2e8a3 100644
--- a/adept/libadept/packageinfo.h
+++ b/adept/libadept/packageinfo.h
@@ -15,8 +15,9 @@ using namespace aptFront;
class PackageInfo : public PackageInfoUi, public cache::Observer
{
Q_OBJECT
+ TQ_OBJECT
public:
- PackageInfo( QWidget *p, const char *n = 0 );
+ PackageInfo( TQWidget *p, const char *n = 0 );
public slots:
void setVersion( cache::entity::Version v, bool = true );
void setPackage( cache::entity::Package v );
@@ -24,25 +25,25 @@ public slots:
public:
void notifyPostChange( cache::component::Base * );
void notifyPostRebuild( cache::component::Base * );
- void hideStatus();
+ void hidetqStatus();
protected:
cache::entity::StableVersion m_version;
bool m_specificVersion;
};
-inline QString labelFormat( const QString &what,
- const QString &txt, bool nobr = true )
+inline TQString labelFormat( const TQString &what,
+ const TQString &txt, bool nobr = true )
{
- QString ret = "<b><nobr>" + what + "</nobr></b>&nbsp;" + (nobr ? "<nobr>" : "")
+ TQString ret = "<b><nobr>" + what + "</nobr></b>&nbsp;" + (nobr ? "<nobr>" : "")
+ txt + (nobr ? "</nobr>" : "");
return ret;
}
-QColor actionColor( cache::entity::Package p );
-QColor statusColor( cache::entity::Package p );
+TQColor actionColor( cache::entity::Package p );
+TQColor statusColor( cache::entity::Package p );
-QString formatLongDescription( QString in );
-QString colorify( QColor c, QString s );
+TQString formatLongDescription( TQString in );
+TQString colorify( TQColor c, TQString s );
}
diff --git a/adept/libadept/packageinfoui.ui b/adept/libadept/packageinfoui.ui
index d7d5dc5..ff733d0 100644
--- a/adept/libadept/packageinfoui.ui
+++ b/adept/libadept/packageinfoui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>PackageInfoUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>details</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>0</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_indent</cstring>
</property>
@@ -37,13 +37,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>16</width>
<height>5</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>16</width>
<height>5</height>
@@ -53,7 +53,7 @@
<string></string>
</property>
</widget>
- <widget class="QLabel" row="4" column="1">
+ <widget class="TQLabel" row="4" column="1">
<property name="name">
<cstring>m_maintainer</cstring>
</property>
@@ -65,7 +65,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -74,11 +74,11 @@
<property name="text">
<string>maintainer</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignBottom</set>
</property>
</widget>
- <widget class="QLabel" row="5" column="1">
+ <widget class="TQLabel" row="5" column="1">
<property name="name">
<cstring>m_candidateVer</cstring>
</property>
@@ -94,7 +94,7 @@
<string>candidate version</string>
</property>
</widget>
- <widget class="QLabel" row="6" column="1">
+ <widget class="TQLabel" row="6" column="1">
<property name="name">
<cstring>m_installedVer</cstring>
</property>
@@ -110,7 +110,7 @@
<string>installed version</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="1">
+ <widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>m_section</cstring>
</property>
@@ -126,7 +126,7 @@
<string>section</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="1">
+ <widget class="TQLabel" row="3" column="1">
<property name="name">
<cstring>m_installedSize</cstring>
</property>
@@ -142,7 +142,7 @@
<string>installed size</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>m_status</cstring>
</property>
@@ -158,7 +158,7 @@
<string>status</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="1">
+ <widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>m_change</cstring>
</property>
@@ -176,5 +176,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/libadept/progress.cpp b/adept/libadept/progress.cpp
index 60a3bd3..24ce649 100644
--- a/adept/libadept/progress.cpp
+++ b/adept/libadept/progress.cpp
@@ -1,5 +1,5 @@
#include <kapplication.h>
-#include <qcursor.h>
+#include <tqcursor.h>
#include <kdebug.h>
#include <adept/progress.h>
#include <adept/utils.h>
@@ -29,7 +29,7 @@ void Progress::Update ()
}
if (MajorChange) {
if ( !m_busy ) {
- QApplication::setOverrideCursor( QCursor( Qt::BusyCursor ) );
+ TQApplication::setOverrideCursor( TQCursor( TQt::BusyCursor ) );
m_busy = true;
}
m_sbar->message( u8( Op + "..." ) );
@@ -46,7 +46,7 @@ void Progress::Done ()
{
kdDebug() << "Progress::Done()" << endl;
- QApplication::restoreOverrideCursor();
+ TQApplication::restoreOverrideCursor();
m_busy = false;
if (m_sbar)
diff --git a/adept/libadept/quickfilter.cpp b/adept/libadept/quickfilter.cpp
index 2cb0577..3e99a58 100644
--- a/adept/libadept/quickfilter.cpp
+++ b/adept/libadept/quickfilter.cpp
@@ -1,44 +1,44 @@
#include <apt-front/predicate/combinators.h>
#include <apt-front/predicate/factory.h>
-#include <qobjectlist.h>
+#include <tqobjectlist.h>
#include <klocale.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include "quickfilter.h"
using namespace aptFront;
using namespace adept;
-QuickFilterWidget::QuickFilterWidget( QWidget *parent, const char *name )
- : QuickFilterUi( parent, name )
+QuickFilterWidget::QuickFilterWidget( TQWidget *tqparent, const char *name )
+ : QuickFilterUi( tqparent, name )
{
setFocusProxy( m_match );
- connect( m_match, SIGNAL( textChanged( const QString & ) ),
- this, SLOT( textChanged( const QString & ) ) );
- /* connect( m_reset, SIGNAL( clicked() ),
- this, SLOT( reset() ) ); */
- connect( m_match, SIGNAL( returnPressed() ),
- this, SLOT( widgetsChanged() ) );
- connect( &timer, SIGNAL( timeout() ),
- this, SLOT( widgetsChanged() ) );
+ connect( m_match, TQT_SIGNAL( textChanged( const TQString & ) ),
+ this, TQT_SLOT( textChanged( const TQString & ) ) );
+ /* connect( m_reset, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( reset() ) ); */
+ connect( m_match, TQT_SIGNAL( returnPressed() ),
+ this, TQT_SLOT( widgetsChanged() ) );
+ connect( &timer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( widgetsChanged() ) );
- QObjectList *chld = queryList( "QCheckBox" );
- QObjectListIt it( *chld );
+ TQObjectList *chld = queryList( TQCHECKBOX_OBJECT_NAME_STRING );
+ TQObjectListIt it( *chld );
while( it.current() != 0 ) {
- connect( it.current(), SIGNAL( toggled( bool ) ),
- this, SLOT( widgetsChanged() ) );
+ connect( it.current(), TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
++it;
}
}
-void QuickFilterWidget::mouseReleaseEvent( QMouseEvent *e ) {
+void QuickFilterWidget::mouseReleaseEvent( TQMouseEvent *e ) {
m_match->setFocus();
QuickFilterUi::mouseReleaseEvent( e );
}
-void QuickFilterWidget::textChanged( const QString & )
+void QuickFilterWidget::textChanged( const TQString & )
{
kdDebug() << "QuickFilterWidget::textChanged" << endl;
timer.start( 1000, true );
@@ -58,7 +58,7 @@ QuickFilterWidget::Predicate QuickFilterWidget::predicate()
return predicate::adapt< entity::Entity >( f );
}
-static void blockedSet( QCheckBox *b, bool v ) {
+static void blockedSet( TQCheckBox *b, bool v ) {
b->blockSignals( true );
b->setChecked( v );
b->blockSignals( false );
diff --git a/adept/libadept/quickfilter.h b/adept/libadept/quickfilter.h
index 788c9da..615454d 100644
--- a/adept/libadept/quickfilter.h
+++ b/adept/libadept/quickfilter.h
@@ -4,8 +4,8 @@
*/
#include <klocale.h>
-#include <qlayout.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
#include <apt-front/cache/entity/entity.h>
#include <apt-front/cache/entity/package.h>
@@ -15,8 +15,8 @@
#include <adept/lister.h>
#include <adept/utils.h>
-#ifndef EPT_QUICKFILTER_H
-#define EPT_QUICKFILTER_H
+#ifndef EPT_TQUICKFILTER_H
+#define EPT_TQUICKFILTER_H
class KLineEdit;
@@ -102,16 +102,17 @@ protected:
class QuickFilterWidget : public QuickFilterUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- QuickFilterWidget( QWidget *parent, const char *name = 0 );
+ QuickFilterWidget( TQWidget *tqparent, const char *name = 0 );
virtual Predicate predicate();
public slots:
void predicateChanged();
protected slots:
- void textChanged( const QString & );
+ void textChanged( const TQString & );
protected:
- void mouseReleaseEvent( QMouseEvent *e );
- QTimer timer;
+ void mouseReleaseEvent( TQMouseEvent *e );
+ TQTimer timer;
};
}
diff --git a/adept/libadept/quickfilterui.ui b/adept/libadept/quickfilterui.ui
index d45c154..ad9bf63 100644
--- a/adept/libadept/quickfilterui.ui
+++ b/adept/libadept/quickfilterui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>QuickFilterUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>1</number>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>m_title</cstring>
</property>
@@ -33,7 +33,7 @@
<string>&lt;b&gt;Search:&amp;nbsp;&lt;/b&gt;</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_match</cstring>
</property>
@@ -45,7 +45,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -62,14 +62,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -80,7 +80,7 @@
<enum>AutoText</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_name</cstring>
</property>
@@ -88,7 +88,7 @@
<string>package name,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_description</cstring>
</property>
@@ -96,7 +96,7 @@
<string>description,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_maintainer</cstring>
</property>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -126,5 +126,5 @@
<includes>
<include location="global" impldecl="in declaration">adept/filterlist.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/adept/libadept/sourceseditor.cpp b/adept/libadept/sourceseditor.cpp
index 3b04cf6..39c2084 100644
--- a/adept/libadept/sourceseditor.cpp
+++ b/adept/libadept/sourceseditor.cpp
@@ -1,9 +1,9 @@
#include <fstream>
#include <iostream>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qpainter.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpainter.h>
#include <kdebug.h>
#include <kpopupmenu.h>
@@ -15,24 +15,24 @@
using namespace aptFront;
using namespace adept;
-SourcesEditor::SourcesEditor( std::string f, QWidget *p, const char *n )
+SourcesEditor::SourcesEditor( std::string f, TQWidget *p, const char *n )
: SourcesEditorUi( p, n ), m_filename( f )
{
m_list->setSorting( -1 );
m_list->setAcceptDrops( true );
- connect( m_close, SIGNAL( clicked() ),
- this, SIGNAL( close() ) );
- connect( m_apply, SIGNAL( clicked() ),
- this, SLOT( save() ) );
- connect( m_reset, SIGNAL( clicked() ),
- this, SLOT( reset() ) );
+ connect( m_close, TQT_SIGNAL( clicked() ),
+ this, TQT_SIGNAL( close() ) );
+ connect( m_apply, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( save() ) );
+ connect( m_reset, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( reset() ) );
- connect( m_list, SIGNAL( contextMenuRequested(
- QListViewItem *, const QPoint &, int) ),
- this, SLOT( contextMenu( QListViewItem *, const QPoint & ) ) );
+ connect( m_list, TQT_SIGNAL( contextMenuRequested(
+ TQListViewItem *, const TQPoint &, int) ),
+ this, TQT_SLOT( contextMenu( TQListViewItem *, const TQPoint & ) ) );
- connect( m_newAdd, SIGNAL( clicked() ),
- this, SLOT( newAdd() ) );
+ connect( m_newAdd, TQT_SIGNAL( clicked() ),
+ this, TQT_SLOT( newAdd() ) );
reset();
}
@@ -47,15 +47,15 @@ void SourcesEditor::newAdd()
m_newLine->setText( u8( "" ) );
}
-void SourcesEditor::contextMenu( QListViewItem *, const QPoint &pt ) {
+void SourcesEditor::contextMenu( TQListViewItem *, const TQPoint &pt ) {
EntryItem *s = dynamic_cast< EntryItem * >( m_list->selectedItem() );
if (!s) return;
KPopupMenu *m = new KPopupMenu (this);
m->insertItem( s->entry().enabled() ? i18n( "Disable" ) : i18n( "Enable" ), 0 );
m->insertItem( i18n( "Clone" ), 1 );
m->insertItem( i18n( "Remove" ), 2 );
- connect( m, SIGNAL( activated( int ) ),
- this, SLOT( contextMenuActivated( int ) ) );
+ connect( m, TQT_SIGNAL( activated( int ) ),
+ this, TQT_SLOT( contextMenuActivated( int ) ) );
m->exec( pt );
delete m;
}
@@ -112,7 +112,7 @@ void SourcesEditor::save() {
}
} */
-QString EntryItem::text( int c ) const {
+TQString EntryItem::text( int c ) const {
if (entry().type() == Sources::Entry::Comment) {
if (c == 0)
if (entry().comment() == "")
@@ -131,7 +131,7 @@ QString EntryItem::text( int c ) const {
return u8( "" );
}
-void EntryItem::setText( int c, const QString &_s )
+void EntryItem::setText( int c, const TQString &_s )
{
kdDebug() << "setText on column " << c << endl;
Sources::Entry e = entry();
@@ -149,16 +149,16 @@ void EntryItem::setText( int c, const QString &_s )
KListViewItem::setText( c, _s ); // stop qlistview from looping infinitely
}
-void EntryItem::paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment )
+void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment )
{
- QColorGroup _cg( cg );
- QColor c = _cg.text();
- QPixmap pm( width, height() );
- QPainter _p( &pm );
+ TQColorGroup _cg( cg );
+ TQColor c = _cg.text();
+ TQPixmap pm( width, height() );
+ TQPainter _p( &pm );
if (!entry().enabled())
- c = Qt::gray;
- _cg.setColor( QColorGroup::Text, c );
+ c = TQt::gray;
+ _cg.setColor( TQColorGroup::Text, c );
KListViewItem::paintCell( &_p, _cg, column, width, AlignTop );
p->drawPixmap( 0, 0, pm );
}
diff --git a/adept/libadept/sourceseditor.h b/adept/libadept/sourceseditor.h
index 32b474f..780b40c 100644
--- a/adept/libadept/sourceseditor.h
+++ b/adept/libadept/sourceseditor.h
@@ -14,13 +14,14 @@ using namespace aptFront;
class SourcesEditor : public SourcesEditorUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- SourcesEditor( std::string f, QWidget *p = 0, const char *n = 0 );
+ SourcesEditor( std::string f, TQWidget *p = 0, const char *n = 0 );
public slots:
void save();
void reset();
protected slots:
- void contextMenu( QListViewItem *, const QPoint & );
+ void contextMenu( TQListViewItem *, const TQPoint & );
void contextMenuActivated( int );
void newAdd();
signals:
@@ -52,10 +53,10 @@ public:
setRenameEnabled( 2, true );
setRenameEnabled( 3, true );
}
- QString text( int c ) const;
- void setText( int c, const QString &s );
- virtual void paintCell (QPainter *p, const QColorGroup &cg,
- int column, int width, int alignment);
+ TQString text( int c ) const;
+ void setText( int c, const TQString &s );
+ virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
+ int column, int width, int tqalignment);
protected:
Sources::Entry m_entry;
};
diff --git a/adept/libadept/sourceseditorui.ui b/adept/libadept/sourceseditorui.ui
index 43397d3..f8b537b 100644
--- a/adept/libadept/sourceseditorui.ui
+++ b/adept/libadept/sourceseditorui.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>adept::SourcesEditorUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>adept::SourcesEditorUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -86,15 +86,15 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -102,7 +102,7 @@
<string>New Repository:</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="TQLineEdit">
<property name="name">
<cstring>m_newLine</cstring>
</property>
@@ -110,7 +110,7 @@
<string>Write or paste a normal sources.list line here to add it to your sources</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_newAdd</cstring>
</property>
@@ -120,15 +120,15 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_reset</cstring>
</property>
@@ -136,7 +136,7 @@
<string>Reset</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_apply</cstring>
</property>
@@ -144,7 +144,7 @@
<string>Apply</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_close</cstring>
</property>
@@ -166,7 +166,7 @@
<tabstop>m_close</tabstop>
<tabstop>m_list</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/adept/libadept/statefilter.cpp b/adept/libadept/statefilter.cpp
index 45ee470..46913da 100644
--- a/adept/libadept/statefilter.cpp
+++ b/adept/libadept/statefilter.cpp
@@ -2,21 +2,21 @@
#include <apt-front/predicate/factory.h>
#include <klocale.h>
#include <kdebug.h>
-#include <qcheckbox.h>
-#include <qobjectlist.h>
+#include <tqcheckbox.h>
+#include <tqobjectlist.h>
#include "statefilter.h"
using namespace aptFront;
using namespace adept;
-StateFilterWidget::StateFilterWidget( QWidget *parent, const char *name )
- : StateFilterUi( parent, name )
+StateFilterWidget::StateFilterWidget( TQWidget *tqparent, const char *name )
+ : StateFilterUi( tqparent, name )
{
- QObjectList *chld = queryList( "QCheckBox" );
- QObjectListIt it( *chld );
+ TQObjectList *chld = queryList( TQCHECKBOX_OBJECT_NAME_STRING );
+ TQObjectListIt it( *chld );
while( it.current() != 0 ) {
- connect( it.current(), SIGNAL( toggled( bool ) ),
- this, SLOT( widgetsChanged() ) );
+ connect( it.current(), TQT_SIGNAL( toggled( bool ) ),
+ this, TQT_SLOT( widgetsChanged() ) );
++it;
}
}
@@ -24,21 +24,21 @@ StateFilterWidget::StateFilterWidget( QWidget *parent, const char *name )
StateFilterWidget::Predicate StateFilterWidget::predicate()
{
typedef StateFilter< entity::Package > F;
- unsigned mask = 0;
- if (m_installed->isChecked()) mask |= F::Installed;
- if (m_notInstalled->isChecked()) mask |= F::NotInstalled;
- if (m_upgradable->isChecked()) mask |= F::Upgradable;
- if (m_keep->isChecked()) mask |= F::Keep;
- if (m_install->isChecked()) mask |= F::Install;
- if (m_remove->isChecked()) mask |= F::Remove;
- if (m_upgrade->isChecked()) mask |= F::Upgrade;
+ unsigned tqmask = 0;
+ if (m_installed->isChecked()) tqmask |= F::Installed;
+ if (m_notInstalled->isChecked()) tqmask |= F::NotInstalled;
+ if (m_upgradable->isChecked()) tqmask |= F::Upgradable;
+ if (m_keep->isChecked()) tqmask |= F::Keep;
+ if (m_install->isChecked()) tqmask |= F::Install;
+ if (m_remove->isChecked()) tqmask |= F::Remove;
+ if (m_upgrade->isChecked()) tqmask |= F::Upgrade;
StateFilter< entity::Package > f;
- f.setMask( mask );
+ f.setMask( tqmask );
return predicate::adapt< entity::Entity >( f );
}
-static void blockedSet( QCheckBox *b, bool v ) {
+static void blockedSet( TQCheckBox *b, bool v ) {
b->blockSignals( true );
b->setChecked( v );
b->blockSignals( false );
@@ -48,13 +48,13 @@ void StateFilterWidget::predicateChanged()
{
typedef StateFilter< entity::Package > F;
F f = downcast< F >( m_pred );
- unsigned mask = f.mask();
- blockedSet( m_installed, mask & F::Installed );
- blockedSet( m_notInstalled, mask & F::NotInstalled );
- blockedSet( m_upgradable, mask & F::Upgradable );
- blockedSet( m_keep, mask & F::Keep );
- blockedSet( m_install, mask & F::Install );
- blockedSet( m_upgrade, mask & F::Upgrade );
- blockedSet( m_remove, mask & F::Remove );
+ unsigned tqmask = f.tqmask();
+ blockedSet( m_installed, tqmask & F::Installed );
+ blockedSet( m_notInstalled, tqmask & F::NotInstalled );
+ blockedSet( m_upgradable, tqmask & F::Upgradable );
+ blockedSet( m_keep, tqmask & F::Keep );
+ blockedSet( m_install, tqmask & F::Install );
+ blockedSet( m_upgrade, tqmask & F::Upgrade );
+ blockedSet( m_remove, tqmask & F::Remove );
}
diff --git a/adept/libadept/statefilter.h b/adept/libadept/statefilter.h
index 570edb1..e578bd0 100644
--- a/adept/libadept/statefilter.h
+++ b/adept/libadept/statefilter.h
@@ -12,7 +12,7 @@
#include <adept/lister.h>
#include <klocale.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <iostream>
#include <sstream>
@@ -36,7 +36,7 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
Upgrade = 1 << 6 };
StateFilter()
- : m_mask( 0xff ) {
+ : m_tqmask( 0xff ) {
setupPredicate();
}
@@ -44,21 +44,21 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
predicate::Predicate< T >
p0 = not predicate::True< T >(),
p1 = not predicate::True< T >();
- if (m_mask & Installed)
+ if (m_tqmask & Installed)
p0 = p0 or (predicate::Factory< T >::member( &T::isInstalled )
and not predicate::Factory< T >::member( &T::isUpgradable ) );
- if (m_mask & NotInstalled)
+ if (m_tqmask & NotInstalled)
p0 = p0 or not predicate::Factory< T >::member( &T::isInstalled );
- if (m_mask & Upgradable)
+ if (m_tqmask & Upgradable)
p0 = p0 or predicate::Factory< T >::member( &T::isUpgradable );
- if (m_mask & Install)
+ if (m_tqmask & Install)
p1 = p1 or predicate::Factory< T >::member( &T::markedNewInstall );
- if (m_mask & Remove)
+ if (m_tqmask & Remove)
p1 = p1 or predicate::Factory< T >::member( &T::markedRemove );
- if (m_mask & Keep)
+ if (m_tqmask & Keep)
p1 = p1 or predicate::Factory< T >::member( &T::markedKeep );
- if (m_mask & Upgrade)
+ if (m_tqmask & Upgrade)
p1 = p1 or predicate::Factory< T >::member( &T::markedUpgrade );
m_op = p0 and p1;
@@ -68,31 +68,31 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
std::ostringstream s;
std::vector< std::string > r;
s << "State filter: ";
- if (m_mask & Installed && m_mask & NotInstalled && m_mask & Upgradable)
+ if (m_tqmask & Installed && m_tqmask & NotInstalled && m_tqmask & Upgradable)
r.push_back( "Any State" );
else {
- if (m_mask & Installed)
+ if (m_tqmask & Installed)
r.push_back( i18n( "Installed" ) );
- if (m_mask & NotInstalled)
+ if (m_tqmask & NotInstalled)
r.push_back( i18n( "Not Installed" ) );
- if (m_mask & Upgradable)
+ if (m_tqmask & Upgradable)
r.push_back( i18n( "Upgradable" ) );
}
std::copy( r.begin(), r.end(),
std::ostream_iterator< std::string >( s, " " ) );
s << "; ";
r.clear();
- if (m_mask & Install && m_mask & Remove
- && m_mask & Keep && m_mask & Upgrade)
+ if (m_tqmask & Install && m_tqmask & Remove
+ && m_tqmask & Keep && m_tqmask & Upgrade)
r.push_back( i18n( "Any Action" ) );
else {
- if (m_mask & Install)
+ if (m_tqmask & Install)
r.push_back( i18n( "Install" ) );
- if (m_mask & Remove)
+ if (m_tqmask & Remove)
r.push_back( i18n( "Remove" ) );
- if (m_mask & Keep)
+ if (m_tqmask & Keep)
r.push_back( i18n( "Keep" ) );
- if (m_mask & Upgrade)
+ if (m_tqmask & Upgrade)
r.push_back( i18n( "Upgrade" ) );
}
std::copy( r.begin(), r.end(),
@@ -100,12 +100,12 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
return s.str();
}
- unsigned mask() const {
- return m_mask;
+ unsigned tqmask() const {
+ return m_tqmask;
}
void setMask( unsigned m ) {
- m_mask = m;
+ m_tqmask = m;
setupPredicate();
}
@@ -120,20 +120,21 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
}
virtual void reset() {
- m_mask = 0xff;
+ m_tqmask = 0xff;
setupPredicate();
}
protected:
- unsigned m_mask;
+ unsigned m_tqmask;
predicate::Predicate< T > m_op;
};
class StateFilterWidget : public StateFilterUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- StateFilterWidget( QWidget *parent, const char *name = 0 );
+ StateFilterWidget( TQWidget *tqparent, const char *name = 0 );
virtual Predicate predicate();
public slots:
void predicateChanged();
diff --git a/adept/libadept/statefilterui.ui b/adept/libadept/statefilterui.ui
index 1ef19e0..9eeca56 100644
--- a/adept/libadept/statefilterui.ui
+++ b/adept/libadept/statefilterui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>StateFilterUi</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,26 +25,26 @@
<property name="spacing">
<number>1</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_title</cstring>
</property>
<property name="text">
<string>Show: </string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter</set>
</property>
</widget>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_notInstalled</cstring>
</property>
@@ -52,7 +52,7 @@
<string>not installed,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_installed</cstring>
</property>
@@ -60,7 +60,7 @@
<string>installed,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_upgradable</cstring>
</property>
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>195</width>
<height>16</height>
@@ -87,15 +87,15 @@
</spacer>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="1" column="1">
+ <widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_keep</cstring>
</property>
@@ -103,7 +103,7 @@
<string>no changes,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_install</cstring>
</property>
@@ -111,7 +111,7 @@
<string>install,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_remove</cstring>
</property>
@@ -119,7 +119,7 @@
<string>removal,</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_upgrade</cstring>
</property>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>195</width>
<height>16</height>
@@ -146,14 +146,14 @@
</spacer>
</hbox>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
<property name="text">
<string>with: </string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -162,5 +162,5 @@
<includes>
<include location="global" impldecl="in declaration">adept/filterlist.h</include>
</includes>
-<layoutdefaults spacing="3" margin="11"/>
+<tqlayoutdefaults spacing="3" margin="11"/>
</UI>
diff --git a/adept/libadept/tagchooser.cpp b/adept/libadept/tagchooser.cpp
index 6443663..6ade10b 100644
--- a/adept/libadept/tagchooser.cpp
+++ b/adept/libadept/tagchooser.cpp
@@ -1,5 +1,5 @@
#include <klocale.h>
-#include <qdragobject.h>
+#include <tqdragobject.h>
#include <apt-front/cache/component/tags.h>
#include <apt-front/cache/component/packagetags.h>
@@ -16,7 +16,7 @@ FacetItem::FacetItem( TagChooser *t )
void FacetItem::removeTag( TagItem::Tag t ) {
// kdDebug() << "removing tag " << t.fullname() << endl;
- for ( QListViewItem *n, *i = firstChild(); i != 0; i = n ) {
+ for ( TQListViewItem *n, *i = firstChild(); i != 0; i = n ) {
n = i->nextSibling();
if ( dynamic_cast< TagItem * >( i )->tag() == t )
delete i;
@@ -33,13 +33,13 @@ TagItem::TagItem( TagChooser *l )
{
}
-QString TagItem::text( int c ) const
+TQString TagItem::text( int c ) const
{
if (c != 0) return u8( "" );
- return QString( "[" ) + m_tag.name() + "] " + m_tag.shortDescription("");
+ return TQString( "[" ) + m_tag.name() + "] " + m_tag.shortDescription("");
}
-TagChooser::TagChooser( QWidget *p, const char *n )
+TagChooser::TagChooser( TQWidget *p, const char *n )
: KListView( p, n )
{
observeComponent< cache::component::PackageTags >();
@@ -54,43 +54,43 @@ TagChooser::TagChooser( QWidget *p, const char *n )
}
void TagChooser::openToplevel() {
- QListViewItem *i;
+ TQListViewItem *i;
for ( i = firstChild(); i != 0; i = i->nextSibling() ) {
i->setOpen( true );
}
}
-QDragObject *TagChooser::dragObject()
+TQDragObject *TagChooser::dragObject()
{
TagItem *sel = dynamic_cast< TagItem * >( selectedItem() );
if (sel)
- return new QTextDrag( sel->tag().fullname(), this );
+ return new TQTextDrag( sel->tag().fullname(), this );
return 0;
}
-void TagChooser::dragEnterEvent( QDragEnterEvent *e )
+void TagChooser::dragEnterEvent( TQDragEnterEvent *e )
{
// hmmmmm :-)
kdDebug() << "TagChooser::dragEnterEvent" << endl;
e->accept( dynamic_cast< TagList * >( e->source() )
- && QTextDrag::canDecode( e ) );
+ && TQTextDrag::canDecode( e ) );
kdDebug() << dynamic_cast< TagList * >( e->source() )
- << "; can decode " << QTextDrag::canDecode( e ) << endl;
+ << "; can decode " << TQTextDrag::canDecode( e ) << endl;
}
-void TagChooser::dropEvent( QDropEvent* e )
+void TagChooser::dropEvent( TQDropEvent* e )
{
TagList *tl = dynamic_cast< TagList * >( e->source() );
- QString tag;
- QTextDrag::decode( e, tag );
+ TQString tag;
+ TQTextDrag::decode( e, tag );
tl->setTags( tl->tags() - cache::Global::get().tags().tagByName(
static_cast< const char * >( tag.local8Bit() ) ) );
}
-QString FacetItem::text( int column ) const
+TQString FacetItem::text( int column ) const
{
if ( column == 0 )
- return QString( "[" ) + m_facet.name() + "] " + m_facet.shortDescription( "" );
+ return TQString( "[" ) + m_facet.name() + "] " + m_facet.shortDescription( "" );
return u8( "" );
}
diff --git a/adept/libadept/tagchooser.h b/adept/libadept/tagchooser.h
index 082a60b..f57e2f1 100644
--- a/adept/libadept/tagchooser.h
+++ b/adept/libadept/tagchooser.h
@@ -2,7 +2,7 @@
written by Peter Rockai <me@mornfall.net> */
#include <kdebug.h>
-#include <qlayout.h>
+#include <tqlayout.h>
#include <apt-front/utils/range.h>
#include <apt-front/cache/cache.h>
@@ -24,7 +24,7 @@ class TagChooser;
class TagItem : public KListViewItem {
public:
typedef cache::entity::Tag Tag;
- virtual QString text( int ) const;
+ virtual TQString text( int ) const;
TagItem( TagChooser *t );
TagItem( FacetItem *t );
void setTag( Tag t ) { m_tag = t; }
@@ -38,7 +38,7 @@ class FacetItem : public KListViewItem
{
public:
typedef cache::entity::Facet Facet;
- virtual QString text( int ) const;
+ virtual TQString text( int ) const;
FacetItem( TagChooser *t );
void setFacet( Facet f ) { m_facet = f; }
void removeTag( TagItem::Tag );
@@ -49,30 +49,31 @@ protected:
class TagChooser : public KListView, public cache::Observer // ExtendableList
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef cache::entity::Tag Tag;
typedef cache::entity::Facet Facet;
- TagChooser( QWidget *p = 0, const char *n = 0 );
+ TagChooser( TQWidget *p = 0, const char *n = 0 );
virtual void notifyPreRebuild( cache::component::Base * );
public slots:
virtual void setTags( TagChooser::Tag::Set );
- void setTitle( QString s ) {
+ void setTitle( TQString s ) {
setColumnText( 0, s );
}
void openToplevel();
protected:
- virtual void dragEnterEvent( QDragEnterEvent *e );
- virtual void dropEvent( QDropEvent* e );
- virtual void contentsDragEnterEvent( QDragEnterEvent *e ) {
+ virtual void dragEnterEvent( TQDragEnterEvent *e );
+ virtual void dropEvent( TQDropEvent* e );
+ virtual void contentsDragEnterEvent( TQDragEnterEvent *e ) {
kdDebug() << "TagChooser::contentsDragEnterEvent" << endl;
dragEnterEvent( e );
}
- virtual void contentsDropEvent( QDropEvent *e ) {
+ virtual void contentsDropEvent( TQDropEvent *e ) {
kdDebug() << "TagChooser::contentsDropEvent" << endl;
dropEvent( e );
}
- virtual QDragObject *dragObject();
+ virtual TQDragObject *dragObject();
Tag::Set m_tags;
std::map< Facet, FacetItem * > m_facets;
};
diff --git a/adept/libadept/tagfilter.cpp b/adept/libadept/tagfilter.cpp
index 4a08adc..8fce581 100644
--- a/adept/libadept/tagfilter.cpp
+++ b/adept/libadept/tagfilter.cpp
@@ -1,9 +1,9 @@
/* -*- C++ -*- libapt/tagfilter.h
written by Peter Rockai <me@mornfall.net> */
-#include <qpopupmenu.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqpushbutton.h>
+#include <tqtoolbutton.h>
#include <tagcoll/InputMerger.h>
@@ -12,16 +12,16 @@
using namespace adept;
-TagFilterWidget::TagFilterWidget( QWidget *w, const char *n )
+TagFilterWidget::TagFilterWidget( TQWidget *w, const char *n )
: TagFilterUi( w, n )
{
m_wanted->setName( i18n( "Tags I Want (drop tags here)" ) );
m_unwanted->setName( i18n( "Tags I Do Not Want (drop tags here)" ) );
- connect( m_wanted, SIGNAL( tagsChanged( TagList::Tag::Set ) ),
- this, SLOT( wantedChanged() ) );
- connect( m_unwanted, SIGNAL( tagsChanged( TagList::Tag::Set ) ),
- this, SLOT( unwantedChanged() ) );
+ connect( m_wanted, TQT_SIGNAL( tagsChanged( TagList::Tag::Set ) ),
+ this, TQT_SLOT( wantedChanged() ) );
+ connect( m_unwanted, TQT_SIGNAL( tagsChanged( TagList::Tag::Set ) ),
+ this, TQT_SLOT( unwantedChanged() ) );
}
TagFilterWidget::Predicate TagFilterWidget::predicate()
diff --git a/adept/libadept/tagfilter.h b/adept/libadept/tagfilter.h
index 1afa44a..9c74104 100644
--- a/adept/libadept/tagfilter.h
+++ b/adept/libadept/tagfilter.h
@@ -2,9 +2,9 @@
written by Peter Rockai <me@mornfall.net> */
#include <klocale.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qpoint.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
+#include <tqpoint.h>
#include <apt-front/cache/entity/entity.h>
#include <apt-front/cache/entity/package.h>
@@ -96,8 +96,9 @@ protected:
class TagFilterWidget : public TagFilterUi
{
Q_OBJECT
+ TQ_OBJECT
public:
- TagFilterWidget( QWidget *p, const char *n );
+ TagFilterWidget( TQWidget *p, const char *n );
virtual Predicate predicate();
public slots:
void predicateChanged();
diff --git a/adept/libadept/tagfilterui.ui b/adept/libadept/tagfilterui.ui
index 1f78b8a..05cf236 100644
--- a/adept/libadept/tagfilterui.ui
+++ b/adept/libadept/tagfilterui.ui
@@ -7,7 +7,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>90</height>
@@ -88,7 +88,7 @@
<includes>
<include location="global" impldecl="in declaration">adept/filterlist.h</include>
</includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>adept/taglist.h</includehint>
</includehints>
diff --git a/adept/libadept/taglist.cpp b/adept/libadept/taglist.cpp
index 22b3d58..f9337c5 100644
--- a/adept/libadept/taglist.cpp
+++ b/adept/libadept/taglist.cpp
@@ -1,11 +1,11 @@
/* -*- C++ -*- adept/taglist.cpp
written by Peter Rockai <me@mornfall.net> */
-#include <qlabel.h>
-#include <qtimer.h>
+#include <tqlabel.h>
+#include <tqtimer.h>
#include <kdebug.h>
-#include <qdragobject.h>
-#include <qevent.h>
+#include <tqdragobject.h>
+#include <tqevent.h>
#include <klocale.h>
#include <apt-front/cache/component/tags.h>
@@ -14,37 +14,37 @@
using namespace adept;
-TagLabel::TagLabel( Tag t, TagList *l, QWidget *p, const char *n )
- : QHBox( p, n ), m_tag( t ), m_list( l )
+TagLabel::TagLabel( Tag t, TagList *l, TQWidget *p, const char *n )
+ : TQHBox( p, n ), m_tag( t ), m_list( l )
{
if ( t == Tag() ) {
- m_description = new QLabel( QString( " " ) + i18n( "[none]" ), this );
+ m_description = new TQLabel( TQString( " " ) + i18n( "[none]" ), this );
} else {
- m_remove = new QLabel( this );
+ m_remove = new TQLabel( this );
m_remove->setPixmap( SmallIcon( u8( "cancel" ) ) );
- m_remove->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
- m_description = new QLabel( QString( " [" ) + t.fullname( "n/a" ) + "] "
+ m_remove->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+ m_description = new TQLabel( TQString( " [" ) + t.fullname( "n/a" ) + "] "
+ t.shortDescription( "n/a" ), this );
}
}
-void TagLabel::mouseReleaseEvent( QMouseEvent *e ) {
+void TagLabel::mouseReleaseEvent( TQMouseEvent *e ) {
if ( e->button() == Qt::LeftButton &&
- dynamic_cast< QLabel * >( childAt( e->pos() ) ) == m_remove )
+ dynamic_cast< TQLabel * >( tqchildAt( e->pos() ) ) == m_remove )
m_list->setTags( m_list->tags() - m_tag );
}
-TagList::TagList( QWidget *p, const char *n )
- : QVBox( p, n )
+TagList::TagList( TQWidget *p, const char *n )
+ : TQVBox( p, n )
{
- m_name = new QLabel( this );
- m_tagBox = new QVBox( this );
- m_tagBox->setFrameShape( QFrame::Panel );
- m_tagBox->setFrameShadow( QFrame::Sunken );
+ m_name = new TQLabel( this );
+ m_tagBox = new TQVBox( this );
+ m_tagBox->setFrameShape( TQFrame::Panel );
+ m_tagBox->setFrameShadow( TQFrame::Sunken );
m_updateScheduled = false;
setAcceptDrops( true );
scheduleUpdateList();
- m_tagSpacer = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
+ m_tagSpacer = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
}
void TagList::setTags( Tag::Set t )
@@ -63,7 +63,7 @@ void TagList::addTag( Tag t )
emit tagsChanged( m_tags );
}
-void TagList::setName( QString n )
+void TagList::setName( TQString n )
{
m_name->setText( n );
}
@@ -72,7 +72,7 @@ void TagList::scheduleUpdateList()
{
if (! m_updateScheduled) {
kdDebug() << "TagList: scheduling update" << endl;
- QTimer::singleShot( 0, this, SLOT( updateList() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( updateList() ) );
m_updateScheduled = true;
}
}
@@ -88,9 +88,9 @@ void TagList::updateList()
appendLabel( new TagLabel( *i, this, m_tagBox ) );
}
}
- m_tagBox->layout()->addItem( m_tagSpacer );
+ m_tagBox->tqlayout()->addItem( m_tagSpacer );
update();
- parentWidget()->adjustSize();
+ tqparentWidget()->adjustSize();
m_updateScheduled = false;
}
@@ -100,23 +100,23 @@ void TagList::appendLabel( TagLabel *l )
l->show();
}
-void TagList::mouseMoveEvent( QMouseEvent *e ) {
- TagLabel *child = dynamic_cast< TagLabel * >( childAt( e->pos() )->parentWidget() );
+void TagList::mouseMoveEvent( TQMouseEvent *e ) {
+ TagLabel *child = dynamic_cast< TagLabel * >( tqchildAt( e->pos() )->tqparentWidget() );
if ( !child )
return;
- QDragObject *d = new QTextDrag( child->tag().fullname( "" ), this );
+ TQDragObject *d = new TQTextDrag( child->tag().fullname( "" ), this );
d->dragCopy();
}
-void TagList::dragEnterEvent( QDragEnterEvent *e ) {
+void TagList::dragEnterEvent( TQDragEnterEvent *e ) {
kdDebug() << "TagList::dragEnterEvent" << endl;
- e->accept( QTextDrag::canDecode( e ) );
+ e->accept( TQTextDrag::canDecode( e ) );
}
-void TagList::dropEvent( QDropEvent* e ) {
- QString tag;
+void TagList::dropEvent( TQDropEvent* e ) {
+ TQString tag;
kdDebug() << "TagList: drop event" << endl;
- QTextDrag::decode( e, tag );
+ TQTextDrag::decode( e, tag );
try {
addTag( cache::Global::get().tags().tagByName(
static_cast< const char * >( tag.local8Bit() ) ) );
@@ -130,5 +130,5 @@ void TagList::clearList()
delete *i;
}
m_list.clear();
- m_tagBox->layout()->removeItem( m_tagSpacer );
+ m_tagBox->tqlayout()->removeItem( m_tagSpacer );
}
diff --git a/adept/libadept/taglist.h b/adept/libadept/taglist.h
index 4cd55a3..501e67a 100644
--- a/adept/libadept/taglist.h
+++ b/adept/libadept/taglist.h
@@ -3,11 +3,11 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
#include <kiconloader.h>
#include <vector>
@@ -16,7 +16,7 @@
#ifndef EPT_TAGLIST_H
#define EPT_TAGLIST_H
-class QLabel;
+class TQLabel;
namespace adept {
@@ -24,48 +24,50 @@ using namespace aptFront;
class TagList;
-class TagLabel : public QHBox
+class TagLabel : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef cache::entity::Tag Tag;
- TagLabel( Tag t, TagList *l, QWidget *p = 0, const char *n = 0 );
+ TagLabel( Tag t, TagList *l, TQWidget *p = 0, const char *n = 0 );
Tag tag() { return m_tag; }
protected:
- void mouseReleaseEvent( QMouseEvent *e );
+ void mouseReleaseEvent( TQMouseEvent *e );
Tag m_tag;
- QLabel *m_remove;
- QLabel *m_description;
+ TQLabel *m_remove;
+ TQLabel *m_description;
TagList *m_list;
};
-class TagList : public QVBox
+class TagList : public TQVBox
{
Q_OBJECT
+ TQ_OBJECT
public:
typedef cache::entity::Tag Tag;
- TagList( QWidget *p = 0, const char *n = 0 );
+ TagList( TQWidget *p = 0, const char *n = 0 );
void setTags( Tag::Set t );
void addTag( Tag t );
Tag::Set tags() { return m_tags; }
- void setName( QString n );
+ void setName( TQString n );
public slots:
void scheduleUpdateList();
void updateList();
signals:
void tagsChanged( TagList::Tag::Set );
protected:
- void mouseMoveEvent( QMouseEvent *e );
- void dropEvent( QDropEvent * );
- void dragEnterEvent( QDragEnterEvent * );
+ void mouseMoveEvent( TQMouseEvent *e );
+ void dropEvent( TQDropEvent * );
+ void dragEnterEvent( TQDragEnterEvent * );
void appendLabel( TagLabel * );
void clearList();
bool m_updateScheduled;
Tag::Set m_tags;
- QLabel *m_name;
- QVBox *m_tagBox;
- QSpacerItem *m_tagSpacer;
+ TQLabel *m_name;
+ TQVBox *m_tagBox;
+ TQSpacerItem *m_tagSpacer;
typedef std::vector< TagLabel * > List;
List m_list;
};
diff --git a/adept/libadept/threadutils.cpp b/adept/libadept/threadutils.cpp
index 722f75d..791a077 100644
--- a/adept/libadept/threadutils.cpp
+++ b/adept/libadept/threadutils.cpp
@@ -8,13 +8,13 @@
namespace adept {
-QMutex Threads::serialize;
+TQMutex Threads::serialize;
Threads::Queue Threads::threads;
void Threads::wait() {
- static std::map< QMutex *, int > locked;
+ static std::map< TQMutex *, int > locked;
while ( !threads.empty() ) {
- QThread *current = threads.front().first;
+ TQThread *current = threads.front().first;
if ( current->finished() ) {
delete current;
threads.pop_front();
@@ -35,7 +35,7 @@ void Threads::wait() {
}
}
-void Threads::enqueue( QThread *t, QMutex *m )
+void Threads::enqueue( TQThread *t, TQMutex *m )
{
threads.push_back( std::make_pair( t, m ) );
t->start();
diff --git a/adept/libadept/utils.h b/adept/libadept/utils.h
index 6c3a3d3..9eee06c 100644
--- a/adept/libadept/utils.h
+++ b/adept/libadept/utils.h
@@ -3,8 +3,8 @@
@author Peter Rockai <me@mornfall.net>
*/
-#include <qthread.h>
-#include <qstring.h>
+#include <tqthread.h>
+#include <tqstring.h>
#include <kapplication.h>
#include <string>
#include <queue>
@@ -15,28 +15,28 @@
namespace adept {
-inline QString u8( std::string s ) {
- return QString::fromUtf8( s.c_str() );
+inline TQString u8( std::string s ) {
+ return TQString::fromUtf8( s.c_str() );
}
-inline std::string u8( QString s ) {
+inline std::string u8( TQString s ) {
return std::string( s.utf8() );
}
-inline QString u8( const char *s ) {
- return QString::fromUtf8( s );
+inline TQString u8( const char *s ) {
+ return TQString::fromUtf8( s );
}
struct Threads {
- static QMutex serialize;
- typedef std::deque< std::pair< QThread *, QMutex * > > Queue;
+ static TQMutex serialize;
+ typedef std::deque< std::pair< TQThread *, TQMutex * > > Queue;
static Queue threads;
- static void enqueue( QThread *t, QMutex *m );
+ static void enqueue( TQThread *t, TQMutex *m );
static void wait();
};
template< typename F, typename P >
-struct AsyncCall : public QThread
+struct AsyncCall : public TQThread
{
AsyncCall( F f, P p ) : func( f ), param( p ) {}
virtual void run()
@@ -59,8 +59,8 @@ template< typename F, typename P > AsyncCall< F, P > *asyncCall( F f, P p ) {
return new AsyncCall< F, P >( f, p );
}
-inline static void adjustFontSize( QWidget *w, int off ) {
- QFont f = w->font();
+inline static void adjustFontSize( TQWidget *w, int off ) {
+ TQFont f = w->font();
f.setPointSize( f.pointSize() + off ); // a bit smaller font...
w->setFont( f );
w->updateGeometry();
diff --git a/adept/libadept/view.cpp b/adept/libadept/view.cpp
index 207277c..4424c93 100644
--- a/adept/libadept/view.cpp
+++ b/adept/libadept/view.cpp
@@ -11,19 +11,19 @@
using namespace adept;
-View::View( QWidget *p, const char *n )
- : QSplitter( p, n )
+View::View( TQWidget *p, const char *n )
+ : TQSplitter( p, n )
{
setOrientation( Qt::Vertical );
m_flist = new FilterList( this );
- m_bottom = new QSplitter( this );
+ m_bottom = new TQSplitter( this );
m_bottom->setOrientation( Qt::Horizontal );
m_lister = new Lister( m_bottom );
m_flist->plugLister( m_lister );
m_sidebar = new FilterSidebar( m_bottom );
- connect( m_lister, SIGNAL( cardinalityChanged( const Lister::Cardinality & ) ),
- m_sidebar, SLOT( setCardinality( const Lister::Cardinality & ) ) );
+ connect( m_lister, TQT_SIGNAL( cardinalityChanged( const Lister::Cardinality & ) ),
+ m_sidebar, TQT_SLOT( setCardinality( const Lister::Cardinality & ) ) );
m_flist->setHiddenPredicate(
predicate::adapt< entity::Entity >(
@@ -40,7 +40,7 @@ View::View( QWidget *p, const char *n )
m_lister->setRangeProvider( this );
- QTimer::singleShot( 0, this, SLOT( delayed() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( delayed() ) );
}
Lister::Range View::listerRange() {
@@ -50,13 +50,13 @@ Lister::Range View::listerRange() {
}
void View::hideTags() {
- QValueList< int > szl;
+ TQValueList< int > szl;
szl.append( 0 ); szl.append( 1 );
setSizes( szl );
}
void View::hideFilters() {
- QValueList< int > szl;
+ TQValueList< int > szl;
szl.append( 1 ); szl.append( 0 );
m_bottom->setSizes( szl );
}
@@ -89,22 +89,22 @@ void View::delayed()
// cleanRebuild();
}
-Browser::Browser( QWidget *p, const char *n )
- : QWidgetStack( p, n ), m_currentValid( false )
+Browser::Browser( TQWidget *p, const char *n )
+ : TQWidgetStack( p, n ), m_currentValid( false )
{
m_current = entity::Entity();
addWidget( m_view = new View( this ) );
addWidget( m_details = new PackageDetails( this ) );
- connect( m_view->lister(), SIGNAL( detailsRequested( Lister::Entity ) ),
- this, SLOT( show( Lister::Entity ) ) );
- connect( m_details, SIGNAL( showList() ),
- this, SLOT( showList() ) );
- connect( m_details, SIGNAL( back() ),
- this, SLOT( back() ) );
- connect( m_details, SIGNAL( forward() ),
- this, SLOT( forward() ) );
- connect( m_details, SIGNAL( detailsRequested( Lister::Entity ) ),
- this, SLOT( show( Lister::Entity ) ) );
+ connect( m_view->lister(), TQT_SIGNAL( detailsRequested( Lister::Entity ) ),
+ this, TQT_SLOT( show( Lister::Entity ) ) );
+ connect( m_details, TQT_SIGNAL( showList() ),
+ this, TQT_SLOT( showList() ) );
+ connect( m_details, TQT_SIGNAL( back() ),
+ this, TQT_SLOT( back() ) );
+ connect( m_details, TQT_SIGNAL( forward() ),
+ this, TQT_SLOT( forward() ) );
+ connect( m_details, TQT_SIGNAL( detailsRequested( Lister::Entity ) ),
+ this, TQT_SLOT( show( Lister::Entity ) ) );
}
void Browser::showList()
diff --git a/adept/libadept/view.h b/adept/libadept/view.h
index ea6c6f5..fc284f9 100644
--- a/adept/libadept/view.h
+++ b/adept/libadept/view.h
@@ -2,8 +2,8 @@
#include <deque>
-#include <qsplitter.h>
-#include <qwidgetstack.h>
+#include <tqsplitter.h>
+#include <tqwidgetstack.h>
#include <adept/lister.h>
#include <adept/filterlist.h>
@@ -11,17 +11,18 @@
#ifndef EPT_VIEW_H
#define EPT_VIEW_H
-class QSplitter;
+class TQSplitter;
namespace adept {
class FilterSidebar;
class PackageDetails;
-class View: public QSplitter, public Lister::RangeProvider {
+class View: public TQSplitter, public Lister::RangeProvider {
Q_OBJECT
+ TQ_OBJECT
public:
- View( QWidget *p = 0, const char *n = 0 );
+ View( TQWidget *p = 0, const char *n = 0 );
FilterList *filterList() { return m_flist; }
Lister *lister() { return m_lister; }
virtual Lister::Range listerRange();
@@ -35,16 +36,17 @@ protected slots:
void delayed();
protected:
predicate::Predicate< entity::Entity > previewPredicate();
- QSplitter *m_bottom;
+ TQSplitter *m_bottom;
FilterList *m_flist;
Lister *m_lister;
FilterSidebar *m_sidebar;
};
-class Browser : public QWidgetStack {
+class Browser : public TQWidgetStack {
Q_OBJECT
+ TQ_OBJECT
public:
- Browser( QWidget *p = 0, const char *n = 0 );
+ Browser( TQWidget *p = 0, const char *n = 0 );
View *searchView() const { return m_view; }
public slots:
void forward();
diff --git a/adept/manager/app.cpp b/adept/manager/app.cpp
index fa1d024..21cae1f 100644
--- a/adept/manager/app.cpp
+++ b/adept/manager/app.cpp
@@ -1,8 +1,8 @@
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qwidgetstack.h>
-#include <qsplitter.h>
-#include <qtimer.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqwidgetstack.h>
+#include <tqsplitter.h>
+#include <tqtimer.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -42,28 +42,28 @@ TestApp::TestApp() {
setupGUI();
m_rebuilds = 0;
- m_stack = new QWidgetStack( this );
+ m_stack = new TQWidgetStack( this );
- m_stack->addWidget( m_loading = new QLabel( i18n( "Loading, please wait..." ), m_stack ) );
- m_loading->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+ m_stack->addWidget( m_loading = new TQLabel( i18n( "Loading, please wait..." ), m_stack ) );
+ m_loading->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
Application::setStatusBar( statusBar() );
setCentralWidget( m_stack );
- QTimer::singleShot(
+ TQTimer::singleShot(
0, this,
- SLOT( delayed() ) );
+ TQT_SLOT( delayed() ) );
kdDebug() << "ctor done" << endl;
}
void TestApp::guardLister( Lister *l )
{
- connect( l, SIGNAL( rebuildStarted() ),
- this, SLOT( rebuildStarted() ) );
- connect( l, SIGNAL( rebuildFinished() ),
- this, SLOT( rebuildFinished() ) );
+ connect( l, TQT_SIGNAL( rebuildStarted() ),
+ this, TQT_SLOT( rebuildStarted() ) );
+ connect( l, TQT_SIGNAL( rebuildFinished() ),
+ this, TQT_SLOT( rebuildFinished() ) );
}
void TestApp::delayed() {
@@ -79,8 +79,8 @@ void TestApp::delayed() {
"Dir::Etc::sourcelist").c_str(),
this ) );
- connect ( m_sources, SIGNAL( close() ),
- this, SLOT( closeSources() ) );
+ connect ( m_sources, TQT_SIGNAL( close() ),
+ this, TQT_SLOT( closeSources() ) );
// set up preview widget
m_stack->addWidget( m_preview = new adept::Browser( m_stack ) );
@@ -109,49 +109,49 @@ void TestApp::setupActions()
{
(new KAction(
i18n( "Fetch Updates" ), u8( "adept_update" ),
- 0, this, SLOT( update() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( update() ), actionCollection(),
"update" ))->setEnabled( false );
(new KAction(
i18n( "Reload Cache" ), u8( "adept_reload" ),
- 0, this, SLOT( reload() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(),
"reload" ))->setEnabled( false );
m_upgrade = new KAction(
i18n( "Safe Upgrade" ), u8( "adept_upgrade" ),
- 0, this, SLOT( upgrade() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( upgrade() ), actionCollection(),
"upgrade" );
m_distUpgrade = new KAction(
i18n( "Full Upgrade" ), u8( "adept_distupgrade" ),
- 0, this, SLOT( distUpgrade() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( distUpgrade() ), actionCollection(),
"dist-upgrade" );
m_commit = new KAction(
i18n( "Apply Changes" ), u8( "adept_commit" ),
- 0, this, SLOT( commit() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( commit() ), actionCollection(),
"commit" );
m_sourcesAction = new KToggleAction(
i18n( "Manage Repositories" ), u8( "adept_sourceseditor" ),
- 0, this, SLOT( toggleSources() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( toggleSources() ), actionCollection(),
"sourceseditor" );
m_previewAction = new KToggleAction(
i18n( "Preview Changes" ), u8( "adept_preview" ),
- 0, this, SLOT( togglePreview() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( togglePreview() ), actionCollection(),
"preview" );
m_progressAction = new KToggleAction(
i18n( "Show Last Download" ), u8( "adept_download_out" ),
- 0, this, SLOT( toggleDownload() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( toggleDownload() ), actionCollection(),
"download_out" );
m_commitProgressAction = new KToggleAction(
i18n( "Show Last DPkg Run" ), u8( "adept_commit_out" ),
- 0, this, SLOT( toggleCommit() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( toggleCommit() ), actionCollection(),
"commit_out" );
m_listAction = new KToggleAction(
i18n( "Show Package List" ), u8( "adept_packagelist" ),
- 0, this, SLOT( closeModes() ), actionCollection(),
+ 0, TQT_TQOBJECT(this), TQT_SLOT( closeModes() ), actionCollection(),
"packagelist" );
m_sourcesAction->setEnabled( true );
@@ -163,14 +163,14 @@ void TestApp::setupActions()
m_modesClosed = m_listAction;
m_listAction->setChecked( true );
- m_undo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
- m_redo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
+ m_undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), actionCollection() );
+ m_redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), actionCollection() );
m_distUpgrade->setEnabled( false );
m_upgrade->setEnabled( false );
m_commit->setEnabled( false );
- KStdAction::quit( this, SLOT( close() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
setHistoryEnabled( false );
createStandardStatusBarAction();
}
@@ -243,7 +243,7 @@ void TestApp::notifyPostChange( component::Base *b )
updateActionState();
}
-void TestApp::closeEvent( QCloseEvent *e ) {
+void TestApp::closeEvent( TQCloseEvent *e ) {
cache::component::State &s = cache::Global::get().state();
if (s.changed()) {
if (KMessageBox::warningYesNo(
diff --git a/adept/manager/app.h b/adept/manager/app.h
index b900b81..ba768b6 100644
--- a/adept/manager/app.h
+++ b/adept/manager/app.h
@@ -13,9 +13,9 @@
#include <adept/sourceseditor.h>
#include <adept/application.h>
-class QVBox;
-class QWidgetStack;
-class QSplitter;
+class TQVBox;
+class TQWidgetStack;
+class TQSplitter;
class KAction;
namespace adept {
class AcqProgressWidget;
@@ -26,6 +26,7 @@ using namespace adept;
class TestApp : public KMainWindow, Application {
Q_OBJECT
+ TQ_OBJECT
public:
enum Mode { Default, Sources, Preview, Download, Commit };
void setupActions();
@@ -87,7 +88,7 @@ protected slots:
protected:
void updateActionState();
void guardLister( adept::Lister * );
- void addMode( Mode m, KToggleAction *a, QWidget *w ) {
+ void addMode( Mode m, KToggleAction *a, TQWidget *w ) {
m_modeActionMap[ m ] = a;
m_modeWidgetMap[ m ] = w;
a->setChecked( false );
@@ -97,7 +98,7 @@ protected:
return m_modeActionMap[ m ];
}
- QWidget *modeWidget( Mode m ) {
+ TQWidget *modeWidget( Mode m ) {
return m_modeWidgetMap[ m ];
}
@@ -106,13 +107,13 @@ protected:
void toggleMode( Mode );
friend class WaitForLister;
- virtual void closeEvent( QCloseEvent * );
+ virtual void closeEvent( TQCloseEvent * );
virtual void notifyPostChange( cache::component::Base * );
virtual void notifyPostRebuild( cache::component::Base * );
virtual void notifyPreChange( cache::component::Base * );
- QWidgetStack *m_stack;
- QLabel *m_loading;
+ TQWidgetStack *m_stack;
+ TQLabel *m_loading;
// stacked widgets
adept::AcqProgressWidget *m_progress;
@@ -122,7 +123,7 @@ protected:
// other stuff
std::vector<KAction *> m_actions;
- QMap< QString, QString > m_icons;
+ TQMap< TQString, TQString > m_icons;
KAction *m_undo, *m_redo;
int m_rebuilds;
@@ -132,7 +133,7 @@ protected:
KToggleAction *m_sourcesAction, *m_commitProgressAction, *m_listAction,
*m_previewAction, *m_progressAction;
std::map< Mode, KToggleAction * > m_modeActionMap;
- std::map< Mode, QWidget * > m_modeWidgetMap;
+ std::map< Mode, TQWidget * > m_modeWidgetMap;
KToggleAction *m_modesClosed;
private:
template<typename T> void plugAptActions();
diff --git a/adept/manager/main.cpp b/adept/manager/main.cpp
index df7c42b..a0dd563 100644
--- a/adept/manager/main.cpp
+++ b/adept/manager/main.cpp
@@ -16,8 +16,8 @@ int main(int argc, char *argv[])
KLocale::setMainCatalogue("adept");
- putenv( "QT_IM_MODULE=xim" );
- QString description = i18n("Adept Manager");
+ putenv( "TQT_IM_MODULE=xim" );
+ TQString description = i18n("Adept Manager");
KAboutData aboutData( "adept_manager",
I18N_NOOP("Adept Manager"),
@@ -43,10 +43,10 @@ int main(int argc, char *argv[])
/* KConfig* config = KGlobal::config();
config->setGroup("General Settings");
- QString version = config->readEntry("Version"); */
+ TQString version = config->readEntry("Version"); */
- KGlobal::locale()->insertCatalogue(QString::fromUtf8("libept"));
- KGlobal::locale()->insertCatalogue(QString::fromUtf8("libapt-front"));
+ KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept"));
+ KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libapt-front"));
TestApp *ta = new TestApp();
diff --git a/adept/notifier/app.cpp b/adept/notifier/app.cpp
index d815772..54770bc 100644
--- a/adept/notifier/app.cpp
+++ b/adept/notifier/app.cpp
@@ -1,8 +1,8 @@
#include <unistd.h>
#include <sys/stat.h>
-#include <qtooltip.h>
-#include <qtimer.h>
-#include <qfile.h>
+#include <tqtooltip.h>
+#include <tqtimer.h>
+#include <tqfile.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
@@ -33,13 +33,13 @@ using namespace cache;
using namespace utils;
using namespace adept;
-TrayWindow::TrayWindow(QWidget *parent, const char *name)
- : KSystemTray(parent, name), m_updates( 0 )
+TrayWindow::TrayWindow(TQWidget *tqparent, const char *name)
+ : KSystemTray(tqparent, name), m_updates( 0 )
{
setAvailableUpdates( m_updates );
// actionCollection()->remove( actionCollection()->action( "quit" ) );
- m_quit = KStdAction::quit( this, SIGNAL( quitSelected() ), actionCollection() );
- m_about = KStdAction::aboutApp( this, SIGNAL( aboutSelected() ), actionCollection() );
+ m_quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SIGNAL( quitSelected() ), actionCollection() );
+ m_about = KStdAction::aboutApp( TQT_TQOBJECT(this), TQT_SIGNAL( aboutSelected() ), actionCollection() );
// setPixmap( loadIcon( u8( "adept_notifier_warning" ) ) );
}
@@ -50,7 +50,7 @@ void TrayWindow::contextMenuAboutToShow( KPopupMenu *r ) {
m_quit->plug( r );
}
-void TrayWindow::resizeEvent ( QResizeEvent * )
+void TrayWindow::resizeEvent ( TQResizeEvent * )
{
// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
setPixmap( m_updates == 0 ?
@@ -77,37 +77,37 @@ void TrayWindow::setAvailableUpdates( int n )
else
show();
- QToolTip::remove(this);
- QToolTip::add(this, n == 0 ? i18n( "No updates needed." )
+ TQToolTip::remove(this);
+ TQToolTip::add(this, n == 0 ? i18n( "No updates needed." )
: i18n( "There is %n updated package available",
"There are %n updated packages available", n ) );
}
-void TrayWindow::mouseReleaseEvent(QMouseEvent *ev)
+void TrayWindow::mouseReleaseEvent(TQMouseEvent *ev)
{
- if (ev->button() == QMouseEvent::LeftButton)
+ if (ev->button() == Qt::LeftButton)
emit clicked();
KSystemTray::mouseReleaseEvent(ev);
}
-void ApportTrayWindow::mousePressEvent(QMouseEvent *ev)
+void ApportTrayWindow::mousePressEvent(TQMouseEvent *ev)
{
emit clicked();
hide();
}
-void ApportTrayWindow::resizeEvent ( QResizeEvent * )
+void ApportTrayWindow::resizeEvent ( TQResizeEvent * )
{
// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
setPixmap( loadSizedIcon(u8("apport"), width()) );
}
-void RebootTrayWindow::mousePressEvent(QMouseEvent *ev)
+void RebootTrayWindow::mousePressEvent(TQMouseEvent *ev)
{
emit clicked();
}
-void RebootTrayWindow::resizeEvent ( QResizeEvent * )
+void RebootTrayWindow::resizeEvent ( TQResizeEvent * )
{
// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
setPixmap( loadSizedIcon(u8("reload"), width()) );
@@ -119,7 +119,7 @@ NotifierApp::NotifierApp(bool allowStyles, bool GUIenabled)
{
sharedConfig()->setGroup( "General" );
m_okAutostart = sharedConfig()->readBoolEntry( "Autostart", true );
- m_timer = new QTimer( this );
+ m_timer = new TQTimer( this );
m_tray = new TrayWindow( 0, 0 );
m_tray->show();
m_rebootRequired = false;
@@ -133,11 +133,11 @@ NotifierApp::NotifierApp(bool allowStyles, bool GUIenabled)
m_tray->setAvailableUpdates( upgradable() );
- connect( m_tray, SIGNAL( clicked() ), this, SLOT( clicked() ) );
- // connect( m_tray, SIGNAL( quitSelected() ), this, SLOT( quit() ) );
- connect( m_tray, SIGNAL( quitSelected() ), this, SLOT( askQuit() ) );
- connect( m_tray, SIGNAL( aboutSelected() ), this, SLOT( about() ) );
- connect( m_timer, SIGNAL( timeout() ), this, SLOT( checkUpdates() ) );
+ connect( m_tray, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
+ // connect( m_tray, TQT_SIGNAL( quitSelected() ), this, TQT_SLOT( quit() ) );
+ connect( m_tray, TQT_SIGNAL( quitSelected() ), this, TQT_SLOT( askQuit() ) );
+ connect( m_tray, TQT_SIGNAL( aboutSelected() ), this, TQT_SLOT( about() ) );
+ connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( checkUpdates() ) );
m_timer->start( 1000*5 ); // 5 secs now, used to be 60
if ( !m_okAutostart ) {
int r = KMessageBox::questionYesNo(
@@ -157,37 +157,37 @@ NotifierApp::NotifierApp(bool allowStyles, bool GUIenabled)
// if apport crash handler it installed, watch for crash reports appearing and run
// the apport frontend when they do
bool runApport = sharedConfig()->readBoolEntry( "Apport", true );
- if ( QFile::exists(QString("/usr/share/apport/apport-qt")) && runApport ) {
- m_dirWatch = new KDirWatch(this);
- m_dirWatch->addDir(QString("/var/crash"));
- connect( m_dirWatch, SIGNAL( dirty(const QString&) ), this, SLOT( crashWatcher() ) );
+ if ( TQFile::exists(TQString("/usr/share/apport/apport-qt")) && runApport ) {
+ m_dirWatch = new KDirWatch(TQT_TQOBJECT(this));
+ m_dirWatch->addDir(TQString("/var/crash"));
+ connect( m_dirWatch, TQT_SIGNAL( dirty(const TQString&) ), this, TQT_SLOT( crashWatcher() ) );
KProcess *proc = new KProcess;
*proc << "/usr/share/apport/apport-checkreports";
- connect( proc, SIGNAL(processExited(KProcess*)), this, SLOT(apportCheckExited(KProcess*)) );
+ connect( proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(apportCheckExited(KProcess*)) );
proc->start(KProcess::Block);
if (m_crashes) {
ApportTrayWindow* crashApplet = new ApportTrayWindow;
crashApplet->setPixmap( crashApplet->loadSizedIcon(u8("apport"), crashApplet->width()) );
- QString crashMessage = i18n("An application has crashed on your "
+ TQString crashMessage = i18n("An application has crashed on your "
"system (now or in the past).\n"
"Click to "
"display details. "
);
- QToolTip::add(crashApplet, crashMessage);
- connect( crashApplet, SIGNAL(clicked()), this, SLOT(crashWatcher()) );
+ TQToolTip::add(crashApplet, crashMessage);
+ connect( crashApplet, TQT_SIGNAL(clicked()), this, TQT_SLOT(crashWatcher()) );
crashApplet->show();
- QPixmap icon = BarIcon(u8("apport"));
+ TQPixmap icon = BarIcon(u8("apport"));
KPassivePopup::message(i18n("Crash Handler"), crashMessage, icon, crashApplet);
}
}
// if reboot-required is installed watch for reboot-required and dpkg-run-stamp
- if ( QFile::exists(QString("/usr/share/update-notifier/notify-reboot-required")) ) {
- m_rebootDirWatch = new KDirWatch(this);
- m_rebootDirWatch->addFile(QString("/var/run/reboot-required"));
- m_rebootDirWatch->addFile(QString("/var/lib/update-notifier/dpkg-run-stamp"));
- connect( m_rebootDirWatch, SIGNAL( dirty(const QString&) ), this, SLOT( rebootWatcher(const QString&) ) );
+ if ( TQFile::exists(TQString("/usr/share/update-notifier/notify-reboot-required")) ) {
+ m_rebootDirWatch = new KDirWatch(TQT_TQOBJECT(this));
+ m_rebootDirWatch->addFile(TQString("/var/run/reboot-required"));
+ m_rebootDirWatch->addFile(TQString("/var/lib/update-notifier/dpkg-run-stamp"));
+ connect( m_rebootDirWatch, TQT_SIGNAL( dirty(const TQString&) ), this, TQT_SLOT( rebootWatcher(const TQString&) ) );
}
}
@@ -197,7 +197,7 @@ void NotifierApp::crashWatcher() {
KProcess *proc = new KProcess;
*proc << "/usr/share/apport/apport-checkreports";
*proc << "--system";
- connect( proc, SIGNAL(processExited(KProcess*)), this, SLOT(apportCheckExited(KProcess*)) );
+ connect( proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(apportCheckExited(KProcess*)) );
proc->start(KProcess::Block);
if (m_crashes) {
@@ -219,23 +219,23 @@ void NotifierApp::apportCheckExited(KProcess* proc) {
}
}
-void NotifierApp::rebootWatcher(const QString& path) {
+void NotifierApp::rebootWatcher(const TQString& path) {
kdDebug() << "NotifierApp::rebootWatcher: " << path << endl;
- if (path == QString("/var/run/reboot-required")) {
+ if (path == TQString("/var/run/reboot-required")) {
m_rebootRequired = true;
}
- if (path == QString("/var/lib/update-notifier/dpkg-run-stamp") && m_rebootRequired && !m_rebootShown) {
+ if (path == TQString("/var/lib/update-notifier/dpkg-run-stamp") && m_rebootRequired && !m_rebootShown) {
RebootTrayWindow* rebootApplet = new RebootTrayWindow;
rebootApplet->setPixmap( rebootApplet->loadSizedIcon(u8("reload"), rebootApplet->width()) );
- QString rebootMessage = i18n("In order to complete the update your system needs to be restarted.");
- QToolTip::add(rebootApplet, rebootMessage);
- connect( rebootApplet, SIGNAL(clicked()), this, SLOT(rebootClicked()) );
+ TQString rebootMessage = i18n("In order to complete the update your system needs to be restarted.");
+ TQToolTip::add(rebootApplet, rebootMessage);
+ connect( rebootApplet, TQT_SIGNAL(clicked()), this, TQT_SLOT(rebootClicked()) );
rebootApplet->show();
- QPixmap icon = BarIcon(u8("reload"));
+ TQPixmap icon = BarIcon(u8("reload"));
KPassivePopup::message(i18n("Reboot Required"), rebootMessage, icon, rebootApplet);
m_rebootShown = true;
}
@@ -244,7 +244,7 @@ void NotifierApp::rebootWatcher(const QString& path) {
void NotifierApp::rebootClicked() {
kdDebug() << "NotifierApp::rebootClicked" << endl;
- if (KMessageBox::questionYesNo(0, QString("In order to complete the update your system needs to be restarted."), QString("Restart Require")) == KMessageBox::Yes) {
+ if (KMessageBox::questionYesNo(0, TQString("In order to complete the update your system needs to be restarted."), TQString("Restart Require")) == KMessageBox::Yes) {
kdDebug() << "NotifierApp::rebootClicked yes!" << endl;
KProcess *proc = new KProcess;
*proc << "/usr/bin/dcop";
diff --git a/adept/notifier/app.h b/adept/notifier/app.h
index 82f6fb6..7015647 100644
--- a/adept/notifier/app.h
+++ b/adept/notifier/app.h
@@ -7,7 +7,7 @@
#include <kdirwatch.h>
#include <kprocess.h>
-class QWidget;
+class TQWidget;
class KAction;
// class KGlobalAccel;
@@ -15,8 +15,9 @@ class KAction;
class TrayWindow : public KSystemTray
{
Q_OBJECT
+ TQ_OBJECT
public:
- TrayWindow(QWidget *parent=0, const char *name=0);
+ TrayWindow(TQWidget *tqparent=0, const char *name=0);
void setAvailableUpdates( int n );
int updates() { return m_updates; }
void contextMenuAboutToShow ( KPopupMenu * );
@@ -24,8 +25,8 @@ signals:
void clicked();
void aboutSelected();
protected:
- void mouseReleaseEvent( QMouseEvent * );
- void resizeEvent( QResizeEvent * );
+ void mouseReleaseEvent( TQMouseEvent * );
+ void resizeEvent( TQResizeEvent * );
int m_updates;
KAction *m_quit, *m_about;
};
@@ -37,22 +38,24 @@ protected:
class ApportTrayWindow : public KSystemTray
{
Q_OBJECT
+ TQ_OBJECT
signals:
void clicked();
protected:
- void mousePressEvent(QMouseEvent*);
- void resizeEvent(QResizeEvent *);
+ void mousePressEvent(TQMouseEvent*);
+ void resizeEvent(TQResizeEvent *);
};
// used for the reboot notifier
class RebootTrayWindow : public KSystemTray
{
Q_OBJECT
+ TQ_OBJECT
signals:
void clicked();
protected:
- void mousePressEvent(QMouseEvent*);
- void resizeEvent(QResizeEvent *);
+ void mousePressEvent(TQMouseEvent*);
+ void resizeEvent(TQResizeEvent *);
};
@@ -62,6 +65,7 @@ protected:
class NotifierApp : public KUniqueApplication
{
Q_OBJECT
+ TQ_OBJECT
public:
NotifierApp(bool allowStyles=true, bool GUIenabled=true);
~NotifierApp();
@@ -77,12 +81,12 @@ protected slots:
// for apport
void crashWatcher();
void apportCheckExited(KProcess*);
- void rebootWatcher(const QString& path);
+ void rebootWatcher(const TQString& path);
void rebootClicked();
protected:
TrayWindow *m_tray;
- QTimer *m_timer;
+ TQTimer *m_timer;
time_t m_updateStamp, m_statusStamp;
bool m_okAutostart;
// for apport crash handler
diff --git a/adept/tests/libcapture/tree-test.cpp b/adept/tests/libcapture/tree-test.cpp
index 0e2f8d5..6cb8a38 100644
--- a/adept/tests/libcapture/tree-test.cpp
+++ b/adept/tests/libcapture/tree-test.cpp
@@ -21,15 +21,15 @@ namespace tut {
class STF: public TreeFactory
{
public:
- TreePkgNode *makePkgNode (TreeNode *parent, pkgCache::PkgIterator P)
- { return new TreePkgNode (parent, P); }
- TreeBranchNode *makeBranchNode (TreeNode *parent, string id, string name)
- { return new TreeBranchNode (parent, id, name); }
- TreeGroupNode *makeGroupNode (TreeNode *parent, pkgTagSection s)
- { return new TreeGroupNode (parent, s); }
+ TreePkgNode *makePkgNode (TreeNode *tqparent, pkgCache::PkgIterator P)
+ { return new TreePkgNode (tqparent, P); }
+ TreeBranchNode *makeBranchNode (TreeNode *tqparent, string id, string name)
+ { return new TreeBranchNode (tqparent, id, name); }
+ TreeGroupNode *makeGroupNode (TreeNode *tqparent, pkgTagSection s)
+ { return new TreeGroupNode (tqparent, s); }
TreeBranchNode *makeRoot () { return new TreeBranchNode (0, "ROOT"); }
- TreeDepNode *makeDepNode (TreeNode *parent, pkgCache::DepIterator) { return 0; }
- TreeVerNode *makeVerNode (TreeNode *parent, pkgCache::VerIterator) { return 0; }
+ TreeDepNode *makeDepNode (TreeNode *tqparent, pkgCache::DepIterator) { return 0; }
+ TreeVerNode *makeVerNode (TreeNode *tqparent, pkgCache::VerIterator) { return 0; }
};
/* class TestProd: public NodeProducer {
diff --git a/adept/tests/tut.h b/adept/tests/tut.h
index dec471a..e068870 100644
--- a/adept/tests/tut.h
+++ b/adept/tests/tut.h
@@ -232,7 +232,7 @@ namespace tut
throw std::invalid_argument("group shall be non-null");
}
- groups::iterator found = groups_.find(name);
+ groups::iterator found = groups_.tqfind(name);
if( found != groups_.end() )
{
std::string msg("attempt to add already existent group "+name);
@@ -316,7 +316,7 @@ namespace tut
{
callback_->run_started();
- const_iterator i = groups_.find(group_name);
+ const_iterator i = groups_.tqfind(group_name);
if( i == groups_.end() )
{
throw no_such_group(group_name);
@@ -347,7 +347,7 @@ namespace tut
{
callback_->run_started();
- const_iterator i = groups_.find(group_name);
+ const_iterator i = groups_.tqfind(group_name);
if( i == groups_.end() )
{
throw no_such_group(group_name);
@@ -724,7 +724,7 @@ namespace tut
if( tests_.rbegin()->first < n ) throw beyond_last_test();
// withing scope; check if given test exists
- tests_iterator ti = tests_.find(n);
+ tests_iterator ti = tests_.tqfind(n);
if( ti == tests_.end() ) throw no_such_test();
safe_holder<object> obj;
diff --git a/adept/updater/app.cpp b/adept/updater/app.cpp
index 4d53f69..d48fbd2 100644
--- a/adept/updater/app.cpp
+++ b/adept/updater/app.cpp
@@ -1,8 +1,8 @@
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qsplitter.h>
-#include <qtimer.h>
-#include <qwidgetstack.h>
+#include <tqvbox.h>
+#include <tqlabel.h>
+#include <tqsplitter.h>
+#include <tqtimer.h>
+#include <tqwidgetstack.h>
#include <kpushbutton.h>
#include <klocale.h>
@@ -38,23 +38,23 @@ void WaitForLister::waiting()
{
kdDebug() << "WaitForLister::waiting()" << endl;
if (app->m_list->searchView()->lister()->busy())
- QTimer::singleShot( 100, this, SLOT( waiting() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( waiting() ) );
else {
- QTimer::singleShot( 0, app, slot );
+ TQTimer::singleShot( 0, app, slot );
deleteLater();
}
}
TestApp::TestApp()
{
- m_all = new QVBox( this );
- m_stack = new QWidgetStack( m_all );
+ m_all = new TQVBox( this );
+ m_stack = new TQWidgetStack( m_all );
- m_stack->addWidget( m_loading = new QLabel( i18n( "Loading, please wait..." ), m_stack ) );
- m_loading->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+ m_stack->addWidget( m_loading = new TQLabel( i18n( "Loading, please wait..." ), m_stack ) );
+ m_loading->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
- m_buttons = new QHBox( m_all );
- QLabel *space = new QLabel( m_buttons ); // spacing
+ m_buttons = new TQHBox( m_all );
+ TQLabel *space = new TQLabel( m_buttons ); // spacing
m_next = new KPushButton( i18n( "Next" ), m_buttons );
m_quit = new KPushButton( i18n( "Quit" ), m_buttons );
m_next->setEnabled( false );
@@ -62,13 +62,13 @@ TestApp::TestApp()
m_buttons->setSpacing( 2 );
m_buttons->setMargin( 2 );
- QSizePolicy buttons( QSizePolicy::Preferred, QSizePolicy::Fixed, false );
- m_buttons->setSizePolicy( buttons );
- m_next->setSizePolicy( buttons );
- m_quit->setSizePolicy( buttons );
- space->setSizePolicy( QSizePolicy(
- QSizePolicy::Expanding,
- QSizePolicy::Fixed, false ) );
+ TQSizePolicy buttons( TQSizePolicy::Preferred, TQSizePolicy::Fixed, false );
+ m_buttons->tqsetSizePolicy( buttons );
+ m_next->tqsetSizePolicy( buttons );
+ m_quit->tqsetSizePolicy( buttons );
+ space->tqsetSizePolicy( TQSizePolicy(
+ TQSizePolicy::Expanding,
+ TQSizePolicy::Fixed, false ) );
setStandardToolBarMenuEnabled( false );
createStandardStatusBarAction();
@@ -78,9 +78,9 @@ TestApp::TestApp()
Application::setStatusBar( statusBar() );
- QTimer::singleShot(
+ TQTimer::singleShot(
0, this,
- SLOT( delayed() ) );
+ TQT_SLOT( delayed() ) );
setCentralWidget( m_all );
setMinimumSize( 400, 300 );
@@ -92,12 +92,12 @@ void TestApp::delayed()
observeComponent< component::State >();
m_stack->addWidget( m_list = new adept::Browser( m_stack ) );
- m_stack->addWidget( m_bye = new QLabel( i18n( "Update Complete" ),
+ m_stack->addWidget( m_bye = new TQLabel( i18n( "Update Complete" ),
m_stack ) );
- m_stack->addWidget( m_start = new QLabel( i18n( "Welcome to Adept Updater" ),
+ m_stack->addWidget( m_start = new TQLabel( i18n( "Welcome to Adept Updater" ),
m_stack ) );
- m_bye->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
- m_start->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+ m_bye->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+ m_start->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
m_list->searchView()->setUpgradeMode();
@@ -113,9 +113,9 @@ void TestApp::delayed()
void TestApp::setupActions()
{
- KStdAction::quit( kapp, SLOT( quit() ), actionCollection() );
- m_undo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
- m_redo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
+ KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() );
+ m_undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), actionCollection() );
+ m_redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), actionCollection() );
setHistoryEnabled( false );
createStandardStatusBarAction();
}
@@ -142,18 +142,18 @@ void TestApp::notifyPostChange( component::Base *b )
m_list->searchView()->lister()->scheduleRebuild(); // rebuild on change...
}
-void TestApp::setNext( QString s, const char *slot, QString q, const char *quits ) {
- disconnect( m_next, SIGNAL( clicked() ), 0, 0 );
+void TestApp::setNext( TQString s, const char *slot, TQString q, const char *quits ) {
+ disconnect( m_next, TQT_SIGNAL( clicked() ), 0, 0 );
m_next->setText( s );
m_next->setEnabled( slot );
if ( slot )
- connect( m_next, SIGNAL( clicked() ), this, slot );
+ connect( m_next, TQT_SIGNAL( clicked() ), this, slot );
- disconnect( m_quit, SIGNAL( clicked() ), 0, 0 );
+ disconnect( m_quit, TQT_SIGNAL( clicked() ), 0, 0 );
m_quit->setEnabled( quits );
m_quit->setText( q );
if ( quits )
- connect( m_quit, SIGNAL( clicked() ), this, quits );
+ connect( m_quit, TQT_SIGNAL( clicked() ), this, quits );
}
void TestApp::disableNext() {
@@ -168,8 +168,8 @@ void TestApp::disableButtons() {
void TestApp::start() {
// disableNext();
update();
-// setNext( i18n( "Fetch List of Updates" ), SLOT( update() ),
-// i18n( "Skip Fetching List" ), SLOT( postUpdate() ) );
+// setNext( i18n( "Fetch List of Updates" ), TQT_SLOT( update() ),
+// i18n( "Skip Fetching List" ), TQT_SLOT( postUpdate() ) );
}
void TestApp::update() {
@@ -198,12 +198,12 @@ void TestApp::postUpdate() {
m_list->searchView()->lister()->scheduleRebuild();
m_stack->raiseWidget( m_list );
setHistoryEnabled( true );
- setNext( i18n( "Apply Updates" ), SLOT( commit() ) );
+ setNext( i18n( "Apply Updates" ), TQT_SLOT( commit() ) );
} else {
m_bye->setText( i18n( "Nothing to Update" ) );
m_stack->raiseWidget( m_bye );
disableNext();
- // setNext( i18n( "Nothing to do, Quit" ), SLOT( close() ) );
+ // setNext( i18n( "Nothing to do, Quit" ), TQT_SLOT( close() ) );
m_quit->setText( i18n( "Quit" ) );
m_quit->setEnabled( true );
}
@@ -214,7 +214,7 @@ void TestApp::commit() {
disableButtons();
setHistoryEnabled( false );
if (m_list->searchView()->lister()->busy()) {
- new WaitForLister( this, SLOT( commit() ) );
+ new WaitForLister( this, TQT_SLOT( commit() ) );
return;
}
diff --git a/adept/updater/app.h b/adept/updater/app.h
index 9f59438..322c80a 100644
--- a/adept/updater/app.h
+++ b/adept/updater/app.h
@@ -12,9 +12,9 @@
#include <adept/commitprogress.h>
#include <adept/application.h>
-class QVBox;
-class QWidgetStack;
-class QSplitter;
+class TQVBox;
+class TQWidgetStack;
+class TQSplitter;
class KAction;
class KPushButton;
namespace adept {
@@ -26,6 +26,7 @@ using namespace adept;
class TestApp : public KMainWindow, Application {
Q_OBJECT
+ TQ_OBJECT
public:
void setupActions();
ExtTerminalInterface *terminal();
@@ -46,19 +47,19 @@ protected slots:
void disableNext();
void disableButtons();
- void setNext( QString str, const char *slot,
- QString qstr = i18n( "Forget Changes and Quit" ),
- const char *qslot = SLOT( close() ) );
+ void setNext( TQString str, const char *slot,
+ TQString qstr = i18n( "Forget Changes and Quit" ),
+ const char *qslot = TQT_SLOT( close() ) );
protected:
friend class WaitForLister;
virtual void notifyPostChange( cache::component::Base * );
virtual void notifyPreChange( cache::component::Base * );
- QWidgetStack *m_stack;
- QVBox *m_all;
- QHBox *m_buttons;
- QLabel *m_start, *m_bye, *m_loading;
+ TQWidgetStack *m_stack;
+ TQVBox *m_all;
+ TQHBox *m_buttons;
+ TQLabel *m_start, *m_bye, *m_loading;
KPushButton *m_next, *m_quit;
// stacked widgets
@@ -68,13 +69,14 @@ protected:
// other stuff
std::vector<KAction *> m_actions;
- QMap< QString, QString > m_icons;
+ TQMap< TQString, TQString > m_icons;
KAction *m_undo, *m_redo;
cache::component::History< cache::component::State > *m_history;
};
-class WaitForLister : public QObject {
+class WaitForLister : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
WaitForLister( TestApp *a, const char *s )
: app( a ), slot( s )
diff --git a/adept/updater/main.cpp b/adept/updater/main.cpp
index a86ee9b..cf003ed 100644
--- a/adept/updater/main.cpp
+++ b/adept/updater/main.cpp
@@ -16,8 +16,8 @@ int main(int argc, char *argv[])
KLocale::setMainCatalogue("adept_updater");
- putenv( "QT_IM_MODULE=xim" );
- QString description = i18n("Adept Updater");
+ putenv( "TQT_IM_MODULE=xim" );
+ TQString description = i18n("Adept Updater");
KAboutData aboutData( "adept_updater",
I18N_NOOP("Adept Updater"),
@@ -43,9 +43,9 @@ int main(int argc, char *argv[])
/* KConfig* config = KGlobal::config();
config->setGroup("General Settings");
- QString version = config->readEntry("Version"); */
+ TQString version = config->readEntry("Version"); */
- KGlobal::locale()->insertCatalogue(QString::fromUtf8("libept"));
+ KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept"));
TestApp *ta = new TestApp();