summaryrefslogtreecommitdiffstats
path: root/kpf/src
diff options
context:
space:
mode:
Diffstat (limited to 'kpf/src')
-rw-r--r--kpf/src/ActiveMonitor.cpp44
-rw-r--r--kpf/src/ActiveMonitor.h22
-rw-r--r--kpf/src/ActiveMonitorItem.cpp22
-rw-r--r--kpf/src/ActiveMonitorItem.h18
-rw-r--r--kpf/src/ActiveMonitorWindow.cpp6
-rw-r--r--kpf/src/ActiveMonitorWindow.h6
-rw-r--r--kpf/src/Applet.cpp86
-rw-r--r--kpf/src/Applet.h24
-rw-r--r--kpf/src/AppletItem.cpp58
-rw-r--r--kpf/src/AppletItem.h10
-rw-r--r--kpf/src/BandwidthGraph.cpp60
-rw-r--r--kpf/src/BandwidthGraph.h28
-rw-r--r--kpf/src/ByteRange.cpp16
-rw-r--r--kpf/src/ByteRange.h10
-rw-r--r--kpf/src/ConfigDialogPage.cpp100
-rw-r--r--kpf/src/ConfigDialogPage.h26
-rw-r--r--kpf/src/Defaults.cpp28
-rw-r--r--kpf/src/Defaults.h6
-rw-r--r--kpf/src/DirSelectWidget.cpp32
-rw-r--r--kpf/src/DirSelectWidget.h10
-rw-r--r--kpf/src/DirectoryLister.cpp76
-rw-r--r--kpf/src/DirectoryLister.h6
-rw-r--r--kpf/src/ErrorMessageConfigDialog.cpp38
-rw-r--r--kpf/src/ErrorMessageConfigDialog.h14
-rw-r--r--kpf/src/Help.cpp2
-rw-r--r--kpf/src/Help.h4
-rw-r--r--kpf/src/KPFInterface.cpp16
-rw-r--r--kpf/src/KPFInterface.h16
-rw-r--r--kpf/src/PortValidator.cpp12
-rw-r--r--kpf/src/PortValidator.h6
-rw-r--r--kpf/src/PropertiesDialogPlugin.cpp200
-rw-r--r--kpf/src/PropertiesDialogPlugin.h10
-rw-r--r--kpf/src/Request.cpp56
-rw-r--r--kpf/src/Request.h44
-rw-r--r--kpf/src/Resource.cpp40
-rw-r--r--kpf/src/Resource.h10
-rw-r--r--kpf/src/Response.cpp40
-rw-r--r--kpf/src/Response.h4
-rw-r--r--kpf/src/RootValidator.cpp18
-rw-r--r--kpf/src/RootValidator.h6
-rw-r--r--kpf/src/Server.cpp68
-rw-r--r--kpf/src/Server.h18
-rw-r--r--kpf/src/ServerPrivate.h20
-rw-r--r--kpf/src/ServerSocket.cpp6
-rw-r--r--kpf/src/ServerSocket.h4
-rw-r--r--kpf/src/ServerWizard.cpp124
-rw-r--r--kpf/src/ServerWizard.h30
-rw-r--r--kpf/src/SingleServerConfigDialog.cpp8
-rw-r--r--kpf/src/SingleServerConfigDialog.h2
-rw-r--r--kpf/src/StartingKPFDialog.cpp28
-rw-r--r--kpf/src/StartingKPFDialog.h4
-rw-r--r--kpf/src/Utils.cpp70
-rw-r--r--kpf/src/Utils.h44
-rw-r--r--kpf/src/WebServer.cpp76
-rw-r--r--kpf/src/WebServer.h18
-rw-r--r--kpf/src/WebServerManager.cpp40
-rw-r--r--kpf/src/WebServerManager.h32
-rw-r--r--kpf/src/WebServerSocket.cpp2
-rw-r--r--kpf/src/WebServerSocket.h2
59 files changed, 913 insertions, 913 deletions
diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp
index 8bd0c34a..5a11848d 100644
--- a/kpf/src/ActiveMonitor.cpp
+++ b/kpf/src/ActiveMonitor.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qlayout.h>
+#include <tqlayout.h>
#include <kiconloader.h>
#include <klocale.h>
@@ -38,16 +38,16 @@ namespace KPF
ActiveMonitor::ActiveMonitor
(
WebServer * server,
- QWidget * parent,
+ TQWidget * parent,
const char * name
)
- : QWidget (parent, name),
+ : TQWidget (parent, name),
server_ (server)
{
- view_ = new QListView(this);
+ view_ = new TQListView(this);
view_->setAllColumnsShowFocus(true);
- view_->setSelectionMode(QListView::Extended);
+ view_->setSelectionMode(TQListView::Extended);
view_->addColumn(i18n("Status"));
view_->addColumn(i18n("Progress"));
@@ -57,36 +57,36 @@ namespace KPF
view_->addColumn(i18n("Resource"));
view_->addColumn(i18n("Host"));
- QVBoxLayout * layout = new QVBoxLayout(this);
+ TQVBoxLayout * layout = new TQVBoxLayout(this);
layout->addWidget(view_);
connect
(
view_,
- SIGNAL(selectionChanged()),
- SLOT(slotSelectionChanged())
+ TQT_SIGNAL(selectionChanged()),
+ TQT_SLOT(slotSelectionChanged())
);
connect
(
server_,
- SIGNAL(connection(Server *)),
- SLOT(slotConnection(Server *))
+ TQT_SIGNAL(connection(Server *)),
+ TQT_SLOT(slotConnection(Server *))
);
connect
(
server_,
- SIGNAL(output(Server *, ulong)),
- SLOT(slotOutput(Server *, ulong))
+ TQT_SIGNAL(output(Server *, ulong)),
+ TQT_SLOT(slotOutput(Server *, ulong))
);
- connect(server_, SIGNAL(finished(Server *)), SLOT(slotFinished(Server *)));
- connect(server_, SIGNAL(request(Server *)), SLOT(slotRequest(Server *)));
- connect(server_, SIGNAL(response(Server *)), SLOT(slotResponse(Server *)));
+ connect(server_, TQT_SIGNAL(finished(Server *)), TQT_SLOT(slotFinished(Server *)));
+ connect(server_, TQT_SIGNAL(request(Server *)), TQT_SLOT(slotRequest(Server *)));
+ connect(server_, TQT_SIGNAL(response(Server *)), TQT_SLOT(slotResponse(Server *)));
- connect(&cullTimer_, SIGNAL(timeout()), SLOT(slotCull()));
+ connect(&cullTimer_, TQT_SIGNAL(timeout()), TQT_SLOT(slotCull()));
cullTimer_.start(1000);
@@ -146,9 +146,9 @@ namespace KPF
void
ActiveMonitor::slotCull()
{
- QDateTime dt = QDateTime::currentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
- QListViewItemIterator it(view_);
+ TQListViewItemIterator it(view_);
for (; it.current(); ++it)
{
@@ -165,7 +165,7 @@ namespace KPF
void
ActiveMonitor::slotSelectionChanged()
{
- for (QListViewItemIterator it(view_); it.current(); ++it)
+ for (TQListViewItemIterator it(view_); it.current(); ++it)
{
ActiveMonitorItem * i = static_cast<ActiveMonitorItem *>(it.current());
@@ -189,7 +189,7 @@ namespace KPF
void
ActiveMonitor::slotKillSelected()
{
- for (QListViewItemIterator it(view_); it.current(); ++it)
+ for (TQListViewItemIterator it(view_); it.current(); ++it)
{
ActiveMonitorItem * i = static_cast<ActiveMonitorItem *>(it.current());
@@ -214,9 +214,9 @@ namespace KPF
}
void
- ActiveMonitor::closeEvent(QCloseEvent * e)
+ ActiveMonitor::closeEvent(TQCloseEvent * e)
{
- QWidget::closeEvent(e);
+ TQWidget::closeEvent(e);
emit(dying(this));
}
diff --git a/kpf/src/ActiveMonitor.h b/kpf/src/ActiveMonitor.h
index f0f62265..1c1e8618 100644
--- a/kpf/src/ActiveMonitor.h
+++ b/kpf/src/ActiveMonitor.h
@@ -24,9 +24,9 @@
#ifndef KPF_ACTIVE_MONITOR_H
#define KPF_ACTIVE_MONITOR_H
-#include <qmap.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <tqmap.h>
+#include <tqtimer.h>
+#include <tqwidget.h>
class QListView;
class QPainter;
@@ -42,7 +42,7 @@ namespace KPF
* Shows a list of ActiveMonitorItem objects.
*
* Proxies signals from Server objects to ActiveMonitorItem objects.
- * This is done to avoid making ActiveMonitorItem inherit QObject.
+ * This is done to avoid making ActiveMonitorItem inherit TQObject.
*/
class ActiveMonitor : public QWidget
{
@@ -57,7 +57,7 @@ namespace KPF
ActiveMonitor
(
WebServer * server,
- QWidget * parent = 0,
+ TQWidget * parent = 0,
const char * name = 0
);
@@ -123,7 +123,7 @@ namespace KPF
void slotCull();
/**
- * Connected to the relevant signal of the contained QListView and used
+ * Connected to the relevant signal of the contained TQListView and used
* to update the enabled/disabled state of the button which allows
* killing connections.
*/
@@ -134,7 +134,7 @@ namespace KPF
/**
* Overridden to emit a signal when this window is closed.
*/
- virtual void closeEvent(QCloseEvent *);
+ virtual void closeEvent(TQCloseEvent *);
signals:
@@ -144,19 +144,19 @@ namespace KPF
void dying(ActiveMonitor *);
/**
- * Emitted when the selection of the contained QListView has changed.
+ * Emitted when the selection of the contained TQListView has changed.
* @param selectionExists true if there is a selection.
*/
void selection(bool selectionExists);
private:
- QListView * view_;
+ TQListView * view_;
WebServer * server_;
- QMap<Server *, ActiveMonitorItem *> itemMap_;
+ TQMap<Server *, ActiveMonitorItem *> itemMap_;
- QTimer cullTimer_;
+ TQTimer cullTimer_;
};
} // End namespace KPF
diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp
index 1cc8fdcb..6721080e 100644
--- a/kpf/src/ActiveMonitorItem.cpp
+++ b/kpf/src/ActiveMonitorItem.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qpainter.h>
+#include <tqpainter.h>
#include <kiconloader.h>
#include "Defines.h"
@@ -31,8 +31,8 @@
namespace KPF
{
- ActiveMonitorItem::ActiveMonitorItem(Server * server, QListView * parent)
- : QListViewItem (parent),
+ ActiveMonitorItem::ActiveMonitorItem(Server * server, TQListView * parent)
+ : TQListViewItem (parent),
server_ (server),
size_ (0),
sent_ (0)
@@ -54,8 +54,8 @@ namespace KPF
void
ActiveMonitorItem::paintCell
(
- QPainter * p,
- const QColorGroup & g,
+ TQPainter * p,
+ const TQColorGroup & g,
int c,
int w,
int a
@@ -63,7 +63,7 @@ namespace KPF
{
if (c != Progress)
{
- QListViewItem::paintCell(p, g, c, w, a);
+ TQListViewItem::paintCell(p, g, c, w, a);
return;
}
@@ -86,8 +86,8 @@ namespace KPF
int
ActiveMonitorItem::width
(
- const QFontMetrics & fm,
- const QListView * lv,
+ const TQFontMetrics & fm,
+ const TQListView * lv,
int c
) const
{
@@ -102,7 +102,7 @@ namespace KPF
break;
default:
- return QListViewItem::width(fm, lv, c);
+ return TQListViewItem::width(fm, lv, c);
break;
}
}
@@ -164,7 +164,7 @@ namespace KPF
size_ = server_->response().size();
- setText(Size, QString::number(size_));
+ setText(Size, TQString::number(size_));
updateState();
}
@@ -176,7 +176,7 @@ namespace KPF
if (0 != server_)
{
sent_ += l;
- setText(Sent, QString::number(sent_));
+ setText(Sent, TQString::number(sent_));
updateState();
repaint();
}
diff --git a/kpf/src/ActiveMonitorItem.h b/kpf/src/ActiveMonitorItem.h
index 99cc13db..d3cb2e71 100644
--- a/kpf/src/ActiveMonitorItem.h
+++ b/kpf/src/ActiveMonitorItem.h
@@ -24,10 +24,10 @@
#ifndef KPF_ACTIVE_MONITOR_ITEM_H
#define KPF_ACTIVE_MONITOR_ITEM_H
-#include <qlistview.h>
-#include <qdatetime.h>
-#include <qfontmetrics.h>
-#include <qpalette.h>
+#include <tqlistview.h>
+#include <tqdatetime.h>
+#include <tqfontmetrics.h>
+#include <tqpalette.h>
class QPainter;
@@ -60,7 +60,7 @@ namespace KPF
/**
* @param server the associated Server object.
*/
- ActiveMonitorItem(Server * server, QListView * parent);
+ ActiveMonitorItem(Server * server, TQListView * parent);
virtual ~ActiveMonitorItem();
/**
@@ -107,7 +107,7 @@ namespace KPF
* @return the time of death (end of transactions with remote client)
* of the associated Server object.
*/
- QDateTime death() const;
+ TQDateTime death() const;
protected:
@@ -122,18 +122,18 @@ namespace KPF
* the number of bytes sent to the remote client by the associated
* Server object.
*/
- virtual void paintCell(QPainter *, const QColorGroup &, int, int, int);
+ virtual void paintCell(TQPainter *, const TQColorGroup &, int, int, int);
/**
* Overridden to provide for giving reasonable sizes for columns which
* do not contain text.
*/
- virtual int width(const QFontMetrics &, const QListView *, int) const;
+ virtual int width(const TQFontMetrics &, const TQListView *, int) const;
private:
Server * server_;
- QDateTime death_;
+ TQDateTime death_;
ulong size_;
ulong sent_;
};
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index ae44e4be..7eb3f07f 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -34,7 +34,7 @@ namespace KPF
ActiveMonitorWindow::ActiveMonitorWindow
(
WebServer * server,
- QWidget * parent,
+ TQWidget * parent,
const char * name
)
: KMainWindow(parent, name)
@@ -52,7 +52,7 @@ namespace KPF
"stop",
0,
monitor_,
- SLOT(slotKillSelected()),
+ TQT_SLOT(slotKillSelected()),
actionCollection(),
"kill"
);
@@ -80,7 +80,7 @@ namespace KPF
}
void
- ActiveMonitorWindow::closeEvent(QCloseEvent *)
+ ActiveMonitorWindow::closeEvent(TQCloseEvent *)
{
emit(dying(this));
}
diff --git a/kpf/src/ActiveMonitorWindow.h b/kpf/src/ActiveMonitorWindow.h
index eddf1113..bb9dc2e0 100644
--- a/kpf/src/ActiveMonitorWindow.h
+++ b/kpf/src/ActiveMonitorWindow.h
@@ -52,7 +52,7 @@ namespace KPF
ActiveMonitorWindow
(
WebServer * server,
- QWidget * parent = 0,
+ TQWidget * parent = 0,
const char * name = 0
);
@@ -76,7 +76,7 @@ namespace KPF
/**
* Overridden to emit a signal when this window is closed.
*/
- virtual void closeEvent(QCloseEvent *);
+ virtual void closeEvent(TQCloseEvent *);
signals:
@@ -86,7 +86,7 @@ namespace KPF
void dying(ActiveMonitorWindow *);
/**
- * Emitted when the selection of the contained QListView has changed.
+ * Emitted when the selection of the contained TQListView has changed.
* @param selectionExists true if there is a selection.
*/
void selection(bool selectionExists);
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index edd7a652..0eee06c8 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -21,14 +21,14 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qpainter.h>
-#include <qtimer.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qtoolbutton.h>
-#include <qpopupmenu.h>
-#include <qfileinfo.h>
-#include <qcursor.h>
+#include <tqpainter.h>
+#include <tqtimer.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqfileinfo.h>
+#include <tqcursor.h>
#include <dcopclient.h>
#include <kiconloader.h>
@@ -54,7 +54,7 @@ static const char kpfVersion[] = "1.0.1";
extern "C"
{
KDE_EXPORT KPanelApplet *
- init(QWidget * parent, const QString & configFile)
+ init(TQWidget * parent, const TQString & configFile)
{
if (0 == kpf::userId() || 0 == kpf::effectiveUserId())
{
@@ -90,10 +90,10 @@ namespace KPF
{
Applet::Applet
(
- const QString & configFile,
+ const TQString & configFile,
Type type,
int actions,
- QWidget * parent,
+ TQWidget * parent,
const char * name
)
: KPanelApplet (configFile, type, actions, parent, name),
@@ -103,26 +103,26 @@ namespace KPF
{
setAcceptDrops(true);
- //setFrameStyle(QFrame::Panel | QFrame::Sunken);
+ //setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
//setLineWidth(1);
connect
(
WebServerManager::instance(),
- SIGNAL(serverCreated(WebServer *)),
- SLOT(slotServerCreated(WebServer *))
+ TQT_SIGNAL(serverCreated(WebServer *)),
+ TQT_SLOT(slotServerCreated(WebServer *))
);
connect
(
WebServerManager::instance(),
- SIGNAL(serverDisabled(WebServer *)),
- SLOT(slotServerDisabled(WebServer *))
+ TQT_SIGNAL(serverDisabled(WebServer *)),
+ TQT_SLOT(slotServerDisabled(WebServer *))
);
WebServerManager::instance()->loadConfig();
- popup_ = new QPopupMenu(this);
+ popup_ = new TQPopupMenu(this);
popup_->insertItem
(BarIcon("filenew"), i18n("New Server..."), NewServer, NewServer);
@@ -171,7 +171,7 @@ namespace KPF
void
Applet::help()
{
- kapp->invokeHelp( QString::null, "kpf" );
+ kapp->invokeHelp( TQString::null, "kpf" );
}
void
@@ -226,15 +226,15 @@ namespace KPF
}
void
- Applet::resizeEvent(QResizeEvent *)
+ Applet::resizeEvent(TQResizeEvent *)
{
resetLayout();
}
void
- Applet::moveEvent(QMoveEvent *)
+ Applet::moveEvent(TQMoveEvent *)
{
- QPtrListIterator<AppletItem> it(itemList_);
+ TQPtrListIterator<AppletItem> it(itemList_);
for (uint i = 0; it.current(); ++it, ++i)
it.current()->setBackground();
@@ -252,7 +252,7 @@ namespace KPF
{
uint itemHeight = height() / itemList_.count();
- QPtrListIterator<AppletItem> it(itemList_);
+ TQPtrListIterator<AppletItem> it(itemList_);
for (uint i = 0; it.current(); ++it, ++i)
{
@@ -266,7 +266,7 @@ namespace KPF
{
uint itemWidth = width() / itemList_.count();
- QPtrListIterator<AppletItem> it(itemList_);
+ TQPtrListIterator<AppletItem> it(itemList_);
for (uint i = 0; it.current(); ++it, ++i)
{
@@ -280,12 +280,12 @@ namespace KPF
}
void
- Applet::mousePressEvent(QMouseEvent * ev)
+ Applet::mousePressEvent(TQMouseEvent * ev)
{
if (Qt::RightButton != ev->button() && Qt::LeftButton != ev->button())
return;
- switch (popup_->exec(QCursor::pos()))
+ switch (popup_->exec(TQCursor::pos()))
{
case NewServer:
slotNewServer();
@@ -301,7 +301,7 @@ namespace KPF
}
void
- Applet::slotNewServerAtLocation(const QString & location)
+ Applet::slotNewServerAtLocation(const TQString & location)
{
if (0 != wizard_)
{
@@ -316,8 +316,8 @@ namespace KPF
connect
(
wizard_,
- SIGNAL(dying(ServerWizard *)),
- SLOT(slotWizardDying(ServerWizard *))
+ TQT_SIGNAL(dying(ServerWizard *)),
+ TQT_SLOT(slotWizardDying(ServerWizard *))
);
wizard_->setLocation(location);
@@ -338,8 +338,8 @@ namespace KPF
connect
(
wizard_,
- SIGNAL(dying(ServerWizard *)),
- SLOT(slotWizardDying(ServerWizard *))
+ TQT_SIGNAL(dying(ServerWizard *)),
+ TQT_SLOT(slotWizardDying(ServerWizard *))
);
wizard_->show();
@@ -349,7 +349,7 @@ namespace KPF
void
Applet::slotWizardDying(ServerWizard * wiz)
{
- if (QDialog::Accepted == wiz->result())
+ if (TQDialog::Accepted == wiz->result())
{
WebServerManager::instance()->createServerLocal
(
@@ -367,9 +367,9 @@ namespace KPF
}
void
- Applet::drawContents(QPainter * p)
+ Applet::drawContents(TQPainter * p)
{
- QPixmap px;
+ TQPixmap px;
if (width() > 48)
px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48);
@@ -380,7 +380,7 @@ namespace KPF
else
return;
- QRect r(contentsRect());
+ TQRect r(contentsRect());
p->drawPixmap
(
@@ -391,7 +391,7 @@ namespace KPF
}
void
- Applet::dragEnterEvent(QDragEnterEvent * e)
+ Applet::dragEnterEvent(TQDragEnterEvent * e)
{
KURL::List l;
@@ -403,14 +403,14 @@ namespace KPF
const KURL &url = l[0];
- if (!url.isLocalFile() || !QFileInfo(url.path()).isDir())
+ if (!url.isLocalFile() || !TQFileInfo(url.path()).isDir())
return;
e->accept();
}
void
- Applet::dropEvent(QDropEvent * e)
+ Applet::dropEvent(TQDropEvent * e)
{
KURL::List l;
@@ -422,7 +422,7 @@ namespace KPF
const KURL &url = l[0];
- if (!url.isLocalFile() || !QFileInfo(url.path()).isDir())
+ if (!url.isLocalFile() || !TQFileInfo(url.path()).isDir())
return;
e->accept();
@@ -438,15 +438,15 @@ namespace KPF
connect
(
i,
- SIGNAL(newServer()),
- SLOT(slotNewServer())
+ TQT_SIGNAL(newServer()),
+ TQT_SLOT(slotNewServer())
);
connect
(
i,
- SIGNAL(newServerAtLocation(const QString &)),
- SLOT(slotNewServerAtLocation(const QString &))
+ TQT_SIGNAL(newServerAtLocation(const TQString &)),
+ TQT_SLOT(slotNewServerAtLocation(const TQString &))
);
itemList_.append(i);
@@ -458,7 +458,7 @@ namespace KPF
void
Applet::slotServerDisabled(WebServer * server)
{
- QPtrListIterator<AppletItem> it(itemList_);
+ TQPtrListIterator<AppletItem> it(itemList_);
for (; it.current(); ++it)
{
diff --git a/kpf/src/Applet.h b/kpf/src/Applet.h
index 15802a37..fccdf8a0 100644
--- a/kpf/src/Applet.h
+++ b/kpf/src/Applet.h
@@ -24,7 +24,7 @@
#ifndef KPF_APPLET_H
#define KPF_APPLET_H
-#include <qptrlist.h>
+#include <tqptrlist.h>
#include <kpanelapplet.h>
class QPopupMenu;
@@ -51,10 +51,10 @@ namespace KPF
Applet
(
- const QString & configFile,
+ const TQString & configFile,
Type = Normal,
int = 0,
- QWidget * = 0,
+ TQWidget * = 0,
const char * = 0
);
@@ -78,7 +78,7 @@ namespace KPF
* Called to create a new server when the path to the server is already
* known.
*/
- void slotNewServerAtLocation(const QString &);
+ void slotNewServerAtLocation(const TQString &);
/**
* Called to create a new server when the path to the server is unknown.
@@ -128,13 +128,13 @@ namespace KPF
/**
* Overridden to update layout accordingly.
*/
- virtual void moveEvent(QMoveEvent *);
- virtual void resizeEvent(QResizeEvent *);
+ virtual void moveEvent(TQMoveEvent *);
+ virtual void resizeEvent(TQResizeEvent *);
/**
* Overridden to provide a context menu.
*/
- virtual void mousePressEvent(QMouseEvent *);
+ virtual void mousePressEvent(TQMouseEvent *);
/**
* Updates the layout, moving AppletItem objects into proper positions.
@@ -145,19 +145,19 @@ namespace KPF
* Overridden to provide something other than a blank display when there
* are no existing AppletItem objects contained.
*/
- virtual void drawContents(QPainter *);
+ virtual void drawContents(TQPainter *);
/**
* Overridden to allow testing whether the dragged object points to a
* local directory.
*/
- virtual void dragEnterEvent(QDragEnterEvent *);
+ virtual void dragEnterEvent(TQDragEnterEvent *);
/**
* Overridden to allow creating a new WebServer when the dropped object
* points to a local directory.
*/
- virtual void dropEvent(QDropEvent *);
+ virtual void dropEvent(TQDropEvent *);
private:
@@ -168,10 +168,10 @@ namespace KPF
};
ServerWizard * wizard_;
- QPopupMenu * popup_;
+ TQPopupMenu * popup_;
DCOPClient * dcopClient_;
- QPtrList<AppletItem> itemList_;
+ TQPtrList<AppletItem> itemList_;
};
}
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index e605f692..4c70640e 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -21,11 +21,11 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtimer.h>
-#include <qfileinfo.h>
-#include <qcursor.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqtimer.h>
+#include <tqfileinfo.h>
+#include <tqcursor.h>
#include <kiconloader.h>
#include <klocale.h>
@@ -43,8 +43,8 @@
namespace KPF
{
- AppletItem::AppletItem(WebServer * server, QWidget * parent)
- : QWidget (parent, "KPF::AppletItem"),
+ AppletItem::AppletItem(WebServer * server, TQWidget * parent)
+ : TQWidget (parent, "KPF::AppletItem"),
server_ (server),
configDialog_ (0L),
monitorWindow_ (0L),
@@ -60,9 +60,9 @@ namespace KPF
graph_->installEventFilter(this);
- (new QVBoxLayout(this))->addWidget(graph_);
+ (new TQVBoxLayout(this))->addWidget(graph_);
- QString popupTitle(i18n("kpf - %1").arg(server_->root()));
+ TQString popupTitle(i18n("kpf - %1").arg(server_->root()));
popup_ = new KPopupMenu(this);
@@ -94,8 +94,8 @@ namespace KPF
connect
(
monitorWindow_,
- SIGNAL(dying(ActiveMonitorWindow *)),
- SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *))
+ TQT_SIGNAL(dying(ActiveMonitorWindow *)),
+ TQT_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *))
);
}
@@ -110,20 +110,20 @@ namespace KPF
void AppletItem::setBackground()
{
- QResizeEvent e(size(), size());
+ TQResizeEvent e(size(), size());
kapp->sendEvent(graph_, &e);
graph_->update();
}
bool
- AppletItem::eventFilter(QObject *, QEvent * ev)
+ AppletItem::eventFilter(TQObject *, TQEvent * ev)
{
switch (ev->type())
{
- case QEvent::MouseButtonRelease:
+ case TQEvent::MouseButtonRelease:
{
- QMouseEvent * e = static_cast<QMouseEvent *>(ev);
+ TQMouseEvent * e = static_cast<TQMouseEvent *>(ev);
if (0 == e)
{
@@ -157,9 +157,9 @@ namespace KPF
}
break;
- case QEvent::MouseButtonPress:
+ case TQEvent::MouseButtonPress:
{
- QMouseEvent * e = static_cast<QMouseEvent *>(ev);
+ TQMouseEvent * e = static_cast<TQMouseEvent *>(ev);
if (0 == e)
{
@@ -178,7 +178,7 @@ namespace KPF
popup_->changeItem
(Pause, SmallIcon("player_pause"), i18n("Pause"));
- switch (popup_->exec(QCursor::pos()))
+ switch (popup_->exec(TQCursor::pos()))
{
case NewServer:
emit(newServer());
@@ -212,9 +212,9 @@ namespace KPF
}
break;
- case QEvent::DragEnter:
+ case TQEvent::DragEnter:
{
- QDragEnterEvent * e = static_cast<QDragEnterEvent *>(ev);
+ TQDragEnterEvent * e = static_cast<TQDragEnterEvent *>(ev);
if (0 == e)
{
@@ -233,7 +233,7 @@ namespace KPF
const KURL &url = l[0];
- if (!url.isLocalFile() || !QFileInfo(url.path()).isDir())
+ if (!url.isLocalFile() || !TQFileInfo(url.path()).isDir())
break;
e->accept();
@@ -241,9 +241,9 @@ namespace KPF
}
break;
- case QEvent::Drop:
+ case TQEvent::Drop:
{
- QDropEvent * e = static_cast<QDropEvent *>(ev);
+ TQDropEvent * e = static_cast<TQDropEvent *>(ev);
if (0 == e)
{
@@ -262,7 +262,7 @@ namespace KPF
const KURL &url = l[0];
- if (!url.isLocalFile() || !QFileInfo(url.path()).isDir())
+ if (!url.isLocalFile() || !TQFileInfo(url.path()).isDir())
break;
e->accept();
@@ -320,8 +320,8 @@ namespace KPF
connect
(
monitorWindow_,
- SIGNAL(dying(ActiveMonitorWindow *)),
- SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *))
+ TQT_SIGNAL(dying(ActiveMonitorWindow *)),
+ TQT_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *))
);
#endif
@@ -332,7 +332,7 @@ namespace KPF
void
AppletItem::removeServer()
{
- QTimer::singleShot(0, this, SLOT(slotSuicide()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotSuicide()));
}
void
@@ -349,8 +349,8 @@ namespace KPF
connect
(
configDialog_,
- SIGNAL(dying(SingleServerConfigDialog *)),
- SLOT(slotConfigDialogDying(SingleServerConfigDialog *))
+ TQT_SIGNAL(dying(SingleServerConfigDialog *)),
+ TQT_SLOT(slotConfigDialogDying(SingleServerConfigDialog *))
);
configDialog_->show();
diff --git a/kpf/src/AppletItem.h b/kpf/src/AppletItem.h
index 013a6b0a..5c602e13 100644
--- a/kpf/src/AppletItem.h
+++ b/kpf/src/AppletItem.h
@@ -24,8 +24,8 @@
#ifndef KPF_APPLET_ITEM_H
#define KPF_APPLET_ITEM_H
-#include <qptrlist.h>
-#include <qwidget.h>
+#include <tqptrlist.h>
+#include <tqwidget.h>
class KPopupMenu;
@@ -53,7 +53,7 @@ namespace KPF
* @param server The WebServer object which will be monitored and
* controlled by this object.
*/
- AppletItem(WebServer * server, QWidget * parent);
+ AppletItem(WebServer * server, TQWidget * parent);
~AppletItem();
@@ -99,14 +99,14 @@ namespace KPF
/**
* Emitted when an URL pointing to a local directory has been dropped.
*/
- void newServerAtLocation(const QString &);
+ void newServerAtLocation(const TQString &);
protected:
/**
* Overridden to provide a context menu plus DnD capabilities.
*/
- bool eventFilter(QObject *, QEvent *);
+ bool eventFilter(TQObject *, TQEvent *);
/**
* Called when the appropriate item is selected from the context menu.
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index a7f6c311..9acc85e5 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -21,9 +21,9 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qdrawutil.h>
-#include <qpainter.h>
-#include <qtooltip.h>
+#include <tqdrawutil.h>
+#include <tqpainter.h>
+#include <tqtooltip.h>
#include <klocale.h>
#include <kiconloader.h>
@@ -40,10 +40,10 @@ namespace KPF
(
WebServer * server,
OverlaySelect overlaySelect,
- QWidget * parent,
+ TQWidget * parent,
const char * name
)
- : QWidget (parent, name, WRepaintNoErase),
+ : TQWidget (parent, name, WRepaintNoErase),
server_ (server),
max_ (0L),
overlaySelect_ (overlaySelect)
@@ -55,8 +55,8 @@ namespace KPF
connect
(
server_,
- SIGNAL(wholeServerOutput(ulong)),
- SLOT(slotOutput(ulong))
+ TQT_SIGNAL(wholeServerOutput(ulong)),
+ TQT_SLOT(slotOutput(ulong))
);
if (UseOverlays == overlaySelect_)
@@ -64,15 +64,15 @@ namespace KPF
connect
(
server_,
- SIGNAL(contentionChange(bool)), this,
- SLOT(slotServerContentionChange(bool))
+ TQT_SIGNAL(contentionChange(bool)), this,
+ TQT_SLOT(slotServerContentionChange(bool))
);
connect
(
server_,
- SIGNAL(pauseChange(bool)), this,
- SLOT(slotServerPauseChange(bool))
+ TQT_SIGNAL(pauseChange(bool)), this,
+ TQT_SLOT(slotServerPauseChange(bool))
);
}
@@ -87,27 +87,27 @@ namespace KPF
void
BandwidthGraph::setTooltip()
{
- QToolTip::add(this, i18n( "%1 on port %2" )
+ TQToolTip::add(this, i18n( "%1 on port %2" )
.arg( server_->root() ).arg( server_->listenPort() ) );
}
QRect
BandwidthGraph::contentsRect() const
{
- return QRect(1, 1, width() - 2, height() - 2);
+ return TQRect(1, 1, width() - 2, height() - 2);
}
void
BandwidthGraph::updateContents()
{
- QRect r(contentsRect());
+ TQRect r(contentsRect());
uint w = r.width();
uint h = r.height();
buffer_.fill(this, 0, 0);
- QPainter p(&buffer_);
+ TQPainter p(&buffer_);
p.drawPixmap( ( width()-bgPix_.width() )/2,
( height()-bgPix_.height() )/2, bgPix_ );
@@ -133,13 +133,13 @@ namespace KPF
}
void
- BandwidthGraph::paintEvent(QPaintEvent * e)
+ BandwidthGraph::paintEvent(TQPaintEvent * e)
{
bitBlt(this, e->rect().topLeft(), &buffer_, e->rect());
}
void
- BandwidthGraph::resizeEvent(QResizeEvent *)
+ BandwidthGraph::resizeEvent(TQResizeEvent *)
{
buffer_.resize(size());
@@ -150,14 +150,14 @@ namespace KPF
else if ( width() > 16 )
bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 16 );
else
- bgPix_.fill( this, QPoint( 0, 0 ) );
+ bgPix_.fill( this, TQPoint( 0, 0 ) );
KIconEffect::semiTransparent( bgPix_ );
if (width() < 2)
{
// We have 0 space. Make history 0 size.
- history_ = QMemArray<ulong>();
+ history_ = TQMemArray<ulong>();
return;
}
@@ -165,7 +165,7 @@ namespace KPF
if (w < history_.size())
{
- QMemArray<ulong> newHistory(w);
+ TQMemArray<ulong> newHistory(w);
uint sizeDiff = history_.size() - w;
@@ -176,7 +176,7 @@ namespace KPF
}
else if (w > history_.size())
{
- QMemArray<ulong> newHistory(w);
+ TQMemArray<ulong> newHistory(w);
uint sizeDiff = w - history_.size();
@@ -197,7 +197,7 @@ namespace KPF
void
BandwidthGraph::slotOutput(ulong l)
{
- QRect r(contentsRect());
+ TQRect r(contentsRect());
uint w = r.width();
uint h = r.height();
@@ -228,7 +228,7 @@ namespace KPF
}
void
- BandwidthGraph::drawOverlays(QPainter & p)
+ BandwidthGraph::drawOverlays(TQPainter & p)
{
if (NoOverlays == overlaySelect_)
return;
@@ -243,11 +243,11 @@ namespace KPF
if (overlayPixmap_.isNull())
{
- QString maxString;
+ TQString maxString;
- QString bs(i18n("%1 b/s"));
- QString kbs(i18n("%1 kb/s"));
- QString mbs(i18n("%1 Mb/s"));
+ TQString bs(i18n("%1 b/s"));
+ TQString kbs(i18n("%1 kb/s"));
+ TQString mbs(i18n("%1 Mb/s"));
if (max_ > 1024)
if (max_ > 1024 * 1024)
@@ -282,13 +282,13 @@ namespace KPF
QSize
BandwidthGraph::sizeHint() const
{
- return QSize(32, 32);
+ return TQSize(32, 32);
}
QSize
BandwidthGraph::minimumSizeHint() const
{
- return QSize(12, 12);
+ return TQSize(12, 12);
}
WebServer *
@@ -324,7 +324,7 @@ namespace KPF
}
else
{
- overlayPixmap_ = QPixmap();
+ overlayPixmap_ = TQPixmap();
}
}
}
diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h
index e0cf51dd..3540ca5b 100644
--- a/kpf/src/BandwidthGraph.h
+++ b/kpf/src/BandwidthGraph.h
@@ -24,10 +24,10 @@
#ifndef KPF_BANDWIDTH_GRAPH_H
#define KPF_BANDWIDTH_GRAPH_H
-#include <qwidget.h>
-#include <qmemarray.h>
-#include <qpixmap.h>
-#include <qrect.h>
+#include <tqwidget.h>
+#include <tqmemarray.h>
+#include <tqpixmap.h>
+#include <tqrect.h>
class QPainter;
@@ -61,7 +61,7 @@ namespace KPF
(
WebServer * server,
OverlaySelect overlaySelect,
- QWidget * parent = 0,
+ TQWidget * parent = 0,
const char * name = 0
);
@@ -75,12 +75,12 @@ namespace KPF
/**
* Overridden to provide reasonable default size and shape.
*/
- virtual QSize sizeHint() const;
+ virtual TQSize sizeHint() const;
/**
* Overridden to provide reasonable minimum size and shape.
*/
- virtual QSize minimumSizeHint() const;
+ virtual TQSize minimumSizeHint() const;
/**
* @return the WebServer object given on construction.
@@ -111,22 +111,22 @@ namespace KPF
/**
* Overridden to provide graph drawing.
*/
- virtual void paintEvent(QPaintEvent *);
+ virtual void paintEvent(TQPaintEvent *);
/**
* Overridden to assist graph drawing.
*/
- virtual void resizeEvent(QResizeEvent *);
+ virtual void resizeEvent(TQResizeEvent *);
/**
* Draw overlay icons to reflect status of associated WebServer.
*/
- virtual void drawOverlays(QPainter &);
+ virtual void drawOverlays(TQPainter &);
/**
* Provides a rectangle in which to draw the graph itself.
*/
- virtual QRect contentsRect() const;
+ virtual TQRect contentsRect() const;
/**
* Called when the status of the associated WebServer changes.
@@ -144,17 +144,17 @@ namespace KPF
void updateContents();
- QMemArray<ulong> history_;
+ TQMemArray<ulong> history_;
WebServer * server_;
- QPixmap buffer_, bgPix_;
+ TQPixmap buffer_, bgPix_;
ulong max_;
OverlaySelect overlaySelect_;
- QPixmap overlayPixmap_;
+ TQPixmap overlayPixmap_;
};
} // End namespace KPF
diff --git a/kpf/src/ByteRange.cpp b/kpf/src/ByteRange.cpp
index cdd0624b..2db5de6b 100644
--- a/kpf/src/ByteRange.cpp
+++ b/kpf/src/ByteRange.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include "Defines.h"
#include "ByteRange.h"
@@ -101,13 +101,13 @@ namespace KPF
// Empty.
}
- ByteRangeList::ByteRangeList(const QString & _s, float /* protocol */)
+ ByteRangeList::ByteRangeList(const TQString & _s, float /* protocol */)
{
kpfDebug << "ByteRangeList parsing `" << _s << "'" << endl;
// Hey, parsing time :)
- QString s(_s);
+ TQString s(_s);
if ("bytes=" == s.left(6))
{
@@ -115,16 +115,16 @@ namespace KPF
s = s.stripWhiteSpace();
}
- QStringList byteRangeSpecList(QStringList::split(',', s));
+ TQStringList byteRangeSpecList(TQStringList::split(',', s));
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it = byteRangeSpecList.begin(); it != byteRangeSpecList.end(); ++it)
addByteRange(*it);
}
void
- ByteRangeList::addByteRange(const QString & s)
+ ByteRangeList::addByteRange(const TQString & s)
{
kpfDebug << "addByteRange(" << s << ")" << endl;
@@ -136,9 +136,9 @@ namespace KPF
return;
}
- QString firstByte(s.left(dashPos).stripWhiteSpace());
+ TQString firstByte(s.left(dashPos).stripWhiteSpace());
- QString lastByte(s.mid(dashPos + 1).stripWhiteSpace());
+ TQString lastByte(s.mid(dashPos + 1).stripWhiteSpace());
ulong first;
diff --git a/kpf/src/ByteRange.h b/kpf/src/ByteRange.h
index 4dd0b841..4452bf70 100644
--- a/kpf/src/ByteRange.h
+++ b/kpf/src/ByteRange.h
@@ -24,8 +24,8 @@
#ifndef KPF_BYTE_RANGE_H
#define KPF_BYTE_RANGE_H
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
namespace KPF
{
@@ -102,7 +102,7 @@ namespace KPF
/**
* Encapsulates a list of ByteRange.
*/
- class ByteRangeList : public QValueList<ByteRange>
+ class ByteRangeList : public TQValueList<ByteRange>
{
public:
@@ -113,13 +113,13 @@ namespace KPF
* @param protocol specifies the HTTP protocol which should
* be assumed whilst parsing.
*/
- ByteRangeList(const QString &, float protocol);
+ ByteRangeList(const TQString &, float protocol);
/**
* Parses a byte range represented as a string and, if successful,
* appends the resultant ByteRange object to this list.
*/
- void addByteRange(const QString &);
+ void addByteRange(const TQString &);
};
} // End namespace KPF
diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp
index 395bb681..657e96f0 100644
--- a/kpf/src/ConfigDialogPage.cpp
+++ b/kpf/src/ConfigDialogPage.cpp
@@ -21,12 +21,12 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
+#include <tqwhatsthis.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqlabel.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
#include <klocale.h>
#include <kseparator.h>
@@ -43,32 +43,32 @@
namespace KPF
{
- ConfigDialogPage::ConfigDialogPage(WebServer * server, QWidget * parent)
- : QWidget (parent, "KPF::ConfigDialogPage"),
+ ConfigDialogPage::ConfigDialogPage(WebServer * server, TQWidget * parent)
+ : TQWidget (parent, "KPF::ConfigDialogPage"),
server_ (server),
errorMessageConfigDialog_ (0L)
{
- l_listenPort_ = new QLabel(i18n("&Listen port:"), this);
- l_bandwidthLimit_ = new QLabel(i18n("&Bandwidth limit:"), this);
-// l_connectionLimit_ = new QLabel(i18n("Connection &limit"), this);
+ l_listenPort_ = new TQLabel(i18n("&Listen port:"), this);
+ l_bandwidthLimit_ = new TQLabel(i18n("&Bandwidth limit:"), this);
+// l_connectionLimit_ = new TQLabel(i18n("Connection &limit"), this);
- sb_listenPort_ = new QSpinBox(1, 65535, 1, this);
- sb_bandwidthLimit_ = new QSpinBox(1, 999999, 1, this);
-// sb_connectionLimit_ = new QSpinBox(1, 9999, 1, this);
+ sb_listenPort_ = new TQSpinBox(1, 65535, 1, this);
+ sb_bandwidthLimit_ = new TQSpinBox(1, 999999, 1, this);
+// sb_connectionLimit_ = new TQSpinBox(1, 9999, 1, this);
- l_serverName_ = new QLabel(i18n("&Server name:"), this);
- le_serverName_ = new QLineEdit(this);
+ l_serverName_ = new TQLabel(i18n("&Server name:"), this);
+ le_serverName_ = new TQLineEdit(this);
bool canPublish = DNSSD::ServiceBrowser::isAvailable() == DNSSD::ServiceBrowser::Working;
l_serverName_->setEnabled(canPublish);
le_serverName_->setEnabled(canPublish);
- cb_followSymlinks_ = new QCheckBox(i18n("&Follow symbolic links"), this);
+ cb_followSymlinks_ = new TQCheckBox(i18n("&Follow symbolic links"), this);
// cb_customErrorMessages_ =
-// new QCheckBox(i18n("Use custom error messages"), this);
+// new TQCheckBox(i18n("Use custom error messages"), this);
-// pb_errorMessages_ = new QPushButton(i18n("&Configure..."), this);
+// pb_errorMessages_ = new TQPushButton(i18n("&Configure..."), this);
// pb_errorMessages_->setEnabled(false);
@@ -85,9 +85,9 @@ namespace KPF
// sb_connectionLimit_ ->setValue(Config::DefaultConnectionLimit);
cb_followSymlinks_ ->setChecked(Config::DefaultFollowSymlinks);
- QVBoxLayout * l0 = new QVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout * l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- QGridLayout * l2 = new QGridLayout(l0);
+ TQGridLayout * l2 = new TQGridLayout(l0);
l2->addWidget(l_listenPort_, 0, 0);
l2->addWidget(sb_listenPort_, 0, 1);
@@ -101,7 +101,7 @@ namespace KPF
l0->addWidget(cb_followSymlinks_);
#if 0
- QHBoxLayout * l3 = new QHBoxLayout(l0);
+ TQHBoxLayout * l3 = new TQHBoxLayout(l0);
l3->addWidget(cb_customErrorMessages_);
l3->addWidget(pb_errorMessages_);
@@ -113,8 +113,8 @@ namespace KPF
connect
(
cb_customErrorMessages_,
- SIGNAL(toggled(bool)),
- SLOT(slotCustomErrorMessagesToggled(bool))
+ TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(slotCustomErrorMessagesToggled(bool))
);
#endif
@@ -122,12 +122,12 @@ namespace KPF
connect
(
pb_errorMessages_,
- SIGNAL(clicked()),
- SLOT(slotConfigureErrorMessages())
+ TQT_SIGNAL(clicked()),
+ TQT_SLOT(slotConfigureErrorMessages())
);
#endif
- QString listenPortHelp =
+ TQString listenPortHelp =
i18n
(
"<p>"
@@ -136,7 +136,7 @@ namespace KPF
"</p>"
);
- QString bandwidthLimitHelp =
+ TQString bandwidthLimitHelp =
i18n
(
"<p>"
@@ -149,7 +149,7 @@ namespace KPF
"</p>"
);
- QString connectionLimitHelp =
+ TQString connectionLimitHelp =
i18n
(
"<p>"
@@ -158,7 +158,7 @@ namespace KPF
"</p>"
);
- QString followSymlinksHelp =
+ TQString followSymlinksHelp =
i18n
(
"<p>"
@@ -172,7 +172,7 @@ namespace KPF
"</p>"
);
- QString errorMessagesHelp =
+ TQString errorMessagesHelp =
i18n
(
"<p>"
@@ -182,37 +182,37 @@ namespace KPF
"</p>"
);
- QString serverNameHelp = KPF::HelpText::getServerNameHelp();
- QWhatsThis::add(l_listenPort_, listenPortHelp);
- QWhatsThis::add(sb_listenPort_, listenPortHelp);
- QWhatsThis::add(l_bandwidthLimit_, bandwidthLimitHelp);
- QWhatsThis::add(sb_bandwidthLimit_, bandwidthLimitHelp);
-// QWhatsThis::add(l_connectionLimit_, connectionLimitHelp);
-// QWhatsThis::add(sb_connectionLimit_, connectionLimitHelp);
- QWhatsThis::add(cb_followSymlinks_, followSymlinksHelp);
- QWhatsThis::add(l_serverName_, serverNameHelp);
- QWhatsThis::add(le_serverName_, serverNameHelp);
-// QWhatsThis::add(pb_errorMessages_, errorMessagesHelp);
+ TQString serverNameHelp = KPF::HelpText::getServerNameHelp();
+ TQWhatsThis::add(l_listenPort_, listenPortHelp);
+ TQWhatsThis::add(sb_listenPort_, listenPortHelp);
+ TQWhatsThis::add(l_bandwidthLimit_, bandwidthLimitHelp);
+ TQWhatsThis::add(sb_bandwidthLimit_, bandwidthLimitHelp);
+// TQWhatsThis::add(l_connectionLimit_, connectionLimitHelp);
+// TQWhatsThis::add(sb_connectionLimit_, connectionLimitHelp);
+ TQWhatsThis::add(cb_followSymlinks_, followSymlinksHelp);
+ TQWhatsThis::add(l_serverName_, serverNameHelp);
+ TQWhatsThis::add(le_serverName_, serverNameHelp);
+// TQWhatsThis::add(pb_errorMessages_, errorMessagesHelp);
connect
(
sb_listenPort_,
- SIGNAL(valueChanged(int)),
- SLOT(slotListenPortChanged(int))
+ TQT_SIGNAL(valueChanged(int)),
+ TQT_SLOT(slotListenPortChanged(int))
);
connect
(
sb_bandwidthLimit_,
- SIGNAL(valueChanged(int)),
- SLOT(slotBandwidthLimitChanged(int))
+ TQT_SIGNAL(valueChanged(int)),
+ TQT_SLOT(slotBandwidthLimitChanged(int))
);
connect
(
cb_followSymlinks_,
- SIGNAL(toggled(bool)),
- SLOT(slotFollowSymlinksToggled(bool))
+ TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(slotFollowSymlinksToggled(bool))
);
@@ -296,10 +296,10 @@ namespace KPF
return;
}
- QPtrList<WebServer>
+ TQPtrList<WebServer>
serverList(WebServerManager::instance()->serverListLocal());
- for (QPtrListIterator<WebServer> it(serverList); it.current(); ++it)
+ for (TQPtrListIterator<WebServer> it(serverList); it.current(); ++it)
{
if (it.current() == server_)
continue;
diff --git a/kpf/src/ConfigDialogPage.h b/kpf/src/ConfigDialogPage.h
index 8d41ea83..521b1077 100644
--- a/kpf/src/ConfigDialogPage.h
+++ b/kpf/src/ConfigDialogPage.h
@@ -24,8 +24,8 @@
#ifndef KPF_CONFIG_DIALOG_PAGE_H
#define KPF_CONFIG_DIALOG_PAGE_H
-#include <qptrlist.h>
-#include <qwidget.h>
+#include <tqptrlist.h>
+#include <tqwidget.h>
class QLabel;
class QSpinBox;
@@ -47,7 +47,7 @@ namespace KPF
public:
- ConfigDialogPage(WebServer *, QWidget * parent);
+ ConfigDialogPage(WebServer *, TQWidget * parent);
virtual ~ConfigDialogPage();
@@ -83,21 +83,21 @@ namespace KPF
WebServer * server_;
- QLabel * l_listenPort_;
- QLabel * l_bandwidthLimit_;
- QLabel * l_connectionLimit_;
+ TQLabel * l_listenPort_;
+ TQLabel * l_bandwidthLimit_;
+ TQLabel * l_connectionLimit_;
QLabel * l_serverName_;
- QSpinBox * sb_listenPort_;
- QSpinBox * sb_bandwidthLimit_;
- QSpinBox * sb_connectionLimit_;
+ TQSpinBox * sb_listenPort_;
+ TQSpinBox * sb_bandwidthLimit_;
+ TQSpinBox * sb_connectionLimit_;
- QCheckBox * cb_followSymlinks_;
+ TQCheckBox * cb_followSymlinks_;
- QLineEdit * le_serverName_;
+ TQLineEdit * le_serverName_;
- QCheckBox * cb_customErrorMessages_;
- QPushButton * pb_errorMessages_;
+ TQCheckBox * cb_customErrorMessages_;
+ TQPushButton * pb_errorMessages_;
ErrorMessageConfigDialog * errorMessageConfigDialog_;
};
diff --git a/kpf/src/Defaults.cpp b/kpf/src/Defaults.cpp
index 691ca0f2..07e42c39 100644
--- a/kpf/src/Defaults.cpp
+++ b/kpf/src/Defaults.cpp
@@ -34,7 +34,7 @@ namespace KPF
const bool DefaultFollowSymlinks = false;
const bool DefaultCustomErrors = false;
const bool DefaultPaused = false;
- const QString& DefaultServername = QString::null;
+ const TQString& DefaultServername = TQString::null;
static const char Name[] = "kpfappletrc";
static const char KeyServerRootList[] = "ServerRootList";
@@ -47,48 +47,48 @@ namespace KPF
static const char KeyPaused[] = "Paused";
static const char KeyServerName[] = "ServerName";
- QString name()
+ TQString name()
{
- return QString::fromUtf8(Name);
+ return TQString::fromUtf8(Name);
}
- QString key(Option o)
+ TQString key(Option o)
{
switch (o)
{
case ServerRootList:
- return QString::fromUtf8(KeyServerRootList);
+ return TQString::fromUtf8(KeyServerRootList);
case GroupPrefix:
- return QString::fromUtf8(KeyGroupPrefix);
+ return TQString::fromUtf8(KeyGroupPrefix);
case ListenPort:
- return QString::fromUtf8(KeyListenPort);
+ return TQString::fromUtf8(KeyListenPort);
case BandwidthLimit:
- return QString::fromUtf8(KeyBandwidthLimit);
+ return TQString::fromUtf8(KeyBandwidthLimit);
case ConnectionLimit:
- return QString::fromUtf8(KeyConnectionLimit);
+ return TQString::fromUtf8(KeyConnectionLimit);
case FollowSymlinks:
- return QString::fromUtf8(KeyFollowSymlinks);
+ return TQString::fromUtf8(KeyFollowSymlinks);
case CustomErrors:
- return QString::fromUtf8(KeyCustomErrors);
+ return TQString::fromUtf8(KeyCustomErrors);
case Paused:
- return QString::fromUtf8(KeyPaused);
+ return TQString::fromUtf8(KeyPaused);
case ServerName:
- return QString::fromUtf8(KeyServerName);
+ return TQString::fromUtf8(KeyServerName);
/* default intentionally left out to have the compiler generate
* warnings in case we add values to the enumeration but forget
* to extend this switch.
*/
}
- return QString::null;
+ return TQString::null;
}
} // End namespace Config
diff --git a/kpf/src/Defaults.h b/kpf/src/Defaults.h
index d49339fe..0a9b6ddc 100644
--- a/kpf/src/Defaults.h
+++ b/kpf/src/Defaults.h
@@ -24,7 +24,7 @@
#ifndef KPF_DEFAULTS_H
#define KPF_DEFAULTS_H
-#include <qstring.h>
+#include <tqstring.h>
namespace KPF
{
@@ -56,12 +56,12 @@ namespace KPF
/**
* Name to be used for configuration file.
*/
- QString name();
+ TQString name();
/**
* Config key to use when accessing option.
*/
- QString key(Option);
+ TQString key(Option);
} // End namespace Config
diff --git a/kpf/src/DirSelectWidget.cpp b/kpf/src/DirSelectWidget.cpp
index bd36ffeb..a405dcb0 100644
--- a/kpf/src/DirSelectWidget.cpp
+++ b/kpf/src/DirSelectWidget.cpp
@@ -21,8 +21,8 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
#include "DirSelectWidget.h"
#include "DirSelectWidget.moc"
@@ -33,13 +33,13 @@ namespace KPF
{
public:
- QString pathToMakeVisible;
+ TQString pathToMakeVisible;
};
DirSelectWidget::DirSelectWidget
(
- const QString & pathToMakeVisible,
- QWidget * parent,
+ const TQString & pathToMakeVisible,
+ TQWidget * parent,
const char * name
)
: KListView(parent, name)
@@ -52,11 +52,11 @@ namespace KPF
connect
(
this,
- SIGNAL(expanded(QListViewItem *)),
- SLOT(slotExpanded(QListViewItem *))
+ TQT_SIGNAL(expanded(TQListViewItem *)),
+ TQT_SLOT(slotExpanded(TQListViewItem *))
);
- QListViewItem * root = new QListViewItem(this, "/");
+ TQListViewItem * root = new TQListViewItem(this, "/");
root->setExpandable(true);
@@ -69,7 +69,7 @@ namespace KPF
}
void
- DirSelectWidget::timerEvent(QTimerEvent *)
+ DirSelectWidget::timerEvent(TQTimerEvent *)
{
killTimers();
@@ -78,32 +78,32 @@ namespace KPF
}
void
- DirSelectWidget::slotExpanded(QListViewItem * item)
+ DirSelectWidget::slotExpanded(TQListViewItem * item)
{
if (0 != item->firstChild())
return;
- QString p(path(item));
+ TQString p(path(item));
- QDir dir(p);
+ TQDir dir(p);
const QFileInfoList * entryInfoList =
- dir.entryInfoList(QDir::Dirs | QDir::Readable);
+ dir.entryInfoList(TQDir::Dirs | TQDir::Readable);
for (QFileInfoListIterator it(*entryInfoList); it.current(); ++it)
{
if (it.current()->isDir() && it.current()->isReadable())
{
- QListViewItem * i = new QListViewItem(item, it.current()->fileName());
+ TQListViewItem * i = new TQListViewItem(item, it.current()->fileName());
i->setExpandable(true);
}
}
}
QString
- DirSelectWidget::path(QListViewItem * item) const
+ DirSelectWidget::path(TQListViewItem * item) const
{
- QString ret(item->text(0));
+ TQString ret(item->text(0));
while (0 != (item = item->parent()))
ret.prepend("/" + item->text(0));
diff --git a/kpf/src/DirSelectWidget.h b/kpf/src/DirSelectWidget.h
index 1f4c9eaf..6bb2194f 100644
--- a/kpf/src/DirSelectWidget.h
+++ b/kpf/src/DirSelectWidget.h
@@ -39,8 +39,8 @@ namespace KPF
DirSelectWidget
(
- const QString & pathToMakeVisible = "/",
- QWidget * = 0,
+ const TQString & pathToMakeVisible = "/",
+ TQWidget * = 0,
const char * = 0
);
@@ -48,12 +48,12 @@ namespace KPF
protected slots:
- void slotExpanded(QListViewItem * item);
+ void slotExpanded(TQListViewItem * item);
protected:
- void timerEvent(QTimerEvent *);
- QString path(QListViewItem * item) const;
+ void timerEvent(TQTimerEvent *);
+ TQString path(TQListViewItem * item) const;
private:
diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp
index bfd0127b..b642d912 100644
--- a/kpf/src/DirectoryLister.cpp
+++ b/kpf/src/DirectoryLister.cpp
@@ -23,12 +23,12 @@
#include <cmath>
-#include <qapplication.h>
-#include <qdir.h>
-#include <qstring.h>
-#include <qstylesheet.h>
-#include <qpalette.h>
-#include <qtextstream.h>
+#include <tqapplication.h>
+#include <tqdir.h>
+#include <tqstring.h>
+#include <tqstylesheet.h>
+#include <tqpalette.h>
+#include <tqtextstream.h>
#include <kglobalsettings.h>
#include <klocale.h>
#include <kmimetype.h>
@@ -49,25 +49,25 @@ namespace KPF
}
};
- QString colorToCSS(const QColor &c)
+ TQString colorToCSS(const TQColor &c)
{
return
"rgb("
- + QString::number(c.red())
+ + TQString::number(c.red())
+ ", "
- + QString::number(c.green())
+ + TQString::number(c.green())
+ ", "
- + QString::number(c.blue())
+ + TQString::number(c.blue())
+ ")";
}
- QByteArray buildHTML(const QString & title, const QString & body)
+ TQByteArray buildHTML(const TQString & title, const TQString & body)
{
- QPalette pal = qApp->palette();
- QByteArray temp_string;
- QTextStream html(temp_string, IO_WriteOnly);
+ TQPalette pal = qApp->palette();
+ TQByteArray temp_string;
+ TQTextStream html(temp_string, IO_WriteOnly);
- html.setEncoding(QTextStream::UnicodeUTF8);
+ html.setEncoding(TQTextStream::UnicodeUTF8);
html
<< "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -90,10 +90,10 @@ namespace KPF
<< endl
<< "table.filelist { "
<< "color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::Foreground))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::Foreground))
<< "; "
<< "background-color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::Background))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::Background))
<< "; "
<< "border: thin outset; "
<< "width: 100%; "
@@ -106,10 +106,10 @@ namespace KPF
<< endl
<< "td.norm { "
<< "background-color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::Base))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::Base))
<< "; "
<< "color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::Foreground))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::Foreground))
<< "; "
<< "}"
<< endl
@@ -118,27 +118,27 @@ namespace KPF
<< colorToCSS
(
KGlobalSettings::calculateAlternateBackgroundColor
- (pal.color(QPalette::Normal, QColorGroup::Base))
+ (pal.color(TQPalette::Normal, TQColorGroup::Base))
)
<< "; "
<< "color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::Foreground))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::Foreground))
<< "; "
<< "}"
<< endl
<< "a { "
<< "color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::Text))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::Text))
<< "; "
<< "text-decoration: none; "
<< "}"
<< endl
<< "th.listheading { "
<< "color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::ButtonText))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::ButtonText))
<< "; "
<< "background-color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::Button))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::Button))
<< "; "
<< "text-align: left; "
<< "white-space: nowrap; "
@@ -151,7 +151,7 @@ namespace KPF
<< endl
<< "div.sizeentry { "
<< "color: "
- << colorToCSS(pal.color(QPalette::Normal, QColorGroup::Text))
+ << colorToCSS(pal.color(TQPalette::Normal, TQColorGroup::Text))
<< "; "
<< "text-align: right; "
<< "}"
@@ -174,10 +174,10 @@ namespace KPF
return temp_string;
}
- QString prettySize(uint size)
+ TQString prettySize(uint size)
{
- QString suffix;
- QString temp;
+ TQString suffix;
+ TQString temp;
float floated_size;
if (size > 1023)
@@ -227,11 +227,11 @@ namespace KPF
}
QByteArray
- DirectoryLister::html(const QString & root, const QString & _path)
+ DirectoryLister::html(const TQString & root, const TQString & _path)
{
kpfDebug << "root: " << root << " path: " << _path << endl;
- QString path;
+ TQString path;
if (_path.right(1) != "/")
path = _path + "/";
@@ -241,7 +241,7 @@ namespace KPF
if (path[0] == '/')
path + "";
- QDir d(root + path);
+ TQDir d(root + path);
if (!d.exists())
{
@@ -253,7 +253,7 @@ namespace KPF
}
const QFileInfoList * infoList =
- d.entryInfoList(QDir::DefaultFilter, QDir::Name | QDir::DirsFirst);
+ d.entryInfoList(TQDir::DefaultFilter, TQDir::Name | TQDir::DirsFirst);
if (0 == infoList)
{
@@ -264,7 +264,7 @@ namespace KPF
);
}
- QString html;
+ TQString html;
html += "<table";
html += " width=\"100%\"";
@@ -279,7 +279,7 @@ namespace KPF
{
static int counter = 0;
- QFileInfo * fi(it.current());
+ TQFileInfo * fi(it.current());
if (
(fi->fileName()[0] == '.')
@@ -292,13 +292,13 @@ namespace KPF
++counter;
- QString td_class = (counter % 2) ? "alt" : "norm";
+ TQString td_class = (counter % 2) ? "alt" : "norm";
html += "<tr>\n";
html += "<td class=\"" + td_class + "\">";
- QString item_class = QString((fi->isDir()) ? "direntry" : "fileentry");
+ TQString item_class = TQString((fi->isDir()) ? "direntry" : "fileentry");
KURL fu(path+fi->fileName());
html +=
@@ -310,7 +310,7 @@ namespace KPF
+ "\">";
if (fi->fileName() != "..")
- html += QStyleSheet::escape(fi->fileName());
+ html += TQStyleSheet::escape(fi->fileName());
else
html += i18n("Parent Directory");
@@ -335,7 +335,7 @@ namespace KPF
return buildHTML
(
- i18n("Directory listing for %1").arg(QStyleSheet::escape(path)),
+ i18n("Directory listing for %1").arg(TQStyleSheet::escape(path)),
html
);
}
diff --git a/kpf/src/DirectoryLister.h b/kpf/src/DirectoryLister.h
index e1809202..51f7ee12 100644
--- a/kpf/src/DirectoryLister.h
+++ b/kpf/src/DirectoryLister.h
@@ -24,8 +24,8 @@
#ifndef KPF_DIRECTORY_LISTER_H
#define KPF_DIRECTORY_LISTER_H
-#include <qstring.h>
-#include <qcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
namespace KPF
{
@@ -47,7 +47,7 @@ namespace KPF
* Get a directory listing (HTML) for the specified path. Uses
* cache if directory has not been modified since last read.
*/
- QByteArray html(const QString &root, const QString & path);
+ TQByteArray html(const TQString &root, const TQString & path);
uint headerLength() const;
uint footerLength() const;
diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp
index 2f7cb43a..0a2833c6 100644
--- a/kpf/src/ErrorMessageConfigDialog.cpp
+++ b/kpf/src/ErrorMessageConfigDialog.cpp
@@ -24,9 +24,9 @@
#include "ErrorMessageConfigDialog.h"
#include "ErrorMessageConfigDialog.moc"
-#include <qlabel.h>
-#include <qframe.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqframe.h>
+#include <tqlayout.h>
#include <kurlrequester.h>
#include <kconfig.h>
@@ -42,7 +42,7 @@ namespace KPF
ErrorMessageConfigDialog::ErrorMessageConfigDialog
(
WebServer * webServer,
- QWidget * parent
+ TQWidget * parent
)
: KDialogBase
(
@@ -56,16 +56,16 @@ namespace KPF
),
server_(webServer)
{
- QValueList<uint> codeList;
+ TQValueList<uint> codeList;
codeList << 400 << 403 << 404 << 412 << 416 << 500 << 501;
- QFrame * w = makeMainWidget();
+ TQFrame * w = makeMainWidget();
- QVBoxLayout * layout =
- new QVBoxLayout(w, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout * layout =
+ new TQVBoxLayout(w, KDialog::marginHint(), KDialog::spacingHint());
- QLabel * info =
+ TQLabel * info =
new QLabel
(
i18n
@@ -86,28 +86,28 @@ namespace KPF
layout->addWidget(info);
- QGridLayout * grid = new QGridLayout(layout, codeList.count(), 2);
+ TQGridLayout * grid = new TQGridLayout(layout, codeList.count(), 2);
- QString pattern(i18n("%1 %2"));
+ TQString pattern(i18n("%1 %2"));
KConfig config(Config::name());
config.setGroup("ErrorMessageOverrideFiles");
- QValueList<uint>::ConstIterator it;
+ TQValueList<uint>::ConstIterator it;
for (it = codeList.begin(); it != codeList.end(); ++it)
{
- QString originalPath =
- config.readPathEntry(QString::number(*it));
+ TQString originalPath =
+ config.readPathEntry(TQString::number(*it));
- QString responseName(translatedResponseName(*it));
+ TQString responseName(translatedResponseName(*it));
KURLRequester * requester = new KURLRequester(originalPath, w);
itemList_.append(new Item(*it, requester, responseName, originalPath));
- QLabel * l = new QLabel(pattern.arg(*it).arg(responseName), w);
+ TQLabel * l = new TQLabel(pattern.arg(*it).arg(responseName), w);
l->setBuddy(requester);
@@ -123,7 +123,7 @@ namespace KPF
}
void
- ErrorMessageConfigDialog::slotURLRequesterTextChanged(const QString &)
+ ErrorMessageConfigDialog::slotURLRequesterTextChanged(const TQString &)
{
}
@@ -134,13 +134,13 @@ namespace KPF
config.setGroup("ErrorMessageOverrideFiles");
- QPtrListIterator<Item> it(itemList_);
+ TQPtrListIterator<Item> it(itemList_);
for (; it.current(); ++it)
{
config.writePathEntry
(
- QString::number(it.current()->code),
+ TQString::number(it.current()->code),
it.current()->urlRequester->url()
);
}
diff --git a/kpf/src/ErrorMessageConfigDialog.h b/kpf/src/ErrorMessageConfigDialog.h
index 51bf4830..7ad71a40 100644
--- a/kpf/src/ErrorMessageConfigDialog.h
+++ b/kpf/src/ErrorMessageConfigDialog.h
@@ -24,7 +24,7 @@
#ifndef KPF_ERROR_MESSAGE_CONFIG_DIALOG_H
#define KPF_ERROR_MESSAGE_CONFIG_DIALOG_H
-#include <qmap.h>
+#include <tqmap.h>
#include <kdialogbase.h>
class KURLRequester;
@@ -42,13 +42,13 @@ namespace KPF
public:
- ErrorMessageConfigDialog(WebServer *, QWidget * parent);
+ ErrorMessageConfigDialog(WebServer *, TQWidget * parent);
virtual ~ErrorMessageConfigDialog();
protected slots:
- void slotURLRequesterTextChanged(const QString &);
+ void slotURLRequesterTextChanged(const TQString &);
protected:
@@ -66,7 +66,7 @@ namespace KPF
{
public:
- Item(uint i, KURLRequester * r, QString s, QString p)
+ Item(uint i, KURLRequester * r, TQString s, TQString p)
: code (i),
urlRequester (r),
report (s),
@@ -76,11 +76,11 @@ namespace KPF
uint code;
KURLRequester * urlRequester;
- QString report;
- QString originalPath;
+ TQString report;
+ TQString originalPath;
};
- QPtrList<Item> itemList_;
+ TQPtrList<Item> itemList_;
};
}
diff --git a/kpf/src/Help.cpp b/kpf/src/Help.cpp
index 19c6ae26..45e67b1a 100644
--- a/kpf/src/Help.cpp
+++ b/kpf/src/Help.cpp
@@ -31,7 +31,7 @@ namespace KPF
namespace HelpText
{
- QString getServerNameHelp()
+ TQString getServerNameHelp()
{
switch(DNSSD::ServiceBrowser::isAvailable()) {
case DNSSD::ServiceBrowser::Working:
diff --git a/kpf/src/Help.h b/kpf/src/Help.h
index 12584213..39a5b044 100644
--- a/kpf/src/Help.h
+++ b/kpf/src/Help.h
@@ -24,7 +24,7 @@
#ifndef KPF_HELP_H
#define KPF_HELP_H
-#include <qstring.h>
+#include <tqstring.h>
namespace KPF
{
@@ -34,7 +34,7 @@ namespace KPF
namespace HelpText
{
- QString getServerNameHelp();
+ TQString getServerNameHelp();
} // End namespace HelpText
diff --git a/kpf/src/KPFInterface.cpp b/kpf/src/KPFInterface.cpp
index d12c751d..cc9c4bc5 100644
--- a/kpf/src/KPFInterface.cpp
+++ b/kpf/src/KPFInterface.cpp
@@ -42,7 +42,7 @@ KPFInterface::serverRootList()
{
QList<KPF::WebServer> l(KPF::WebServerManager::instance()->serverListLocal());
- QStringList ret;
+ TQStringList ret;
for (QListIterator<KPF::WebServer> it(l); it.current(); ++it)
ret << it.current()->root();
@@ -53,7 +53,7 @@ KPFInterface::serverRootList()
bool
KPFInterface::createServer
(
- QString root,
+ TQString root,
uint port,
uint bandwidthLimit,
uint connectionLimit,
@@ -87,42 +87,42 @@ KPFInterface::createServer
}
bool
-KPFInterface::disableServer(QString root)
+KPFInterface::disableServer(TQString root)
{
kpfDebug << "KPFInterface::disableServer(" << root << ")" << endl;
return KPF::WebServerManager::instance()->disableServer(root);
}
bool
-KPFInterface::restartServer(QString root)
+KPFInterface::restartServer(TQString root)
{
kpfDebug << "KPFInterface::restartServer(" << root << ")" << endl;
return KPF::WebServerManager::instance()->restartServer(root);
}
bool
-KPFInterface::reconfigureServer(QString root)
+KPFInterface::reconfigureServer(TQString root)
{
kpfDebug << "KPFInterface::reconfigureServer(" << root << ")" << endl;
return KPF::WebServerManager::instance()->reconfigureServer(root);
}
bool
-KPFInterface::pauseServer(QString root)
+KPFInterface::pauseServer(TQString root)
{
kpfDebug << "KPFInterface::pauseServer(" << root << ")" << endl;
return KPF::WebServerManager::instance()->pauseServer(root, true);
}
bool
-KPFInterface::unpauseServer(QString root)
+KPFInterface::unpauseServer(TQString root)
{
kpfDebug << "KPFInterface::unpauseServer(" << root << ")" << endl;
return KPF::WebServerManager::instance()->pauseServer(root, false);
}
bool
-KPFInterface::serverPaused(QString root)
+KPFInterface::serverPaused(TQString root)
{
kpfDebug << "KPFInterface::serverPaused(" << root << ")" << endl;
return KPF::WebServerManager::instance()->serverPaused(root);
diff --git a/kpf/src/KPFInterface.h b/kpf/src/KPFInterface.h
index facd482c..a4d54f02 100644
--- a/kpf/src/KPFInterface.h
+++ b/kpf/src/KPFInterface.h
@@ -45,23 +45,23 @@ class KPFInterface : virtual public DCOPObject
/**
* @return list of root directories used by WebServer objects.
*/
- virtual QStringList serverRootList();
+ virtual TQStringList serverRootList();
virtual bool createServer
(
- QString root,
+ TQString root,
uint port,
uint bandwidthLimit = KPF::Config::DefaultBandwidthLimit,
uint connectionLimit = KPF::Config::DefaultConnectionLimit,
bool followSymlinks = KPF::Config::DefaultFollowSymlinks
);
- virtual bool disableServer (QString root);
- virtual bool restartServer (QString root);
- virtual bool reconfigureServer (QString root);
- virtual bool pauseServer (QString root);
- virtual bool unpauseServer (QString root);
- virtual bool serverPaused (QString root);
+ virtual bool disableServer (TQString root);
+ virtual bool restartServer (TQString root);
+ virtual bool reconfigureServer (TQString root);
+ virtual bool pauseServer (TQString root);
+ virtual bool unpauseServer (TQString root);
+ virtual bool serverPaused (TQString root);
};
#endif
diff --git a/kpf/src/PortValidator.cpp b/kpf/src/PortValidator.cpp
index 01c2074e..b841377c 100644
--- a/kpf/src/PortValidator.cpp
+++ b/kpf/src/PortValidator.cpp
@@ -27,21 +27,21 @@
namespace KPF
{
- PortValidator::PortValidator(QObject * parent, const char * name)
- : QValidator(parent, name)
+ PortValidator::PortValidator(TQObject * parent, const char * name)
+ : TQValidator(parent, name)
{
// Empty.
}
- QValidator::State
- PortValidator::validate(QString & input, int & /* unused */) const
+ TQValidator::State
+ PortValidator::validate(TQString & input, int & /* unused */) const
{
uint port(input.toUInt());
- QPtrList<WebServer>
+ TQPtrList<WebServer>
serverList(WebServerManager::instance()->serverListLocal());
- for (QPtrListIterator<WebServer> it(serverList); it.current(); ++it)
+ for (TQPtrListIterator<WebServer> it(serverList); it.current(); ++it)
{
if (it.current()->listenPort() == port)
{
diff --git a/kpf/src/PortValidator.h b/kpf/src/PortValidator.h
index c86d0d01..cba5cbfc 100644
--- a/kpf/src/PortValidator.h
+++ b/kpf/src/PortValidator.h
@@ -24,7 +24,7 @@
#ifndef KPF_PORT_VALIDATOR_H
#define KPF_PORT_VALIDATOR_H
-#include <qvalidator.h>
+#include <tqvalidator.h>
namespace KPF
{
@@ -36,9 +36,9 @@ namespace KPF
{
public:
- PortValidator(QObject * parent, const char * name = 0);
+ PortValidator(TQObject * parent, const char * name = 0);
- virtual State validate(QString & input, int & pos) const;
+ virtual State validate(TQString & input, int & pos) const;
};
} // End namespace KPF
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index e86743e3..b53422ba 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -21,17 +21,17 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qspinbox.h>
-#include <qlabel.h>
-#include <qframe.h>
-#include <qwhatsthis.h>
-#include <qpushbutton.h>
-#include <qwidgetstack.h>
-#include <qtimer.h>
-#include <qdir.h>
-#include <qlineedit.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqspinbox.h>
+#include <tqlabel.h>
+#include <tqframe.h>
+#include <tqwhatsthis.h>
+#include <tqpushbutton.h>
+#include <tqwidgetstack.h>
+#include <tqtimer.h>
+#include <tqdir.h>
+#include <tqlineedit.h>
#include <kapplication.h>
#include <kglobal.h>
@@ -106,7 +106,7 @@ namespace KPF
uint listenPort;
uint bandwidthLimit;
// uint connectionLimit;
- QString serverName;
+ TQString serverName;
bool followSymlinks;
};
@@ -132,25 +132,25 @@ namespace KPF
{
}
- QLabel * l_listenPort;
- QLabel * l_bandwidthLimit;
-// QLabel * l_connectionLimit;
- QLabel * l_serverName;
- QLabel * l_kpfStatus;
+ TQLabel * l_listenPort;
+ TQLabel * l_bandwidthLimit;
+// TQLabel * l_connectionLimit;
+ TQLabel * l_serverName;
+ TQLabel * l_kpfStatus;
- QSpinBox * sb_listenPort;
- QSpinBox * sb_bandwidthLimit;
-// QSpinBox * sb_connectionLimit;
- QLineEdit * le_serverName;
+ TQSpinBox * sb_listenPort;
+ TQSpinBox * sb_bandwidthLimit;
+// TQSpinBox * sb_connectionLimit;
+ TQLineEdit * le_serverName;
- QCheckBox * cb_followSymlinks;
- QCheckBox * cb_share;
+ TQCheckBox * cb_followSymlinks;
+ TQCheckBox * cb_share;
- QPushButton * pb_startKPF;
+ TQPushButton * pb_startKPF;
- QWidgetStack * stack;
- QWidget * initWidget;
- QWidget * configWidget;
+ TQWidgetStack * stack;
+ TQWidget * initWidget;
+ TQWidget * configWidget;
WebServerManager_stub * webServerManagerInterface;
@@ -164,7 +164,7 @@ namespace KPF
PropertiesDialogPlugin::PropertiesDialogPlugin(KPropertiesDialog * dialog,
const char *,
- const QStringList &)
+ const TQStringList &)
: KPropsDlgPlugin(dialog)
{
d = new Private;
@@ -175,19 +175,19 @@ namespace KPF
d->url = dialog->kurl();
if (
- d->url == QDir::homeDirPath()
- || d->url == "file:" + QDir::homeDirPath()
+ d->url == TQDir::homeDirPath()
+ || d->url == "file:" + TQDir::homeDirPath()
)
{
// Don't even show ourselves if it's the home dir
return;
}
- QWidget * widget = dialog->addPage(i18n("&Sharing"));
+ TQWidget * widget = dialog->addPage(i18n("&Sharing"));
- d->stack = new QWidgetStack(widget);
+ d->stack = new TQWidgetStack(widget);
- QVBoxLayout * stackLayout = new QVBoxLayout(widget);
+ TQVBoxLayout * stackLayout = new TQVBoxLayout(widget);
stackLayout->addWidget(d->stack);
d->initWidget = createInitWidget(d->stack);
@@ -201,15 +201,15 @@ namespace KPF
connect
(
kapp->dcopClient(),
- SIGNAL(applicationRegistered(const QCString &)),
- SLOT(slotApplicationRegistered(const QCString &))
+ TQT_SIGNAL(applicationRegistered(const TQCString &)),
+ TQT_SLOT(slotApplicationRegistered(const TQCString &))
);
connect
(
kapp->dcopClient(),
- SIGNAL(applicationRemoved(const QCString &)),
- SLOT(slotApplicationUnregistered(const QCString &))
+ TQT_SIGNAL(applicationRemoved(const TQCString &)),
+ TQT_SLOT(slotApplicationUnregistered(const TQCString &))
);
d->kpfRunning = kapp->dcopClient()->isApplicationRegistered("kpf");
@@ -272,12 +272,12 @@ namespace KPF
d->cb_followSymlinks ->setEnabled(b);
}
- QWidget *
- PropertiesDialogPlugin::createInitWidget(QWidget * parent)
+ TQWidget *
+ PropertiesDialogPlugin::createInitWidget(TQWidget * parent)
{
- QWidget * w = new QWidget(parent);
+ TQWidget * w = new TQWidget(parent);
- QLabel * about =
+ TQLabel * about =
new QLabel
(
i18n
@@ -292,52 +292,52 @@ namespace KPF
);
d->pb_startKPF
- = new QPushButton(i18n("Start Applet"), w);
+ = new TQPushButton(i18n("Start Applet"), w);
- QVBoxLayout * l = new QVBoxLayout(w);
+ TQVBoxLayout * l = new TQVBoxLayout(w);
l->addWidget(about);
d->l_kpfStatus =
- new QLabel(i18n("Applet status: <strong>not running</strong>"), w);
+ new TQLabel(i18n("Applet status: <strong>not running</strong>"), w);
l->addWidget(d->l_kpfStatus);
- QHBoxLayout * l2 = new QHBoxLayout(l);
+ TQHBoxLayout * l2 = new TQHBoxLayout(l);
l2->addStretch(1);
l2->addWidget(d->pb_startKPF);
l->addStretch(1);
- connect(d->pb_startKPF, SIGNAL(clicked()), SLOT(slotStartKPF()));
+ connect(d->pb_startKPF, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartKPF()));
return w;
}
- QWidget *
- PropertiesDialogPlugin::createConfigWidget(QWidget * parent)
+ TQWidget *
+ PropertiesDialogPlugin::createConfigWidget(TQWidget * parent)
{
- QWidget * w = new QWidget(parent);
+ TQWidget * w = new TQWidget(parent);
d->cb_share =
- new QCheckBox(i18n("Share this directory on the &Web"), w);
+ new TQCheckBox(i18n("Share this directory on the &Web"), w);
- d->l_listenPort = new QLabel(i18n("&Listen port:"), w);
- d->l_bandwidthLimit = new QLabel(i18n("&Bandwidth limit:"), w);
-// d->l_connectionLimit = new QLabel(i18n("Connection &limit"), w);
- d->l_serverName = new QLabel(i18n("&Server name:"), w);
+ d->l_listenPort = new TQLabel(i18n("&Listen port:"), w);
+ d->l_bandwidthLimit = new TQLabel(i18n("&Bandwidth limit:"), w);
+// d->l_connectionLimit = new TQLabel(i18n("Connection &limit"), w);
+ d->l_serverName = new TQLabel(i18n("&Server name:"), w);
bool canPublish = DNSSD::ServiceBrowser::isAvailable() == DNSSD::ServiceBrowser::Working;
d->l_serverName->setEnabled(canPublish);
- d->sb_listenPort = new QSpinBox(1000, 999999, 1, w);
- d->sb_bandwidthLimit = new QSpinBox(1, 999999, 1, w);
-// d->sb_connectionLimit = new QSpinBox(1, 9999, 1, w);
- d->le_serverName = new QLineEdit( w);
+ d->sb_listenPort = new TQSpinBox(1000, 999999, 1, w);
+ d->sb_bandwidthLimit = new TQSpinBox(1, 999999, 1, w);
+// d->sb_connectionLimit = new TQSpinBox(1, 9999, 1, w);
+ d->le_serverName = new TQLineEdit( w);
d->le_serverName->setEnabled(canPublish);
d->cb_followSymlinks =
- new QCheckBox(i18n("&Follow symbolic links"), w);
+ new TQCheckBox(i18n("&Follow symbolic links"), w);
d->l_listenPort ->setBuddy(d->sb_listenPort);
d->l_serverName ->setBuddy(d->le_serverName);
@@ -350,14 +350,14 @@ namespace KPF
// d->sb_connectionLimit ->setValue(Config::DefaultConnectionLimit);
d->cb_followSymlinks ->setChecked(Config::DefaultFollowSymlinks);
- QVBoxLayout * l0 =
- new QVBoxLayout(w, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout * l0 =
+ new TQVBoxLayout(w, KDialog::marginHint(), KDialog::spacingHint());
l0->addWidget(d->cb_share);
- l0->addWidget(new KSeparator(QFrame::HLine, w));
+ l0->addWidget(new KSeparator(TQFrame::HLine, w));
- QGridLayout * l2 = new QGridLayout(l0);
+ TQGridLayout * l2 = new TQGridLayout(l0);
l2->addWidget(d->l_listenPort, 0, 0);
l2->addWidget(d->sb_listenPort, 0, 1);
@@ -372,7 +372,7 @@ namespace KPF
l0->addStretch(1);
- QString shareHelp =
+ TQString shareHelp =
i18n
(
"<p>"
@@ -395,9 +395,9 @@ namespace KPF
" (%1)"
"</p>"
)
- .arg(QDir::homeDirPath());
+ .arg(TQDir::homeDirPath());
- QString listenPortHelp =
+ TQString listenPortHelp =
i18n
(
"<p>"
@@ -406,7 +406,7 @@ namespace KPF
"</p>"
);
- QString bandwidthLimitHelp =
+ TQString bandwidthLimitHelp =
i18n
(
"<p>"
@@ -419,7 +419,7 @@ namespace KPF
"</p>"
);
- QString connectionLimitHelp =
+ TQString connectionLimitHelp =
i18n
(
"<p>"
@@ -428,7 +428,7 @@ namespace KPF
"</p>"
);
- QString followSymlinksHelp =
+ TQString followSymlinksHelp =
i18n
(
"<p>"
@@ -441,64 +441,64 @@ namespace KPF
" risk. Use only if you understand the issues involved."
"</p>"
);
- QString serverNameHelp = KPF::HelpText::getServerNameHelp();
+ TQString serverNameHelp = KPF::HelpText::getServerNameHelp();
- QWhatsThis::add(d->cb_share, shareHelp);
- QWhatsThis::add(d->l_listenPort, listenPortHelp);
- QWhatsThis::add(d->sb_listenPort, listenPortHelp);
- QWhatsThis::add(d->l_bandwidthLimit, bandwidthLimitHelp);
- QWhatsThis::add(d->sb_bandwidthLimit, bandwidthLimitHelp);
-// QWhatsThis::add(d->l_connectionLimit, connectionLimitHelp);
-// QWhatsThis::add(d->sb_connectionLimit, connectionLimitHelp);
- QWhatsThis::add(d->l_serverName, serverNameHelp);
- QWhatsThis::add(d->le_serverName, serverNameHelp);
- QWhatsThis::add(d->cb_followSymlinks, followSymlinksHelp);
+ TQWhatsThis::add(d->cb_share, shareHelp);
+ TQWhatsThis::add(d->l_listenPort, listenPortHelp);
+ TQWhatsThis::add(d->sb_listenPort, listenPortHelp);
+ TQWhatsThis::add(d->l_bandwidthLimit, bandwidthLimitHelp);
+ TQWhatsThis::add(d->sb_bandwidthLimit, bandwidthLimitHelp);
+// TQWhatsThis::add(d->l_connectionLimit, connectionLimitHelp);
+// TQWhatsThis::add(d->sb_connectionLimit, connectionLimitHelp);
+ TQWhatsThis::add(d->l_serverName, serverNameHelp);
+ TQWhatsThis::add(d->le_serverName, serverNameHelp);
+ TQWhatsThis::add(d->cb_followSymlinks, followSymlinksHelp);
- connect(d->cb_share, SIGNAL(toggled(bool)), SLOT(slotSharingToggled(bool)));
+ connect(d->cb_share, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSharingToggled(bool)));
slotSharingToggled(false);
connect
(
d->cb_share,
- SIGNAL(toggled(bool)),
- SLOT(slotChanged())
+ TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(slotChanged())
);
connect
(
d->sb_listenPort,
- SIGNAL(valueChanged(int)),
- SLOT(slotChanged())
+ TQT_SIGNAL(valueChanged(int)),
+ TQT_SLOT(slotChanged())
);
connect
(
d->sb_bandwidthLimit,
- SIGNAL(valueChanged(int)),
- SLOT(slotChanged())
+ TQT_SIGNAL(valueChanged(int)),
+ TQT_SLOT(slotChanged())
);
#if 0
connect
(
d->sb_connectionLimit,
- SIGNAL(valueChanged(int)),
- SLOT(slotChanged())
+ TQT_SIGNAL(valueChanged(int)),
+ TQT_SLOT(slotChanged())
);
#endif
connect
(
d->le_serverName,
- SIGNAL(textChanged(const QString&)),
- SLOT(slotChanged())
+ TQT_SIGNAL(textChanged(const TQString&)),
+ TQT_SLOT(slotChanged())
);
connect
(
d->cb_followSymlinks,
- SIGNAL(toggled(bool)),
- SLOT(slotChanged())
+ TQT_SIGNAL(toggled(bool)),
+ TQT_SLOT(slotChanged())
);
return w;
@@ -511,9 +511,9 @@ namespace KPF
->setText(i18n("Applet status: <strong>starting...</strong>"));
kapp->dcopClient()
- ->send("kicker", "default", "addApplet(QString)", "kpfapplet.desktop");
+ ->send("kicker", "default", "addApplet(TQString)", "kpfapplet.desktop");
- QTimer::singleShot(4 * 1000, this, SLOT(slotStartKPFFailed()));
+ TQTimer::singleShot(4 * 1000, this, TQT_SLOT(slotStartKPFFailed()));
}
void
@@ -526,7 +526,7 @@ namespace KPF
}
void
- PropertiesDialogPlugin::slotApplicationRegistered(const QCString & s)
+ PropertiesDialogPlugin::slotApplicationRegistered(const TQCString & s)
{
if ("kpf" == s)
{
@@ -544,7 +544,7 @@ namespace KPF
}
void
- PropertiesDialogPlugin::slotApplicationUnregistered(const QCString & s)
+ PropertiesDialogPlugin::slotApplicationUnregistered(const TQCString & s)
{
if ("kpf" == s)
{
@@ -629,7 +629,7 @@ namespace KPF
void
PropertiesDialogPlugin::getServerRef()
{
- QValueList<DCOPRef> serverRefList =
+ TQValueList<DCOPRef> serverRefList =
d->webServerManagerInterface->serverList();
if (DCOPStub::CallFailed == d->webServerManagerInterface->status())
@@ -641,7 +641,7 @@ namespace KPF
d->webServerRef.clear();
- QValueList<DCOPRef>::ConstIterator it(serverRefList.begin());
+ TQValueList<DCOPRef>::ConstIterator it(serverRefList.begin());
for (; it != serverRefList.end(); ++it)
{
@@ -660,7 +660,7 @@ namespace KPF
bool
PropertiesDialogPlugin::userAcceptsWarning() const
{
- QString noWarningKey("DoNotWarnAboutSharingDirectoriesViaHTTP");
+ TQString noWarningKey("DoNotWarnAboutSharingDirectoriesViaHTTP");
KConfig * config(KGlobal::config());
diff --git a/kpf/src/PropertiesDialogPlugin.h b/kpf/src/PropertiesDialogPlugin.h
index 5881080a..8406f4c2 100644
--- a/kpf/src/PropertiesDialogPlugin.h
+++ b/kpf/src/PropertiesDialogPlugin.h
@@ -40,7 +40,7 @@ namespace KPF
public:
- PropertiesDialogPlugin(KPropertiesDialog *, const char *, const QStringList &);
+ PropertiesDialogPlugin(KPropertiesDialog *, const char *, const TQStringList &);
virtual ~PropertiesDialogPlugin();
@@ -52,8 +52,8 @@ namespace KPF
void slotStartKPF();
void slotStartKPFFailed();
- void slotApplicationRegistered(const QCString &);
- void slotApplicationUnregistered(const QCString &);
+ void slotApplicationRegistered(const TQCString &);
+ void slotApplicationUnregistered(const TQCString &);
void slotChanged();
@@ -64,8 +64,8 @@ namespace KPF
void updateGUIFromCurrentState();
void updateWantedStateFromGUI();
- QWidget * createInitWidget(QWidget * parent);
- QWidget * createConfigWidget(QWidget * parent);
+ TQWidget * createInitWidget(TQWidget * parent);
+ TQWidget * createConfigWidget(TQWidget * parent);
void readSettings();
void setControlsEnabled(bool);
diff --git a/kpf/src/Request.cpp b/kpf/src/Request.cpp
index 01735363..442e4993 100644
--- a/kpf/src/Request.cpp
+++ b/kpf/src/Request.cpp
@@ -23,7 +23,7 @@
#include <climits> // For ULONG_MAX
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kurl.h>
#include "Defines.h"
@@ -50,25 +50,25 @@ namespace KPF
}
void
- Request::parseHeaders(const QStringList & buf)
+ Request::parseHeaders(const TQStringList & buf)
{
- for (QStringList::ConstIterator it(buf.begin()); it != buf.end(); ++it)
+ for (TQStringList::ConstIterator it(buf.begin()); it != buf.end(); ++it)
{
- QString line(*it);
+ TQString line(*it);
int colonPos = line.find(':');
if (-1 != colonPos)
{
- QString name(line.left(colonPos).stripWhiteSpace().lower());
- QString value(line.mid(colonPos + 1).stripWhiteSpace());
+ TQString name(line.left(colonPos).stripWhiteSpace().lower());
+ TQString value(line.mid(colonPos + 1).stripWhiteSpace());
handleHeader(name, value);
}
}
}
void
- Request::handleHeader(const QString & name, const QString & value)
+ Request::handleHeader(const TQString & name, const TQString & value)
{
if ("host" == name)
{
@@ -80,21 +80,21 @@ namespace KPF
}
else if ("if-modified-since" == name)
{
- QDateTime dt;
+ TQDateTime dt;
if (parseDate(value, dt))
setIfModifiedSince(dt);
}
else if ("if-unmodified-since" == name)
{
- QDateTime dt;
+ TQDateTime dt;
if (parseDate(value, dt))
setIfUnmodifiedSince(dt);
}
else if ("connection" == name)
{
- QString v(value.lower());
+ TQString v(value.lower());
if ("keep-alive" == v)
{
@@ -108,9 +108,9 @@ namespace KPF
}
void
- Request::setProtocol(const QString & _s)
+ Request::setProtocol(const TQString & _s)
{
- QString s(_s);
+ TQString s(_s);
s.remove(0, 5);
@@ -131,7 +131,7 @@ namespace KPF
}
void
- Request::setMethod(const QString & s)
+ Request::setMethod(const TQString & s)
{
if ("GET" == s)
method_ = Get;
@@ -148,7 +148,7 @@ namespace KPF
}
void
- Request::setPath(const QString & s)
+ Request::setPath(const TQString & s)
{
KURL p(s);
path_ = clean(p.path());
@@ -162,21 +162,21 @@ namespace KPF
}
void
- Request::setHost(const QString & s)
+ Request::setHost(const TQString & s)
{
host_ = s;
haveHost_ = true;
}
void
- Request::setIfModifiedSince(const QDateTime & dt)
+ Request::setIfModifiedSince(const TQDateTime & dt)
{
ifModifiedSince_ = dt;
haveIfModifiedSince_ = true;
}
void
- Request::setIfUnmodifiedSince(const QDateTime & dt)
+ Request::setIfUnmodifiedSince(const TQDateTime & dt)
{
ifUnmodifiedSince_ = dt;
haveIfUnmodifiedSince_ = true;
@@ -251,10 +251,10 @@ namespace KPF
QCString
Request::protocolString() const
{
- QCString s("HTTP/");
- s += QCString().setNum(protocolMajor_);
+ TQCString s("HTTP/");
+ s += TQCString().setNum(protocolMajor_);
s += '.';
- s += QCString().setNum(protocolMinor_);
+ s += TQCString().setNum(protocolMinor_);
return s;
}
@@ -271,7 +271,7 @@ namespace KPF
}
void
- Request::setRange(const QString & s)
+ Request::setRange(const TQString & s)
{
kpfDebug << "Request::setRange(`" << s << "')" << endl;
@@ -346,17 +346,17 @@ namespace KPF
expectContinue_ = false;
haveRange_ = false;
persist_ = false;
- path_ = QString::null;
- host_ = QString::null;
- ifModifiedSince_ = QDateTime();
- ifUnmodifiedSince_ = QDateTime();
+ path_ = TQString::null;
+ host_ = TQString::null;
+ ifModifiedSince_ = TQDateTime();
+ ifUnmodifiedSince_ = TQDateTime();
range_.clear();
}
QString
- Request::clean(const QString & _path) const
+ Request::clean(const TQString & _path) const
{
- QString s(_path);
+ TQString s(_path);
while (s.endsWith("/./"))
s.truncate(s.length() - 2);
@@ -366,7 +366,7 @@ namespace KPF
// Double slash -> slash.
- QRegExp r("\\/\\/+");
+ TQRegExp r("\\/\\/+");
s.replace(r, "/");
return s;
diff --git a/kpf/src/Request.h b/kpf/src/Request.h
index 92034c9c..d31d5ef8 100644
--- a/kpf/src/Request.h
+++ b/kpf/src/Request.h
@@ -24,9 +24,9 @@
#ifndef KPF_REQUEST_H
#define KPF_REQUEST_H
-#include <qcstring.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <tqcstring.h>
+#include <tqstringlist.h>
+#include <tqdatetime.h>
#include "ByteRange.h"
@@ -58,12 +58,12 @@ namespace KPF
* Take a list of headers and parse them, setting our values
* appropriately.
*/
- void parseHeaders(const QStringList &);
+ void parseHeaders(const TQStringList &);
/**
* Parse one header line and set whatever value is appropriate.
*/
- void handleHeader(const QString & name, const QString & value);
+ void handleHeader(const TQString & name, const TQString & value);
/**
* HTTP has had a few revisions (protocols) since birth. Here you may
@@ -71,7 +71,7 @@ namespace KPF
* version of setProtocol parses a string of the form
* "HTTP/major.minor", where major and minor are integers.
*/
- void setProtocol (const QString &);
+ void setProtocol (const TQString &);
/**
* HTTP has had a few revisions (protocols) since birth. Here you may
@@ -83,7 +83,7 @@ namespace KPF
* Specify the 'method' requested by the client. This version parses
* a string.
*/
- void setMethod (const QString &);
+ void setMethod (const TQString &);
/**
* Specify the 'method' requested by the client.
@@ -94,26 +94,26 @@ namespace KPF
* Set the path to the requested resource. The path is
* immediately decoded and canonicalised.
*/
- void setPath (const QString &);
+ void setPath (const TQString &);
/**
* HTTP/1.1 requests must have a "Host:" header.
*/
- void setHost (const QString &);
+ void setHost (const TQString &);
/**
* HTTP/1.1 allows an "If-Modified-Since" header, specifying that
* the requested resource should only be retrieved if the resource
* has been modified since a certain date and time.
*/
- void setIfModifiedSince (const QDateTime &);
+ void setIfModifiedSince (const TQDateTime &);
/**
* HTTP/1.1 allows an "If-Unmodified-Since" header, specifying that
* the requested resource should only be retrieved if the resource
* has NOT been modified since a certain date and time.
*/
- void setIfUnmodifiedSince (const QDateTime &);
+ void setIfUnmodifiedSince (const TQDateTime &);
/**
* HTTP/1.1 allows an "Expect: 100-continue" header, specifying
@@ -125,7 +125,7 @@ namespace KPF
* Specify a range of bytes which should be retrieved from the
* resource. See RFC 2616.
*/
- void setRange (const QString &);
+ void setRange (const TQString &);
/**
* HTTP/1.1 allows "persistent" connections. These may be specified
@@ -172,27 +172,27 @@ namespace KPF
/**
* @return the path that was set with (and modified by) setPath()
*/
- QString path() const;
+ TQString path() const;
/**
* @return the host that was set previously.
*/
- QString host() const;
+ TQString host() const;
/**
* @return the date/time set by @ref setIfModifiedSince previously.
*/
- QDateTime ifModifiedSince() const;
+ TQDateTime ifModifiedSince() const;
/**
* @return the date/time set by @ref setIfUnmodifiedSince previously.
*/
- QDateTime ifUnmodifiedSince() const;
+ TQDateTime ifUnmodifiedSince() const;
/**
* @return the protocol as a string, e.g. "HTTP/1.1".
*/
- QCString protocolString() const;
+ TQCString protocolString() const;
/**
* @return true if @ref setExpectContinue was used previously.
@@ -223,7 +223,7 @@ namespace KPF
* Clean up the path given in a request, so it's more like what we
* expect.
*/
- QString clean(const QString & path) const;
+ TQString clean(const TQString & path) const;
private:
@@ -239,10 +239,10 @@ namespace KPF
bool persist_;
// End order dependency
- QString path_;
- QString host_;
- QDateTime ifModifiedSince_;
- QDateTime ifUnmodifiedSince_;
+ TQString path_;
+ TQString host_;
+ TQDateTime ifModifiedSince_;
+ TQDateTime ifUnmodifiedSince_;
ByteRange range_;
};
diff --git a/kpf/src/Resource.cpp b/kpf/src/Resource.cpp
index d5e77072..6c3dad91 100644
--- a/kpf/src/Resource.cpp
+++ b/kpf/src/Resource.cpp
@@ -21,11 +21,11 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qstringlist.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
+#include <tqstringlist.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqregexp.h>
#include <kglobal.h>
#include <kmimetype.h>
@@ -50,17 +50,17 @@ namespace KPF
{
}
- QString root;
+ TQString root;
FileType fileType;
- QString path;
- QFile file;
- QFileInfo fileInfo;
- QDir dir;
+ TQString path;
+ TQFile file;
+ TQFileInfo fileInfo;
+ TQDir dir;
uint size;
bool sizeCalculated;
uint offset;
- QByteArray html;
+ TQByteArray html;
};
Resource::Resource()
@@ -75,7 +75,7 @@ namespace KPF
}
void
- Resource::setPath(const QString & root, const QString & relativePath)
+ Resource::setPath(const TQString & root, const TQString & relativePath)
{
kpfDebug << "setPath(`" << root << "',`" << relativePath << "'" << endl;
@@ -99,13 +99,13 @@ namespace KPF
// Does the path actually point to a directory ?
- if (QFileInfo(d->root + d->path).isDir())
+ if (TQFileInfo(d->root + d->path).isDir())
{
kpfDebug << "Path points to directory" << endl;
// Does an index.html exist in that directory ?
- if (QFileInfo(d->root + d->path + "index.html").exists())
+ if (TQFileInfo(d->root + d->path + "index.html").exists())
{
kpfDebug << "Found index.html" << endl;
@@ -129,7 +129,7 @@ namespace KPF
kpfDebug << "NOT Directory requested" << endl;
}
- kpfDebug << "QFileInfo::setFile(`" << d->root << "' + `" << d->path << "'" << endl;
+ kpfDebug << "TQFileInfo::setFile(`" << d->root << "' + `" << d->path << "'" << endl;
d->fileInfo.setFile(d->root + d->path);
}
@@ -296,18 +296,18 @@ namespace KPF
if (d->fileInfo.isSymLink())
return true;
- QString path(d->fileInfo.dirPath());
+ TQString path(d->fileInfo.dirPath());
- QStringList l(QStringList::split('/', path));
+ TQStringList l(TQStringList::split('/', path));
- QString testPath;
+ TQString testPath;
- for (QStringList::ConstIterator it(l.begin()); it != l.end(); ++it)
+ for (TQStringList::ConstIterator it(l.begin()); it != l.end(); ++it)
{
testPath += '/';
testPath += *it;
- if (QFileInfo(testPath).isSymLink())
+ if (TQFileInfo(testPath).isSymLink())
return true;
}
diff --git a/kpf/src/Resource.h b/kpf/src/Resource.h
index 870daed7..f6e0044c 100644
--- a/kpf/src/Resource.h
+++ b/kpf/src/Resource.h
@@ -24,8 +24,8 @@
#ifndef KPF_RESOURCE_H
#define KPF_RESOURCE_H
-#include <qstring.h>
-#include <qdatetime.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
namespace KPF
{
@@ -51,7 +51,7 @@ namespace KPF
/**
* Reset this object and tell it what the new paths are.
*/
- void setPath(const QString & root, const QString & relativePath);
+ void setPath(const TQString & root, const TQString & relativePath);
/**
* @return true if the file was opened ok or the dir was readable.
@@ -96,7 +96,7 @@ namespace KPF
/**
* @return mtime of resource.
*/
- QDateTime lastModified() const;
+ TQDateTime lastModified() const;
/**
* @return size of file, or size of HTML that will be generated.
@@ -123,7 +123,7 @@ namespace KPF
* @return mime type of file if available. If dir, returns text/html.
* If nothing available, returns text/plain.
*/
- QString mimeType() const;
+ TQString mimeType() const;
/**
* Reset to initial state.
diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp
index f9ce46d8..a52de893 100644
--- a/kpf/src/Response.cpp
+++ b/kpf/src/Response.cpp
@@ -21,9 +21,9 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqregexp.h>
#include <kconfig.h>
@@ -79,7 +79,7 @@ namespace KPF
QCString
Response::text(const Request & request) const
{
- QString s;
+ TQString s;
// XXX: Ensure that all codes we know about are enumerated here.
switch (code_)
@@ -89,8 +89,8 @@ namespace KPF
case 304:
if (request.protocol() >= 1.0)
{
- s = QString(request.protocolString())
- + QString(" %1 %2\r\n").arg(code_).arg(responseName(code_));
+ s = TQString(request.protocolString())
+ + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_));
}
break;
@@ -102,8 +102,8 @@ namespace KPF
case 500:
case 501:
case 505:
- s = QString(request.protocolString())
- + QString(" %1 %2\r\n").arg(code_).arg(responseName(code_))
+ s = TQString(request.protocolString())
+ + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_))
+ data(code_, request);
break;
@@ -118,13 +118,13 @@ namespace KPF
QString
Response::data(uint code, const Request & request) const
{
- QString contentType = "Content-Type: text/html; charset=utf-8\r\n";
+ TQString contentType = "Content-Type: text/html; charset=utf-8\r\n";
KConfig config(Config::name());
config.setGroup("General");
- QString html;
+ TQString html;
if
(
@@ -134,26 +134,26 @@ namespace KPF
{
config.setGroup("ErrorMessageOverrideFiles");
- QString filename = config.readPathEntry(QString::number(code));
+ TQString filename = config.readPathEntry(TQString::number(code));
if (!filename.isEmpty())
{
- QFile f(filename);
+ TQFile f(filename);
if (f.open(IO_ReadOnly))
{
- QRegExp regexpMessage ("ERROR_MESSAGE");
- QRegExp regexpCode ("ERROR_CODE");
- QRegExp regexpResource ("RESOURCE");
+ TQRegExp regexpMessage ("ERROR_MESSAGE");
+ TQRegExp regexpCode ("ERROR_CODE");
+ TQRegExp regexpResource ("RESOURCE");
- QTextStream str(&f);
+ TQTextStream str(&f);
while (!str.atEnd())
{
- QString line(str.readLine());
+ TQString line(str.readLine());
line.replace(regexpMessage, responseName(code));
- line.replace(regexpCode, QString::number(code));
+ line.replace(regexpCode, TQString::number(code));
line.replace(regexpResource, request.path());
html = line + "\r\n";
@@ -177,8 +177,8 @@ namespace KPF
html += "</body>\r\n</html>\r\n";
}
- QString contentLength =
- QString("Content-Length: %1\r\n").arg(html.length());
+ TQString contentLength =
+ TQString("Content-Length: %1\r\n").arg(html.length());
return (contentType + contentLength + "\r\n" + html);
}
diff --git a/kpf/src/Response.h b/kpf/src/Response.h
index c24ba69c..d4da0706 100644
--- a/kpf/src/Response.h
+++ b/kpf/src/Response.h
@@ -76,7 +76,7 @@ namespace KPF
* @return header/body data to send to the client. This string is
* constructed differently depending on HTTP response code.
*/
- QCString text(const Request &) const;
+ TQCString text(const Request &) const;
/**
* Reset to initial state.
@@ -89,7 +89,7 @@ namespace KPF
* @internal
* Create HTML.
*/
- QString data(uint, const Request &) const;
+ TQString data(uint, const Request &) const;
private:
diff --git a/kpf/src/RootValidator.cpp b/kpf/src/RootValidator.cpp
index 17d6a43a..00fae54d 100644
--- a/kpf/src/RootValidator.cpp
+++ b/kpf/src/RootValidator.cpp
@@ -21,23 +21,23 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qfileinfo.h>
-#include <qdir.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
#include "RootValidator.h"
#include "WebServerManager.h"
namespace KPF
{
- RootValidator::RootValidator(QObject * parent, const char * name)
- : QValidator(parent, name)
+ RootValidator::RootValidator(TQObject * parent, const char * name)
+ : TQValidator(parent, name)
{
}
- QValidator::State
- RootValidator::validate(QString & input, int & /* unused */) const
+ TQValidator::State
+ RootValidator::validate(TQString & input, int & /* unused */) const
{
- QString root(input);
+ TQString root(input);
if ('/' == root.at(root.length() - 1))
{
@@ -49,13 +49,13 @@ namespace KPF
if (0 != WebServerManager::instance()->server(root))
return Intermediate;
- QFileInfo fi(root);
+ TQFileInfo fi(root);
if (!fi.isDir())
return Intermediate;
// Disabling disallowing of ~, on request.
-// if (fi.dirPath() == QDir::homeDirPath())
+// if (fi.dirPath() == TQDir::homeDirPath())
// return Intermediate;
return Acceptable;
diff --git a/kpf/src/RootValidator.h b/kpf/src/RootValidator.h
index 5ac96829..020816f7 100644
--- a/kpf/src/RootValidator.h
+++ b/kpf/src/RootValidator.h
@@ -24,7 +24,7 @@
#ifndef KPF_ROOT_VALIDATOR_H
#define KPF_ROOT_VALIDATOR_H
-#include <qvalidator.h>
+#include <tqvalidator.h>
namespace KPF
{
@@ -36,9 +36,9 @@ namespace KPF
{
public:
- RootValidator(QObject * parent, const char * name = 0);
+ RootValidator(TQObject * parent, const char * name = 0);
- virtual State validate(QString & input, int & pos) const;
+ virtual State validate(TQString & input, int & pos) const;
};
} // End namespace KPF
diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp
index 3e59281a..90d94209 100644
--- a/kpf/src/Server.cpp
+++ b/kpf/src/Server.cpp
@@ -38,12 +38,12 @@ namespace KPF
Server::Server
(
- const QString & dir,
+ const TQString & dir,
bool followSymlinks,
int socket,
WebServer * parent
)
- : QObject(parent, "Server")
+ : TQObject(parent, "Server")
{
d = new Private;
@@ -53,38 +53,38 @@ namespace KPF
d->followSymlinks = followSymlinks;
- d->birth = QDateTime::currentDateTime();
+ d->birth = TQDateTime::currentDateTime();
d->socket.setSocket(socket);
- connect(&(d->socket), SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
+ connect(&(d->socket), TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
connect
(
&(d->socket),
- SIGNAL(bytesWritten(int)),
- SLOT(slotBytesWritten(int))
+ TQT_SIGNAL(bytesWritten(int)),
+ TQT_SLOT(slotBytesWritten(int))
);
connect
(
&(d->socket),
- SIGNAL(connectionClosed()),
- SLOT(slotConnectionClosed())
+ TQT_SIGNAL(connectionClosed()),
+ TQT_SLOT(slotConnectionClosed())
);
connect
(
&(d->idleTimer),
- SIGNAL(timeout()),
- SLOT(slotTimeout())
+ TQT_SIGNAL(timeout()),
+ TQT_SLOT(slotTimeout())
);
connect
(
&(d->readTimer),
- SIGNAL(timeout()),
- SLOT(slotRead())
+ TQT_SIGNAL(timeout()),
+ TQT_SLOT(slotRead())
);
// If nothing happens for a bit, cancel ourselves.
@@ -128,7 +128,7 @@ namespace KPF
{
kpfDebug << d->id << ": socket.canReadLine" << endl;
- QString line(d->socket.readLine().stripWhiteSpace());
+ TQString line(d->socket.readLine().stripWhiteSpace());
#ifdef KPF_TRAFFIC_DEBUG
kpfDebug
@@ -194,7 +194,7 @@ namespace KPF
}
bool
- Server::readRequest(const QString & line)
+ Server::readRequest(const TQString & line)
{
++d->requestCount;
@@ -205,9 +205,9 @@ namespace KPF
<< line << "'" << endl;
#endif
- QStringList l(QStringList::split(' ', line));
+ TQStringList l(TQStringList::split(' ', line));
- // A request usually looks like METHOD PATH PROTOCOL but we don't
+ // A request usually looks like TQT_METHOD PATH PROTOCOL but we don't
// require PROTOCOL - we just assume HTTP/0.9 and act accordingly.
if (l.count() == 2)
@@ -226,7 +226,7 @@ namespace KPF
d->request.setMethod (l[0]);
d->request.setPath (l[1]);
- d->request.setProtocol (l.count() == 3 ? l[2] : QString::null);
+ d->request.setProtocol (l.count() == 3 ? l[2] : TQString::null);
// Before we check the request, say we received it.
@@ -238,7 +238,7 @@ namespace KPF
bool
Server::checkRequest()
{
- // We only handle METHOD of GET or HEAD.
+ // We only handle TQT_METHOD of GET or HEAD.
if (Request::Unsupported == d->request.method())
{
@@ -336,7 +336,7 @@ namespace KPF
// This would be cleaner if there was a QValueQueue.
// Basically we 'dequeue' the first line from incomingHeaderBuffer.
- QString line(d->incomingLineBuffer.first());
+ TQString line(d->incomingLineBuffer.first());
d->incomingLineBuffer.remove(d->incomingLineBuffer.begin());
// Unless the line is empty, this is (in theory) a header.
@@ -393,7 +393,7 @@ namespace KPF
{
// The path to the requested resource is relative to our root.
- QString filename = d->dir + '/' + d->request.path();
+ TQString filename = d->dir + '/' + d->request.path();
kpfDebug << d->id << ": filename: " << filename << endl;
@@ -550,25 +550,25 @@ namespace KPF
if (206 == d->response.code())
{
- QString line = "Content-Range: bytes ";
+ TQString line = "Content-Range: bytes ";
- line += QString::number(d->request.range().first());
+ line += TQString::number(d->request.range().first());
line += '-';
if (d->request.range().haveLast())
- line += QString::number(d->request.range().last());
+ line += TQString::number(d->request.range().last());
else
- line += QString::number(d->resource.size() - 1);
+ line += TQString::number(d->resource.size() - 1);
line += '/';
- line += QString::number(d->resource.size());
+ line += TQString::number(d->resource.size());
writeLine(line);
}
- writeLine("Content-Length: " + QString::number(d->fileBytesLeft));
+ writeLine("Content-Length: " + TQString::number(d->fileBytesLeft));
}
if (d->requestCount >= MaxKeepAlive && d->request.protocol() >= 1.1)
@@ -689,12 +689,12 @@ namespace KPF
}
void
- Server::writeLine(const QString & line)
+ Server::writeLine(const TQString & line)
{
// Fill a buffer. We're not allowed to send anything out until our
// controller calls write().
- QCString s(line.utf8() + "\r\n");
+ TQCString s(line.utf8() + "\r\n");
d->headerBytesLeft += s.length();
d->outgoingHeaderBuffer += s;
@@ -717,7 +717,7 @@ namespace KPF
// Request from the Response object the text that should be sent
// back to the client.
- QCString s(d->response.text(d->request));
+ TQCString s(d->response.text(d->request));
// Tell our Response object how long it will be in total (it doesn't
// know its total size until we tell it about the resource size.)
@@ -754,7 +754,7 @@ namespace KPF
d->socket.close();
- d->death = QDateTime::currentDateTime();
+ d->death = TQDateTime::currentDateTime();
emit(finished(this));
}
@@ -789,7 +789,7 @@ namespace KPF
// If the socket has been closed (e.g. the remote end hung up)
// then we just give up.
- if (QSocket::Connection != d->socket.state())
+ if (TQSocket::Connection != d->socket.state())
{
kpfDebug << d->id << ": Socket closed by client -> finished" << endl;
setFinished(Flush);
@@ -1020,7 +1020,7 @@ namespace KPF
bytesToWrite = min(bytesToWrite, d->socket.outputBufferLeft());
- QByteArray a(bytesToWrite);
+ TQByteArray a(bytesToWrite);
if (0 == bytesToWrite)
return true;
@@ -1049,14 +1049,14 @@ namespace KPF
kpfDebug
<< d->id
<< ": Wrote file data: `"
- << QCString(a.data(), fileBytesWritten)
+ << TQCString(a.data(), fileBytesWritten)
<< "'"
<< endl;
#endif
// We should have been able to write the full amount to the socket,
// because we tested d->socket.outputBufferLeft(). If we didn't
- // manage to write that much, either we have a bug or QSocket does.
+ // manage to write that much, either we have a bug or TQSocket does.
if (fileBytesWritten < fileBytesRead)
{
diff --git a/kpf/src/Server.h b/kpf/src/Server.h
index 8d26a167..c83f4a3d 100644
--- a/kpf/src/Server.h
+++ b/kpf/src/Server.h
@@ -24,9 +24,9 @@
#ifndef KPF_SERVER_H
#define KPF_SERVER_H
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qhostaddress.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqhostaddress.h>
#include "Request.h"
#include "Response.h"
@@ -64,7 +64,7 @@ namespace KPF
*/
Server
(
- const QString & dir,
+ const TQString & dir,
bool followSymlinks,
int socket,
WebServer * parent
@@ -78,7 +78,7 @@ namespace KPF
/**
* @return address of client that has connected to us.
*/
- QHostAddress peerAddress() const;
+ TQHostAddress peerAddress() const;
/**
* @return Request object associated with this connection.
@@ -109,12 +109,12 @@ namespace KPF
/**
* @return date and time this object was created.
*/
- QDateTime birth() const;
+ TQDateTime birth() const;
/**
* @return date and time all activity was completed.
*/
- QDateTime death() const;
+ TQDateTime death() const;
/**
* @return number of bytes remaining to send to client.
@@ -164,10 +164,10 @@ namespace KPF
};
void setFinished (FlushSelect);
- void writeLine (const QString &);
+ void writeLine (const TQString &);
void prepareResponse ();
void respond (uint code, ulong size = 0);
- bool readRequest (const QString &);
+ bool readRequest (const TQString &);
bool checkRequest ();
void handleRequest ();
void readHeaders ();
diff --git a/kpf/src/ServerPrivate.h b/kpf/src/ServerPrivate.h
index fcf7fd39..91d6424a 100644
--- a/kpf/src/ServerPrivate.h
+++ b/kpf/src/ServerPrivate.h
@@ -24,8 +24,8 @@
#ifndef KPF_SERVER_PRIVATE_H
#define KPF_SERVER_PRIVATE_H
-#include <qcstring.h>
-#include <qtimer.h>
+#include <tqcstring.h>
+#include <tqtimer.h>
#include "ServerSocket.h"
#include "Server.h"
@@ -57,17 +57,17 @@ namespace KPF
uint requestCount;
// End order dependency
- QString dir;
+ TQString dir;
Request request;
Response response;
Resource resource;
- QStringList incomingHeaderLineBuffer;
- QStringList incomingLineBuffer;
- QDateTime birth;
- QDateTime death;
- QCString outgoingHeaderBuffer;
- QTimer idleTimer;
- QTimer readTimer;
+ TQStringList incomingHeaderLineBuffer;
+ TQStringList incomingLineBuffer;
+ TQDateTime birth;
+ TQDateTime death;
+ TQCString outgoingHeaderBuffer;
+ TQTimer idleTimer;
+ TQTimer readTimer;
ulong id;
static ulong ID;
};
diff --git a/kpf/src/ServerSocket.cpp b/kpf/src/ServerSocket.cpp
index 9f39ac57..38d419a5 100644
--- a/kpf/src/ServerSocket.cpp
+++ b/kpf/src/ServerSocket.cpp
@@ -21,15 +21,15 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qsocketdevice.h>
+#include <tqsocketdevice.h>
#include "Defines.h"
#include "ServerSocket.h"
namespace KPF
{
- ServerSocket::ServerSocket(QObject * parent, const char * name)
- : QSocket(parent, name)
+ ServerSocket::ServerSocket(TQObject * parent, const char * name)
+ : TQSocket(parent, name)
{
// Empty.
}
diff --git a/kpf/src/ServerSocket.h b/kpf/src/ServerSocket.h
index 14a2e2d8..76618c9b 100644
--- a/kpf/src/ServerSocket.h
+++ b/kpf/src/ServerSocket.h
@@ -24,7 +24,7 @@
#ifndef KPF_SERVER_SOCKET_H
#define KPF_SERVER_SOCKET_H
-#include <qsocket.h>
+#include <tqsocket.h>
namespace KPF
{
@@ -36,7 +36,7 @@ namespace KPF
{
public:
- ServerSocket(QObject * parent, const char * name = 0);
+ ServerSocket(TQObject * parent, const char * name = 0);
uint outputBufferLeft();
};
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 8ca47e22..840c64d9 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -21,12 +21,12 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qdir.h>
-#include <qptrlist.h>
-#include <qlineedit.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqdir.h>
+#include <tqptrlist.h>
+#include <tqlineedit.h>
#include <kapplication.h>
#include <klineedit.h>
@@ -46,18 +46,18 @@
namespace KPF
{
- ServerWizard::ServerWizard(QWidget * parent)
+ ServerWizard::ServerWizard(TQWidget * parent)
: KWizard(parent, "KPF::ServerWizard", true)
{
setCaption(i18n("New Server - %1").arg("kpf"));
- page1_ = new QWidget(this);
- page2_ = new QWidget(this);
- page3_ = new QWidget(this);
-// page4_ = new QWidget(this);
- page5_ = new QWidget(this);
+ page1_ = new TQWidget(this);
+ page2_ = new TQWidget(this);
+ page3_ = new TQWidget(this);
+// page4_ = new TQWidget(this);
+ page5_ = new TQWidget(this);
- QLabel * l_rootDirectoryHelp =
+ TQLabel * l_rootDirectoryHelp =
new QLabel
(
i18n
@@ -74,7 +74,7 @@ namespace KPF
page1_
);
- QLabel * l_listenPortHelp =
+ TQLabel * l_listenPortHelp =
new QLabel
(
i18n
@@ -87,7 +87,7 @@ namespace KPF
page2_
);
- QLabel * l_bandwidthLimitHelp =
+ TQLabel * l_bandwidthLimitHelp =
new QLabel
(
i18n
@@ -104,7 +104,7 @@ namespace KPF
page3_
);
/*
- QLabel * l_connectionLimitHelp =
+ TQLabel * l_connectionLimitHelp =
new QLabel
(
i18n
@@ -118,42 +118,42 @@ namespace KPF
);
*/
bool canPublish = DNSSD::ServiceBrowser::isAvailable() == DNSSD::ServiceBrowser::Working;
- QLabel * l_serverNameHelp =
+ TQLabel * l_serverNameHelp =
new QLabel
(
KPF::HelpText::getServerNameHelp(),
page5_
);
- QLabel * l_root_ =
- new QLabel(i18n("&Root directory:"), page1_);
+ TQLabel * l_root_ =
+ new TQLabel(i18n("&Root directory:"), page1_);
- QLabel * l_listenPort_ =
- new QLabel(i18n("&Listen port:"), page2_);
+ TQLabel * l_listenPort_ =
+ new TQLabel(i18n("&Listen port:"), page2_);
- QLabel * l_bandwidthLimit_ =
- new QLabel(i18n("&Bandwidth limit:"), page3_);
+ TQLabel * l_bandwidthLimit_ =
+ new TQLabel(i18n("&Bandwidth limit:"), page3_);
-// QLabel * l_connectionLimit_ =
-// new QLabel(i18n("Connection &limit"), page4_);
+// TQLabel * l_connectionLimit_ =
+// new TQLabel(i18n("Connection &limit"), page4_);
- QLabel * l_serverName_ =
- new QLabel(i18n("&Server name:"), page5_);
+ TQLabel * l_serverName_ =
+ new TQLabel(i18n("&Server name:"), page5_);
if(!canPublish)
l_serverName_->setEnabled(false);
kur_root_ = new KURLRequester(page1_);
- sb_listenPort_ = new QSpinBox(1, 65535, 1, page2_);
+ sb_listenPort_ = new TQSpinBox(1, 65535, 1, page2_);
- sb_bandwidthLimit_ = new QSpinBox(1, 999999, 1, page3_);
-// sb_connectionLimit_ = new QSpinBox(1, 9999, 1, page4_);
+ sb_bandwidthLimit_ = new TQSpinBox(1, 999999, 1, page3_);
+// sb_connectionLimit_ = new TQSpinBox(1, 9999, 1, page4_);
char hostname[255];
gethostname(hostname, 255-2);
hostname[255-1]=0;
- le_serverName_ = new QLineEdit(hostname, page5_);
+ le_serverName_ = new TQLineEdit(hostname, page5_);
if(!canPublish)
le_serverName_->setEnabled(false);
@@ -171,20 +171,20 @@ namespace KPF
sb_bandwidthLimit_ ->setSuffix(i18n(" kB/s"));
// sb_connectionLimit_ ->setValue(Config::DefaultConnectionLimit);
- QVBoxLayout * layout1 =
- new QVBoxLayout(page1_, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout * layout1 =
+ new TQVBoxLayout(page1_, KDialog::marginHint(), KDialog::spacingHint());
- QVBoxLayout * layout2 =
- new QVBoxLayout(page2_, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout * layout2 =
+ new TQVBoxLayout(page2_, KDialog::marginHint(), KDialog::spacingHint());
- QVBoxLayout * layout3 =
- new QVBoxLayout(page3_, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout * layout3 =
+ new TQVBoxLayout(page3_, KDialog::marginHint(), KDialog::spacingHint());
-// QVBoxLayout * layout4 =
-// new QVBoxLayout(page4_, KDialog::marginHint(), KDialog::spacingHint());
+// TQVBoxLayout * layout4 =
+// new TQVBoxLayout(page4_, KDialog::marginHint(), KDialog::spacingHint());
- QVBoxLayout * layout5 =
- new QVBoxLayout(page5_, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout * layout5 =
+ new TQVBoxLayout(page5_, KDialog::marginHint(), KDialog::spacingHint());
layout1->addWidget(l_rootDirectoryHelp);
layout2->addWidget(l_listenPortHelp);
@@ -192,35 +192,35 @@ namespace KPF
// layout4->addWidget(l_connectionLimitHelp);
layout5->addWidget(l_serverNameHelp);
- QHBoxLayout * layout10 = new QHBoxLayout(layout1);
+ TQHBoxLayout * layout10 = new TQHBoxLayout(layout1);
layout10->addWidget(l_root_);
layout10->addWidget(kur_root_);
layout1->addStretch(1);
- QHBoxLayout * layout20 = new QHBoxLayout(layout2);
+ TQHBoxLayout * layout20 = new TQHBoxLayout(layout2);
layout20->addWidget(l_listenPort_);
layout20->addWidget(sb_listenPort_);
layout2->addStretch(1);
- QHBoxLayout * layout30 = new QHBoxLayout(layout3);
+ TQHBoxLayout * layout30 = new TQHBoxLayout(layout3);
layout30->addWidget(l_bandwidthLimit_);
layout30->addWidget(sb_bandwidthLimit_);
layout3->addStretch(1);
-// QHBoxLayout * layout40 = new QHBoxLayout(layout4);
+// TQHBoxLayout * layout40 = new TQHBoxLayout(layout4);
// layout40->addWidget(l_connectionLimit_);
// layout40->addWidget(sb_connectionLimit_);
// layout4->addStretch(1);
- QHBoxLayout * layout50 = new QHBoxLayout(layout5);
+ TQHBoxLayout * layout50 = new TQHBoxLayout(layout5);
layout50->addWidget(l_serverName_);
layout50->addWidget(le_serverName_);
@@ -231,7 +231,7 @@ namespace KPF
// addPage(page4_, i18n("Connection Limit"));
addPage(page5_, i18n("Server Name"));
- kur_root_->setURL(QDir::homeDirPath() + "/public_html");
+ kur_root_->setURL(TQDir::homeDirPath() + "/public_html");
kur_root_->setMode
(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
@@ -244,8 +244,8 @@ namespace KPF
connect
(
kur_root_,
- SIGNAL(textChanged(const QString &)),
- SLOT(slotServerRootChanged(const QString &))
+ TQT_SIGNAL(textChanged(const TQString &)),
+ TQT_SLOT(slotServerRootChanged(const TQString &))
);
// Used for setting the caption on the file dialog.
@@ -253,8 +253,8 @@ namespace KPF
connect
(
kur_root_,
- SIGNAL(openFileDialog(KURLRequester *)),
- SLOT(slotOpenFileDialog(KURLRequester *))
+ TQT_SIGNAL(openFileDialog(KURLRequester *)),
+ TQT_SLOT(slotOpenFileDialog(KURLRequester *))
);
// This slot sets the 'Next' button on page 2 to enabled/disabled
@@ -263,8 +263,8 @@ namespace KPF
connect
(
sb_listenPort_,
- SIGNAL(valueChanged(int)),
- SLOT(slotListenPortChanged(int))
+ TQT_SIGNAL(valueChanged(int)),
+ TQT_SLOT(slotListenPortChanged(int))
);
// Update 'Next' button on page 1.
@@ -281,7 +281,7 @@ namespace KPF
}
void
- ServerWizard::setLocation(const QString & location)
+ ServerWizard::setLocation(const TQString & location)
{
kur_root_->setURL(location);
}
@@ -319,14 +319,14 @@ namespace KPF
void
ServerWizard::accept()
{
- QWizard::accept();
+ TQWizard::accept();
emit(dying(this));
}
void
ServerWizard::reject()
{
- QWizard::reject();
+ TQWizard::reject();
emit(dying(this));
}
@@ -339,10 +339,10 @@ namespace KPF
return;
}
- QPtrList<WebServer>
+ TQPtrList<WebServer>
serverList(WebServerManager::instance()->serverListLocal());
- for (QPtrListIterator<WebServer> it(serverList); it.current(); ++it)
+ for (TQPtrListIterator<WebServer> it(serverList); it.current(); ++it)
{
if (it.current()->listenPort() == uint(newPort))
{
@@ -355,9 +355,9 @@ namespace KPF
}
void
- ServerWizard::slotServerRootChanged(const QString & _root)
+ ServerWizard::slotServerRootChanged(const TQString & _root)
{
- QString root(_root);
+ TQString root(_root);
kpfDebug << root << endl;
@@ -373,9 +373,9 @@ namespace KPF
if ("/" != root.right(1))
root += "/";
- QFileInfo fi(root);
+ TQFileInfo fi(root);
- if (!fi.isDir()) // || (fi.dirPath() == QDir::homeDirPath()))
+ if (!fi.isDir()) // || (fi.dirPath() == TQDir::homeDirPath()))
{
kpfDebug << root << " isn't a dir" << endl; //, or it's $HOME" << endl;
setNextEnabled(page1_, false);
diff --git a/kpf/src/ServerWizard.h b/kpf/src/ServerWizard.h
index a484b8eb..670d94d0 100644
--- a/kpf/src/ServerWizard.h
+++ b/kpf/src/ServerWizard.h
@@ -41,17 +41,17 @@ namespace KPF
public:
- ServerWizard(QWidget * parent = 0);
+ ServerWizard(TQWidget * parent = 0);
virtual ~ServerWizard();
- void setLocation(const QString &);
+ void setLocation(const TQString &);
- QString root() const;
+ TQString root() const;
uint listenPort() const;
uint bandwidthLimit() const;
uint connectionLimit() const;
- QString serverName() const;
+ TQString serverName() const;
signals:
@@ -61,7 +61,7 @@ namespace KPF
virtual void accept();
virtual void reject();
- void slotServerRootChanged(const QString &);
+ void slotServerRootChanged(const TQString &);
void slotListenPortChanged(int);
void slotOpenFileDialog(KURLRequester *);
@@ -73,16 +73,16 @@ namespace KPF
KURLRequester * kur_root_;
- QSpinBox * sb_listenPort_;
- QSpinBox * sb_bandwidthLimit_;
- QSpinBox * sb_connectionLimit_;
- QLineEdit * le_serverName_;
-
- QWidget * page1_;
- QWidget * page2_;
- QWidget * page3_;
- QWidget * page4_;
- QWidget * page5_;
+ TQSpinBox * sb_listenPort_;
+ TQSpinBox * sb_bandwidthLimit_;
+ TQSpinBox * sb_connectionLimit_;
+ TQLineEdit * le_serverName_;
+
+ TQWidget * page1_;
+ TQWidget * page2_;
+ TQWidget * page3_;
+ TQWidget * page4_;
+ TQWidget * page5_;
};
}
diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp
index 6fa1792b..c39f944b 100644
--- a/kpf/src/SingleServerConfigDialog.cpp
+++ b/kpf/src/SingleServerConfigDialog.cpp
@@ -33,7 +33,7 @@ namespace KPF
SingleServerConfigDialog::SingleServerConfigDialog
(
WebServer * server,
- QWidget * parent
+ TQWidget * parent
)
: KDialogBase
(
@@ -52,13 +52,13 @@ namespace KPF
connect
(
widget_,
- SIGNAL(ok(bool)),
- SLOT(slotOk(bool))
+ TQT_SIGNAL(ok(bool)),
+ TQT_SLOT(slotOk(bool))
);
setMainWidget(widget_);
- connect(this, SIGNAL(finished()), SLOT(slotFinished()));
+ connect(this, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished()));
widget_->checkOk();
}
diff --git a/kpf/src/SingleServerConfigDialog.h b/kpf/src/SingleServerConfigDialog.h
index a6f1c17f..e9bb415c 100644
--- a/kpf/src/SingleServerConfigDialog.h
+++ b/kpf/src/SingleServerConfigDialog.h
@@ -40,7 +40,7 @@ namespace KPF
public:
- SingleServerConfigDialog(WebServer *, QWidget * parent);
+ SingleServerConfigDialog(WebServer *, TQWidget * parent);
virtual ~SingleServerConfigDialog();
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 19b073bd..15a50d47 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -21,10 +21,10 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qframe.h>
-#include <qtimer.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqframe.h>
+#include <tqtimer.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -44,10 +44,10 @@ namespace KPF
// Empty.
}
- QTimer timer;
+ TQTimer timer;
};
- StartingKPFDialog::StartingKPFDialog(QWidget * parent)
+ StartingKPFDialog::StartingKPFDialog(TQWidget * parent)
:
KDialogBase
(
@@ -62,16 +62,16 @@ namespace KPF
{
d = new Private;
- QFrame * mainWidget = makeMainWidget();
+ TQFrame * mainWidget = makeMainWidget();
- QLabel * about =
+ TQLabel * about =
new QLabel
(
i18n("Starting kpf..."),
mainWidget
);
- QVBoxLayout * layout = new QVBoxLayout(mainWidget);
+ TQVBoxLayout * layout = new TQVBoxLayout(mainWidget);
layout->addWidget(about);
@@ -80,14 +80,14 @@ namespace KPF
connect
(
kapp->dcopClient(),
- SIGNAL(applicationRegistered(const QCString &)),
- SLOT(slotApplicationRegistered(const QCString &))
+ TQT_SIGNAL(applicationRegistered(const TQCString &)),
+ TQT_SLOT(slotApplicationRegistered(const TQCString &))
);
kapp->dcopClient()
- ->send("kicker", "default", "addApplet(QString)", "kpfapplet.desktop");
+ ->send("kicker", "default", "addApplet(TQString)", "kpfapplet.desktop");
- connect(&d->timer, SIGNAL(timeout()), SLOT(slotTimeout()));
+ connect(&d->timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
enableButtonOK(false);
enableButtonCancel(true);
@@ -124,7 +124,7 @@ namespace KPF
}
void
- StartingKPFDialog::slotApplicationRegistered(const QCString & id)
+ StartingKPFDialog::slotApplicationRegistered(const TQCString & id)
{
if ("kpf" == id)
{
diff --git a/kpf/src/StartingKPFDialog.h b/kpf/src/StartingKPFDialog.h
index cbeca549..9dc7b651 100644
--- a/kpf/src/StartingKPFDialog.h
+++ b/kpf/src/StartingKPFDialog.h
@@ -38,14 +38,14 @@ namespace KPF
public:
- StartingKPFDialog(QWidget * parent);
+ StartingKPFDialog(TQWidget * parent);
virtual ~StartingKPFDialog();
protected slots:
void slotTimeout();
- void slotApplicationRegistered(const QCString &);
+ void slotApplicationRegistered(const TQCString &);
protected:
diff --git a/kpf/src/Utils.cpp b/kpf/src/Utils.cpp
index a867a998..08f3318a 100644
--- a/kpf/src/Utils.cpp
+++ b/kpf/src/Utils.cpp
@@ -24,8 +24,8 @@
#include <ctime>
#include <clocale>
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqfile.h>
+#include <tqregexp.h>
#include <klocale.h>
@@ -36,11 +36,11 @@ namespace KPF
{
static bool dateInitDone = false;
- static QStringList monthList;
+ static TQStringList monthList;
static const char rfc1123Format[] = "%a, %d %b %Y %H:%M:%S GMT";
- static time_t qDateTimeToTimeT(const QDateTime & t)
+ static time_t qDateTimeToTimeT(const TQDateTime & t)
{
struct tm tempTm;
@@ -52,7 +52,7 @@ namespace KPF
tempTm.tm_sec = t.time().second();
tempTm.tm_isdst = -1;
- // Fix up differences between QDateTime and tm.
+ // Fix up differences between TQDateTime and tm.
tempTm.tm_year -= 1900;
@@ -62,18 +62,18 @@ namespace KPF
}
QDateTime
- toGMT(const QDateTime & dt)
+ toGMT(const TQDateTime & dt)
{
time_t dtAsTimeT = qDateTimeToTimeT(dt);
struct tm * dtAsGmTm = ::gmtime(&dtAsTimeT);
if (0 == dtAsGmTm)
- return QDateTime();
+ return TQDateTime();
time_t dtAsGmTimeT = ::mktime(dtAsGmTm);
- QDateTime ret;
+ TQDateTime ret;
ret.setTime_t(dtAsGmTimeT);
@@ -103,13 +103,13 @@ namespace KPF
;
}
- QString dateString()
+ TQString dateString()
{
- return dateString(QDateTime::currentDateTime());
+ return dateString(TQDateTime::currentDateTime());
}
- QString dateString(const QDateTime & t)
+ TQString dateString(const TQDateTime & t)
{
time_t asTimeT = qDateTimeToTimeT(t);
@@ -118,7 +118,7 @@ namespace KPF
if (0 == asTm)
{
kpfDebug << "::gmtime() failed" << endl;
- return QString::null;
+ return TQString::null;
}
asTm->tm_isdst = -1;
@@ -129,25 +129,25 @@ namespace KPF
// Ensure we use locale "C" for strftime.
- QCString oldLC_ALL = ::strdup(::setlocale(LC_TIME, "C"));
- QCString oldLC_TIME = ::strdup(::setlocale(LC_ALL, "C"));
+ TQCString oldLC_ALL = ::strdup(::setlocale(LC_TIME, "C"));
+ TQCString oldLC_TIME = ::strdup(::setlocale(LC_ALL, "C"));
{
::strftime(static_cast<char *>(buf), len, rfc1123Format, asTm);
}
::setlocale(LC_TIME, oldLC_TIME.data());
::setlocale(LC_ALL, oldLC_ALL.data());
- return QString::fromUtf8(buf);
+ return TQString::fromUtf8(buf);
}
bool
- parseDate(const QString & s, QDateTime & dt)
+ parseDate(const TQString & s, TQDateTime & dt)
{
dateInit();
// kpfDebug << "Parsing date `" << s << "'" << endl;
- QStringList l(QStringList::split(' ', s));
+ TQStringList l(TQStringList::split(' ', s));
switch (l.count())
{
@@ -173,7 +173,7 @@ namespace KPF
}
bool
- parseDateRFC1123(const QStringList & l, QDateTime & dt)
+ parseDateRFC1123(const TQStringList & l, TQDateTime & dt)
{
if ("GMT" != l[5])
return false;
@@ -183,7 +183,7 @@ namespace KPF
bool haveMonth = false;
uint month = 0;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it = monthList.begin(); it != monthList.end(); ++it)
{
@@ -201,7 +201,7 @@ namespace KPF
uint year(l[3].toUInt());
- QStringList timeTokenList(QStringList::split(':', l[4]));
+ TQStringList timeTokenList(TQStringList::split(':', l[4]));
if (3 != timeTokenList.count())
return false;
@@ -210,19 +210,19 @@ namespace KPF
uint minutes (timeTokenList[1].toUInt());
uint seconds (timeTokenList[2].toUInt());
- dt.setDate(QDate(year, month + 1, day));
- dt.setTime(QTime(hours, minutes, seconds));
+ dt.setDate(TQDate(year, month + 1, day));
+ dt.setTime(TQTime(hours, minutes, seconds));
return dt.isValid();
}
bool
- parseDateRFC850(const QStringList & l, QDateTime & dt)
+ parseDateRFC850(const TQStringList & l, TQDateTime & dt)
{
if ("GMT" != l[3])
return false;
- QStringList dateTokenList(QStringList::split('-', l[1]));
+ TQStringList dateTokenList(TQStringList::split('-', l[1]));
if (3 != dateTokenList.count())
return false;
@@ -232,7 +232,7 @@ namespace KPF
bool haveMonth = false;
uint month = 0;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it = monthList.begin(); it != monthList.end(); ++it)
{
@@ -255,7 +255,7 @@ namespace KPF
else if (year < 100)
year += 1900;
- QStringList timeTokenList(QStringList::split(':', l[2]));
+ TQStringList timeTokenList(TQStringList::split(':', l[2]));
if (3 != timeTokenList.count())
return false;
@@ -264,19 +264,19 @@ namespace KPF
uint minutes (timeTokenList[1].toUInt());
uint seconds (timeTokenList[2].toUInt());
- dt.setDate(QDate(year, month + 1, day));
- dt.setTime(QTime(hours, minutes, seconds));
+ dt.setDate(TQDate(year, month + 1, day));
+ dt.setTime(TQTime(hours, minutes, seconds));
return dt.isValid();
}
bool
- parseDateAscTime(const QStringList & l, QDateTime & dt)
+ parseDateAscTime(const TQStringList & l, TQDateTime & dt)
{
bool haveMonth = false;
uint month = 0;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it = monthList.begin(); it != monthList.end(); ++it)
{
@@ -294,7 +294,7 @@ namespace KPF
uint day(l[2].toUInt());
- QStringList timeTokenList(QStringList::split(':', l[3]));
+ TQStringList timeTokenList(TQStringList::split(':', l[3]));
if (3 != timeTokenList.count())
return false;
@@ -305,8 +305,8 @@ namespace KPF
uint year(l[4].toUInt());
- dt.setDate(QDate(year, month + 1, day));
- dt.setTime(QTime(hours, minutes, seconds));
+ dt.setDate(TQDate(year, month + 1, day));
+ dt.setTime(TQTime(hours, minutes, seconds));
return dt.isValid();
}
@@ -314,7 +314,7 @@ namespace KPF
QString
translatedResponseName(uint code)
{
- QString s;
+ TQString s;
switch (code)
{
@@ -362,7 +362,7 @@ namespace KPF
QString
responseName(uint code)
{
- QString s;
+ TQString s;
switch (code)
{
diff --git a/kpf/src/Utils.h b/kpf/src/Utils.h
index 6a81dfa8..12e55507 100644
--- a/kpf/src/Utils.h
+++ b/kpf/src/Utils.h
@@ -24,10 +24,10 @@
#ifndef KPF_UTILS_H
#define KPF_UTILS_H
-#include <qstringlist.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qfileinfo.h>
+#include <tqstringlist.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqfileinfo.h>
/**
* Used to keep all parts of the kpf application out of the global namespace.
@@ -49,63 +49,63 @@ namespace KPF
/**
* @return the current date and time as an HTTP/1.1 compliant date string.
*/
- QString dateString();
+ TQString dateString();
/**
- * @return the passed QDateTime as an HTTP/1.1 compliant date string.
+ * @return the passed TQDateTime as an HTTP/1.1 compliant date string.
*/
- QString dateString(const QDateTime & dt);
+ TQString dateString(const TQDateTime & dt);
/**
- * Parse an HTTP/1.1 date to a QDateTime.
- * @param ret the QDateTime representation (result of parsing)
+ * Parse an HTTP/1.1 date to a TQDateTime.
+ * @param ret the TQDateTime representation (result of parsing)
* @return true if the date is an an acceptable format.
*/
- bool parseDate(const QString &, QDateTime & ret);
+ bool parseDate(const TQString &, TQDateTime & ret);
/**
- * Parse an RFC 1123 format date to a QDateTime. Usually called by
+ * Parse an RFC 1123 format date to a TQDateTime. Usually called by
* @ref parseDate.
*/
- bool parseDateRFC1123(const QStringList &, QDateTime &);
+ bool parseDateRFC1123(const TQStringList &, TQDateTime &);
/**
- * Parse an RFC 850 format date to a QDateTime. Usually called by
+ * Parse an RFC 850 format date to a TQDateTime. Usually called by
* @ref parseDate.
*/
- bool parseDateRFC850(const QStringList &, QDateTime &);
+ bool parseDateRFC850(const TQStringList &, TQDateTime &);
/**
- * Parse an asctime(3) format date to a QDateTime. Usually called by
+ * Parse an asctime(3) format date to a TQDateTime. Usually called by
* @ref parseDate.
*/
- bool parseDateAscTime(const QStringList &, QDateTime &);
+ bool parseDateAscTime(const TQStringList &, TQDateTime &);
/**
* @return i18n(HTTP response message for code)
*/
- QString translatedResponseName(uint code);
+ TQString translatedResponseName(uint code);
/**
* @return HTTP response message for code
*/
- QString responseName(uint code);
+ TQString responseName(uint code);
/**
- * @return the passed QDateTime converted GMT, honouring daylight
+ * @return the passed TQDateTime converted GMT, honouring daylight
* saving time if necessary.
*/
- QDateTime toGMT(const QDateTime &);
+ TQDateTime toGMT(const TQDateTime &);
/**
* Unquote hex quoted chars in string.
*/
- QString unquote(const QString &);
+ TQString unquote(const TQString &);
/**
* Quote naughty chars in %xx format.
*/
- QString quote(const QString &);
+ TQString quote(const TQString &);
} // End namespace KPF
diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp
index 37301f09..b7fd944b 100644
--- a/kpf/src/WebServer.cpp
+++ b/kpf/src/WebServer.cpp
@@ -27,9 +27,9 @@
#include <unistd.h>
// Qt includes
-#include <qsocket.h>
-#include <qdatetime.h>
-#include <qtimer.h>
+#include <tqsocket.h>
+#include <tqdatetime.h>
+#include <tqtimer.h>
// KDE includes
#include "config.h"
@@ -81,13 +81,13 @@ namespace KPF
WebServerSocket * socket;
uint listenPort;
uint connectionLimit;
- QPtrList<Server> serverList;
- QString root;
- QString serverName;
- QTimer writeTimer;
- QTimer resetOutputTimer;
- QTimer bindTimer;
- QTimer backlogTimer;
+ TQPtrList<Server> serverList;
+ TQString root;
+ TQString serverName;
+ TQTimer writeTimer;
+ TQTimer resetOutputTimer;
+ TQTimer bindTimer;
+ TQTimer backlogTimer;
ulong bandwidthLimit;
ulong lastTotalOutput;
ulong totalOutput;
@@ -95,14 +95,14 @@ namespace KPF
bool paused;
bool followSymlinks;
bool customErrorMessages;
- QValueList<int> backlog;
+ TQValueList<int> backlog;
DNSSD::PublicService* service;
};
- WebServer::WebServer(const QString & root)
- : DCOPObject(QCString("WebServer_") + root.utf8()),
- QObject()
+ WebServer::WebServer(const TQString & root)
+ : DCOPObject(TQCString("WebServer_") + root.utf8()),
+ TQObject()
{
d = new Private;
@@ -110,10 +110,10 @@ namespace KPF
loadConfig();
publish();
- connect(&d->bindTimer, SIGNAL(timeout()), SLOT(slotBind()));
- connect(&d->writeTimer, SIGNAL(timeout()), SLOT(slotWrite()));
- connect(&d->resetOutputTimer, SIGNAL(timeout()), SLOT(slotCheckOutput()));
- connect(&d->backlogTimer, SIGNAL(timeout()), SLOT(slotClearBacklog()));
+ connect(&d->bindTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBind()));
+ connect(&d->writeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotWrite()));
+ connect(&d->resetOutputTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCheckOutput()));
+ connect(&d->backlogTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotClearBacklog()));
d->bindTimer .start( 0, true);
d->resetOutputTimer .start(1000 / SamplesPerSecond, false);
@@ -122,15 +122,15 @@ namespace KPF
WebServer::WebServer
(
- const QString & root,
+ const TQString & root,
uint listenPort,
uint bandwidthLimit,
uint connectionLimit,
bool followSymlinks,
- const QString & serverName
+ const TQString & serverName
)
- : DCOPObject(QCString("WebServer_") + root.utf8()),
- QObject()
+ : DCOPObject(TQCString("WebServer_") + root.utf8()),
+ TQObject()
{
d = new Private;
@@ -144,10 +144,10 @@ namespace KPF
saveConfig();
publish();
- connect(&d->bindTimer, SIGNAL(timeout()), SLOT(slotBind()));
- connect(&d->writeTimer, SIGNAL(timeout()), SLOT(slotWrite()));
- connect(&d->resetOutputTimer, SIGNAL(timeout()), SLOT(slotCheckOutput()));
- connect(&d->backlogTimer, SIGNAL(timeout()), SLOT(slotClearBacklog()));
+ connect(&d->bindTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBind()));
+ connect(&d->writeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotWrite()));
+ connect(&d->resetOutputTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCheckOutput()));
+ connect(&d->backlogTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotClearBacklog()));
d->bindTimer .start( 0, true);
d->resetOutputTimer .start(1000 / SamplesPerSecond, false);
@@ -164,7 +164,7 @@ namespace KPF
void WebServer::publish()
{
d->service = new DNSSD::PublicService(d->serverName,"_http._tcp",d->listenPort);
- connect(d->service,SIGNAL(published(bool)),this,SLOT(wasPublished(bool)));
+ connect(d->service,TQT_SIGNAL(published(bool)),this,TQT_SLOT(wasPublished(bool)));
d->service->publishAsync();
}
@@ -195,7 +195,7 @@ namespace KPF
emit(contentionChange(d->portContention));
if (!d->portContention)
- connect(d->socket, SIGNAL(connection(int)), SLOT(slotConnection(int)));
+ connect(d->socket, TQT_SIGNAL(connection(int)), TQT_SLOT(slotConnection(int)));
else
{
@@ -277,18 +277,18 @@ namespace KPF
connect
(
s,
- SIGNAL(output(Server *, ulong)),
- SLOT(slotOutput(Server *, ulong))
+ TQT_SIGNAL(output(Server *, ulong)),
+ TQT_SLOT(slotOutput(Server *, ulong))
);
- connect(s, SIGNAL(finished(Server *)), SLOT(slotFinished(Server *)));
- connect(s, SIGNAL(request(Server *)), SIGNAL(request(Server *)));
- connect(s, SIGNAL(response(Server *)), SIGNAL(response(Server *)));
+ connect(s, TQT_SIGNAL(finished(Server *)), TQT_SLOT(slotFinished(Server *)));
+ connect(s, TQT_SIGNAL(request(Server *)), TQT_SIGNAL(request(Server *)));
+ connect(s, TQT_SIGNAL(response(Server *)), TQT_SIGNAL(response(Server *)));
d->serverList.append(s);
connect
- (s, SIGNAL(readyToWrite(Server *)), SLOT(slotReadyToWrite(Server *)));
+ (s, TQT_SIGNAL(readyToWrite(Server *)), TQT_SLOT(slotReadyToWrite(Server *)));
emit(connection(s));
@@ -311,7 +311,7 @@ namespace KPF
void
WebServer::killAllConnections()
{
- QPtrListIterator<Server> it(d->serverList);
+ TQPtrListIterator<Server> it(d->serverList);
for (; it.current(); ++it)
it.current()->cancel();
@@ -449,7 +449,7 @@ namespace KPF
if (d->serverList.isEmpty())
return;
- QPtrListIterator<Server> it(d->serverList);
+ TQPtrListIterator<Server> it(d->serverList);
for (; it.current(); ++it)
{
@@ -551,7 +551,7 @@ namespace KPF
return d->serverName;
}
void
- WebServer::setServerName(const QString& serverName)
+ WebServer::setServerName(const TQString& serverName)
{
d->serverName=serverName;
}
@@ -569,7 +569,7 @@ namespace KPF
ulong bandwidthLimit,
uint connectionLimit,
bool followSymlinks,
- const QString& serverName
+ const TQString& serverName
)
{
d->listenPort = listenPort;
diff --git a/kpf/src/WebServer.h b/kpf/src/WebServer.h
index ae9d9383..4940e863 100644
--- a/kpf/src/WebServer.h
+++ b/kpf/src/WebServer.h
@@ -25,7 +25,7 @@
#define KPF_WEB_SERVER_H
#include <dcopobject.h>
-#include <qserversocket.h>
+#include <tqserversocket.h>
#include "Defaults.h"
#include "Request.h"
@@ -42,7 +42,7 @@ namespace KPF
* Maintains concurrent connection limit, using a backlog to queue incoming
* connections which cannot be served immediately.
*/
- class WebServer : public QObject, virtual public DCOPObject
+ class WebServer : public TQObject, virtual public DCOPObject
{
K_DCOP
Q_OBJECT
@@ -56,7 +56,7 @@ namespace KPF
* Server objects, which much ensure that only files from the root and
* its child directories are served.
*/
- WebServer(const QString & root);
+ WebServer(const TQString & root);
/**
* @param root Virtual root directory for servers. Passed to all created
@@ -65,12 +65,12 @@ namespace KPF
*/
WebServer
(
- const QString & root,
+ const TQString & root,
uint listenPort,
uint bandwidthLimit,
uint connectionLimit,
bool followSymlinks,
- const QString & serverName
+ const TQString & serverName
);
virtual ~WebServer();
@@ -87,12 +87,12 @@ namespace KPF
/**
* @return virtual root.
*/
- QString root();
+ TQString root();
/**
* @return server name
*/
- QString serverName();
+ TQString serverName();
/**
* @return amount of bytes that may be sent out per second, in total
@@ -143,7 +143,7 @@ namespace KPF
/**
* Set server name
*/
- void setServerName (const QString&);
+ void setServerName (const TQString&);
/**
* Set whether requests may include symbolic links in their path.
@@ -165,7 +165,7 @@ namespace KPF
ulong bandwidthLimit,
uint connectionLimit,
bool followSymlinks,
- const QString& serverName
+ const TQString& serverName
);
/**
diff --git a/kpf/src/WebServerManager.cpp b/kpf/src/WebServerManager.cpp
index feec661d..08075fe8 100644
--- a/kpf/src/WebServerManager.cpp
+++ b/kpf/src/WebServerManager.cpp
@@ -54,7 +54,7 @@ namespace KPF
WebServerManager::WebServerManager()
: DCOPObject("WebServerManager"),
- QObject()
+ TQObject()
{
serverList_.setAutoDelete(true);
}
@@ -64,7 +64,7 @@ namespace KPF
// Empty.
}
- QPtrList<WebServer>
+ TQPtrList<WebServer>
WebServerManager::serverListLocal()
{
return serverList_;
@@ -73,12 +73,12 @@ namespace KPF
WebServer *
WebServerManager::createServerLocal
(
- const QString & root,
+ const TQString & root,
uint listenPort,
uint bandwidthLimit,
uint connectionLimit,
bool followSymlinks,
- const QString & serverName
+ const TQString & serverName
)
{
if (0 != server(root))
@@ -112,9 +112,9 @@ namespace KPF
config.setGroup("General");
- QStringList serverRootList = config.readListEntry("ServerRootList");
+ TQStringList serverRootList = config.readListEntry("ServerRootList");
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for (it = serverRootList.begin(); it != serverRootList.end(); ++it)
{
@@ -132,9 +132,9 @@ namespace KPF
config.setGroup("General");
- QPtrListIterator<WebServer> it(serverList_);
+ TQPtrListIterator<WebServer> it(serverList_);
- QStringList serverRootList;
+ TQStringList serverRootList;
for (; it.current(); ++it)
serverRootList << it.current()->root();
@@ -145,9 +145,9 @@ namespace KPF
}
WebServer *
- WebServerManager::server(const QString & root)
+ WebServerManager::server(const TQString & root)
{
- QPtrListIterator<WebServer> it(serverList_);
+ TQPtrListIterator<WebServer> it(serverList_);
for (; it.current(); ++it)
{
@@ -168,7 +168,7 @@ namespace KPF
}
bool
- WebServerManager::disableServer(const QString & root)
+ WebServerManager::disableServer(const TQString & root)
{
WebServer * existing = server(root);
@@ -186,12 +186,12 @@ namespace KPF
}
}
- QValueList<DCOPRef>
+ TQValueList<DCOPRef>
WebServerManager::serverList()
{
- QValueList<DCOPRef> l;
+ TQValueList<DCOPRef> l;
- QPtrListIterator<WebServer> it(serverList_);
+ TQPtrListIterator<WebServer> it(serverList_);
for (; it.current(); ++it)
l << DCOPRef(it.current());
@@ -202,12 +202,12 @@ namespace KPF
DCOPRef
WebServerManager::createServer
(
- QString root,
+ TQString root,
uint listenPort,
uint bandwidthLimit,
uint connectionLimit,
bool followSymlinks,
- QString serverName
+ TQString serverName
)
{
WebServer * server = createServerLocal
@@ -228,7 +228,7 @@ namespace KPF
WebServer_stub webServer
(serverRef.app(), serverRef.object());
- QString root = webServer.root();
+ TQString root = webServer.root();
if (DCOPStub::CallFailed == webServer.status())
{
@@ -252,9 +252,9 @@ namespace KPF
}
bool
- WebServerManager::hasServer(const QString & s)
+ WebServerManager::hasServer(const TQString & s)
{
- QString root(s);
+ TQString root(s);
if ('/' == root.at(root.length() - 1))
{
@@ -270,7 +270,7 @@ namespace KPF
{
bool ok = true;
- for (QPtrListIterator<WebServer> it(serverList_); it.current(); ++it)
+ for (TQPtrListIterator<WebServer> it(serverList_); it.current(); ++it)
{
if (it.current()->listenPort() == port)
{
diff --git a/kpf/src/WebServerManager.h b/kpf/src/WebServerManager.h
index 6faa8a30..daa8db33 100644
--- a/kpf/src/WebServerManager.h
+++ b/kpf/src/WebServerManager.h
@@ -29,7 +29,7 @@
#include "Defaults.h"
-#include <qptrlist.h>
+#include <tqptrlist.h>
namespace KPF
{
@@ -40,7 +40,7 @@ namespace KPF
* creating WebServer objects at startup (based on settings) and
* on demand. Destroys WebServer objects on demand.
*/
- class WebServerManager : public QObject, virtual public DCOPObject
+ class WebServerManager : public TQObject, virtual public DCOPObject
{
Q_OBJECT
K_DCOP
@@ -58,7 +58,7 @@ namespace KPF
* @return a list of pointers to WebServer objects managed
* by this object.
*/
- QPtrList<WebServer> serverListLocal();
+ TQPtrList<WebServer> serverListLocal();
/**
* @return a pointer to a new WebServer object, with the root
@@ -67,18 +67,18 @@ namespace KPF
*/
WebServer * createServerLocal
(
- const QString & root,
+ const TQString & root,
uint listenPort,
uint bandwidthLimit = Config::DefaultBandwidthLimit,
uint connectionLimit = Config::DefaultConnectionLimit,
bool followSymlinks = Config::DefaultFollowSymlinks,
- const QString & serverName = QString::null
+ const TQString & serverName = TQString::null
);
/**
* Disables a WebServer and updates the configuration.
*/
- bool disableServer(const QString & root);
+ bool disableServer(const TQString & root);
/**
* Loads the configuration.
@@ -96,49 +96,49 @@ namespace KPF
/**
* Find a WebServer or return 0.
*/
- WebServer * server(const QString & root);
+ WebServer * server(const TQString & root);
/**
* Ask a server to re-read its configuration.
*/
- bool reconfigureServer(const QString & root);
+ bool reconfigureServer(const TQString & root);
/**
* Pause/unpause a server.
*/
- bool pauseServer(const QString & root, bool);
+ bool pauseServer(const TQString & root, bool);
/**
* @return whether the server is paused.
*/
- bool serverPaused(const QString & root);
+ bool serverPaused(const TQString & root);
/**
* Restart a server.
*/
- bool restartServer(const QString & root);
+ bool restartServer(const TQString & root);
/**
* @return if a Server object with the specified root exists. Handles
* the two possible variations of trailing slash, i.e. existing and not
* existing.
*/
- bool hasServer(const QString & root);
+ bool hasServer(const TQString & root);
uint nextFreePort() const;
k_dcop:
- QValueList<DCOPRef> serverList();
+ TQValueList<DCOPRef> serverList();
DCOPRef createServer
(
- QString root,
+ TQString root,
uint listenPort,
uint bandwidthLimit,
uint connectionLimit,
bool followSymlinks,
- QString serverName
+ TQString serverName
);
void disableServer(DCOPRef);
@@ -164,7 +164,7 @@ namespace KPF
static WebServerManager * instance_;
void load();
- QPtrList<WebServer> serverList_;
+ TQPtrList<WebServer> serverList_;
};
} // End namespace KPF
diff --git a/kpf/src/WebServerSocket.cpp b/kpf/src/WebServerSocket.cpp
index 4dfa6626..fceaa6c1 100644
--- a/kpf/src/WebServerSocket.cpp
+++ b/kpf/src/WebServerSocket.cpp
@@ -27,7 +27,7 @@
namespace KPF
{
WebServerSocket::WebServerSocket(Q_UINT16 port, uint maxconn)
- : QServerSocket(port, maxconn, 0L)
+ : TQServerSocket(port, maxconn, 0L)
{
// Empty.
}
diff --git a/kpf/src/WebServerSocket.h b/kpf/src/WebServerSocket.h
index f45e0d70..bebd6a79 100644
--- a/kpf/src/WebServerSocket.h
+++ b/kpf/src/WebServerSocket.h
@@ -24,7 +24,7 @@
#ifndef WEB_SERVER_SOCKET_H
#define WEB_SERVER_SOCKET_H
-#include <qserversocket.h>
+#include <tqserversocket.h>
namespace KPF
{