summaryrefslogtreecommitdiffstats
path: root/kdevdesigner
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 23:43:22 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 23:43:22 +0000
commit39f1ae114d5b5122527fbfc321d8087c474e02de (patch)
treeebb27a998654c732a87577e0ce7dd6545fe56982 /kdevdesigner
parent2ea0370d7988cd1a77a00bdeb1ccd2f35ef2da77 (diff)
downloadtdevelop-39f1ae114d5b5122527fbfc321d8087c474e02de.tar.gz
tdevelop-39f1ae114d5b5122527fbfc321d8087c474e02de.zip
Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q*
This fixes the Kopete MSN protocol among other things git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdevdesigner')
-rw-r--r--kdevdesigner/designer/designerappiface.cpp6
-rw-r--r--kdevdesigner/designer/formfile.cpp2
-rw-r--r--kdevdesigner/designer/mainwindowactions.cpp2
-rw-r--r--kdevdesigner/designer/newformimpl.cpp2
-rw-r--r--kdevdesigner/designer/sourcefile.cpp2
-rw-r--r--kdevdesigner/designer/startdialogimpl.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index a5780339..cfafb4e9 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -304,9 +304,9 @@ void DesignerProjectImpl::setCustomSetting( const TQString &key, const TQString
TQString DesignerProjectImpl::customSetting( const TQString &key ) const
{
- if ( key == "TQTSCRIPT_PACKAGES" ) {
- TQString s = getenv( "TQTSCRIPT_PACKAGES" );
- TQString s2 = project->customSetting( "TQUICK_PACKAGES" );
+ if ( key == "QTSCRIPT_PACKAGES" ) {
+ TQString s = getenv( "QTSCRIPT_PACKAGES" );
+ TQString s2 = project->customSetting( "QUICK_PACKAGES" );
if ( !s.isEmpty() && !s2.isEmpty() )
#if defined(Q_OS_WIN32)
s += ";";
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index e485fbb9..93486243 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -254,7 +254,7 @@ bool FormFile::saveAs( bool ignoreModified )
}
bool saved = FALSE;
if ( ignoreModified ) {
- TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "TQTSCRIPT_PACKAGES" ) ).first();
+ TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first();
f = TQFileInfo( f ).fileName();
f.prepend( dir + "/" );
}
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index c4790ccc..e7ba30f3 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -1453,7 +1453,7 @@ void MainWindow::createNewTemplate()
}
TQStringList templRoots;
- const char *qtdir = getenv( "TQTDIR" );
+ const char *qtdir = getenv( "QTDIR" );
if(qtdir)
templRoots << qtdir;
templRoots << qInstallPathData();
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index dcc2c416..6026a9bd 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -282,7 +282,7 @@ void NewForm::insertTemplates( TQIconView *tView,
TQString templPath = templatePath;
TQStringList templRoots;
- const char *qtdir = getenv( "TQTDIR" );
+ const char *qtdir = getenv( "QTDIR" );
if(qtdir)
templRoots << qtdir;
templRoots << qInstallPathData();
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index b1858859..ad76e201 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -122,7 +122,7 @@ bool SourceFile::saveAs( bool ignoreModified )
TQString old = filename;
TQString initFn = pro->makeAbsolute( filename );
if ( ignoreModified ) {
- TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "TQTSCRIPT_PACKAGES" ) ).first();
+ TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first();
initFn = TQFileInfo( initFn ).fileName();
initFn.prepend( dir + "/" );
}
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index 72978260..9bf43f87 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -168,7 +168,7 @@ void StartDialog::initFileOpen()
TQStringList filterlist;
filterlist << i18n( "Designer Files (*.ui *.pro)" );
filterlist << i18n( "TQt User-Interface Files (*.ui)" );
- filterlist << i18n( "TQMAKE Project Files (*.pro)" );
+ filterlist << i18n( "QMAKE Project Files (*.pro)" );
TQStringList list = manager.featureList();
for ( TQStringList::Iterator it2 = list.begin(); it2 != list.end(); ++it2 )