From af8caeadf368a17dabd9f53d4c661213c840eebd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 3 Dec 2023 00:48:33 +0900 Subject: Replaced various '#define' with actual strings - part 5 Signed-off-by: Michele Calgaro (cherry picked from commit 44e712a770ad0ab59d33790a80b5f6235cff6921) --- tdeprint/cups/cupsaddsmb2.cpp | 2 +- tdeprint/cups/cupsdconf2/portdialog.cpp | 2 +- tdeprint/cups/kmconfigcupsdir.cpp | 2 +- tdeprint/cups/kphpgl2page.cpp | 2 +- tdeprint/cups/kpimagepage.cpp | 2 +- tdeprint/cups/kptextpage.cpp | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tdeprint/cups') diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index f5c7781c2..e9ff1256d 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -109,7 +109,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) l1->addWidget(m_sep); l1->addWidget(m_text); TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 ); - l1->addLayout( TQT_TQLAYOUT(l3) ); + l1->addLayout( l3 ); l3->addWidget( m_loginlab, 1, 0 ); l3->addWidget( m_passwdlab, 2, 0 ); l3->addWidget( m_serverlab, 0, 0 ); diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp index df2ea8793..a1fc7dd00 100644 --- a/tdeprint/cups/cupsdconf2/portdialog.cpp +++ b/tdeprint/cups/cupsdconf2/portdialog.cpp @@ -45,7 +45,7 @@ PortDialog::PortDialog(TQWidget *parent, const char *name) TQVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10); TQGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5); - m1->addLayout(TQT_TQLAYOUT(m2)); + m1->addLayout(m2); m2->addWidget(l1, 0, 0, TQt::AlignRight); m2->addWidget(l2, 1, 0, TQt::AlignRight); m2->addMultiCellWidget(usessl_, 2, 2, 0, 1); diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index 6cabe17b6..47d2c7f32 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -44,7 +44,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lay0->addWidget(m_dirbox); lay0->addStretch(1); - TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_dirbox->layout()), 10); + TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10); lay1->addWidget(m_stddir); lay1->addWidget(m_installdir); diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp index 42123375c..03271fa1c 100644 --- a/tdeprint/cups/kphpgl2page.cpp +++ b/tdeprint/cups/kphpgl2page.cpp @@ -128,7 +128,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) l0->addWidget(box); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), 10); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), 10); l1->addWidget(m_blackplot); l1->addWidget(m_fitplot); l1->addWidget(m_penwidth); diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index ca21a1366..29be5bc0c 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -361,7 +361,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l1->addWidget(m_gamma, 4, 0); l1->addMultiCellWidget(m_preview, 0, 3, 1, 1); l1->addWidget(defbtn, 4, 1); - TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3); + TQVBoxLayout *l2 = new TQVBoxLayout(sizebox->layout(), 3); l2->addStretch(1); l2->addWidget(lab); l2->addWidget(m_sizetype); diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index 3fecdd88a..9ad9d7cb5 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -233,16 +233,16 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) l0->addWidget(formatbox, 0, 0); l0->addWidget(prettybox, 0, 1); l0->addMultiCellWidget(marginbox, 1, 1, 0, 1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(formatbox->layout()), 5); + TQVBoxLayout *l1 = new TQVBoxLayout(formatbox->layout(), 5); l1->addWidget(m_cpi); l1->addWidget(m_lpi); l1->addWidget(sep); l1->addWidget(m_columns); - TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(prettybox->layout()), 2, 2, 10); + TQGridLayout *l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10); l2->addWidget(off, 0, 0); l2->addWidget(on, 1, 0); l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1); - TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(marginbox->layout()), 10); + TQVBoxLayout *l3 = new TQVBoxLayout(marginbox->layout(), 10); l3->addWidget(m_margin); } -- cgit v1.2.1