summaryrefslogtreecommitdiffstats
path: root/kexi/core
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/core')
-rw-r--r--kexi/core/kexi.cpp10
-rw-r--r--kexi/core/kexiactionproxy.cpp6
-rw-r--r--kexi/core/kexiactionproxy.h2
-rw-r--r--kexi/core/kexidbshortcutfile.cpp6
-rw-r--r--kexi/core/kexidialogbase.cpp2
-rw-r--r--kexi/core/kexiinternalpart.cpp2
-rw-r--r--kexi/core/kexipart.cpp10
-rw-r--r--kexi/core/kexipartmanager.cpp4
-rw-r--r--kexi/core/kexiproject.cpp18
-rw-r--r--kexi/core/kexiprojectdata.cpp6
-rw-r--r--kexi/core/kexisharedactionhost.cpp2
-rw-r--r--kexi/core/kexiviewbase.cpp6
-rw-r--r--kexi/core/kexiviewbase.h2
13 files changed, 38 insertions, 38 deletions
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index d8be5249..e297ee52 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -330,14 +330,14 @@ void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text)
TQString msg;
if (feature_name.isEmpty())
msg = i18n("This function is not available for version %1 of %2 application.")
- .tqarg(KEXI_VERSION_STRING)
- .tqarg(KEXI_APP_NAME);
+ .arg(KEXI_VERSION_STRING)
+ .arg(KEXI_APP_NAME);
else {
TQString feature_name_(feature_name);
msg = i18n("\"%1\" function is not available for version %2 of %3 application.")
- .tqarg(feature_name_.replace("&",""))
- .tqarg(KEXI_VERSION_STRING)
- .tqarg(KEXI_APP_NAME);
+ .arg(feature_name_.replace("&",""))
+ .arg(KEXI_VERSION_STRING)
+ .arg(KEXI_APP_NAME);
}
TQString extra_text_(extra_text);
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 49cbeb3b..851a4d3a 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -193,7 +193,7 @@ bool KexiActionProxy::activateSharedAction(const char *action_name, bool alsoChe
{
TQPair<TQSignal*,bool> *p = m_signals[action_name];
if (!p || !p->second) {
- //try in tqchildren...
+ //try in children...
if (alsoCheckInChildren) {
TQPtrListIterator<KexiActionProxy> it( m_sharedActionChildren );
for( ; it.current(); ++it ) {
@@ -217,7 +217,7 @@ bool KexiActionProxy::isSupported(const char* action_name) const
{
TQPair<TQSignal*,bool> *p = m_signals[action_name];
if (!p) {
- //not supported explicitly - try in tqchildren...
+ //not supported explicitly - try in children...
if (m_focusedChild)
return m_focusedChild->isSupported(action_name);
TQPtrListIterator<KexiActionProxy> it( m_sharedActionChildren );
@@ -234,7 +234,7 @@ bool KexiActionProxy::isAvailable(const char* action_name, bool alsoCheckInChild
{
TQPair<TQSignal*,bool> *p = m_signals[action_name];
if (!p) {
- //not supported explicitly - try in tqchildren...
+ //not supported explicitly - try in children...
if (alsoCheckInChildren) {
if (m_focusedChild)
return m_focusedChild->isAvailable(action_name, alsoCheckInChildren);
diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h
index facb09b3..163efced 100644
--- a/kexi/core/kexiactionproxy.h
+++ b/kexi/core/kexiactionproxy.h
@@ -150,7 +150,7 @@ class KEXICORE_EXPORT KexiActionProxy
/*! Adds \a child of this proxy. Children will receive activateSharedAction() event,
If activateSharedAction() "event" is not consumed by the main proxy,
- we start to iterate over proxy tqchildren (in unspecified order) to and call
+ we start to iterate over proxy children (in unspecified order) to and call
activateSharedAction() on every child until one of them accept the "event".
If proxy child is destroyed, it is automatically detached from its parent proxy.
diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp
index 451eb66a..01f0adb3 100644
--- a/kexi/core/kexidbshortcutfile.cpp
+++ b/kexi/core/kexidbshortcutfile.cpp
@@ -97,7 +97,7 @@ bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _group
d->isDatabaseShortcut = false;
}
else {
- //ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").tqarg(group).tqarg(type)
+ //ERR: i18n("No valid "type" field specified for section \"%1\": unknown value \"%2\".").arg(group).arg(type)
return false;
}
@@ -194,9 +194,9 @@ bool KexiDBShortcutFile::saveProjectData(const KexiProjectData& data,
groupPrefix = "Database%1"; //do not i18n!
int number = 1;
- while (config.hasGroup(groupPrefix.tqarg(number))) //a new group key couldn't exist
+ while (config.hasGroup(groupPrefix.arg(number))) //a new group key couldn't exist
number++;
- groupKey = groupPrefix.tqarg(number);
+ groupKey = groupPrefix.arg(number);
}
if (_groupKey) //return this one (generated or found)
*_groupKey = groupKey;
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 14651f3f..67e81a5d 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -379,7 +379,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
<< prevViewMode << " restored." << endl;
const Kexi::ObjectStatus status(*this);
setStatus(mainWin()->project()->dbConnection(),
- i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(newViewMode)),"");
+ i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(newViewMode)),"");
append( status );
m_currentViewMode = prevViewMode;
return false;
diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index 669039cc..49b3c46d 100644
--- a/kexi/core/kexiinternalpart.cpp
+++ b/kexi/core/kexiinternalpart.cpp
@@ -54,7 +54,7 @@ class KexiInternalPartManager
fullname, 0, fullname);
if (!part) {
if (msgHdr)
- msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").tqarg(partName));
+ msgHdr->showErrorMessage(i18n("Could not load \"%1\" plugin.").arg(partName));
}
else
m_parts.insert(partName, part);
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index 6671e168..49f1aeab 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -66,7 +66,7 @@ public:
singleStatusString.prepend(TQString("\n\n")+i18n("Details:")+" ");
if (KMessageBox::No==KMessageBox::questionYesNo(0,
((viewMode == Kexi::DesignViewMode)
- ? i18n("Object \"%1\" could not be opened in Design View.").tqarg(item.name())
+ ? i18n("Object \"%1\" could not be opened in Design View.").arg(item.name())
: i18n("Object could not be opened in Data View."))+"\n"
+ i18n("Do you want to open it in Text View?") + singleStatusString, 0,
KStdGuiItem::open(), KStdGuiItem::cancel()))
@@ -246,7 +246,7 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
// KexiDialogBase *dlg = createInstance(win,item,viewMode);
// if (!dlg)
// return 0;
-// TQString capt = TQString("%1 : %2").tqarg(item.name()).tqarg(instanceName());
+// TQString capt = TQString("%1 : %2").arg(item.name()).arg(instanceName());
KexiDialogBase *dlg = new KexiDialogBase(win);
dlg->m_supportedViewModes = m_supportedViewModes;
// dlg->m_neverSaved = item.neverSaved();
@@ -293,7 +293,7 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
i18n("Could not load object's definition."), i18n("Object design may be corrupted."));
m_status.append(
Kexi::ObjectStatus(i18n("You can delete \"%1\" object and create it again.")
- .tqarg(item.name()), TQString()) );
+ .arg(item.name()), TQString()) );
dlg->close();
delete dlg;
@@ -367,7 +367,7 @@ bool Part::loadDataBlock( KexiDialogBase *dlg, TQString &dataString, const TQStr
{
if (!dlg->mainWin()->project()->dbConnection()->loadDataBlock( dlg->id(), dataString, dataID )) {
m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(),
- i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").tqarg(dataID) );
+ i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").arg(dataID) );
m_status.append( *dlg );
return false;
}
@@ -431,7 +431,7 @@ tristate Part::rename(KexiMainWindow *win, KexiPart::Item &item, const TQString&
GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, const char* nameSuffix)
: TQObject(part,
(part->info()->objectName()
- + (nameSuffix ? TQString(":%1").tqarg(nameSuffix) : TQString())).latin1() )
+ + (nameSuffix ? TQString(":%1").arg(nameSuffix) : TQString())).latin1() )
, KXMLGUIClient(win)
{
if(!win->project()->data()->userMode())
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index f6fcd7d8..d651f8d0 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -131,7 +131,7 @@ Manager::part(Info *i)
if(!p) {
kdDebug() << "Manager::part(): failed :( (ERROR #" << error << ")" << endl;
kdDebug() << " " << KLibLoader::self()->lastErrorMessage() << endl;
- i->setBroken(true, i18n("Error while loading plugin \"%1\"").tqarg(i->objectName()));
+ i->setBroken(true, i18n("Error while loading plugin \"%1\"").arg(i->objectName()));
setError(i->errorMessage());
return 0;
}
@@ -198,7 +198,7 @@ Manager::infoForMimeType(const TQString &mimeType)
Info *i = mimeType.isEmpty() ? 0 : m_partsByMime[mimeType.latin1()];
if (i)
return i;
- setError(i18n("No plugin for mime type \"%1\"").tqarg(mimeType));
+ setError(i18n("No plugin for mime type \"%1\"").arg(mimeType));
return 0;
}
diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp
index 5b26cb39..1dbe4eef 100644
--- a/kexi/core/kexiproject.cpp
+++ b/kexi/core/kexiproject.cpp
@@ -180,7 +180,7 @@ KexiProject::openInternal(bool *incompatibleWithKexi)
*incompatibleWithKexi = false;
kdDebug() << "KexiProject::open(): " << d->data->databaseName() <<" "<< d->data->connectionData()->driverName << endl;
KexiDB::MessageTitle et(this,
- i18n("Could not open project \"%1\".").tqarg(d->data->databaseName()));
+ i18n("Could not open project \"%1\".").arg(d->data->databaseName()));
if (!createConnection()) {
kdDebug() << "KexiProject::open(): !createConnection()" << endl;
@@ -225,7 +225,7 @@ tristate
KexiProject::create(bool forceOverwrite)
{
KexiDB::MessageTitle et(this,
- i18n("Could not create project \"%1\".").tqarg(d->data->databaseName()));
+ i18n("Could not create project \"%1\".").arg(d->data->databaseName()));
if (!createConnection())
return false;
@@ -529,9 +529,9 @@ KexiProject::initProject()
d->data->setDescription( str );
/* KexiDB::RowData data;
TQString sql = "select db_value from kexi__db where db_property='%1'";
- if (d->connection->querySingleRecord( sql.tqarg("project_caption"), data ) && !data[0].toString().isEmpty())
+ if (d->connection->querySingleRecord( sql.arg("project_caption"), data ) && !data[0].toString().isEmpty())
d->data->setCaption(data[0].toString());
- if (d->connection->querySingleRecord( sql.tqarg("project_desc"), data) && !data[0].toString().isEmpty())
+ if (d->connection->querySingleRecord( sql.arg("project_desc"), data) && !data[0].toString().isEmpty())
d->data->setDescription(data[0].toString());*/
return true;
@@ -736,7 +736,7 @@ KexiDialogBase* KexiProject::openObject(KexiMainWindow *wnd, KexiPart::Item& ite
KexiDialogBase *dlg = part->openInstance(wnd, item, viewMode, staticObjectArgs);
if (!dlg) {
if (part->lastOperationStatus().error())
- setError(i18n("Opening object \"%1\" failed.").tqarg(item.name())+"<br>"
+ setError(i18n("Opening object \"%1\" failed.").arg(item.name())+"<br>"
+part->lastOperationStatus().message,
part->lastOperationStatus().description);
return 0;
@@ -817,13 +817,13 @@ bool KexiProject::renameObject( KexiMainWindow *wnd, KexiPart::Item& item, const
}
if (this->itemForMimeType(item.mimeType(), newName)!=0) {
setError( i18n("Could not use this name. Object with name \"%1\" already exists.")
- .tqarg(newName) );
+ .arg(newName) );
return false;
}
}
KexiDB::MessageTitle et(this,
- i18n("Could not rename object \"%1\".").tqarg(item.name()) );
+ i18n("Could not rename object \"%1\".").arg(item.name()) );
if (!checkWritable())
return false;
KexiPart::Part *part = findPartFor(item);
@@ -960,7 +960,7 @@ KexiProject::createBlankProject(bool &cancelled, KexiProjectData* data,
if (KMessageBox::Yes != KMessageBox::warningYesNo(0, "<qt>"+i18n(
"The project %1 already exists.\n"
"Do you want to replace it with a new, blank one?")
- .tqarg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>",
+ .arg(prj->data()->infoString())+"\n"+warningNoUndo+"</qt>",
TQString(), KGuiItem(i18n("Replace")), KStdGuiItem::cancel() ))
//todo add serverInfoString() for server-based prj
{
@@ -985,7 +985,7 @@ tristate KexiProject::dropProject(KexiProjectData* data,
KexiDB::MessageHandler* handler, bool dontAsk)
{
if (!dontAsk && KMessageBox::Yes != KMessageBox::warningYesNo(0,
- i18n("Do you want to drop the project \"%1\"?").tqarg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo ))
+ i18n("Do you want to drop the project \"%1\"?").arg(data->KexiDB::SchemaData::objectName())+"\n"+warningNoUndo ))
return cancelled;
KexiProject prj( new KexiProjectData(*data), handler );
diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp
index 9f0106bc..9b9203c8 100644
--- a/kexi/core/kexiprojectdata.cpp
+++ b/kexi/core/kexiprojectdata.cpp
@@ -155,13 +155,13 @@ TQString KexiProjectData::infoString(bool nobr) const
{
if (constConnectionData()->fileName().isEmpty()) {
//server-based
- return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").tqarg(databaseName()) + (nobr ? "</nobr>" : "")
+ return TQString(nobr ? "<nobr>" : "") + TQString("\"%1\"").arg(databaseName()) + (nobr ? "</nobr>" : "")
+ (nobr ? " <nobr>" : " ") + i18n("database connection", "(connection %1)")
- .tqarg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : "");
+ .arg(constConnectionData()->serverInfoString()) + (nobr ? "</nobr>" : "");
}
//file-based
return TQString(nobr ? "<nobr>" : "")
- + TQString("\"%1\"").tqarg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : "");
+ + TQString("\"%1\"").arg(constConnectionData()->fileName()) + (nobr ? "</nobr>" : "");
}
void KexiProjectData::setReadOnly(bool set)
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index 04197412..1ba85265 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -149,7 +149,7 @@ void KexiSharedActionHost::invalidateSharedActions(TQObject *o)
KAction *a = *it;
if (!insideDialogBase && d->mainWin->actionCollection()!=a->parentCollection()) {
//o is not KexiDialogBase or its child:
- // only tqinvalidate action if it comes from mainwindow's KActionCollection
+ // only invalidate action if it comes from mainwindow's KActionCollection
// (thus part-actions are untouched when the focus is e.g. in the Property Editor)
continue;
}
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index 45df1b0d..65f2e68f 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -263,7 +263,7 @@ void KexiViewBase::setViewWidget(TQWidget* w, bool focusProxy)
void KexiViewBase::addChildView( KexiViewBase* childView )
{
- m_tqchildren.append( childView );
+ m_children.append( childView );
addActionProxyChild( childView );
childView->m_parentView = this;
// if (m_parentView)
@@ -318,8 +318,8 @@ void KexiViewBase::setAvailable(const char* action_name, bool set)
void KexiViewBase::updateActions(bool activated)
{
//do nothing here
- //do the same for tqchildren :)
- for (TQPtrListIterator<KexiViewBase> it(m_tqchildren); it.current(); ++it) {
+ //do the same for children :)
+ for (TQPtrListIterator<KexiViewBase> it(m_children); it.current(); ++it) {
it.current()->updateActions(activated);
}
}
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 1b2b6f38..564f5a20 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -270,7 +270,7 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
Can be useful when single class is used for more than one view (e.g. KexiDBForm). */
int m_viewMode;
- TQPtrList<KexiViewBase> m_tqchildren;
+ TQPtrList<KexiViewBase> m_children;
bool m_dirty : 1;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 02:35:11 +0000