summaryrefslogtreecommitdiffstats
path: root/tdeprint
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:46:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:46:05 -0600
commit73c08b592db45af554b9f21029bc549d70f683ab (patch)
tree122898ea951e59fdc4419b3c84b7a6c2dd0bb5f7 /tdeprint
parente81bdee8ae92d6eeb82daa8c0a0e46bf37f4a6da (diff)
downloadtdebase-73c08b592db45af554b9f21029bc549d70f683ab.tar.gz
tdebase-73c08b592db45af554b9f21029bc549d70f683ab.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'tdeprint')
-rw-r--r--tdeprint/kjobviewer/kjobviewer.cpp2
-rw-r--r--tdeprint/kprinter/printwrapper.cpp2
-rw-r--r--tdeprint/printmgr/kcmprintmgr.cpp2
-rw-r--r--tdeprint/slave/kio_print.cpp16
-rw-r--r--tdeprint/tdeprintfax/conffax.cpp2
-rw-r--r--tdeprint/tdeprintfax/conffilters.cpp4
-rw-r--r--tdeprint/tdeprintfax/confgeneral.cpp2
-rw-r--r--tdeprint/tdeprintfax/confsystem.cpp2
-rw-r--r--tdeprint/tdeprintfax/faxab.cpp2
-rw-r--r--tdeprint/tdeprintfax/faxctrl.cpp14
-rw-r--r--tdeprint/tdeprintfax/filterdlg.cpp2
-rw-r--r--tdeprint/tdeprintfax/tdeprintfax.cpp10
12 files changed, 30 insertions, 30 deletions
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index cde28c24..7d72dbd5 100644
--- a/tdeprint/kjobviewer/kjobviewer.cpp
+++ b/tdeprint/kjobviewer/kjobviewer.cpp
@@ -77,7 +77,7 @@ void JobTray::mousePressEvent(TQMouseEvent *e)
int choice = menu.exec(mapToGlobal(e->pos()));
if (choice != -1)
{
- KMJobViewer *view = list.tqat(choice);
+ KMJobViewer *view = list.at(choice);
if (view->isVisible())
KWin::activateWindow(view->winId());
else
diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index effa3dea..e0862271 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -66,7 +66,7 @@ void showmsgdialog(const TQString& msg, int type = 0)
void showmsgconsole(const TQString& msg, int type = 0)
{
- TQString errmsg = TQString::tqfromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error"))));
+ TQString errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error"))));
kdDebug() << errmsg << msg << endl;
}
diff --git a/tdeprint/printmgr/kcmprintmgr.cpp b/tdeprint/printmgr/kcmprintmgr.cpp
index 34b77307..17c6880a 100644
--- a/tdeprint/printmgr/kcmprintmgr.cpp
+++ b/tdeprint/printmgr/kcmprintmgr.cpp
@@ -20,7 +20,7 @@
#include "kcmprintmgr.h"
#include "tdeprint/kmmainview.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <kgenericfactory.h>
#include <kaboutdata.h>
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index 71c8779e..ef080f19 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -25,7 +25,7 @@
#include <tdeprint/driver.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klocale.h>
#include <kdebug.h>
#include <kinstance.h>
@@ -635,7 +635,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer)
mimeType("text/html");
TQString content;
- if (!loadTemplate(TQString::tqfromLatin1("printer.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("printer.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template"));
return;
@@ -676,7 +676,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
mimeType("text/html");
TQString content;
- if (!loadTemplate(TQString::tqfromLatin1("class.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("class.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template"));
return;
@@ -686,7 +686,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
TQStringList members(printer->members());
for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
{
- memberContent.append(TQString::tqfromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it));
+ memberContent.append(TQString::fromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it));
}
memberContent.append("</ul>\n");
@@ -719,7 +719,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
mimeType("text/html");
TQString content;
- if (!loadTemplate(TQString::tqfromLatin1("pseudo.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return;
@@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer)
{
- TQFile f(locate("data", TQString::tqfromLatin1("tdeprint/template/")+filename));
+ TQFile f(locate("data", TQString::fromLatin1("tdeprint/template/")+filename));
if (f.exists() && f.open(IO_ReadOnly))
{
TQTextStream t(&f);
@@ -820,7 +820,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
}
TQString content;
- if (!loadTemplate(TQString::tqfromLatin1("jobs.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("jobs.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return;
@@ -891,7 +891,7 @@ void KIO_Print::showDriver(KMPrinter *prt)
mimeType("text/html");
TQString content;
- if (!loadTemplate(TQString::tqfromLatin1("driver.template"), content))
+ if (!loadTemplate(TQString::fromLatin1("driver.template"), content))
{
error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return;
diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp
index 1f3b8c3c..ca29527b 100644
--- a/tdeprint/tdeprintfax/conffax.cpp
+++ b/tdeprint/tdeprintfax/conffax.cpp
@@ -23,7 +23,7 @@
#include <tqcombobox.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqprinter.h>
#include <kglobal.h>
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index d32f33ea..8ba191e4 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -22,10 +22,10 @@
#include "filterdlg.h"
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqregexp.h>
#include <tqheader.h>
diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp
index db3ef916..5028a376 100644
--- a/tdeprint/tdeprintfax/confgeneral.cpp
+++ b/tdeprint/tdeprintfax/confgeneral.cpp
@@ -22,7 +22,7 @@
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <kglobal.h>
diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp
index 91c23adb..4e1254f1 100644
--- a/tdeprint/tdeprintfax/confsystem.cpp
+++ b/tdeprint/tdeprintfax/confsystem.cpp
@@ -23,7 +23,7 @@
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <kglobal.h>
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index ad50ac9f..0cec25c2 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -21,7 +21,7 @@
#include "faxab.h"
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kpushbutton.h>
#include <klistview.h>
#include <tqheader.h>
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 171077ee..39137ebf 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -24,16 +24,16 @@
#include <ktextedit.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
#include <kprinter.h>
#include <tqsimplerichtext.h>
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
#include <tqvaluestack.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kprocess.h>
#include <kglobal.h>
@@ -291,7 +291,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
if (v.isEmpty())
v = getenv("FAXSERVER");
if (v.isEmpty())
- v = TQString::tqfromLatin1("localhost");
+ v = TQString::fromLatin1("localhost");
v = processTag( match, v );
}
else if (isTag( match, "%page" ))
@@ -491,7 +491,7 @@ void FaxCtrl::filter()
m_tempfiles.append(tmp);
m_process->clearArguments();
*m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters"))
- << TQString::tqfromLatin1("--mime=%1").arg(mimeType)
+ << TQString::fromLatin1("--mime=%1").arg(mimeType)
<< "-p" << pageSize()
<< KProcess::quote(m_files[0]) << KProcess::quote(tmp);
if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
@@ -617,7 +617,7 @@ void FaxCtrl::slotPrintLog()
KPrinter printer;
printer.setDocName( i18n( "Fax log" ) );
printer.setDocFileName( "faxlog" );
- if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) )
+ if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) )
{
TQPainter painter( &printer );
TQPaintDeviceMetrics metric( &printer );
@@ -634,7 +634,7 @@ void FaxCtrl::slotPrintLog()
richText.setWidth( &painter, body.width() );
do
{
- richText.draw( &painter, body.left(), body.top(), view, m_logview->tqcolorGroup() );
+ richText.draw( &painter, body.left(), body.top(), view, m_logview->colorGroup() );
view.moveBy( 0, body.height() );
painter.translate( 0, -body.height() );
if ( view.top() >= richText.height() )
diff --git a/tdeprint/tdeprintfax/filterdlg.cpp b/tdeprint/tdeprintfax/filterdlg.cpp
index 0324863b..42e33e9b 100644
--- a/tdeprint/tdeprintfax/filterdlg.cpp
+++ b/tdeprint/tdeprintfax/filterdlg.cpp
@@ -23,7 +23,7 @@
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 24ad58a0..088951f9 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -26,9 +26,9 @@
#include <tqcheckbox.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqdatetimeedit.h>
#include <tqcombobox.h>
#include <tqtooltip.h>
@@ -429,14 +429,14 @@ void KdeprintFax::updateState()
if ( !m_cover->isEnabled() )
m_cover->setChecked(false);
m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked());
- //m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background));
+ //m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background));
if (!m_comment->isEnabled())
{
m_comment->setText("");
- m_comment->setPaper( tqcolorGroup().background() );
+ m_comment->setPaper( colorGroup().background() );
}
else
- m_comment->setPaper( tqcolorGroup().base() );
+ m_comment->setPaper( colorGroup().base() );
/*
m_enterprise->setEnabled(cmd.find("%enterprise") != -1);
if (!m_enterprise->isEnabled())