diff options
Diffstat (limited to 'kppp/logview')
-rw-r--r-- | kppp/logview/export.cpp | 10 | ||||
-rw-r--r-- | kppp/logview/export.h | 2 | ||||
-rw-r--r-- | kppp/logview/main.cpp | 4 | ||||
-rw-r--r-- | kppp/logview/monthly.cpp | 80 | ||||
-rw-r--r-- | kppp/logview/monthly.h | 2 |
5 files changed, 49 insertions, 49 deletions
diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp index ae665ec5..b646acdc 100644 --- a/kppp/logview/export.cpp +++ b/kppp/logview/export.cpp @@ -23,7 +23,7 @@ #include "export.h" #include <tqpushbutton.h> -#include <textcodec.h> +#include <tqtextcodec.h> class Export; @@ -73,7 +73,7 @@ ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date) formatLayout->addSpacing(10); typeInfo = new TQLabel(formatPage); - typeInfo->setAlignment(TQt::AlignTop | TQt::WordBreak); + typeInfo->tqsetAlignment(TQt::AlignTop | TQt::WordBreak); typeInfo->setText(i18n("<qt><b>Please choose the output format on the left side.</b></qt>")); typeInfo->setMinimumSize(350, 200); formatLayout->addWidget(typeInfo); @@ -219,12 +219,12 @@ void CSVExport::setFinishCode() { /***** HTMLExport *****/ HTMLExport::HTMLExport(const TQString &filename, const TQString &date) : Export(filename) { - TQString title = i18n("Connection log for %1").arg(date); + TQString title = i18n("Connection log for %1").tqarg(date); buffer = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"; buffer.append("<html>\n<head>\n <title>"+title+"</title>\n"); - buffer.append(TQString::fromLatin1(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=") + buffer.append(TQString::tqfromLatin1(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=") + TQTextCodec::codecForLocale()->mimeName() + - TQString::fromLatin1("\">")); + TQString::tqfromLatin1("\">")); buffer.append("\n</head>\n<body>\n<h1>"+title+"</h1>\n\n"); buffer.append("<table width=\"100%\" border=\"1\">\n"); diff --git a/kppp/logview/export.h b/kppp/logview/export.h index 91a3ab14..fb1f0291 100644 --- a/kppp/logview/export.h +++ b/kppp/logview/export.h @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <tqfile.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqlistbox.h> #include <tqlineedit.h> diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index f034c462..6f87ae21 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -86,8 +86,8 @@ TopWidget::TopWidget() : KMainWindow(0, "") { kapp, TQT_SLOT(quit())); } - setMinimumSize(mw->sizeHint().width() + 15, - mw->sizeHint().height() + 120); + setMinimumSize(mw->tqsizeHint().width() + 15, + mw->tqsizeHint().height() + 120); setCentralWidget(w); } diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 0844f85a..831976cc 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -38,67 +38,67 @@ static void formatBytes(double bytes, TQString &result) { if(bytes < 1024) result.setNum(bytes); else if(bytes < 1024*1024) - result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); + result = i18n("%1 KB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); else - result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); + result = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); } static void formatBytesMonth(double bytes, TQString &result) { int day, days; - day = TQDate::currentDate().day(); - days = TQDate::currentDate().daysInMonth(); + day = TQDate::tqcurrentDate().day(); + days = TQDate::tqcurrentDate().daysInMonth(); bytes = (bytes / day) * days; if(bytes < 1024) result.setNum(bytes); else if(bytes < 1024*1024) - result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); + result = i18n("%1 KB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); else - result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); + result = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); } static void formatDuration(int seconds, TQString &result) { TQString sec; sec.sprintf("%02d", seconds%60); if(seconds < 60) - result = i18n("%1s").arg(sec); + result = i18n("%1s").tqarg(sec); else if(seconds < 3600) - result = i18n("%1m %2s").arg(seconds/60).arg(sec); + result = i18n("%1m %2s").tqarg(seconds/60).tqarg(sec); else result = i18n("%1h %2m %3s") - .arg(seconds/3600) - .arg((seconds % 3600)/60) - .arg(sec); + .tqarg(seconds/3600) + .tqarg((seconds % 3600)/60) + .tqarg(sec); } static void formatDurationMonth(int seconds, TQString &result) { int day, days; - day = TQDate::currentDate().day(); - days = TQDate::currentDate().daysInMonth(); + day = TQDate::tqcurrentDate().day(); + days = TQDate::tqcurrentDate().daysInMonth(); seconds = (seconds / day) * days; TQString sec; sec.sprintf("%02d", seconds%60); if(seconds < 60) - result = i18n("%1s").arg(sec); + result = i18n("%1s").tqarg(sec); else if(seconds < 3600) - result = i18n("%1m %2s").arg(seconds/60).arg(sec); + result = i18n("%1m %2s").tqarg(seconds/60).tqarg(sec); else result = i18n("%1h %2m %3s") - .arg(seconds/3600) - .arg((seconds % 3600)/60) - .arg(sec); + .tqarg(seconds/3600) + .tqarg((seconds % 3600)/60) + .tqarg(sec); } static void costsMonth(double costs, double &result) { int day, days; - day = TQDate::currentDate().day(); - days = TQDate::currentDate().daysInMonth(); + day = TQDate::tqcurrentDate().day(); + days = TQDate::tqcurrentDate().daysInMonth(); result = (costs / day) * days; @@ -117,7 +117,7 @@ public: { } virtual void paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); virtual TQString key(int, bool) const; @@ -125,9 +125,9 @@ public: }; void LogListItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { - TQListViewItem::paintCell(p, cg, column, width, alignment); + TQListViewItem::paintCell(p, cg, column, width, tqalignment); // double line above sum //if(!li) { @@ -212,7 +212,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : lv2->setSorting(-1); lv2->setItemMargin(2); lv2->setMaximumHeight(100); - lv2->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + lv2->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); lv2->setSelectionMode(TQListView::NoSelection); title = new TQLabel("X", this); @@ -220,7 +220,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : f.setPointSize(f.pointSize() + 2); f.setBold(TRUE); title->setFont(f); - title->setFixedHeight(title->sizeHint().height()*2); + title->setFixedHeight(title->tqsizeHint().height()*2); cboConnections = new TQComboBox(false, this); // add a combo box to select connections cboConnections->setMaximumWidth(200); // a resonable size @@ -246,7 +246,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : this, TQT_SLOT(exportWizard())); bbox->addStretch(8); - bbox->layout(); + bbox->tqlayout(); currentMonth(); layoutWidget(); @@ -265,8 +265,8 @@ void MonthlyWidget::layoutWidget() { f2.setPointSize(f2.pointSize() + 1); f2.setBold(TRUE); l->setFont(f2); - l->setFixedHeight(l->sizeHint().height()); - l->setAlignment( AlignLeft ); + l->setFixedHeight(l->tqsizeHint().height()); + l->tqsetAlignment( AlignLeft ); tl->addWidget(l, 5, 0); tl->addWidget(bbox, 1, 2); tl->addMultiCellWidget(lv, 1, 4, 0, 1); @@ -396,7 +396,7 @@ void MonthlyWidget::plotMonth() { const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - if(calendar->month(periodeFirst()) == calendar->month(TQDate::currentDate())) { + if(calendar->month(periodeFirst()) == calendar->month(TQDate::tqcurrentDate())) { TQString m_bin, m_bout; @@ -426,13 +426,13 @@ void MonthlyWidget::plotMonth() { if(lv->childCount() > 0) { exportBttn->setEnabled(true); // export possibility t = i18n("Connection log for %1 %2") - .arg(calendar->monthName(startDate)) - .arg(calendar->year(startDate)); + .tqarg(calendar->monthName(startDate)) + .tqarg(calendar->year(startDate)); } else { exportBttn->setEnabled(false); // nothing to export t = i18n("No connection log for %1 %2 available") - .arg(calendar->monthName(startDate)) - .arg(calendar->year(startDate)); + .tqarg(calendar->monthName(startDate)) + .tqarg(calendar->year(startDate)); } title->setText(t); @@ -456,7 +456,7 @@ void MonthlyWidget::prevMonth() { void MonthlyWidget::currentMonth() { const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - TQDate dt = TQDate::currentDate(); + TQDate dt = TQDate::tqcurrentDate(); calendar->setYMD(m_periodeFirst, calendar->year(dt), calendar->month(dt), 1); plotMonth(); @@ -464,9 +464,9 @@ void MonthlyWidget::currentMonth() { void MonthlyWidget::exportWizard() { const KCalendarSystem * calendar = KGlobal::locale()->calendar(); - TQString date = TQString::fromLatin1("%1-%2") // e.g.: June-2001 - .arg(calendar->monthName(periodeFirst())) - .arg(calendar->year(periodeFirst())); + TQString date = TQString::tqfromLatin1("%1-%2") // e.g.: June-2001 + .tqarg(calendar->monthName(periodeFirst())) + .tqarg(calendar->year(periodeFirst())); ExportWizard *wizard = new ExportWizard(0, date); wizard->exec(); @@ -576,7 +576,7 @@ void MonthlyWidget::exportWizard() { } } - if(calendar->month(periodeFirst()) == calendar->month(TQDate::currentDate())) { + if(calendar->month(periodeFirst()) == calendar->month(TQDate::tqcurrentDate())) { TQString m_bin, m_bout; if(bin < 0) @@ -595,10 +595,10 @@ void MonthlyWidget::exportWizard() { costsMonth(costs, costs); TQString m_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2)); - TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true); + TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true); exportIFace->addEmptyLine(); - exportIFace->addDataline(i18n("Monthly estimates (%1)").arg(datetime), + exportIFace->addDataline(i18n("Monthly estimates (%1)").tqarg(datetime), TQString(), TQString(), TQString(), m_duration, m_costs, m_bin, m_bout); } diff --git a/kppp/logview/monthly.h b/kppp/logview/monthly.h index 71c33739..2889a5af 100644 --- a/kppp/logview/monthly.h +++ b/kppp/logview/monthly.h @@ -24,7 +24,7 @@ #include "log.h" #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqvaluelist.h> |