summaryrefslogtreecommitdiffstats
path: root/languages/cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 16:03:57 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 16:03:57 +0900
commit430aedbbce33fd98ce26df658842f94f333cc8ef (patch)
tree6a8894ba14f996bb1e74648d9be377603c5dfb46 /languages/cpp
parent255de04fbbb4597e46fb25017879a6afeaf4cebd (diff)
downloadtdevelop-430aedbbce33fd98ce26df658842f94f333cc8ef.tar.gz
tdevelop-430aedbbce33fd98ce26df658842f94f333cc8ef.zip
qt -> tqt conversion:
QTDIR -> TQTDIR QTDOC -> TQTDOC INCDIR_QT -> INCDIR_TQT LIBDIR_QT -> LIBDIR_TQT QT_INC -> TQT_INC QT_LIB -> TQT_LIB Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'languages/cpp')
-rw-r--r--languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src4
-rw-r--r--languages/cpp/app_templates/kscons_kxt/INSTALL2
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/INSTALL2
-rw-r--r--languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop2
-rw-r--r--languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate4
-rw-r--r--languages/cpp/app_templates/qmakesimple/app.kdevelop2
-rw-r--r--languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate4
-rw-r--r--languages/cpp/app_templates/qtopia4app/app.kdevelop4
-rw-r--r--languages/cpp/kdevdriver.cpp2
-rw-r--r--languages/cpp/main.cpp2
-rw-r--r--languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp2
-rw-r--r--languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp2
-rw-r--r--languages/cpp/qtbuildconfig.cpp4
13 files changed, 18 insertions, 18 deletions
diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src
index c4ce3e70..6122c34f 100644
--- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src
+++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src
@@ -5,7 +5,7 @@
ADD_DEFINITIONS(${QT_DEFINITIONS} -Wall -O2 -g)
# add the Qt include dir to the include path
-INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${TQT_INCLUDE_DIR})
# list all source files in a variable
SET(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp)
@@ -18,7 +18,7 @@ QT_WRAP_CPP (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h)
ADD_EXECUTABLE(%{APPNAMELC} ${%{APPNAMELC}_SRCS})
# link the application to the Qt libs
-TARGET_LINK_LIBRARIES(%{APPNAMELC} ${QT_LIBRARIES} )
+TARGET_LINK_LIBRARIES(%{APPNAMELC} ${TQT_LIBRARIES} )
# create an install rule for the executable
INSTALL(TARGETS %{APPNAMELC} DESTINATION bin )
diff --git a/languages/cpp/app_templates/kscons_kxt/INSTALL b/languages/cpp/app_templates/kscons_kxt/INSTALL
index e61a3acc..49c761f1 100644
--- a/languages/cpp/app_templates/kscons_kxt/INSTALL
+++ b/languages/cpp/app_templates/kscons_kxt/INSTALL
@@ -48,7 +48,7 @@ The installation scripts are relying on the tde-config program.
The programs tde-config, qmake, uic and moc must be accesssible
through your PATH.
-Qt and kde may not be installed as expected (in QTDIR and TDEDIR)
+Qt and kde may not be installed as expected (in TQTDIR and TDEDIR)
So until tde-config is able to give that information, you may
have to give those paths. You may also want to tune the build.
diff --git a/languages/cpp/app_templates/kscons_tdemdi/INSTALL b/languages/cpp/app_templates/kscons_tdemdi/INSTALL
index e61a3acc..49c761f1 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/INSTALL
+++ b/languages/cpp/app_templates/kscons_tdemdi/INSTALL
@@ -48,7 +48,7 @@ The installation scripts are relying on the tde-config program.
The programs tde-config, qmake, uic and moc must be accesssible
through your PATH.
-Qt and kde may not be installed as expected (in QTDIR and TDEDIR)
+Qt and kde may not be installed as expected (in TQTDIR and TDEDIR)
So until tde-config is able to give that information, you may
have to give those paths. You may also want to tune the build.
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
index 2fa79421..93c6aafc 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop
@@ -28,7 +28,7 @@
<version>3</version>
<includestyle>3</includestyle>
<designerintegration>EmbeddedKDevDesigner</designerintegration>
- <root>%{QTDIR}</root>
+ <root>%{TQTDIR}</root>
<qmake>%{QMAKE}</qmake>
</qt>
</kdevcppsupport>
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
index 8ac87635..62467596 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
@@ -126,10 +126,10 @@ Comment[sr@Latn]=Program na osnovi Qt3/Qmake napravljen je u %{dest}
Comment[sv]=Ett Qmake/Qt3-baserat program skapades i %{dest}
Comment[zh_TW]=一個 QMake/Qt3 為基礎的應用程式已建立於 %{dest}
-[QTDIR]
+[TQTDIR]
Type=value
ValueType=QString
-Value=QTDIR
+Value=TQTDIR
Comment=Directory where Qt3 is installed.
Comment[ca]=Directori a on està instal·lat Qt3.
Comment[da]=Katalog hvor Qt3 er installeret.
diff --git a/languages/cpp/app_templates/qmakesimple/app.kdevelop b/languages/cpp/app_templates/qmakesimple/app.kdevelop
index 31180af7..38b35bfa 100644
--- a/languages/cpp/app_templates/qmakesimple/app.kdevelop
+++ b/languages/cpp/app_templates/qmakesimple/app.kdevelop
@@ -24,7 +24,7 @@
<used>true</used>
<includestyle>3</includestyle>
<designerintegration>EmbeddedKDevDesigner</designerintegration>
- <root>%{QTDIR}</root>
+ <root>%{TQTDIR}</root>
<qmake>%{QMAKE}</qmake>
</qt>
</kdevcppsupport>
diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
index d9d03936..41b855bd 100644
--- a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
+++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
@@ -102,10 +102,10 @@ Comment[sv]=Ett Qmake/Qt3-baserat Hello world-program skapades i %{dest}
Comment[zh_TW]=一個 Qmake/Qt3 為基礎的 hello world 程式已建立於 %{dest}
-[QTDIR]
+[TQTDIR]
Type=value
ValueType=QString
-Value=QTDIR
+Value=TQTDIR
Comment=Directory where Qt3 is installed.
Comment[ca]=Directori a on està instal·lat Qt3.
Comment[da]=Katalog hvor Qt3 er installeret.
diff --git a/languages/cpp/app_templates/qtopia4app/app.kdevelop b/languages/cpp/app_templates/qtopia4app/app.kdevelop
index e6dd32b1..f7e4a952 100644
--- a/languages/cpp/app_templates/qtopia4app/app.kdevelop
+++ b/languages/cpp/app_templates/qtopia4app/app.kdevelop
@@ -85,7 +85,7 @@
<programargs>-qws</programargs>
<envvars>
<envvar value="/opt/Qtopia/SDK/4.2.4/x86" name="QPEDIR" />
- <envvar value="$QPEDIR/qtopiacore/target" name="QTDIR" />
+ <envvar value="$QPEDIR/qtopiacore/target" name="TQTDIR" />
<envvar value="/opt/Qtopia/SDK/4.2.4/x86/lib:/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target/lib:$LD_LIBRARY_PATH" name="LD_LIBRARY_PATH" />
<envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" />
@@ -101,7 +101,7 @@
<prio>0</prio>
<envvars>
<envvar value="/opt/Qtopia/SDK/4.2.4/x86" name="QPEDIR" />
- <envvar value="/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target" name="QTDIR" />
+ <envvar value="/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target" name="TQTDIR" />
<envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" />
</envvars>
</make>
diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp
index 4a6c45ec..5dbc5c64 100644
--- a/languages/cpp/kdevdriver.cpp
+++ b/languages/cpp/kdevdriver.cpp
@@ -109,7 +109,7 @@ void KDevDriver::setup()
if ( qmakespec.isNull() )
qmakespec = "linux-g++";
- TQString qtdir = getenv( "QTDIR" );
+ TQString qtdir = getenv( "TQTDIR" );
if( !qtdir.isNull() ) {
addIncludePath( qtdir + "/include" );
diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp
index 845cc382..6352e211 100644
--- a/languages/cpp/main.cpp
+++ b/languages/cpp/main.cpp
@@ -86,7 +86,7 @@ public:
if ( !tdedir.isNull() )
addIncludePath( tdedir + "/include" );
- TQString qtdir = getenv( "QTDIR" );
+ TQString qtdir = getenv( "TQTDIR" );
if ( !qtdir.isNull() )
addIncludePath( qtdir + "/include" );
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
index bede0b3e..8cb9a1d8 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
@@ -40,7 +40,7 @@ SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl)
: SettingsDialogBase(parent,name,fl)
{
TQStringList qtdirs;
- qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") );
+ qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") );
qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" );
qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" );
qtdirs.push_back( "/usr/qt/4/include" );
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index 405b7c93..39c2faa3 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -40,7 +40,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl )
: SettingsDialogBase( parent, name, fl )
{
TQStringList qtdirs;
- qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") );
+ qtdirs.push_back( ::getenv( "TQTDIR" ) + TQString("/include") );
qtdirs.push_back( "/usr/lib/qt3/include" );
qtdirs.push_back( "/usr/lib/qt/include" );
qtdirs.push_back( "/usr/share/qt3/include" );
diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp
index c5c87b1c..e846b99c 100644
--- a/languages/cpp/qtbuildconfig.cpp
+++ b/languages/cpp/qtbuildconfig.cpp
@@ -97,7 +97,7 @@ void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const
{
if( !m_root.isEmpty() )
dirs << (m_root + TQString( TQChar( TQDir::separator() ) ) + "bin");
- dirs << (::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin");
+ dirs << (::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin");
}
TQStringList paths = TQStringList::split(":",::getenv("PATH"));
dirs += paths;
@@ -140,7 +140,7 @@ void QtBuildConfig::findTQtDir()
{
TQStringList qtdirs;
if( m_version == 3 )
- qtdirs.push_back( ::getenv("QTDIR") );
+ qtdirs.push_back( ::getenv("TQTDIR") );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( m_version ) );
qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) );