summaryrefslogtreecommitdiffstats
path: root/parts/appwizard
diff options
context:
space:
mode:
Diffstat (limited to 'parts/appwizard')
-rw-r--r--parts/appwizard/appwizarddlg.cpp10
-rw-r--r--parts/appwizard/appwizarddlg.h2
-rw-r--r--parts/appwizard/appwizarddlgbase.ui4
-rw-r--r--parts/appwizard/appwizardpart.cpp8
-rw-r--r--parts/appwizard/appwizardpart.h2
m---------parts/appwizard/common/admin0
-rw-r--r--parts/appwizard/common/scons/admin/generic.py48
-rw-r--r--parts/appwizard/common/scons/admin/kde.py130
-rw-r--r--parts/appwizard/filepropspage.h2
-rw-r--r--parts/appwizard/filepropspagebase.ui4
-rw-r--r--parts/appwizard/importdlg.cpp20
-rw-r--r--parts/appwizard/importdlg.h2
-rw-r--r--parts/appwizard/importdlgbase.ui4
-rw-r--r--parts/appwizard/imports/CMakeLists.txt4
-rw-r--r--parts/appwizard/imports/Makefile.am4
-rw-r--r--parts/appwizard/imports/qt4qmake3
-rw-r--r--parts/appwizard/imports/qt4qmake.kdevelop80
17 files changed, 122 insertions, 205 deletions
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 86373504..76e33693 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -98,17 +98,17 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
m_customOptions = 0L;
loadLicenses();
- connect( this, TQT_SIGNAL( selected( const TQString & ) ), this, TQT_SLOT( pageChanged() ) );
+ connect( this, TQ_SIGNAL( selected( const TQString & ) ), this, TQ_SLOT( pageChanged() ) );
helpButton()->hide();
templates_listview->header()->hide();
templates_listview->setColumnWidthMode(0, TQListView::Maximum); //to provide horiz scrollbar.
m_templatesMenu = new TDEPopupMenu(templates_listview);
- m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQT_SLOT(addTemplateToFavourites()));
+ m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQ_SLOT(addTemplateToFavourites()));
m_favouritesMenu = new TDEPopupMenu(favourites_iconview);
- m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQT_SLOT(removeFavourite()));
+ m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQ_SLOT(removeFavourite()));
m_pathIsValid=false;
m_part = part;
@@ -304,7 +304,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
// How about names like "__" or "123" for project name? Are they legal?
TQRegExpValidator *appname_edit_validator;
appname_edit_validator = new TQRegExpValidator (appname_regexp,
- TQT_TQOBJECT(appname_edit),
+ appname_edit,
"AppNameValidator");
appname_edit->setValidator(appname_edit_validator);
@@ -319,7 +319,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
license_combo->setCurrentItem( idx - 1 );
}
- connect( license_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(licenseChanged()) );
+ connect( license_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(licenseChanged()) );
m_custom_options_layout = new TQHBoxLayout( custom_options );
m_custom_options_layout->setAutoAdd(true);
diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h
index bae75531..06fc723c 100644
--- a/parts/appwizard/appwizarddlg.h
+++ b/parts/appwizard/appwizarddlg.h
@@ -120,7 +120,7 @@ struct AppWizardFileTemplate
class AppWizardDialog : public AppWizardDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index f9c22c2f..af51e997 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -634,7 +634,7 @@
<forward>class TQListViewItem;</forward>
<forward>class TQIconViewItem;</forward>
</forwards>
-<Q_SLOTS>
+<slots>
<slot access="protected">licenseChanged()</slot>
<slot access="protected">destButtonClicked( const TQString &amp; )</slot>
<slot access="protected">projectLocationChanged()</slot>
@@ -645,7 +645,7 @@
<slot access="protected">templatesContextMenu( TQListViewItem *, const TQPoint &amp;, int )</slot>
<slot access="protected">favouritesContextMenu( TQIconViewItem *, const TQPoint &amp; )</slot>
<slot>showTemplates(bool)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index e1a9dbad..dfdfc14a 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -43,7 +43,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL
TDEAction *action;
action = new TDEAction( i18n("&New Project..."), "window-new", 0,
- this, TQT_SLOT(slotNewProject()),
+ this, TQ_SLOT(slotNewProject()),
actionCollection(), "project_new" );
action->setToolTip( i18n("Generate a new project from a template") );
action->setWhatsThis( i18n("<b>New project</b><p>"
@@ -52,7 +52,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL
"application from a set of templates.") );
action = new TDEAction( i18n("&Import Existing Project..."),"wizard", 0,
- this, TQT_SLOT(slotImportProject()),
+ this, TQ_SLOT(slotImportProject()),
actionCollection(), "project_import" );
action->setToolTip( i18n("Import existing project") );
action->setWhatsThis( i18n("<b>Import existing project</b><p>Creates a project file for a given directory.") );
@@ -82,7 +82,7 @@ void AppWizardPart::slotImportProject()
void AppWizardPart::openFilesAfterGeneration(const KURL::List urlsToOpen)
{
m_urlsToOpen = urlsToOpen;
- connect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) );
+ connect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( openFilesAfterGeneration() ) );
}
void AppWizardPart::openFilesAfterGeneration()
@@ -90,7 +90,7 @@ void AppWizardPart::openFilesAfterGeneration()
for (KURL::List::const_iterator it = m_urlsToOpen.begin(); it != m_urlsToOpen.end(); ++it)
partController()->editDocument(*it);
m_urlsToOpen.clear();
- disconnect( core(), TQT_SIGNAL( projectOpened() ), this, TQT_SLOT( openFilesAfterGeneration() ) );
+ disconnect( core(), TQ_SIGNAL( projectOpened() ), this, TQ_SLOT( openFilesAfterGeneration() ) );
}
#include "appwizardpart.moc"
diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h
index 59280631..a68a2cab 100644
--- a/parts/appwizard/appwizardpart.h
+++ b/parts/appwizard/appwizardpart.h
@@ -23,7 +23,7 @@ class AppWizardDialog;
class AppWizardPart : public KDevPlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin
-Subproject 8c7e0d40de084fe5d54e173918756639e0d4d63
+Subproject 34c35e11fbc7237f94ec8ede61ef0c8c9b6c58b
diff --git a/parts/appwizard/common/scons/admin/generic.py b/parts/appwizard/common/scons/admin/generic.py
index 55c37c90..52c4e3bc 100644
--- a/parts/appwizard/common/scons/admin/generic.py
+++ b/parts/appwizard/common/scons/admin/generic.py
@@ -31,18 +31,18 @@ def generate(env):
env['HELP']=1
if env['HELP']:
- print """
+ print("""
"""+BOLD+"""*** Generic options ***
-----------------------"""+NORMAL+"""
"""+BOLD+"""* debug """+NORMAL+""": debug=1 (-g) or debug=full (-g3, slower) else use environment CXXFLAGS, or -O2 by default
"""+BOLD+"""* prefix """+NORMAL+""": the installation path
"""+BOLD+"""* extraincludes """+NORMAL+""": a list of paths separated by ':'
ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/include:/usr/local
-"""+NORMAL
+"""+NORMAL)
## Global cache directory
## Put all project files in it so a rm -rf cache will clean up the config
- if not env.has_key('CACHEDIR'):
+ if 'CACHEDIR' not in env:
env['CACHEDIR'] = os.getcwd()+'/cache/'
if not os.path.isdir(env['CACHEDIR']):
os.mkdir(env['CACHEDIR'])
@@ -56,9 +56,9 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/
# Special trick for installing rpms ...
env['DESTDIR']=''
- if 'install' in sys.argv and os.environ.has_key('DESTDIR'):
+ if 'install' in sys.argv and 'DESTDIR' in os.environ:
env['DESTDIR']=os.environ['DESTDIR']+'/'
- print CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR']
+ print(CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR'])
# load the options
from SCons.Options import Options, PathOption
@@ -89,7 +89,7 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/
env['_CONFIGURE']=0
# configure the environment if needed
- if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('ISCONFIGURED')):
+ if not env['HELP'] and (env['_CONFIGURE'] or 'ISCONFIGURED' not in env):
import re
def makeHashTable(args):
@@ -108,40 +108,40 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/
env['ARGS']=makeHashTable(sys.argv)
# be paranoid, unset existing variables
- if env.has_key('KDECXXFLAGS'):
+ if 'KDECXXFLAGS' in env:
env.__delitem__('KDECXXFLAGS')
- if env.has_key('KDECCFLAGS'):
+ if 'KDECCFLAGS' in env:
env.__delitem__('KDECCFLAGS')
- if env.has_key('KDELINKFLAGS'):
+ if 'KDELINKFLAGS' in env:
env.__delitem__('KDELINKFLAGS')
- if env.has_key('PREFIX'):
+ if 'PREFIX' in env:
env.__delitem__('PREFIX')
- if env.has_key('EXTRAINCLUDES'):
+ if 'EXTRAINCLUDES' in env:
env.__delitem__('EXTRAINCLUDES')
- if env.has_key('ISCONFIGURED'):
+ if 'ISCONFIGURED' in env:
env.__delitem__('ISCONFIGURED')
if env['ARGS'].get('debug', None):
debuglevel = env['ARGS'].get('debug', None)
- print CYAN+'** Enabling debug for the project **' + NORMAL
+ print(CYAN+'** Enabling debug for the project **' + NORMAL)
if (debuglevel == "full"):
env['KDECXXFLAGS'] = ['-DDEBUG', '-g3']
else:
env['KDECXXFLAGS'] = ['-DDEBUG', '-g']
else:
- if os.environ.has_key('CXXFLAGS'):
+ if 'CXXFLAGS' in os.environ:
# user-defined flags (gentooers will be elighted)
env['KDECXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] )
env.Append( KDECXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] )
else:
env.Append(KDECXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG'])
- if os.environ.has_key('CFLAGS'):
+ if 'CFLAGS' in os.environ:
env['KDECCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] )
## FreeBSD settings (contributed by will at freebsd dot org)
if os.uname()[0] == "FreeBSD":
- if os.environ.has_key('PTHREAD_LIBS'):
+ if 'PTHREAD_LIBS' in os.environ:
env.AppendUnique( KDELINKFLAGS = SCons.Util.CLVar( os.environ['PTHREAD_LIBS'] ) )
else:
syspf = os.popen('/sbin/sysctl kern.osreldate')
@@ -159,15 +159,15 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/
# User-specified prefix
if env['ARGS'].get('prefix', None):
env['PREFIX'] = env['ARGS'].get('prefix', None)
- print CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL
- elif env.has_key('PREFIX'):
+ print(CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL)
+ elif 'PREFIX' in env:
env.__delitem__('PREFIX')
# User-specified include paths
env['EXTRAINCLUDES'] = env['ARGS'].get('extraincludes', None)
if env['ARGS'].get('extraincludes', None):
- print CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL
- elif env.has_key('EXTRAINCLUDES'):
+ print(CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL)
+ elif 'EXTRAINCLUDES' in env:
env.__delitem__('EXTRAINCLUDES')
env['ISCONFIGURED']=1
@@ -175,16 +175,16 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/
# And finally save the options in the cache
opts.Save(cachefile, env)
- if env.has_key('KDECXXFLAGS'):
+ if 'KDECXXFLAGS' in env:
env.AppendUnique( CPPFLAGS = env['KDECXXFLAGS'] )
- if env.has_key('KDECCFLAGS'):
+ if 'KDECCFLAGS' in env:
env.AppendUnique( CCFLAGS = env['KDECCFLAGS'] )
- if env.has_key('KDELINKFLAGS'):
+ if 'KDELINKFLAGS' in env:
env.AppendUnique( LINKFLAGS = env['KDELINKFLAGS'] )
- if env.has_key('EXTRAINCLUDES'):
+ if 'EXTRAINCLUDES' in env:
incpaths = []
for dir in str(env['EXTRAINCLUDES']).split(':'):
incpaths.append( dir )
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 84b2c812..3d54ce93 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -43,109 +43,109 @@ def detect_kde(env):
libdir = libdir+libsuffix
## Detect the kde libraries
- print "Checking for tde-config : ",
+ print("Checking for tde-config : ", end=' ')
kde_config = os.popen("which tde-config 2>/dev/null").read().strip()
if len(kde_config):
- print GREEN+"tde-config was found"+NORMAL
+ print(GREEN+"tde-config was found"+NORMAL)
else:
- print RED+"tde-config was NOT found in your PATH"+NORMAL
- print "Make sure kde is installed properly"
- print "(missing package tdebase-devel?)"
+ print(RED+"tde-config was NOT found in your PATH"+NORMAL)
+ print("Make sure kde is installed properly")
+ print("(missing package tdebase-devel?)")
env.Exit(1)
env['TDEDIR'] = os.popen('tde-config -prefix').read().strip()
- print "Checking for kde version : ",
+ print("Checking for kde version : ", end=' ')
kde_version = os.popen("tde-config --version|grep KDE").read().strip().split()[1]
if int(kde_version[0]) != 3 or int(kde_version[2]) < 2:
- print RED+kde_version
- print RED+"Your kde version can be too old"+NORMAL
- print RED+"Please make sure kde is at least 3.2"+NORMAL
+ print(RED+kde_version)
+ print(RED+"Your kde version can be too old"+NORMAL)
+ print(RED+"Please make sure kde is at least 3.2"+NORMAL)
else:
- print GREEN+kde_version+NORMAL
+ print(GREEN+kde_version+NORMAL)
## Detect the qt library
- print "Checking for the qt library : ",
+ print("Checking for the qt library : ", end=' ')
qtdir = os.getenv("TQTDIR")
if qtdir:
- print GREEN+"qt is in "+qtdir+NORMAL
+ print(GREEN+"qt is in "+qtdir+NORMAL)
else:
libdir = os.popen('tde-config --expandvars --install lib').read().strip()
libtdeuiSO = libdir+'/'+getSOfromLA(libdir+'/libtdeui.la')
m = re.search('(.*)/lib/libtqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libtqt').read().strip().split()[2])
if m:
qtdir = m.group(1)
- print YELLOW+"qt was found as "+m.group(1)+NORMAL
+ print(YELLOW+"qt was found as "+m.group(1)+NORMAL)
else:
- print RED+"qt was not found"+NORMAL
- print RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL
+ print(RED+"qt was not found"+NORMAL)
+ print(RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL)
env.Exit(1)
env['TQTDIR'] = qtdir.strip()
## Find the necessary programs uic and moc
- print "Checking for uic : ",
+ print("Checking for uic : ", end=' ')
uic = qtdir + "/bin/uic"
if os.path.isfile(uic):
- print GREEN+"uic was found as "+uic+NORMAL
+ print(GREEN+"uic was found as "+uic+NORMAL)
else:
uic = os.popen("which uic 2>/dev/null").read().strip()
if len(uic):
- print YELLOW+"uic was found as "+uic+NORMAL
+ print(YELLOW+"uic was found as "+uic+NORMAL)
else:
uic = os.popen("which uic 2>/dev/null").read().strip()
if len(uic):
- print YELLOW+"uic was found as "+uic+NORMAL
+ print(YELLOW+"uic was found as "+uic+NORMAL)
else:
- print RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL
+ print(RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL)
env.Exit(1)
env['QT_UIC'] = uic
- print "Checking for moc : ",
+ print("Checking for moc : ", end=' ')
moc = qtdir + "/bin/moc"
if os.path.isfile(moc):
- print GREEN + "moc was found as " + moc + NORMAL
+ print(GREEN + "moc was found as " + moc + NORMAL)
else:
moc = os.popen("which moc 2>/dev/null").read().strip()
if len(moc):
- print YELLOW + "moc was found as " + moc + NORMAL
+ print(YELLOW + "moc was found as " + moc + NORMAL)
elif os.path.isfile("/usr/share/qt3/bin/moc"):
moc = "/usr/share/qt3/bin/moc"
- print YELLOW + "moc was found as " + moc + NORMAL
+ print(YELLOW + "moc was found as " + moc + NORMAL)
else:
- print RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL
+ print(RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL)
env.Exit(1)
env['QT_MOC'] = moc
## check for the qt and kde includes
- print "Checking for the qt includes : ",
+ print("Checking for the qt includes : ", end=' ')
if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"):
# The user told where to look for and it looks valid
- print GREEN + "ok " + qtincludes + NORMAL
+ print(GREEN + "ok " + qtincludes + NORMAL)
else:
if os.path.isfile(qtdir + "/include/qtqlayout.h"):
# Automatic detection
- print GREEN + "ok " + qtdir + "/include/ " + NORMAL
+ print(GREEN + "ok " + qtdir + "/include/ " + NORMAL)
qtincludes = qtdir + "/include/"
elif os.path.isfile("/usr/include/qt3/qtqlayout.h"):
# Debian probably
- print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL
+ print(YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL)
qtincludes = "/usr/include/qt3"
else:
- print RED + "the qt headers were not found" + NORMAL
+ print(RED + "the qt headers were not found" + NORMAL)
env.Exit(1)
- print "Checking for the kde includes : ",
+ print("Checking for the kde includes : ", end=' ')
kdeprefix = os.popen("tde-config --prefix").read().strip()
if not kdeincludes:
kdeincludes = kdeprefix+"/include/"
if os.path.isfile(kdeincludes + "/klineedit.h"):
- print GREEN + "ok " + kdeincludes + NORMAL
+ print(GREEN + "ok " + kdeincludes + NORMAL)
else:
if os.path.isfile(kdeprefix+"/include/tde/klineedit.h"):
# Debian, Fedora probably
- print YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL
+ print(YELLOW + "the kde headers were found in " + kdeprefix + "/include/tde/" + NORMAL)
kdeincludes = kdeprefix + "/include/tde/"
else:
- print RED + "The kde includes were NOT found" + NORMAL
+ print(RED + "The kde includes were NOT found" + NORMAL)
env.Exit(1)
if prefix:
@@ -206,7 +206,7 @@ def detect_kde(env):
def generate(env):
""""Set up the qt and kde environment and builders - the moc part is difficult to understand """
if env['HELP']:
- print """
+ print("""
"""+BOLD+"""*** KDE options ***
-------------------"""+NORMAL+"""
"""+BOLD+"""* prefix """+NORMAL+""": base install path, ie: /usr/local
@@ -219,7 +219,7 @@ def generate(env):
"""+BOLD+"""* tdelibs """+NORMAL+""": path to the kde libs, for linking the programs
"""+BOLD+"""* tqtlibs """+NORMAL+""": same punishment, for qt libraries
ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
-"""+NORMAL
+"""+NORMAL)
import SCons.Defaults
import SCons.Tool
@@ -264,8 +264,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
objBuilder = getattr(env, self.objBuilderName)
# some regular expressions:
- # Q_OBJECT detection
- q_object_search = re.compile(r'[^A-Za-z0-9]Q_OBJECT[^A-Za-z0-9]')
+ # TQ_OBJECT detection
+ q_object_search = re.compile(r'[^A-Za-z0-9]TQ_OBJECT[^A-Za-z0-9]')
# The following is kind of hacky to get builders working properly (FIXME) ??
objBuilderEnv = objBuilder.env
@@ -280,12 +280,12 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
if not obj.has_builder():
# binary obj file provided
if qtdebug:
- print "scons: qt: '%s' seems to be a binary. Discarded." % str(obj)
+ print("scons: qt: '%s' seems to be a binary. Discarded." % str(obj))
continue
cpp = obj.sources[0]
if not splitext(str(cpp))[1] in source_extensions:
if qtdebug:
- print "scons: qt: '%s' is no cxx file. Discarded." % str(cpp)
+ print("scons: qt: '%s' is no cxx file. Discarded." % str(cpp))
# c or fortran source
continue
#cpp_contents = comment.sub('', cpp.get_contents())
@@ -300,7 +300,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
ui = find_file(uiname, (cpp.get_dir(),), FS.File)
if ui:
if qtdebug:
- print "scons: qt: found .ui file of header" #% (str(h), str(cpp))
+ print("scons: qt: found .ui file of header") #% (str(h), str(cpp))
#h_contents = comment.sub('', h.get_contents())
break
@@ -315,18 +315,18 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
h = find_file(hname, (cpp.get_dir(),), FS.File)
if h:
if qtdebug:
- print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))
+ print("scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp)))
#h_contents = comment.sub('', h.get_contents())
h_contents = h.get_contents()
break
if not h and qtdebug:
- print "scons: qt: no header for '%s'." % (str(cpp))
+ print("scons: qt: no header for '%s'." % (str(cpp)))
if h and q_object_search.search(h_contents):
- # h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file
+ # h file with the TQ_OBJECT macro found -> add .moc or _moc.cpp file
moc_cpp = None
- if env.has_key('NOMOCSCAN'):
+ if 'NOMOCSCAN' in env:
moc_cpp = env.Moc(h)
else:
reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)'
@@ -338,12 +338,12 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
moc_o = objBuilder(moc_cpp)
out_sources.append(moc_o)
if qtdebug:
- print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0]))
+ print("scons: qt: found TQ_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0])))
if cpp and q_object_search.search(cpp_contents):
- print "error, bksys cannot handle cpp files with Q_OBJECT classes"
- print "if you are sure this is a feature worth the effort, "
- print "report this to the authors tnagyemail-mail yahoo.fr"
+ print("error, bksys cannot handle cpp files with TQ_OBJECT classes")
+ print("if you are sure this is a feature worth the effort, ")
+ print("report this to the authors tnagyemail-mail yahoo.fr")
# restore the original env attributes (FIXME)
objBuilder.env = objBuilderEnv
@@ -392,7 +392,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
opts.Update(env)
# reconfigure when things are missing
- if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR')):
+ if not env['HELP'] and (env['_CONFIGURE'] or 'TQTDIR' not in env or 'TDEDIR' not in env):
detect_kde(env)
# finally save the configuration to the cache file
@@ -501,7 +501,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
if len(source) <2:
if not os.path.isfile(str(source[0])):
- print RED+'kcfg file given'+str(source[0])+' does not exist !'+NORMAL
+ print(RED+'kcfg file given'+str(source[0])+' does not exist !'+NORMAL)
return target, source
kfcgfilename=""
kcfgFileDeclRx = re.compile("^[fF]ile\s*=\s*(.+)\s*$")
@@ -523,7 +523,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
def dcopGenerator(target, source, env, for_signature):
act=[]
act.append('dcopidl '+source[0].path+' > '+target[1].path+'|| ( rm -f '+target[1].path+' ; false)')
- act.append('dcopidl2cpp --c++-suffix cpp --no-Q_SIGNALS --no-stub '+target[1].path)
+ act.append('dcopidl2cpp --c++-suffix cpp --no-signals --no-stub '+target[1].path)
return act
def dcopEmitter(target, source, env):
@@ -604,7 +604,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
## return a list of things
def make_list(e):
- if type(e) is types.ListType:
+ if type(e) is list:
return e
else:
return e.split()
@@ -650,13 +650,13 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
for file in ui_files:
for ofile in other_files:
if ofile == file:
- print RED+"WARNING: You have included "+file+".ui and another file of the same prefix"+NORMAL
- print "Files generated by uic (file.h, file.cpp must not be included"
+ print(RED+"WARNING: You have included "+file+".ui and another file of the same prefix"+NORMAL)
+ print("Files generated by uic (file.h, file.cpp must not be included")
for file in kcfg_files:
for ofile in other_files:
if ofile == file:
- print RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL
- print "Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included"
+ print(RED+"WARNING: You have included "+file+".kcfg and another file of the same prefix"+NORMAL)
+ print("Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included")
return src
@@ -670,8 +670,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
return
basedir=env['DESTDIR']
if len(restype)>0:
- if not lenv.has_key(restype):
- print RED+"unknown resource type "+restype+NORMAL
+ if restype not in lenv:
+ print(RED+"unknown resource type "+restype+NORMAL)
else:
basedir += lenv[restype]+'/'
#print file # <- useful to trace stuff :)
@@ -684,8 +684,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
return
basedir=env['DESTDIR']
if len(restype)>0:
- if not lenv.has_key(restype):
- print RED+"unknown resource type "+restype+NORMAL
+ if restype not in lenv:
+ print(RED+"unknown resource type "+restype+NORMAL)
else:
basedir += lenv[restype]+'/'
install_list = env.InstallAs(basedir+destfile, file)
@@ -697,7 +697,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
The program is installed except if one sets env['NOAUTOINSTALL'] """
src = KDEfiles(lenv, target, source)
program_list = lenv.Program(target, src)
- if not lenv.has_key('NOAUTOINSTALL'):
+ if 'NOAUTOINSTALL' not in lenv:
KDEinstall(lenv, 'KDEBIN', '', target)
return program_list
@@ -708,7 +708,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
lenv['LIBPREFIX']=libprefix
library_list = lenv.SharedLibrary(target, src)
lafile_list = lenv.LaFile(target, library_list)
- if not lenv.has_key('NOAUTOINSTALL'):
+ if 'NOAUTOINSTALL' not in lenv:
install_dir = 'KDEMODULE'
if kdelib==1:
install_dir = 'KDELIBPATH'
@@ -800,13 +800,13 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
filename = lst[ len(lst) - 1 ]
tmp = filename.split('-')
if len(tmp)!=3:
- print RED+'WARNING: icon filename has unknown format: '+iconfile+NORMAL
+ print(RED+'WARNING: icon filename has unknown format: '+iconfile+NORMAL)
continue
[icon_dir, icon_type, icon_filename]=tmp
try:
destfile = '%s/%s/%s/%s' % (lenv['KDEICONS'], dir_dic[icon_dir], type_dic[icon_type], icon_filename)
except KeyError:
- print RED+'WARNING: unknown icon type: '+iconfile+NORMAL
+ print(RED+'WARNING: unknown icon type: '+iconfile+NORMAL)
continue
## Do not use KDEinstallas here, as parsing from an ide will be necessary
if env['_INSTALL']:
diff --git a/parts/appwizard/filepropspage.h b/parts/appwizard/filepropspage.h
index 2539fd79..c75aa1b1 100644
--- a/parts/appwizard/filepropspage.h
+++ b/parts/appwizard/filepropspage.h
@@ -19,7 +19,7 @@ class ClassFileProp {
class FilePropsPage : public FilePropsPageBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui
index 00d7f677..11c20e9e 100644
--- a/parts/appwizard/filepropspagebase.ui
+++ b/parts/appwizard/filepropspagebase.ui
@@ -150,10 +150,10 @@
<tabstop>baseclass_edit</tabstop>
<tabstop>implfile_edit</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>slotSelectionChanged()</slot>
<slot>slotClassnameChanged(const TQString&amp;)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index cbe5bec2..3a2c7c11 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -86,12 +86,12 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na
infrastructureBox->setEnabled(false);
setProjectType("c");
- connect( name_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotProjectNameChanged( const TQString & ) ) );
+ connect( name_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotProjectNameChanged( const TQString & ) ) );
// scanAvailableVCS();
- connect( fetchModuleButton, TQT_SIGNAL(clicked()),
- this, TQT_SLOT(slotFetchModulesFromRepository()) );
- connect(urlinput_edit, TQT_SIGNAL(urlSelected(const TQString& )), this, TQT_SLOT(dirChanged()));
- connect(urlinput_edit, TQT_SIGNAL(returnPressed(const TQString& )), this, TQT_SLOT(dirChanged()));
+ connect( fetchModuleButton, TQ_SIGNAL(clicked()),
+ this, TQ_SLOT(slotFetchModulesFromRepository()) );
+ connect(urlinput_edit, TQ_SIGNAL(urlSelected(const TQString& )), this, TQ_SLOT(dirChanged()));
+ connect(urlinput_edit, TQ_SIGNAL(returnPressed(const TQString& )), this, TQ_SLOT(dirChanged()));
slotProjectNameChanged( name_edit->text() );
}
@@ -417,7 +417,7 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName)
TQFile configIn(dirName+"/configure.in");
TQFile configAc(dirName+"/configure.ac");
if (configInIn.open(IO_ReadOnly)){
- cstream.setDevice(TQT_TQIODEVICE(&configInIn));
+ cstream.setDevice(&configInIn);
while (!cstream.atEnd()) {
TQString line = cstream.readLine();
if ( ac_init.search(line) >= 0){
@@ -437,11 +437,11 @@ void ImportDialog::scanAutomakeProject(const TQString &dirName)
}
if (configIn.open(IO_ReadOnly)){
- cstream.setDevice(TQT_TQIODEVICE(&configIn));
+ cstream.setDevice(&configIn);
}
else{
if (configAc.open(IO_ReadOnly)){
- cstream.setDevice(TQT_TQIODEVICE(&configAc));
+ cstream.setDevice(&configAc);
}
else{
return;
@@ -531,8 +531,8 @@ void ImportDialog::slotFetchModulesFromRepository()
setCursor( KCursor::waitCursor() );
// setEnabled( false );
- connect( vcs, TQT_SIGNAL(finishedFetching(TQString)),
- this, TQT_SLOT(slotFinishedCheckout(TQString)) );
+ connect( vcs, TQ_SIGNAL(finishedFetching(TQString)),
+ this, TQ_SLOT(slotFinishedCheckout(TQString)) );
//restore cursor if we can't fetch repository
if ( !vcs->fetchFromRepository() )
diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h
index 5b334668..3ab2e71a 100644
--- a/parts/appwizard/importdlg.h
+++ b/parts/appwizard/importdlg.h
@@ -27,7 +27,7 @@ struct InfrastructureCmd{
class ImportDialog : public ImportDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui
index aa778f00..c18beff7 100644
--- a/parts/appwizard/importdlgbase.ui
+++ b/parts/appwizard/importdlgbase.ui
@@ -346,12 +346,12 @@ will be the author, everything between
<tabstop>ok_button</tabstop>
<tabstop>cancel_button</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">dirButtonClicked()</slot>
<slot>dirChanged()</slot>
<slot access="protected">projectTypeChanged(const TQString &amp;)</slot>
<slot access="protected">projectTypeChanged(int)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/parts/appwizard/imports/CMakeLists.txt b/parts/appwizard/imports/CMakeLists.txt
index b9abbf17..76d6e153 100644
--- a/parts/appwizard/imports/CMakeLists.txt
+++ b/parts/appwizard/imports/CMakeLists.txt
@@ -13,7 +13,7 @@ tde_create_translated_desktop(
SOURCE
c-auto cpp-auto fortran-auto java-auto kde gnome c cpp
fortran python php perl java java-ant qttmake qtqmake
- qt4qmake ruby pascal ada
+ ruby pascal ada
DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/imports
PO_DIR tdevelop-desktops
)
@@ -23,6 +23,6 @@ install( FILES
java-auto.kdevelop kde.kdevelop gnome.kdevelop
c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop
php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop
- qttmake.kdevelop qtqmake.kdevelop qt4qmake.kdevelop
+ qttmake.kdevelop qtqmake.kdevelop
ruby.kdevelop pascal.kdevelop ada.kdevelop
DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/importfiles )
diff --git a/parts/appwizard/imports/Makefile.am b/parts/appwizard/imports/Makefile.am
index 5047de18..309293d4 100644
--- a/parts/appwizard/imports/Makefile.am
+++ b/parts/appwizard/imports/Makefile.am
@@ -2,6 +2,6 @@ appwizarddatadir = ${kde_datadir}/kdevappwizard
importsdir = ${appwizarddatadir}/imports
importfilesdir = ${appwizarddatadir}/importfiles
-imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada
-importfiles_DATA = c-auto.kdevelop cpp-auto.kdevelop fortran-auto.kdevelop java-auto.kdevelop kde.kdevelop gnome.kdevelop c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop qttmake.kdevelop qtqmake.kdevelop qt4qmake.kdevelop ruby.kdevelop pascal.kdevelop ada.kdevelop
+imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake ruby pascal ada
+importfiles_DATA = c-auto.kdevelop cpp-auto.kdevelop fortran-auto.kdevelop java-auto.kdevelop kde.kdevelop gnome.kdevelop c.kdevelop cpp.kdevelop fortran.kdevelop python.kdevelop php.kdevelop perl.kdevelop java.kdevelop java-ant.kdevelop qttmake.kdevelop qtqmake.kdevelop ruby.kdevelop pascal.kdevelop ada.kdevelop
diff --git a/parts/appwizard/imports/qt4qmake b/parts/appwizard/imports/qt4qmake
deleted file mode 100644
index 56f22885..00000000
--- a/parts/appwizard/imports/qt4qmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# TDE Config File
-[General]
-Comment=Qt4 C++ Application (QMake4 based)
diff --git a/parts/appwizard/imports/qt4qmake.kdevelop b/parts/appwizard/imports/qt4qmake.kdevelop
deleted file mode 100644
index dedc866b..00000000
--- a/parts/appwizard/imports/qt4qmake.kdevelop
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<kdevelop>
- <general>
- <author>%{AUTHOR}</author>
- <email>%{EMAIL}</email>
- <version>%{VERSION}</version>
- <projectmanagement>KDevTrollProject</projectmanagement>
- <primarylanguage>C++</primarylanguage>
- <keywords>
- <keyword>Qt</keyword>
- </keywords>
- </general>
- <kdevfileview>
- <groups>
- <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
- <group pattern="*.ui" name="User Interface" />
- <group pattern="*.png" name="Icons" />
- <group pattern="*" name="Others" />
- </groups>
- </kdevfileview>
- <kdevdoctreeview>
- <ignoretocs>
- <toc>bash</toc>
- <toc>bash_bugs</toc>
- <toc>clanlib</toc>
- <toc>w3c-dom-level2-html</toc>
- <toc>fortran_bugs_gcc</toc>
- <toc>gnome1</toc>
- <toc>gnustep</toc>
- <toc>gtk</toc>
- <toc>gtk_bugs</toc>
- <toc>haskell</toc>
- <toc>haskell_bugs_ghc</toc>
- <toc>java_bugs_gcc</toc>
- <toc>java_bugs_sun</toc>
- <toc>kde2book</toc>
- <toc>opengl</toc>
- <toc>pascal_bugs_fp</toc>
- <toc>php</toc>
- <toc>php_bugs</toc>
- <toc>perl</toc>
- <toc>perl_bugs</toc>
- <toc>python</toc>
- <toc>python_bugs</toc>
- <toc>qt-kdev3</toc>
- <toc>ruby</toc>
- <toc>ruby_bugs</toc>
- <toc>sdl</toc>
- <toc>stl</toc>
- <toc>w3c-svg</toc>
- <toc>sw</toc>
- <toc>w3c-uaag10</toc>
- <toc>wxwidgets_bugs</toc>
- </ignoretocs>
- <ignoredoxygen>
- <toc>KDE Libraries (Doxygen)</toc>
- </ignoredoxygen>
- </kdevdoctreeview>
- <kdevdebugger>
- <general>
- <dbgshell/>
- </general>
- </kdevdebugger>
- <kdevcppsupport>
- <qt>
- <version>4</version>
- <used>true</used>
- <includestyle>4</includestyle>
- <designerintegration>ExternalDesigner</designerintegration>
- </qt>
- </kdevcppsupport>
- <kdevfilecreate>
- <useglobaltypes>
- <type ext="ui" />
- <type ext="cpp" />
- <type ext="h" />
- <type ext="qrc" />
- </useglobaltypes>
- </kdevfilecreate>
-</kdevelop>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 15:35:57 +0000