Reset submodule main/applications/system/knetstats/admin to latest HEAD

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "admin"]
+	path = admin
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

acinclude.m4

@@ -428,7 +428,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
 if test "$1" = "default"; then
 
   if test -z "$kde_htmldir"; then
-    kde_htmldir='\${datadir}/doc/HTML'
+    kde_htmldir='\${datadir}/doc/tde/HTML'
   fi
   if test -z "$kde_appsdir"; then
     kde_appsdir='\${datadir}/applnk'

admin

@@ -0,0 +1 @@
+Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

src/src/chart.cpp

@@ -24,7 +24,7 @@
 
 Chart::Chart(TQWidget* parent, const double* uploadBuffer, const double* downloadBuffer, int bufferSize, const int* ptr, const double* maxspeed) : TQWidget(parent), mUplBuffer(uploadBuffer), mDldBuffer(downloadBuffer), mBufferSize(bufferSize), mPtr(ptr), mMaxSpeed(maxspeed) {
 	setWFlags(TQt::WNoAutoErase);
-	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 }
 
 void Chart::paintEvent(TQPaintEvent*) {

src/src/chart.h

@@ -28,7 +28,7 @@ class TQPaintEvent;
 class Chart : public TQWidget {
 public:
 	Chart(TQWidget* parent, const double* uploadBuffer, const double* downloadBuffer, int bufferSize, const int* ptr, const double* maxspeed);
-	TQSize tqsizeHint() { return TQSize(200, 100); }
+	TQSize sizeHint() { return TQSize(200, 100); }
 protected:	
 	void paintEvent( TQPaintEvent* ev );
 

src/src/configurebase.ui

@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -48,7 +48,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>120</width>
                             <height>20</height>
@@ -136,7 +136,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout5</cstring>
+                                    <cstring>layout5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -190,7 +190,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -201,7 +201,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout7_2</cstring>
+                                    <cstring>layout7_2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -219,7 +219,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -239,7 +239,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -258,7 +258,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -278,7 +278,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -297,7 +297,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -317,7 +317,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -336,7 +336,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -356,7 +356,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -375,7 +375,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>22</width>
                                                 <height>22</height>
@@ -397,7 +397,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -596,7 +596,7 @@
                     <property name="text">
                         <string>Update interval:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>

src/src/knetstats.cpp

@@ -184,7 +184,7 @@ bool KNetStats::createInterface(const TQString& name) {
 	Interface* interface = new Interface(this, name);
 	mInterfaces.insert(name, interface);
 	if (!mBoot)
-		interface->say(i18n("New interface detected: %1").tqarg(name));
+		interface->say(i18n("New interface detected: %1").arg(name));
 	return interface->isVisible();
 }
 

src/src/knetstatsview.cpp

@@ -89,7 +89,7 @@ KNetStatsView::KNetStatsView(KNetStats* parent, const TQString& interface)
 	mTimer = new TQTimer(this, "timer");
 	connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStats(void)));
 
-	TQToolTip::add(this, i18n("Monitoring %1").tqarg(mInterface));
+	TQToolTip::add(this, i18n("Monitoring %1").arg(mInterface));
 	setup();
 	mStatistics = new Statistics(this);
 }
