summaryrefslogtreecommitdiffstats
path: root/kpf
diff options
context:
space:
mode:
Diffstat (limited to 'kpf')
-rw-r--r--kpf/src/ActiveMonitor.cpp8
-rw-r--r--kpf/src/ActiveMonitorItem.cpp12
-rw-r--r--kpf/src/ActiveMonitorItem.h4
-rw-r--r--kpf/src/ActiveMonitorWindow.cpp2
-rw-r--r--kpf/src/Applet.cpp2
-rw-r--r--kpf/src/Applet.h10
-rw-r--r--kpf/src/AppletItem.cpp4
-rw-r--r--kpf/src/BandwidthGraph.cpp14
-rw-r--r--kpf/src/BandwidthGraph.h8
-rw-r--r--kpf/src/ConfigDialogPage.cpp2
-rw-r--r--kpf/src/DirectoryLister.cpp12
-rw-r--r--kpf/src/ErrorMessageConfigDialog.cpp10
-rw-r--r--kpf/src/PropertiesDialogPlugin.cpp18
-rw-r--r--kpf/src/Response.cpp8
-rw-r--r--kpf/src/Server.cpp4
-rw-r--r--kpf/src/ServerWizard.cpp64
-rw-r--r--kpf/src/SingleServerConfigDialog.cpp2
-rw-r--r--kpf/src/StartingKPFDialog.cpp6
-rw-r--r--kpf/src/Utils.cpp2
19 files changed, 96 insertions, 96 deletions
diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp
index 58fc416e..dc6115df 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 <layout.h>
+#include <tqlayout.h>
#include <kiconloader.h>
#include <klocale.h>
@@ -57,9 +57,9 @@ namespace KPF
view_->addColumn(i18n("Resource"));
view_->addColumn(i18n("Host"));
- TQVBoxLayout * layout = new TQVBoxLayout(this);
+ TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
- layout->addWidget(view_);
+ tqlayout->addWidget(view_);
connect
(
@@ -146,7 +146,7 @@ namespace KPF
void
ActiveMonitor::slotCull()
{
- TQDateTime dt = TQDateTime::currentDateTime();
+ TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQListViewItemIterator it(view_);
diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp
index 1fe889d1..04fe857d 100644
--- a/kpf/src/ActiveMonitorItem.cpp
+++ b/kpf/src/ActiveMonitorItem.cpp
@@ -93,7 +93,7 @@ namespace KPF
{
switch (c)
{
- case Status:
+ case tqStatus:
return 16;
break;
@@ -115,19 +115,19 @@ namespace KPF
switch (server_->state())
{
case Server::WaitingForRequest:
- setPixmap(Status, SmallIcon("connect_creating"));
+ setPixmap(tqStatus, SmallIcon("connect_creating"));
break;
case Server::WaitingForHeaders:
- setPixmap(Status, SmallIcon("connect_creating"));
+ setPixmap(tqStatus, SmallIcon("connect_creating"));
break;
case Server::Responding:
- setPixmap(Status, SmallIcon("connect_established"));
+ setPixmap(tqStatus, SmallIcon("connect_established"));
break;
case Server::Finished:
- setPixmap(Status, SmallIcon("connect_no"));
+ setPixmap(tqStatus, SmallIcon("connect_no"));
break;
}
}
@@ -178,7 +178,7 @@ namespace KPF
sent_ += l;
setText(Sent, TQString::number(sent_));
updateState();
- repaint();
+ tqrepaint();
}
}
diff --git a/kpf/src/ActiveMonitorItem.h b/kpf/src/ActiveMonitorItem.h
index bd4e5e7a..8cc347e2 100644
--- a/kpf/src/ActiveMonitorItem.h
+++ b/kpf/src/ActiveMonitorItem.h
@@ -27,7 +27,7 @@
#include <tqlistview.h>
#include <tqdatetime.h>
#include <tqfontmetrics.h>
-#include <palette.h>
+#include <tqpalette.h>
class TQPainter;
@@ -48,7 +48,7 @@ namespace KPF
enum Column
{
- Status,
+ tqStatus,
Progress,
Size,
Sent,
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index 0e0450b4..238ddefa 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -39,7 +39,7 @@ namespace KPF
)
: KMainWindow(parent, name)
{
- setCaption(i18n("Monitoring %1 - kpf").arg(server->root()));
+ setCaption(i18n("Monitoring %1 - kpf").tqarg(server->root()));
monitor_ = new ActiveMonitor(server, this, "ActiveMonitor");
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 85ec4917..983ae0c3 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -23,7 +23,7 @@
#include <tqpainter.h>
#include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqtoolbutton.h>
#include <tqpopupmenu.h>
diff --git a/kpf/src/Applet.h b/kpf/src/Applet.h
index 5b7e9e8c..bd41962f 100644
--- a/kpf/src/Applet.h
+++ b/kpf/src/Applet.h
@@ -93,13 +93,13 @@ namespace KPF
/**
* Called when a WebServer object has been created. Creates an
- * AppletItem, associates it with the former, and updates the layout.
+ * AppletItem, associates it with the former, and updates the tqlayout.
*/
void slotServerCreated(WebServer *);
/**
* Called when a WebServer object has been disabled.
- * Deletes the associated AppletItem and updates the layout.
+ * Deletes the associated AppletItem and updates the tqlayout.
*/
void slotServerDisabled(WebServer *);
@@ -121,13 +121,13 @@ namespace KPF
virtual void about();
/**
- * Overridden to keep track of orientation change and update layout
+ * Overridden to keep track of orientation change and update tqlayout
* accordingly.
*/
virtual void orientationChange(Qt::Orientation);
/**
- * Overridden to update layout accordingly.
+ * Overridden to update tqlayout accordingly.
*/
virtual void moveEvent(TQMoveEvent *);
virtual void resizeEvent(TQResizeEvent *);
@@ -138,7 +138,7 @@ namespace KPF
virtual void mousePressEvent(TQMouseEvent *);
/**
- * Updates the layout, moving AppletItem objects into proper positions.
+ * Updates the tqlayout, moving AppletItem objects into proper positions.
*/
virtual void resetLayout();
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index fc16ae00..e5d3dc51 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -22,7 +22,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <tqfileinfo.h>
#include <tqcursor.h>
@@ -62,7 +62,7 @@ namespace KPF
(new TQVBoxLayout(this))->addWidget(graph_);
- TQString popupTitle(i18n("kpf - %1").arg(server_->root()));
+ TQString popupTitle(i18n("kpf - %1").tqarg(server_->root()));
popup_ = new KPopupMenu(this);
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index d5a26233..546aa630 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -88,7 +88,7 @@ namespace KPF
BandwidthGraph::setTooltip()
{
TQToolTip::add(this, i18n( "%1 on port %2" )
- .arg( server_->root() ).arg( server_->listenPort() ) );
+ .tqarg( server_->root() ).tqarg( server_->listenPort() ) );
}
TQRect
@@ -112,7 +112,7 @@ namespace KPF
p.drawPixmap( ( width()-bgPix_.width() )/2,
( height()-bgPix_.height() )/2, bgPix_ );
- p.setPen(colorGroup().dark());
+ p.setPen(tqcolorGroup().dark());
for (uint i = 0; i < history_.size(); i++)
{
@@ -251,11 +251,11 @@ namespace KPF
if (max_ > 1024)
if (max_ > 1024 * 1024)
- maxString = mbs.arg(max_ / (1024 * 1024));
+ maxString = mbs.tqarg(max_ / (1024 * 1024));
else
- maxString = kbs.arg(max_ / 1024);
+ maxString = kbs.tqarg(max_ / 1024);
else if ( max_ > 0 )
- maxString = bs.arg(max_);
+ maxString = bs.tqarg(max_);
else
maxString = i18n( "Idle" );
@@ -280,13 +280,13 @@ namespace KPF
}
TQSize
- BandwidthGraph::sizeHint() const
+ BandwidthGraph::tqsizeHint() const
{
return TQSize(32, 32);
}
TQSize
- BandwidthGraph::minimumSizeHint() const
+ BandwidthGraph::tqminimumSizeHint() const
{
return TQSize(12, 12);
}
diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h
index eac25f76..8684c71f 100644
--- a/kpf/src/BandwidthGraph.h
+++ b/kpf/src/BandwidthGraph.h
@@ -74,14 +74,14 @@ namespace KPF
void setTooltip();
/**
- * Overridden to provide reasonable default size and shape.
+ * Overridden to provide reasonable default size and tqshape.
*/
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
/**
- * Overridden to provide reasonable minimum size and shape.
+ * Overridden to provide reasonable minimum size and tqshape.
*/
- virtual TQSize minimumSizeHint() const;
+ virtual TQSize tqminimumSizeHint() const;
/**
* @return the WebServer object given on construction.
diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp
index 830ede9e..657e96f0 100644
--- a/kpf/src/ConfigDialogPage.cpp
+++ b/kpf/src/ConfigDialogPage.cpp
@@ -22,7 +22,7 @@
*/
#include <tqwhatsthis.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqspinbox.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp
index 1a196373..18aa7a98 100644
--- a/kpf/src/DirectoryLister.cpp
+++ b/kpf/src/DirectoryLister.cpp
@@ -26,9 +26,9 @@
#include <tqapplication.h>
#include <tqdir.h>
#include <tqstring.h>
-#include <stylesheet.h>
-#include <palette.h>
-#include <textstream.h>
+#include <tqstylesheet.h>
+#include <tqpalette.h>
+#include <tqtextstream.h>
#include <kglobalsettings.h>
#include <klocale.h>
#include <kmimetype.h>
@@ -248,7 +248,7 @@ namespace KPF
return buildHTML
(
i18n("Error"),
- i18n("Directory does not exist: %1 %2").arg(root).arg(path)
+ i18n("Directory does not exist: %1 %2").tqarg(root).tqarg(path)
);
}
@@ -260,7 +260,7 @@ namespace KPF
return buildHTML
(
i18n("Error"),
- i18n("Directory unreadable: %1 %2").arg(root).arg(path)
+ i18n("Directory unreadable: %1 %2").tqarg(root).tqarg(path)
);
}
@@ -335,7 +335,7 @@ namespace KPF
return buildHTML
(
- i18n("Directory listing for %1").arg(TQStyleSheet::escape(path)),
+ i18n("Directory listing for %1").tqarg(TQStyleSheet::escape(path)),
html
);
}
diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp
index 04749b3e..e53941e7 100644
--- a/kpf/src/ErrorMessageConfigDialog.cpp
+++ b/kpf/src/ErrorMessageConfigDialog.cpp
@@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kurlrequester.h>
#include <kconfig.h>
@@ -62,7 +62,7 @@ namespace KPF
TQFrame * w = makeMainWidget();
- TQVBoxLayout * layout =
+ TQVBoxLayout * tqlayout =
new TQVBoxLayout(w, KDialog::marginHint(), KDialog::spacingHint());
TQLabel * info =
@@ -84,9 +84,9 @@ namespace KPF
w
);
- layout->addWidget(info);
+ tqlayout->addWidget(info);
- TQGridLayout * grid = new TQGridLayout(layout, codeList.count(), 2);
+ TQGridLayout * grid = new TQGridLayout(tqlayout, codeList.count(), 2);
TQString pattern(i18n("%1 %2"));
@@ -107,7 +107,7 @@ namespace KPF
itemList_.append(new Item(*it, requester, responseName, originalPath));
- TQLabel * l = new TQLabel(pattern.arg(*it).arg(responseName), w);
+ TQLabel * l = new TQLabel(pattern.tqarg(*it).tqarg(responseName), w);
l->setBuddy(requester);
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index bd3b9638..028697d3 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqspinbox.h>
#include <tqlabel.h>
@@ -136,7 +136,7 @@ namespace KPF
TQLabel * l_bandwidthLimit;
// TQLabel * l_connectionLimit;
TQLabel * l_serverName;
- TQLabel * l_kpfStatus;
+ TQLabel * l_kpftqStatus;
TQSpinBox * sb_listenPort;
TQSpinBox * sb_bandwidthLimit;
@@ -298,10 +298,10 @@ namespace KPF
l->addWidget(about);
- d->l_kpfStatus =
+ d->l_kpftqStatus =
new TQLabel(i18n("Applet status: <strong>not running</strong>"), w);
- l->addWidget(d->l_kpfStatus);
+ l->addWidget(d->l_kpftqStatus);
TQHBoxLayout * l2 = new TQHBoxLayout(l);
@@ -395,7 +395,7 @@ namespace KPF
" (%1)"
"</p>"
)
- .arg(TQDir::homeDirPath());
+ .tqarg(TQDir::homeDirPath());
TQString listenPortHelp =
i18n
@@ -507,7 +507,7 @@ namespace KPF
void
PropertiesDialogPlugin::slotStartKPF()
{
- d->l_kpfStatus
+ d->l_kpftqStatus
->setText(i18n("Applet status: <strong>starting...</strong>"));
kapp->dcopClient()
@@ -519,7 +519,7 @@ namespace KPF
void
PropertiesDialogPlugin::slotStartKPFFailed()
{
- d->l_kpfStatus
+ d->l_kpftqStatus
->setText(i18n("Applet status: <strong>failed to start</strong>"));
d->pb_startKPF->setEnabled(true);
@@ -532,7 +532,7 @@ namespace KPF
{
d->kpfRunning = true;
- d->l_kpfStatus
+ d->l_kpftqStatus
->setText(i18n("Applet status: <strong>running</strong>"));
d->pb_startKPF->setEnabled(false);
@@ -554,7 +554,7 @@ namespace KPF
d->pb_startKPF->setEnabled(true);
- d->l_kpfStatus
+ d->l_kpftqStatus
->setText(i18n("Applet status: <strong>not running</strong>"));
d->stack->raiseWidget(d->initWidget);
diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp
index da25a8a6..67d4f206 100644
--- a/kpf/src/Response.cpp
+++ b/kpf/src/Response.cpp
@@ -22,7 +22,7 @@
*/
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqregexp.h>
#include <kconfig.h>
@@ -90,7 +90,7 @@ namespace KPF
if (request.protocol() >= 1.0)
{
s = TQString(request.protocolString())
- + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_));
+ + TQString(" %1 %2\r\n").tqarg(code_).tqarg(responseName(code_));
}
break;
@@ -103,7 +103,7 @@ namespace KPF
case 501:
case 505:
s = TQString(request.protocolString())
- + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_))
+ + TQString(" %1 %2\r\n").tqarg(code_).tqarg(responseName(code_))
+ data(code_, request);
break;
@@ -178,7 +178,7 @@ namespace KPF
}
TQString contentLength =
- TQString("Content-Length: %1\r\n").arg(html.length());
+ TQString("Content-Length: %1\r\n").tqarg(html.length());
return (contentType + contentLength + "\r\n" + html);
}
diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp
index 868a88d3..87d3c733 100644
--- a/kpf/src/Server.cpp
+++ b/kpf/src/Server.cpp
@@ -53,7 +53,7 @@ namespace KPF
d->followSymlinks = followSymlinks;
- d->birth = TQDateTime::currentDateTime();
+ d->birth = TQDateTime::tqcurrentDateTime();
d->socket.setSocket(socket);
@@ -754,7 +754,7 @@ namespace KPF
d->socket.close();
- d->death = TQDateTime::currentDateTime();
+ d->death = TQDateTime::tqcurrentDateTime();
emit(finished(this));
}
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 80266ca5..b48a2bf2 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -22,7 +22,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqspinbox.h>
#include <tqdir.h>
#include <tqptrlist.h>
@@ -49,7 +49,7 @@ namespace KPF
ServerWizard::ServerWizard(TQWidget * parent)
: KWizard(parent, "KPF::ServerWizard", true)
{
- setCaption(i18n("New Server - %1").arg("kpf"));
+ setCaption(i18n("New Server - %1").tqarg("kpf"));
page1_ = new TQWidget(this);
page2_ = new TQWidget(this);
@@ -171,59 +171,59 @@ namespace KPF
sb_bandwidthLimit_ ->setSuffix(i18n(" kB/s"));
// sb_connectionLimit_ ->setValue(Config::DefaultConnectionLimit);
- TQVBoxLayout * layout1 =
+ TQVBoxLayout * tqlayout1 =
new TQVBoxLayout(page1_, KDialog::marginHint(), KDialog::spacingHint());
- TQVBoxLayout * layout2 =
+ TQVBoxLayout * tqlayout2 =
new TQVBoxLayout(page2_, KDialog::marginHint(), KDialog::spacingHint());
- TQVBoxLayout * layout3 =
+ TQVBoxLayout * tqlayout3 =
new TQVBoxLayout(page3_, KDialog::marginHint(), KDialog::spacingHint());
-// TQVBoxLayout * layout4 =
+// TQVBoxLayout * tqlayout4 =
// new TQVBoxLayout(page4_, KDialog::marginHint(), KDialog::spacingHint());
- TQVBoxLayout * layout5 =
+ TQVBoxLayout * tqlayout5 =
new TQVBoxLayout(page5_, KDialog::marginHint(), KDialog::spacingHint());
- layout1->addWidget(l_rootDirectoryHelp);
- layout2->addWidget(l_listenPortHelp);
- layout3->addWidget(l_bandwidthLimitHelp);
-// layout4->addWidget(l_connectionLimitHelp);
- layout5->addWidget(l_serverNameHelp);
+ tqlayout1->addWidget(l_rootDirectoryHelp);
+ tqlayout2->addWidget(l_listenPortHelp);
+ tqlayout3->addWidget(l_bandwidthLimitHelp);
+// tqlayout4->addWidget(l_connectionLimitHelp);
+ tqlayout5->addWidget(l_serverNameHelp);
- TQHBoxLayout * layout10 = new TQHBoxLayout(layout1);
+ TQHBoxLayout * tqlayout10 = new TQHBoxLayout(tqlayout1);
- layout10->addWidget(l_root_);
- layout10->addWidget(kur_root_);
+ tqlayout10->addWidget(l_root_);
+ tqlayout10->addWidget(kur_root_);
- layout1->addStretch(1);
+ tqlayout1->addStretch(1);
- TQHBoxLayout * layout20 = new TQHBoxLayout(layout2);
+ TQHBoxLayout * tqlayout20 = new TQHBoxLayout(tqlayout2);
- layout20->addWidget(l_listenPort_);
- layout20->addWidget(sb_listenPort_);
+ tqlayout20->addWidget(l_listenPort_);
+ tqlayout20->addWidget(sb_listenPort_);
- layout2->addStretch(1);
+ tqlayout2->addStretch(1);
- TQHBoxLayout * layout30 = new TQHBoxLayout(layout3);
+ TQHBoxLayout * tqlayout30 = new TQHBoxLayout(tqlayout3);
- layout30->addWidget(l_bandwidthLimit_);
- layout30->addWidget(sb_bandwidthLimit_);
+ tqlayout30->addWidget(l_bandwidthLimit_);
+ tqlayout30->addWidget(sb_bandwidthLimit_);
- layout3->addStretch(1);
+ tqlayout3->addStretch(1);
-// TQHBoxLayout * layout40 = new TQHBoxLayout(layout4);
+// TQHBoxLayout * tqlayout40 = new TQHBoxLayout(tqlayout4);
-// layout40->addWidget(l_connectionLimit_);
-// layout40->addWidget(sb_connectionLimit_);
+// tqlayout40->addWidget(l_connectionLimit_);
+// tqlayout40->addWidget(sb_connectionLimit_);
-// layout4->addStretch(1);
+// tqlayout4->addStretch(1);
- TQHBoxLayout * layout50 = new TQHBoxLayout(layout5);
+ TQHBoxLayout * tqlayout50 = new TQHBoxLayout(tqlayout5);
- layout50->addWidget(l_serverName_);
- layout50->addWidget(le_serverName_);
+ tqlayout50->addWidget(l_serverName_);
+ tqlayout50->addWidget(le_serverName_);
addPage(page1_, i18n("Root Directory"));
addPage(page2_, i18n("Listen Port"));
@@ -396,7 +396,7 @@ namespace KPF
return;
}
- fileDialog->setCaption(i18n("Choose Directory to Share - %1").arg("kpf"));
+ fileDialog->setCaption(i18n("Choose Directory to Share - %1").tqarg("kpf"));
}
void
diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp
index c39f944b..0dd907b3 100644
--- a/kpf/src/SingleServerConfigDialog.cpp
+++ b/kpf/src/SingleServerConfigDialog.cpp
@@ -40,7 +40,7 @@ namespace KPF
parent,
"KPF::SingleServerConfigDialog",
false,
- i18n("Configuring Server %1 - kpf").arg(server->root()),
+ i18n("Configuring Server %1 - kpf").tqarg(server->root()),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok,
true
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 9f1d0d21..94709edc 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqframe.h>
#include <tqtimer.h>
@@ -71,9 +71,9 @@ namespace KPF
mainWidget
);
- TQVBoxLayout * layout = new TQVBoxLayout(mainWidget);
+ TQVBoxLayout * tqlayout = new TQVBoxLayout(mainWidget);
- layout->addWidget(about);
+ tqlayout->addWidget(about);
kapp->dcopClient()->setNotifications(true);
diff --git a/kpf/src/Utils.cpp b/kpf/src/Utils.cpp
index 631059a7..8dc5c373 100644
--- a/kpf/src/Utils.cpp
+++ b/kpf/src/Utils.cpp
@@ -105,7 +105,7 @@ namespace KPF
TQString dateString()
{
- return dateString(TQDateTime::currentDateTime());
+ return dateString(TQDateTime::tqcurrentDateTime());
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 05:54:35 +0000