summaryrefslogtreecommitdiffstats
path: root/src/kvilib
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvilib')
-rw-r--r--src/kvilib/core/kvi_qstring.cpp10
-rw-r--r--src/kvilib/ext/kvi_osinfo.cpp6
-rw-r--r--src/kvilib/net/kvi_http.cpp8
-rw-r--r--src/kvilib/system/kvi_locale.cpp4
-rw-r--r--src/kvilib/tal/kvi_tal_listview.cpp32
-rw-r--r--src/kvilib/tal/kvi_tal_listview_qt3.h2
-rw-r--r--src/kvilib/tal/kvi_tal_listview_qt4.h2
-rw-r--r--src/kvilib/tal/kvi_tal_wizard.cpp2
8 files changed, 33 insertions, 33 deletions
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index 3b564c17..b02e3080 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -165,24 +165,24 @@ namespace KviTQString
{
double size = bytes;
if(size<900)
- return TQString(__tr2qs("%1 bytes")).tqarg(size,0,'f',3);
+ return TQString(__tr2qs("%1 bytes")).arg(size,0,'f',3);
size/=1024;
if(size<900)
- return TQString(__tr2qs("%1 KB")).tqarg(size,0,'f',3);
+ return TQString(__tr2qs("%1 KB")).arg(size,0,'f',3);
size/=1024;
if(size<900)
- return TQString(__tr2qs("%1 MB")).tqarg(size,0,'f',3);
+ return TQString(__tr2qs("%1 MB")).arg(size,0,'f',3);
//Pirated DVD?;)
size/=1024;
if(size<900)
- return TQString(__tr2qs("%1 GB")).tqarg(size,0,'f',3);
+ return TQString(__tr2qs("%1 GB")).arg(size,0,'f',3);
//Uhm.. We are downloading a whole internet:)))
size/=1024;
- return TQString(__tr2qs("%1 TB")).tqarg(size,0,'f',3);
+ return TQString(__tr2qs("%1 TB")).arg(size,0,'f',3);
}
bool equalCS(const TQString &sz1,const TQString &sz2)
diff --git a/src/kvilib/ext/kvi_osinfo.cpp b/src/kvilib/ext/kvi_osinfo.cpp
index 9d443c0b..f2f39d29 100644
--- a/src/kvilib/ext/kvi_osinfo.cpp
+++ b/src/kvilib/ext/kvi_osinfo.cpp
@@ -350,17 +350,17 @@ static TQString queryWinInfo( QueryInfo info)
TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"),
0, KEY_TQUERY_VALUE, &hKey );
if( lRet == ERROR_SUCCESS )
- szVersion+= TQString("Service Pack 6a (Build %1)").tqarg( osvi.dwBuildNumber & 0xFFFF );
+ szVersion+= TQString("Service Pack 6a (Build %1)").arg( osvi.dwBuildNumber & 0xFFFF );
else // Windows NT 4.0 prior to SP6a
{
- szVersion+= TQString( "%1 (Build %2)").tqarg( osvi.szCSDVersion).tqarg( osvi.dwBuildNumber & 0xFFFF);
+ szVersion+= TQString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF);
}
RegCloseKey( hKey );
}
else // not Windows NT 4.0
{
- szVersion+= TQString( "%1 (Build %2)").tqarg( osvi.szCSDVersion).tqarg( osvi.dwBuildNumber & 0xFFFF);
+ szVersion+= TQString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF);
}
break;
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index 6b3dd912..9e87d78c 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -164,7 +164,7 @@ bool KviHttpRequest::start()
if((!kvi_strEqualCI(m_url.protocol().ptr(),"http")) && (!kvi_strEqualCI(m_url.protocol().ptr(),"https")))
{
resetInternalStatus();
- m_szLastError=__tr2qs("Unsupported protocol %1").tqarg(m_url.protocol().ptr());
+ m_szLastError=__tr2qs("Unsupported protocol %1").arg(m_url.protocol().ptr());
return false;
}
@@ -409,7 +409,7 @@ bool KviHttpRequest::openFile()
TQString tmp = m_szFileName;
do {
i++;
- m_szFileName = tmp + TQString(".kvirnm-%1").tqarg(i);
+ m_szFileName = tmp + TQString(".kvirnm-%1").arg(i);
} while(KviFile::exists(m_szFileName));
}
break;
@@ -419,7 +419,7 @@ bool KviHttpRequest::openFile()
TQString tmp;
do {
i++;
- tmp = m_szFileName + TQString(".kvirnm-%1").tqarg(i);
+ tmp = m_szFileName + TQString(".kvirnm-%1").arg(i);
} while(KviFile::exists(tmp));
TQDir d;
if(!d.rename(m_szFileName,tmp))
@@ -494,7 +494,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
{
// the response is invalid ?
resetInternalStatus();
- m_szLastError=__tr2qs("Invalid HTTP response: %s").tqarg(szResponse.ptr());
+ m_szLastError=__tr2qs("Invalid HTTP response: %s").arg(szResponse.ptr());
emit terminated(false);
return false;
}
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index 7bf7e348..3ee2ef82 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -957,9 +957,9 @@ namespace KviLocale
// first of all try to find out the current locale
g_szLang="";
#ifdef COMPILE_USE_QT4
- TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homePath());
+ TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homePath());
#else
- TQString szLangFile=TQString("%1/.kvirc_force_locale").tqarg(TQDir::homeDirPath());
+ TQString szLangFile=TQString("%1/.kvirc_force_locale").arg(TQDir::homeDirPath());
#endif
if(KviFileUtils::fileExists(szLangFile))
{
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index 1a7f9754..68e69675 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -324,7 +324,7 @@
&& d->exclusive && d->exclusive->d
&& d->exclusive->d->exclusive == this)
d->exclusive->turnOffChild();
- d->exclusive = 0; // so the tqchildren won't try to access us.
+ d->exclusive = 0; // so the children won't try to access us.
delete d;
d = 0;
}
@@ -403,7 +403,7 @@
updateController(update, store);
} else {
- // if there are no tqchildren we simply set the CheckBoxController and update its parent
+ // if there are no children we simply set the CheckBoxController and update its parent
setCurrentState(s);
stateChange(state());
if (parent() && parent()->rtti() == 1
@@ -430,7 +430,7 @@
}
stateChange(state());
}
- tqrepaint();
+ repaint();
}
void KviTalCheckListItem::setCurrentState(ToggleState s)
@@ -551,13 +551,13 @@
case CheckBox:
setCurrentState(storedState(key));
stateChange(state());
- tqrepaint();
+ repaint();
break;
case CheckBoxController: {
KviTalListViewItem *item = firstChild();
int childCount = 0;
while (item) {
- // recursively calling restoreState for tqchildren of type CheckBox and CheckBoxController
+ // recursively calling restoreState for children of type CheckBox and CheckBoxController
if (item->rtti() == 1 &&
(((KviTalCheckListItem*)item)->type() == CheckBox ||
((KviTalCheckListItem*)item)->type() == CheckBoxController)) {
@@ -572,7 +572,7 @@
else
updateController(false);
} else {
- // if there are no tqchildren we retrieve the CheckBoxController state directly.
+ // if there are no children we retrieve the CheckBoxController state directly.
setState(storedState(key), true, false);
}
}
@@ -622,7 +622,7 @@
if (update && controller) {
controller->updateController(update, store);
}
- tqrepaint();
+ repaint();
}
}
@@ -642,7 +642,7 @@
}
item = item->nextSibling();
}
- // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController tqchildren.
+ // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController children.
setStoredState(internalState() , key);
}
@@ -1056,7 +1056,7 @@
&& d->exclusive && d->exclusive->d
&& d->exclusive->d->exclusive == this )
d->exclusive->turnOffChild();
- d->exclusive = 0; // so the tqchildren won't try to access us.
+ d->exclusive = 0; // so the children won't try to access us.
if ( d->statesDict )
delete d->statesDict;
delete d;
@@ -1137,7 +1137,7 @@
updateController( update, store );
} else {
- // if there are no tqchildren we simply set the CheckBoxController and update its parent
+ // if there are no children we simply set the CheckBoxController and update its parent
setCurrentState( s );
stateChange( state() );
if ( parent() && parent()->rtti() == 1
@@ -1164,7 +1164,7 @@
}
stateChange( state() );
}
- tqrepaint();
+ repaint();
}
void KviTalCheckListItem::setCurrentState( ToggleState s )
@@ -1287,13 +1287,13 @@
case CheckBox:
setCurrentState( storedState( key ) );
stateChange( state() );
- tqrepaint();
+ repaint();
break;
case CheckBoxController: {
KviTalListViewItem *item = firstChild();
int childCount = 0;
while ( item ) {
- // recursively calling restoreState for tqchildren of type CheckBox and CheckBoxController
+ // recursively calling restoreState for children of type CheckBox and CheckBoxController
if ( item->rtti() == 1 &&
( ((KviTalCheckListItem*)item)->type() == CheckBox ||
((KviTalCheckListItem*)item)->type() == CheckBoxController ) ) {
@@ -1308,7 +1308,7 @@
else
updateController( FALSE );
} else {
- // if there are no tqchildren we retrieve the CheckBoxController state directly.
+ // if there are no children we retrieve the CheckBoxController state directly.
setState( storedState( key ), TRUE, FALSE );
}
}
@@ -1358,7 +1358,7 @@
if ( update && controller ) {
controller->updateController( update, store );
}
- tqrepaint();
+ repaint();
}
}
@@ -1378,7 +1378,7 @@
}
item = item->nextSibling();
}
- // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController tqchildren.
+ // this state is only needed if the CheckBoxController has no CheckBox / CheckBoxController children.
setStoredState( internalState() , key );
}
diff --git a/src/kvilib/tal/kvi_tal_listview_qt3.h b/src/kvilib/tal/kvi_tal_listview_qt3.h
index cf72e9ff..47d23fb5 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt3.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt3.h
@@ -143,7 +143,7 @@ public:
KviTalCheckListItem( KviTalListView *parent, const TQString &text,const TQPixmap & );
~KviTalCheckListItem();
- void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int tqalignment );
+ void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int alignment );
virtual void paintFocus( TQPainter *, const TQColorGroup & cg,
const TQRect & r );
int width( const TQFontMetrics&, const KviTalListView*, int column) const;
diff --git a/src/kvilib/tal/kvi_tal_listview_qt4.h b/src/kvilib/tal/kvi_tal_listview_qt4.h
index 83e46869..15acac62 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt4.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt4.h
@@ -152,7 +152,7 @@ public:
~KviTalCheckListItem();
void paintCell(TQPainter *, const TQColorGroup & cg,
- int column, int width, int tqalignment);
+ int column, int width, int alignment);
virtual void paintFocus(TQPainter *, const TQColorGroup &cg,
const TQRect & r);
int width(const TQFontMetrics&, const KviTalListView*, int column) const;
diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp
index a0aee30c..396aa650 100644
--- a/src/kvilib/tal/kvi_tal_wizard.cpp
+++ b/src/kvilib/tal/kvi_tal_wizard.cpp
@@ -413,7 +413,7 @@ void KviTalWizard::setCurrentPage(KviTalWizardPageData * pData)
szSteps = "<nobr><font color=\"";
szSteps += clrMid.name();
szSteps += "\"><b>[";
- szSteps += TQString("Step %1 of %2").tqarg(pData->iVisibleIndex).tqarg(m_p->iEnabledPageCount);
+ szSteps += TQString("Step %1 of %2").arg(pData->iVisibleIndex).arg(m_p->iEnabledPageCount);
szSteps += "]</b></font></nobr>";
}