summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-06-09 14:56:23 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-06-09 17:36:19 +0900
commit0e015b4cfac4a494f6bda8de8e653c1b35bdf160 (patch)
tree50972e3a8a6492dd39fde529eb5dac5301436cdf
parentb6c2f5167df2f15be3d44445e4dc4af43fb8ebc7 (diff)
downloadtdeadmin-0e015b4cfac4a494f6bda8de8e653c1b35bdf160.tar.gz
tdeadmin-0e015b4cfac4a494f6bda8de8e653c1b35bdf160.zip
Drop TQT_NO_COMPAT code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 9d83393cc1a0de6c66a9ecd37716d4160843e5cd)
-rw-r--r--knetworkconf/knetworkconf/CMakeLists.txt3
-rw-r--r--knetworkconf/knetworkconf/Makefile.am3
-rw-r--r--knetworkconf/knetworkconf/kadddevicecontainer.cpp7
-rw-r--r--knetworkconf/knetworkconf/kadddevicecontainer.h3
-rw-r--r--knetworkconf/knetworkconf/kadddnsserverdlg.ui1
-rw-r--r--knetworkconf/knetworkconf/kadddnsserverdlg.ui.h8
-rw-r--r--knetworkconf/knetworkconf/kaddknownhostdlg.ui1
-rw-r--r--knetworkconf/knetworkconf/kaddknownhostdlg.ui.h11
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.cpp15
-rw-r--r--knetworkconf/knetworkconf/knetworkconf.h2
-rw-r--r--knetworkconf/knetworkconf/kreloadnetworkdlg.ui3
-rw-r--r--kpackage/pkgOptions.cpp2
-rw-r--r--kpackage/procbuf.cpp2
13 files changed, 0 insertions, 61 deletions
diff --git a/knetworkconf/knetworkconf/CMakeLists.txt b/knetworkconf/knetworkconf/CMakeLists.txt
index dc23479..7750c9a 100644
--- a/knetworkconf/knetworkconf/CMakeLists.txt
+++ b/knetworkconf/knetworkconf/CMakeLists.txt
@@ -13,9 +13,6 @@ link_directories(
${TDE_LIB_DIR}
)
-add_definitions( -UTQT_NO_COMPAT
-)
-
##### kcm_knetworkconfmodule (kpart) ############
diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am
index 3b4e4c9..29ffe82 100644
--- a/knetworkconf/knetworkconf/Makefile.am
+++ b/knetworkconf/knetworkconf/Makefile.am
@@ -2,9 +2,6 @@
#INCLUDES= $(all_includes)
AM_CPPFLAGS = $(all_includes)
-# We use deprecated routines in QButton, undefine TQT_NO_COMPAT.
-KDE_CXXFLAGS = -UTQT_NO_COMPAT
-
METASOURCES = AUTO
#bin_PROGRAMS = knetworkconf
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
index d68dffe..51f66e4 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
@@ -150,13 +150,6 @@ void KAddDeviceContainer::verifyDeviceInfoSlot()
}
}
-void KAddDeviceContainer::makeButtonsResizeable()
-{
- kpbApply->setAutoResize(true);
- kpbAdvanced->setAutoResize(true);
- kpbCancel->setAutoResize(true);
-}
-
bool KAddDeviceContainer::modified()
{
return _modified;
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h
index 80e954e..fec8c2f 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.h
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.h
@@ -61,9 +61,6 @@ class KAddDeviceContainer : public KDialog
bool modified();
bool advanced();
- private:
- void makeButtonsResizeable();
-
protected:
TQVBoxLayout* mainLayout;
TQHBoxLayout* buttonsLayout;
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
index a05a9e7..c47948c 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
@@ -149,7 +149,6 @@
</includes>
<Q_SLOTS>
<slot access="private">validateAddressSlot()</slot>
- <slot access="private">makeButtonsResizeable()</slot>
</Q_SLOTS>
<functions>
<function specifier="non virtual">setAddingAlias( bool add )</function>
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
index 3eba8a6..b2b9a49 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
@@ -25,7 +25,6 @@ void KAddDNSServerDlg::init()
{
_modified2 = false;
addingAlias = false;
- makeButtonsResizeable();
}
void KAddDNSServerDlg::validateAddressSlot()
@@ -55,10 +54,3 @@ void KAddDNSServerDlg::validateAddressSlot()
}
}
}
-
-
-void KAddDNSServerDlg::makeButtonsResizeable()
-{
- kpbAddServer->setAutoResize(true);
- kpbCancel->setAutoResize(true);
-}
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
index 35586fb..83b4ffe 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
@@ -280,7 +280,6 @@
</includes>
<Q_SLOTS>
<slot access="private">validateAddressSlot()</slot>
- <slot access="private">makeButtonsResizeable()</slot>
<slot access="private">editHostSlot()</slot>
<slot access="private">removeHostSlot()</slot>
<slot access="private">addHostSlot()</slot>
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
index bbf6e8f..f6465b2 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
@@ -16,7 +16,6 @@ bool _modifiedhost;
void KAddKnownHostDlg::init()
{
_modifiedhost = false;
- makeButtonsResizeable();
}
void KAddKnownHostDlg::validateAddressSlot()
{
@@ -37,16 +36,6 @@ void KAddKnownHostDlg::validateAddressSlot()
}
-void KAddKnownHostDlg::makeButtonsResizeable()
-{
- kpbAdd->setAutoResize(true);
- kpbCancel->setAutoResize(true);
- kpbAddHost->setAutoResize(true);
- kpbEditHost->setAutoResize(true);
- kpbRemoveHost->setAutoResize(true);
-}
-
-
bool KAddKnownHostDlg::modified()
{
return _modifiedhost;
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
index 36d4a46..a92f5bc 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -23,7 +23,6 @@
KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name)
{
netInfo = 0L;
- makeButtonsResizeable();
config = new KNetworkConfigParser();
klvCardList->setAllColumnsShowFocus(true);
klvKnownHosts->setAllColumnsShowFocus(true);
@@ -810,20 +809,6 @@ bool KNetworkConf::valuesChanged(KNetworkInterface *dev,
return false;
}
-/** Sets the TQPushButton::autoResize() in true for all buttons. */
-void KNetworkConf::makeButtonsResizeable(){
- kpbConfigureNetworkInterface->setAutoResize(true);
- kcbGwDevice->setAutoResize(true);
- kpbAddDomainServer->setAutoResize(true);
- kpbEditDomainServer->setAutoResize(true);
- kpbRemoveDomainServer->setAutoResize(true);
- kpbUpButton->setAutoResize(true);
- kpbDownButton->setAutoResize(true);
- kpbAddKnownHost->setAutoResize(true);
- kpbEditKnownHost->setAutoResize(true);
- kpbRemoveKnownHost->setAutoResize(true);
-}
-
void KNetworkConf::enableInterfaceSlot()
{
if (modified) {
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index 990bef1..66408aa 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -175,8 +175,6 @@ class KNetworkConf : public KNetworkConfDlg, public DCOPObject
TQString broadcast);
/** Returns a list of strings of all the configured devices. */
TQStringList getDeviceList();
- /** Sets the TQPushButton::autoResize() in true for all buttons. */
- void makeButtonsResizeable();
/** Adds a new host to the TDEListView that has the known hosts. */
void addKnownHostSlot();
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
index acef30e..0bf26aa 100644
--- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
+++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
@@ -72,9 +72,6 @@
<property name="text">
<string>&amp;OK</string>
</property>
- <property name="autoResize">
- <bool>true</bool>
- </property>
</widget>
<widget class="TQLabel">
<property name="name">
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index acf9c4f..e817736 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -79,8 +79,6 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
f.setBold(true);
f.setPointSize(f.pointSize()+6);
title->setFont(f);
- // title->setAutoResize(TRUE);
- // title->update();
installButton = new TQPushButton(insType,this);
cancelButton = new KPushButton(KStdGuiItem::cancel(),this);
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 122bf18..af94200 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -37,8 +37,6 @@ Modal::Modal(TQString msg, TQWidget *parent, const char * name )
{
TQLabel *line1 = new TQLabel(msg,this);
line1->setAlignment(AlignCenter);
- line1->setAutoResize(true);
-
}
void Modal::terminate()