TDE
/
tdevelop
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix inadvertent tqt changes.

Browse Source 
(cherry picked from commit ffc74f0318)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent 236c8d66c5
commit a660674175
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
buildtools/autotools/autosubprojectview.cpp
Unescape View File

@ -230,7 +230,7 @@ void AutoSubprojectView::initActions()
TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" );
forceReeditSubprojectAction->setWhatsThis(i18n("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> "
"from the directory of the selected subproject.<br>This "
"recreates makefile (tip: and solves most of .tqmoc related "
"recreates makefile (tip: and solves most of .moc related "
"problems)<br>Environment variables and make arguments can "
"be specified in the project settings dialog, "
"<b>Make Options</b> tab.</qt>"));

16
buildtools/qmake/projectconfigurationdlg.cpp
Unescape View File

@ -109,8 +109,8 @@ ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollPro
TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), TQT_TQOBJECT(this) ) );
customVariables->setSortColumn(0);
customVariables->setSortOrder(TQt::Ascending);
tqmocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion);
tqmocdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion);
mocdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
objdir_url->completionObject()->setMode(KURLCompletion::DirCompletion);
objdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
rccdir_url->completionObject()->setMode(KURLCompletion::DirCompletion);
@ -603,7 +603,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration()
// intermediate locations
myProjectItem->scope->setEqualOp( "OBJECTS_DIR", TQStringList( objdir_url->url() ) );
myProjectItem->scope->setEqualOp( "UI_DIR", TQStringList( uidir_url->url() ) );
myProjectItem->scope->setEqualOp( "QMOC_DIR", TQStringList( tqmocdir_url->url() ) );
myProjectItem->scope->setEqualOp( "QMOC_DIR", TQStringList( mocdir_url->url() ) );
myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) );
//CORBA
@ -974,14 +974,14 @@ void ProjectConfigurationDlg::updateControls()
dir = myProjectItem->scope->variableValues( "QMOC_DIR" ).front();
if( TQFileInfo(dir).isRelative() )
{
tqmocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() );
tqmocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) );
mocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() );
mocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) );
}else
{
tqmocdir_url->completionObject()->setDir( dir );
tqmocdir_url->fileDialog()->setURL( KURL( dir ) );
mocdir_url->completionObject()->setDir( dir );
mocdir_url->fileDialog()->setURL( KURL( dir ) );
}
tqmocdir_url->setURL( dir );
mocdir_url->setURL( dir );
dir = myProjectItem->scope->variableValues( "RC_DIR" ).front();
if( TQFileInfo(dir).isRelative() )
{

2
kdevdesigner/designer/project.cpp
Unescape View File

@ -691,7 +691,7 @@ void Project::save( bool onlyProjectFile )
contents +=
"unix {\n"
" UI_DIR = .ui\n"
" TQMOC_DIR = .tqmoc\n"
" TQMOC_DIR = .moc\n"
" OBJECTS_DIR = .obj\n"
"}\n";
}

2
languages/cpp/cppimplementationwidget.cpp
Unescape View File

@ -57,7 +57,7 @@ TQStringList CppImplementationWidget::createClassFiles()
template_cpp.replace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" );
template_cpp.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() );
template_cpp.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName );
template_cpp.replace( TQRegExp( "\\$TQMOCINCLUDE\\$" ), fileNameEdit->text() + ".tqmoc" );
template_cpp.replace( TQRegExp( "\\$TQMOCINCLUDE\\$" ), fileNameEdit->text() + ".moc" );
template_h = FileTemplate::read( m_part, "h" ) + template_h;
template_cpp = FileTemplate::read( m_part, "cpp" ) + template_cpp;

6
languages/cpp/cppnewclassdlg.cpp
Unescape View File

@ -1820,9 +1820,9 @@ void CppNewClassDialog::ClassGenerator::gen_implementation()
if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) )
{
TQString tqmoc = header;
tqmoc.replace( TQRegExp( "\\..*" ), ".tqmoc" );
classImpl += "#include \"" + tqmoc + "\"\n";
TQString moc = header;
moc.replace( TQRegExp( "\\..*" ), ".moc" );
classImpl += "#include \"" + moc + "\"\n";
}
if ( dlg.gen_config->reformat_box->isChecked() )

2
languages/cpp/qtdesignercppintegration.cpp
Unescape View File

@ -158,7 +158,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function
}
else
{
if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.tqmoc.*" ) ) )
if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.moc.*" ) ) )
atLine = line;
break;
}

2
languages/cpp/subclassingdlg.cpp
Unescape View File

@ -476,7 +476,7 @@ void SubclassingDlg::accept()
buffer.replace(TQRegExp("\\$MODULE\\$"),module);
buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename);
if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem))
buffer += "\n#include \"$NEWFILENAMELC$.tqmoc\"\n";
buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n";
}
else
loadBuffer(buffer,m_filename+".cpp");

2
lib/cppparser/lexer.cpp
Unescape View File

@ -1026,7 +1026,7 @@ int Lexer::macroExpression()
}
// *IMPORTANT*
// please, don't include lexer.tqmoc here, because Lexer isn't a TQObject class!!
// please, don't include lexer.moc here, because Lexer isn't a TQObject class!!
// if you have problem while recompiling try to remove cppsupport/.deps,
// cppsupport/Makefile.in and rerun automake/autoconf

2
lib/widgets/propeditor/pdoublenuminput.h
Unescape View File

@ -47,7 +47,7 @@ public:
virtual void setValue(const TQVariant &value, bool emitChange=true);
private slots:
//because of a bug in tqmoc which doesn't detect conditional slots
//because of a bug in moc which doesn't detect conditional slots
//we need them both
void updateProperty(double val);
void updateProperty(int val);

2
parts/astyle/astyle_part.cpp
Unescape View File

@ -36,7 +36,7 @@
static const KDevPluginInfo data("kdevastyle");
namespace {
const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.tqmoc,*.patch,*.tlh,*.xpm";
const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm";
}

2
parts/doxygen/doxygenpart.cpp
Unescape View File

@ -172,7 +172,7 @@ void DoxygenPart::adjustDoxyfile()
patterns->addValue("*.tlh");
patterns->addValue("*.diff");
patterns->addValue("*.patch");
patterns->addValue("*.tqmoc");
patterns->addValue("*.moc");
patterns->addValue("*.xpm");
patterns->addValue("*.dox");
}

4
parts/outputviews/makeactionfilter.cpp
Unescape View File

@ -79,8 +79,8 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats()
ActionFormat( i18n("built"), 1, 1, "\\[.+%\\] Built target (.*)" ), //cmake
ActionFormat( i18n("generating"), 1, 1, "\\[.+%\\] Generating (.*)" ), //cmake
//tqmoc and uic
ActionFormat( i18n("generating"), 1, 2, "/(tqmoc|uic)\\b.*\\s-o\\s([^\\s;]+)"),
//moc and uic
ActionFormat( i18n("generating"), 1, 2, "/(moc|uic)\\b.*\\s-o\\s([^\\s;]+)"),
ActionFormat( i18n("generating"), 1, 2, "^generating (.*)" ), //unsermake
ActionFormat( i18n("linking"), "libtool", "/bin/sh\\s.*libtool.*--mode=link\\s.*\\s-o\\s([^\\s;]+)", 1 ),

Write Preview
Loading…
Cancel
Save