@@ -135,24 +135,24 @@ void KNetStatsView::updateViewOptions() {
 
 void KNetStatsView::updateStats() {
 	FILE* flags_fp = fopen((mSysDevPath+"flags").latin1(), "r");
-	bool currenttqStatus;
+	bool currentStatus;
 	if (!flags_fp)
-		currenttqStatus = false;
+		currentStatus = false;
 	else {
 		int flags;
 		fscanf(flags_fp, "%Xu", &flags);
 		fclose(flags_fp);
-		currenttqStatus = IFF_UP & flags;
+		currentStatus = IFF_UP & flags;
 	}
 
-	if (!currenttqStatus && mConnected) { // interface down...
+	if (!currentStatus && mConnected) { // interface down...
 		mConnected = false;
 		resetBuffers();
 		TQWidget::update();
-		say(i18n("%1 is inactive").tqarg(mInterface));
-	} else if (currenttqStatus && !mConnected) {
+		say(i18n("%1 is inactive").arg(mInterface));
+	} else if (currentStatus && !mConnected) {
 		mConnected = true;
-		say(i18n("%1 is active").tqarg(mInterface));
+		say(i18n("%1 is active").arg(mInterface));
 	}
 
 	// kernel < 2.6.9 (I think) does not have carrier info, considering carrier ever on.
@@ -169,12 +169,12 @@ void KNetStatsView::updateStats() {
 		if (mCarrier) {
 			mCarrier = false;
 			TQWidget::update();
-			say(i18n("%1 is disconnected").tqarg(mInterface));
+			say(i18n("%1 is disconnected").arg(mInterface));
 		}
 		return;
 	} else if (!mCarrier) { // carrier up
 		mCarrier = true;
-		say(i18n("%1 is connected").tqarg(mInterface));
+		say(i18n("%1 is connected").arg(mInterface));
 	}
 
 	unsigned int brx = readInterfaceNumValue("rx_bytes");

src/src/statistics.cpp

@@ -31,15 +31,15 @@
 
 Statistics::Statistics( KNetStatsView* parent, const char *name )
 : StatisticsBase( parent, name ), mInterface(parent->interface()), mParent(parent) {
-	setCaption( i18n( "Details of %1" ).tqarg( mInterface ) );
+	setCaption( i18n( "Details of %1" ).arg( mInterface ) );
 
 	TQBoxLayout* l = new TQHBoxLayout( mChart );
 	l->setAutoAdd( true );
 	Chart* chart = new Chart(mChart, parent->speedHistoryTx(), parent->speedHistoryRx(), parent->historyBufferSize(), parent->historyPointer(), parent->maxSpeed());
 	mMAC->setText(mParent->readInterfaceStringValue("address", 18));
-	mIP->tqsetAlignment(TQt::AlignRight);
-	mMAC->tqsetAlignment(TQt::AlignRight);
-	mNetmask->tqsetAlignment(TQt::AlignRight);
+	mIP->setAlignment(TQt::AlignRight);
+	mMAC->setAlignment(TQt::AlignRight);
+	mNetmask->setAlignment(TQt::AlignRight);
 	update();
 
 	mTimer = new TQTimer( this );

src/src/statisticsbase.ui

@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>41</height>
@@ -86,7 +86,7 @@
                     <property name="text">
                         <string>? KB/s</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -102,7 +102,7 @@
                     <property name="text">
                         <string>0 KB/s</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -173,7 +173,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>71</width>
                                 <height>20</height>
@@ -184,7 +184,7 @@
                         <property name="name">
                             <cstring>mPktSpeedRx</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
@@ -200,7 +200,7 @@
                         <property name="name">
                             <cstring>mPRx</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
@@ -208,7 +208,7 @@
                         <property name="name">
                             <cstring>mByteSpeedTx</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
@@ -216,7 +216,7 @@
                         <property name="name">
                             <cstring>mBTx</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
@@ -224,7 +224,7 @@
                         <property name="name">
                             <cstring>mPTx</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
@@ -232,7 +232,7 @@
                         <property name="name">
                             <cstring>mPktSpeedTx</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
@@ -240,7 +240,7 @@
                         <property name="name">
                             <cstring>mBRx</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
@@ -248,7 +248,7 @@
                         <property name="name">
                             <cstring>mByteSpeedRx</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
                         </property>
                     </widget>
@@ -315,7 +315,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>200</width>
                                 <height>21</height>
@@ -332,7 +332,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>51</width>
                                 <height>80</height>
@@ -403,7 +403,7 @@
                         <property name="text">
                             <string></string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter</set>
                         </property>
                     </widget>
@@ -412,7 +412,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -428,7 +428,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>91</width>
                             <height>20</height>