diff --git a/acinclude.m4 b/acinclude.m4 index 2db09a6..d789b14 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1141,7 +1141,7 @@ fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <> conftest.$ac_ext <button() == Qt::RightButton) + if(TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton) ktview->m_headerMenu->popup(TQCursor::pos()); break; diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp index dd90345..b2df871 100644 --- a/apps/ktorrent/newui/dmainwindow.cpp +++ b/apps/ktorrent/newui/dmainwindow.cpp @@ -34,7 +34,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) { loadSettings(); createToolWindows(); - m_central = new Ideal::DockSplitter(Qt::Horizontal, this); + m_central = new Ideal::DockSplitter(TQt::Horizontal, this); m_activeTabWidget = createTab(); m_central->addDock(0, 0, m_activeTabWidget); setCentralWidget(m_central); diff --git a/apps/ktorrent/newui/docksplitter.cpp b/apps/ktorrent/newui/docksplitter.cpp index bb6a68d..fde09d8 100644 --- a/apps/ktorrent/newui/docksplitter.cpp +++ b/apps/ktorrent/newui/docksplitter.cpp @@ -23,16 +23,16 @@ namespace Ideal { -DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *parent, const char *name) +DockSplitter::DockSplitter(TQt::Orientation orientation, TQWidget *parent, const char *name) :TQSplitter(parent, name), m_orientation(orientation) { switch (m_orientation) { - case Qt::Horizontal: - setOrientation(Qt::Vertical); + case TQt::Horizontal: + setOrientation(TQt::Vertical); break; - case Qt::Vertical: - setOrientation(Qt::Horizontal); + case TQt::Vertical: + setOrientation(TQt::Horizontal); break; } setOpaqueResize(true); @@ -73,11 +73,11 @@ void DockSplitter::appendSplitter() { switch (m_orientation) { - case Qt::Horizontal: - m_splitters.append(new TQSplitter(Qt::Horizontal, this)); + case TQt::Horizontal: + m_splitters.append(new TQSplitter(TQt::Horizontal, this)); break; - case Qt::Vertical: - m_splitters.append(new TQSplitter(Qt::Vertical, this)); + case TQt::Vertical: + m_splitters.append(new TQSplitter(TQt::Vertical, this)); break; } m_splitters[m_splitters.size()-1]->setOpaqueResize(true); diff --git a/apps/ktorrent/newui/docksplitter.h b/apps/ktorrent/newui/docksplitter.h index f1be737..3856c4c 100644 --- a/apps/ktorrent/newui/docksplitter.h +++ b/apps/ktorrent/newui/docksplitter.h @@ -34,7 +34,7 @@ class DockSplitter: public TQSplitter { TQ_OBJECT public: - DockSplitter(Qt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); + DockSplitter(TQt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); ~DockSplitter(); void addDock(uint row, uint col, TQWidget *dock); @@ -53,7 +53,7 @@ protected: bool isRowEmpty(int row); private: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQValueList m_splitters; TQValueList > m_docks; }; diff --git a/libktorrent/expandablewidget.cpp b/libktorrent/expandablewidget.cpp index fe7a0df..2302329 100644 --- a/libktorrent/expandablewidget.cpp +++ b/libktorrent/expandablewidget.cpp @@ -57,7 +57,7 @@ namespace kt top_layout->remove(begin->w); // create new toplevel splitter - Qt::Orientation orientation = (pos == RIGHT || pos == LEFT) ? Qt::Horizontal : Qt::Vertical; + TQt::Orientation orientation = (pos == RIGHT || pos == LEFT) ? TQt::Horizontal : TQt::Vertical; TQSplitter* s = new TQSplitter(orientation,this);; se->s = s; diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp index 7fe1424..1518943 100644 --- a/libktorrent/labelview.cpp +++ b/libktorrent/labelview.cpp @@ -91,7 +91,7 @@ namespace kt void LabelViewItem::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { clicked(this); } diff --git a/plugins/stats/ChartDrawer.cpp b/plugins/stats/ChartDrawer.cpp index 6eb08b4..ad4ff67 100644 --- a/plugins/stats/ChartDrawer.cpp +++ b/plugins/stats/ChartDrawer.cpp @@ -190,7 +190,7 @@ void ChartDrawer::DrawChart(TQPainter & rPnt) // ------------ TQPen myop(rPnt.pen()); TQPen topl(myop); - topl.setStyle(Qt::DotLine); + topl.setStyle(TQt::DotLine); rPnt.setPen(topl); rPnt.drawLine(0, TrY(FindYScreenCoords(mEls[i].pmVals -> at(mEls[i].pmVals -> size() - 1))), width(), TrY(FindYScreenCoords(mEls[i].pmVals -> at(mEls[i].pmVals -> size() - 1))) ); rPnt.setPen(myop); diff --git a/plugins/stats/StatsCon.cpp b/plugins/stats/StatsCon.cpp index 568005d..d2f8d5f 100644 --- a/plugins/stats/StatsCon.cpp +++ b/plugins/stats/StatsCon.cpp @@ -25,13 +25,13 @@ namespace kt { StatsCon::StatsCon(TQWidget * p) : StatsConWgt(p), pmPeersConCht(new ChartDrawer(PeersConGbw, StatsPluginSettings::connectionsMeasurements())), pmDHTCht(new ChartDrawer(DHTGbw, StatsPluginSettings::dHTMeasurements())) { - PeersConGbw->setColumnLayout(0, Qt::Vertical ); + PeersConGbw->setColumnLayout(0, TQt::Vertical ); PeersConGbw->layout()->setSpacing( 6 ); PeersConGbw->layout()->setMargin( 11 ); pmPeersConLay = new TQVBoxLayout(PeersConGbw -> layout()); - DHTGbw->setColumnLayout(0, Qt::Vertical ); + DHTGbw->setColumnLayout(0, TQt::Vertical ); DHTGbw->layout()->setSpacing( 6 ); DHTGbw->layout()->setMargin( 11 ); diff --git a/plugins/stats/StatsSpd.cpp b/plugins/stats/StatsSpd.cpp index c8cb157..d48e2fd 100644 --- a/plugins/stats/StatsSpd.cpp +++ b/plugins/stats/StatsSpd.cpp @@ -28,19 +28,19 @@ StatsSpd::StatsSpd(TQWidget *p) : StatsSpdWgt(p), pmUpCht(new ChartDrawer(UpSpeedGbw, StatsPluginSettings::uploadMeasurements())) { - DownSpeedGbw->setColumnLayout(0, Qt::Vertical ); + DownSpeedGbw->setColumnLayout(0, TQt::Vertical ); DownSpeedGbw->layout()->setSpacing( 6 ); DownSpeedGbw->layout()->setMargin( 11 ); pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> layout()); - UpSpeedGbw->setColumnLayout(0, Qt::Vertical ); + UpSpeedGbw->setColumnLayout(0, TQt::Vertical ); UpSpeedGbw->layout()->setSpacing( 6 ); UpSpeedGbw->layout()->setMargin( 11 ); pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> layout()); - PeersSpdGbw->setColumnLayout(0, Qt::Vertical ); + PeersSpdGbw->setColumnLayout(0, TQt::Vertical ); PeersSpdGbw->layout()->setSpacing( 6 ); PeersSpdGbw->layout()->setMargin( 11 ); diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp index 24e847f..f7f9600 100644 --- a/plugins/webinterface/httpserver.cpp +++ b/plugins/webinterface/httpserver.cpp @@ -248,7 +248,7 @@ namespace kt void HttpServer::setDefaultResponseHeaders(HttpResponseHeader & hdr,const TQString & content_type,bool with_session_info) { hdr.setValue("Server","KTorrent/" KT_VERSION_MACRO); - hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC),false)); + hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC),false)); hdr.setValue("Content-Type",content_type); hdr.setValue("Connection","keep-alive"); if (with_session_info && session.sessionId && session.logged_in) @@ -351,7 +351,7 @@ namespace kt setDefaultResponseHeaders(rhdr,"text/html",true); rhdr.setValue("Cache-Control","max-age=0"); rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false)); - rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false)); + rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC).addSecs(3600),false)); hdlr->sendResponse(rhdr); return; } @@ -361,7 +361,7 @@ namespace kt HttpResponseHeader rhdr(200); setDefaultResponseHeaders(rhdr,ExtensionToContentType(ext),true); rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false)); - rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false)); + rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC).addSecs(3600),false)); rhdr.setValue("Cache-Control","private"); if (!hdlr->sendFile(rhdr,path)) { @@ -505,7 +505,7 @@ namespace kt d.setYMD(sl[3].toInt(),m,sl[1].toInt()); - TQTime t = TQTime::fromString(sl[4],Qt::ISODate); + TQTime t = TQTime::fromString(sl[4],TQt::ISODate); return TQDateTime(d,t); } else if (sl.count() == 4) @@ -524,7 +524,7 @@ namespace kt d.setYMD(2000 + dl[2].toInt(),m,dl[0].toInt()); - TQTime t = TQTime::fromString(sl[2],Qt::ISODate); + TQTime t = TQTime::fromString(sl[2],TQt::ISODate); return TQDateTime(d,t); } else if (sl.count() == 5) @@ -539,7 +539,7 @@ namespace kt d.setYMD(sl[4].toInt(),m,sl[2].toInt()); - TQTime t = TQTime::fromString(sl[3],Qt::ISODate); + TQTime t = TQTime::fromString(sl[3],TQt::ISODate); return TQDateTime(d,t); } else