18 files changed, 21 insertions, 21 deletions
diff --git a/tdeprint/cups/cupsdconf2/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp
index fab6a6fba..32217b2af 100644
--- a/tdeprint/cups/cupsdconf2/addressdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp
@@ -22,7 +22,7 @@
 #include <tqcombobox.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 
diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp
index b337eb883..6460a8aa3 100644
--- a/tdeprint/cups/cupsdconf2/browsedialog.cpp
+++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
index 4b056cdb0..acfe393c4 100644
--- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
@@ -23,7 +23,7 @@
 #include "browsedialog.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqwhatsthis.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.h b/tdeprint/cups/cupsdconf2/cupsdconf.h
index 70b4f591b..5dff96f91 100644
--- a/tdeprint/cups/cupsdconf2/cupsdconf.h
+++ b/tdeprint/cups/cupsdconf2/cupsdconf.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqptrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqpair.h>
 
 #include "cupsdcomment.h"
diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
index 268465a76..6af5a8a54 100644
--- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
@@ -23,7 +23,7 @@
 #include "qdirmultilineedit.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
index 79c8a9401..32c6bdaab 100644
--- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
@@ -23,7 +23,7 @@
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
index f12f82f1e..31f3afe57 100644
--- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
index 61a89f933..cf52f25e3 100644
--- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
index 9edca5868..29ef71c81 100644
--- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
index 092e1a7e5..2249050ab 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlabel.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
@@ -127,7 +127,7 @@ void CupsdSecurityPage::slotAdd()
 			{
 				if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue)
 				{
-					index = locs_.tqat();
+					index = locs_.at();
 					locs_.remove();
 					break;
 				}
@@ -149,7 +149,7 @@ void CupsdSecurityPage::slotAdd()
 
 void CupsdSecurityPage::slotEdit(int index)
 {
-	CupsLocation *loc = locs_.tqat(index);
+	CupsLocation *loc = locs_.at(index);
 	LocationDialog::editLocation(loc, this, conf_);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index cfd731430..ecfebfa92 100644
--- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
index a058299f0..c514bd429 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlabel.h>
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index 754c9659e..0b325311b 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -21,7 +21,7 @@
 
 #include <klistbox.h>
 #include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp
index 7e1858cc7..d1e9ac96a 100644
--- a/tdeprint/cups/cupsdconf2/locationdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
@@ -128,7 +128,7 @@ void LocationDialog::setInfos(CupsdConf *conf)
 
 void LocationDialog::fillLocation(CupsLocation *loc)
 {
-	loc->resource_ = conf_->resources_.tqat(resource_->currentItem());
+	loc->resource_ = conf_->resources_.at(resource_->currentItem());
 	loc->resourcename_ = loc->resource_->path_;
 	loc->authtype_ = authtype_->currentItem();
 	loc->authclass_ = (loc->authtype_ == AUTHTYPE_NONE ? AUTHCLASS_ANONYMOUS : authclass_->currentItem());
diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp
index 18cade9fc..b89a4adb2 100644
--- a/tdeprint/cups/cupsdconf2/portdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/portdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
index 7cf0ea74e..9ee1e0f2e 100644
--- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
@@ -20,7 +20,7 @@
 #include "qdirlineedit.h"
 
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kpushbutton.h>
 #include <kfiledialog.h>
 #include <kiconloader.h>
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index b1bd96ee6..026c39aad 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -19,7 +19,7 @@
 
 #include "qdirmultilineedit.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
 #include <klistview.h>
diff --git a/tdeprint/cups/cupsdconf2/sizewidget.cpp b/tdeprint/cups/cupsdconf2/sizewidget.cpp
index 742702e48..d59735349 100644
--- a/tdeprint/cups/cupsdconf2/sizewidget.cpp
+++ b/tdeprint/cups/cupsdconf2/sizewidget.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcombobox.h>
 #include <tqspinbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <klocale.h>