diff options
Diffstat (limited to 'parts/doxygen')
-rw-r--r-- | parts/doxygen/config.cpp | 160 | ||||
-rw-r--r-- | parts/doxygen/config.h | 4 | ||||
-rw-r--r-- | parts/doxygen/doxygenconfigwidget.cpp | 22 | ||||
-rw-r--r-- | parts/doxygen/doxygenconfigwidget.h | 7 | ||||
-rw-r--r-- | parts/doxygen/doxygenpart.cpp | 10 | ||||
-rw-r--r-- | parts/doxygen/doxygenpart.h | 3 | ||||
-rw-r--r-- | parts/doxygen/input.cpp | 76 | ||||
-rw-r--r-- | parts/doxygen/input.h | 20 | ||||
-rw-r--r-- | parts/doxygen/messages.cpp | 4 |
9 files changed, 156 insertions, 150 deletions
diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp index de582013..658f5ae5 100644 --- a/parts/doxygen/config.cpp +++ b/parts/doxygen/config.cpp @@ -708,7 +708,7 @@ void ConfigBool::convertStrToVal() TQCString &Config::getString(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -724,7 +724,7 @@ TQCString &Config::getString(const char *fileName,int num,const char *name) cons TQStrList &Config::getList(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -740,7 +740,7 @@ TQStrList &Config::getList(const char *fileName,int num,const char *name) const TQCString &Config::getEnum(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -756,7 +756,7 @@ TQCString &Config::getEnum(const char *fileName,int num,const char *name) const int &Config::getInt(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -772,7 +772,7 @@ int &Config::getInt(const char *fileName,int num,const char *name) const bool &Config::getBool(const char *fileName,int num,const char *name) const { - ConfigOption *opt = m_dict->find(name); + ConfigOption *opt = m_dict->tqfind(name); if (opt==0) { config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name); @@ -2493,7 +2493,7 @@ static void substEnvVarsInStrList(TQStrList &sl) { TQCString result(s); // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE. - bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1); + bool wasQuoted = (result.tqfind(' ')!=-1) || (result.tqfind('\t')!=-1); // here we strip the quote again substEnvVarsInString(result); @@ -2654,15 +2654,15 @@ void Config::check() } else { - if (warnFormat.find("$file")==-1) + if (warnFormat.tqfind("$file")==-1) { config_err("Warning: warning format does not contain a $file tag!\n"); } - if (warnFormat.find("$line")==-1) + if (warnFormat.tqfind("$line")==-1) { config_err("Warning: warning format does not contain a $line tag!\n"); } - if (warnFormat.find("$text")==-1) + if (warnFormat.tqfind("$text")==-1) { config_err("Warning: warning format foes not contain a $text tag!\n"); } @@ -2774,7 +2774,7 @@ void Config::check() TQRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument TQCString alias=s; alias=alias.stripWhiteSpace(); - if (alias.find(re1)!=0 && alias.find(re2)!=0) + if (alias.tqfind(re1)!=0 && alias.tqfind(re2)!=0) { config_err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n", alias.data()); @@ -2963,25 +2963,25 @@ void Config::check() #define PUTENV putenv #define SEP ":" #endif - // check QHP creation requirements - if (Config_getBool("GENERATE_QHP")) + // check TQHP creation requirements + if (Config_getBool("GENERATE_TQHP")) { bool quit = false; if (!Config_getBool("GENERATE_HTML")) { - config_err("Warning: GENERATE_QHP=YES requires GENERATE_HTML=YES.\n"); + config_err("Warning: GENERATE_TQHP=YES requires GENERATE_HTML=YES.\n"); quit = true; } - if (Config_getString("QHP_NAMESPACE").isEmpty()) + if (Config_getString("TQHP_NAMESPACE").isEmpty()) { - config_err("Warning: GENERATE_QHP=YES requires QHP_NAMESPACE to be set.\n"); + config_err("Warning: GENERATE_TQHP=YES requires TQHP_NAMESPACE to be set.\n"); quit = true; } - if (Config_getString("QHP_VIRTUAL_FOLDER").isEmpty()) + if (Config_getString("TQHP_VIRTUAL_FOLDER").isEmpty()) { - config_err("Warning: GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set.\n"); + config_err("Warning: GENERATE_TQHP=YES requires TQHP_VIRTUAL_FOLDER to be set.\n"); quit = true; } @@ -2991,16 +2991,16 @@ void Config::check() } } - // check QCH creation requirements - if (!Config_getString("QHG_LOCATION").isEmpty() && - !Config_getBool("GENERATE_QHP")) + // check TQCH creation requirements + if (!Config_getString("TQHG_LOCATION").isEmpty() && + !Config_getBool("GENERATE_TQHP")) { - config_err("Warning: Specifying QHG_LOCATION requires GENERATE_QHP=YES.\n"); + config_err("Warning: Specifying TQHG_LOCATION requires GENERATE_TQHP=YES.\n"); } - if (!Config_getString("QCH_FILE").isEmpty() && - Config_getString("QHG_LOCATION").isEmpty()) + if (!Config_getString("TQCH_FILE").isEmpty() && + Config_getString("TQHG_LOCATION").isEmpty()) { - config_err("Warning: Specifying QCH_FILE requires QHG_LOCATION to be set.\n"); + config_err("Warning: Specifying TQCH_FILE requires TQHG_LOCATION to be set.\n"); } if (Config_getBool("HAVE_DOT")) @@ -3042,7 +3042,7 @@ void Config::check() annotationFromBrief.append("is"); annotationFromBrief.append("provides"); annotationFromBrief.append("specifies"); - annotationFromBrief.append("contains"); + annotationFromBrief.append("tqcontains"); annotationFromBrief.append("represents"); annotationFromBrief.append("a"); annotationFromBrief.append("an"); @@ -3306,7 +3306,7 @@ void Config::create() "used as the annotated text. Otherwise, the brief description is used as-is. \n" "If left blank, the following values are used (\"$name\" is automatically \n" "replaced with the name of the entity): \"The $name class\" \"The $name widget\" \n" - "\"The $name file\" \"is\" \"provides\" \"specifies\" \"contains\" \n" + "\"The $name file\" \"is\" \"provides\" \"specifies\" \"tqcontains\" \n" "\"represents\" \"a\" \"an\" \"the\"\n" ); cb = addBool( @@ -3362,16 +3362,16 @@ void Config::create() "If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen \n" "will interpret the first line (until the first dot) of a JavaDoc-style \n" "comment as the brief description. If set to NO, the JavaDoc \n" - "comments will behave just like regular Qt-style comments \n" + "comments will behave just like regular TQt-style comments \n" "(thus requiring an explicit @brief command for a brief description.) \n", FALSE ); cb = addBool( - "QT_AUTOBRIEF", - "If the QT_AUTOBRIEF tag is set to YES then Doxygen will \n" - "interpret the first line (until the first dot) of a Qt-style \n" + "TQT_AUTOBRIEF", + "If the TQT_AUTOBRIEF tag is set to YES then Doxygen will \n" + "interpret the first line (until the first dot) of a TQt-style \n" "comment as the brief description. If set to NO, the comments \n" - "will behave just like regular Qt-style comments (thus requiring \n" + "will behave just like regular TQt-style comments (thus requiring \n" "an explicit \\brief command for a brief description.) \n", FALSE ); @@ -3773,12 +3773,12 @@ void Config::create() ); cs->setWidgetType(ConfigString::File); cs = addString( "LAYOUT_FILE", - "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n" - "doxygen. The layout file controls the global structure of the generated output files \n" - "in an output format independent way. The create the layout file that represents \n" + "The LAYOUT_FILE tag can be used to specify a tqlayout file which will be parsed by \n" + "doxygen. The tqlayout file controls the global structure of the generated output files \n" + "in an output format independent way. The create the tqlayout file that represents \n" "doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n" "file name after the option, if omitted DoxygenLayout.xml will be used as the name \n" - "of the layout file.\n" + "of the tqlayout file.\n" ); cs->setWidgetType(ConfigString::File); addObsolete("DETAILS_AT_TOP"); @@ -3789,8 +3789,8 @@ void Config::create() //----------------------------------------------------------------------------------------------- cb = addBool( - "QUIET", - "The QUIET tag can be used to turn on/off the messages that are generated \n" + "TQUIET", + "The TQUIET tag can be used to turn on/off the messages that are generated \n" "by doxygen. Possible values are YES and NO. If left blank NO is used. \n", FALSE ); @@ -4132,7 +4132,7 @@ void Config::create() "To create a documentation set, doxygen will generate a Makefile in the \n" "HTML output directory. Running make will produce the docset in that \n" "directory and running \"make install\" will install the docset in \n" - "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find \n" + "~/Library/Developer/Shared/Documentation/DocSets so that Xcode will tqfind \n" "it at startup. \n" "See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html " "for more information. \n", @@ -4191,8 +4191,8 @@ void Config::create() cs->addDependency("GENERATE_HTML"); #if 0 cs = addString( - "QTHELP_FILE", - "If the GENERATE_HTMLHELP tag is set to YES, the QTHELP_FILE tag can \n" + "TQTHELP_FILE", + "If the GENERATE_HTMLHELP tag is set to YES, the TQTHELP_FILE tag can \n" "be used to specify the file name of the resulting .(qch|qhp) file. \n" "You can add a path in front of the file if the result should not be \n" "written to the html output directory. \n" @@ -4200,15 +4200,15 @@ void Config::create() cs->setWidgetType(ConfigString::File); cs->addDependency("GENERATE_HTML"); cs = addString( - "QTHELP_CONFIG", - "If DOXYGEN2QTHELP_LOC is set, QTHELP_CONFIG must specify the file name \n" + "TQTHELP_CONFIG", + "If DOXYGEN2TQTHELP_LOC is set, TQTHELP_CONFIG must specify the file name \n" "of a config file to pass to doxygen2qthelp. \n" ); cs->setWidgetType(ConfigString::File); cs->addDependency("GENERATE_HTML"); cs = addString( - "DOXYGEN2QTHELP_LOC", - "If the GENERATE_HTMLHELP tag is set to YES, the DOXYGEN2QTHELP_LOC tag \n" + "DOXYGEN2TQTHELP_LOC", + "If the GENERATE_HTMLHELP tag is set to YES, the DOXYGEN2TQTHELP_LOC tag \n" "can be used to specify the location (absolute path including file name) of \n" "the doxygen2qthelp tool. If non-empty doxygen will try to run doxygen2qthelp \n" "on the generated index.hhp.\n" @@ -4216,9 +4216,9 @@ void Config::create() cs->setWidgetType(ConfigString::File); cs->addDependency("GENERATE_HTML"); #endif - addObsolete("QTHELP_FILE"); - addObsolete("QTHELP_CONFIG"); - addObsolete("DOXYGEN2QTHELP_LOC"); + addObsolete("TQTHELP_FILE"); + addObsolete("TQTHELP_CONFIG"); + addObsolete("DOXYGEN2TQTHELP_LOC"); cb = addBool( "GENERATE_CHI", "If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n" @@ -4255,71 +4255,71 @@ void Config::create() ///////////////////////////////////////////////////////// cb = addBool( - "GENERATE_QHP", - "If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER \n" + "GENERATE_TQHP", + "If the GENERATE_TQHP tag is set to YES and both TQHP_NAMESPACE and TQHP_VIRTUAL_FOLDER \n" "are set, an additional index file will be generated that can be used as input for \n" - "Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated \n" + "TQt's qhelpgenerator to generate a TQt Compressed Help (.qch) of the generated \n" "HTML documentation. \n", FALSE ); cb->addDependency("GENERATE_HTML"); cs = addString( - "QCH_FILE", - "If the QHG_LOCATION tag is specified, the QCH_FILE tag can \n" + "TQCH_FILE", + "If the TQHG_LOCATION tag is specified, the TQCH_FILE tag can \n" "be used to specify the file name of the resulting .qch file. \n" "The path specified is relative to the HTML output folder. \n" ); cs->setWidgetType(ConfigString::File); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_NAMESPACE", - "The QHP_NAMESPACE tag specifies the namespace to use when generating \n" - "Qt Help Project output. For more information please see \n" + "TQHP_NAMESPACE", + "The TQHP_NAMESPACE tag specifies the namespace to use when generating \n" + "TQt Help Project output. For more information please see \n" "http://doc.trolltech.com/qthelpproject.html#namespace \n" ); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_VIRTUAL_FOLDER", - "The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating \n" - "Qt Help Project output. For more information please see \n" + "TQHP_VIRTUAL_FOLDER", + "The TQHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating \n" + "TQt Help Project output. For more information please see \n" "http://doc.trolltech.com/qthelpproject.html#virtual-folders \n" ); cs->setDefaultValue("doc"); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_CUSTOM_FILTER_NAME", - "If QHP_CUSTOM_FILTER_NAME is set, it specifies the name of a custom filter to add. \n" + "TQHP_CUSTOM_FILTER_NAME", + "If TQHP_CUSTOM_FILTER_NAME is set, it specifies the name of a custom filter to add. \n" "For more information please see \n" "http://doc.trolltech.com/qthelpproject.html#custom-filters \n" ); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_CUST_FILTER_ATTRS", - "The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add." + "TQHP_CUST_FILTER_ATTRS", + "The TQHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add." "For more information please see \n" - "<a href=\"http://doc.trolltech.com/qthelpproject.html#custom-filters\">Qt Help Project / Custom Filters</a>. \n" + "<a href=\"http://doc.trolltech.com/qthelpproject.html#custom-filters\">TQt Help Project / Custom Filters</a>. \n" ); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHP_SECT_FILTER_ATTRS", - "The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's \n" + "TQHP_SECT_FILTER_ATTRS", + "The TQHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's \n" "filter section matches. \n" - "<a href=\"http://doc.trolltech.com/qthelpproject.html#filter-attributes\">Qt Help Project / Filter Attributes</a>. \n" + "<a href=\"http://doc.trolltech.com/qthelpproject.html#filter-attributes\">TQt Help Project / Filter Attributes</a>. \n" ); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); cs = addString( - "QHG_LOCATION", - "If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can \n" - "be used to specify the location of Qt's qhelpgenerator. \n" + "TQHG_LOCATION", + "If the GENERATE_TQHP tag is set to YES, the TQHG_LOCATION tag can \n" + "be used to specify the location of TQt's qhelpgenerator. \n" "If non-empty doxygen will try to run qhelpgenerator on the generated \n" ".qhp file .\n" ); cs->setWidgetType(ConfigString::File); - cs->addDependency("GENERATE_QHP"); + cs->addDependency("GENERATE_TQHP"); ///////////////////////////////////////////////////////// // MISC ///////////////////////////////////////////////// @@ -4857,7 +4857,7 @@ void Config::create() cs = addString( "DOT_FONTNAME", "By default doxygen will write a font called FreeSans.ttf to the output \n" "directory and reference it in all dot files that doxygen generates. This \n" - "font does not include all possible unicode characters however, so when you need \n" + "font does not include all possible tqunicode characters however, so when you need \n" "these (or just want a differently looking font) you can specify the font name \n" "using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n" "which can be done by putting it in a standard location or by setting the \n" @@ -5005,7 +5005,7 @@ void Config::create() "nodes that will be shown in the graph. If the number of nodes in a graph \n" "becomes larger than this value, doxygen will truncate the graph, which is \n" "visualized by representing a node as a red box. Note that doxygen if the \n" - "number of direct children of the root node in a graph is already larger than \n" + "number of direct tqchildren of the root node in a graph is already larger than \n" "DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n" "that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n", 0,10000, 50 @@ -5102,8 +5102,8 @@ static TQCString configFileToString(const char *name) } totalSize+=size+2; contents.resize(totalSize); - contents.at(totalSize-2)='\n'; // to help the scanner - contents.at(totalSize-1)='\0'; + contents.tqat(totalSize-2)='\n'; // to help the scanner + contents.tqat(totalSize-1)='\0'; return contents; } } diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h index 2486956e..19d877d8 100644 --- a/parts/doxygen/config.h +++ b/parts/doxygen/config.h @@ -30,7 +30,7 @@ class ConfigOption enum { /*! Maximum length of an option in the config file. Used for - * alignment purposes. + * tqalignment purposes. */ MAX_OPTION_LENGTH = 23 }; @@ -409,7 +409,7 @@ class Config */ ConfigOption *get(const char *name) const { - return m_dict->find(name); + return m_dict->tqfind(name); } /* @} */ diff --git a/parts/doxygen/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp index 8269bf0e..eb08f0f9 100644 --- a/parts/doxygen/doxygenconfigwidget.cpp +++ b/parts/doxygen/doxygenconfigwidget.cpp @@ -27,8 +27,8 @@ #include "messages.h" -DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *parent, const char *name) - : TQTabWidget(parent, name) +DoxygenConfigWidget::DoxygenConfigWidget(const TQString &fileName, TQWidget *tqparent, const char *name) + : TQTabWidget(tqparent, name) { m_hasChanged = false; m_dependencies = new TQDict< TQPtrList<IInput> >(257); @@ -171,10 +171,10 @@ DoxygenConfigWidget::~DoxygenConfigWidget() } -TQSize DoxygenConfigWidget::sizeHint() const +TQSize DoxygenConfigWidget::tqsizeHint() const { // without this the whole dialog becomes much too large - return TQSize(TQTabWidget::sizeHint().width(), 1); + return TQSize(TQTabWidget::tqsizeHint().width(), 1); } @@ -184,13 +184,13 @@ void DoxygenConfigWidget::addDependency(TQDict<TQObject> *switches, if (dep.isEmpty()) return; - IInput *parent = m_inputWidgets->find(dep); - Q_ASSERT(parent!=0); - IInput *child = m_inputWidgets->find(name); + IInput *tqparent = m_inputWidgets->tqfind(dep); + Q_ASSERT(tqparent!=0); + IInput *child = m_inputWidgets->tqfind(name); Q_ASSERT(child!=0); - if (!switches->find(dep)) - switches->insert(dep, parent->qobject()); - TQPtrList<IInput> *list = m_dependencies->find(dep); + if (!switches->tqfind(dep)) + switches->insert(dep, tqparent->qobject()); + TQPtrList<IInput> *list = m_dependencies->tqfind(dep); if (!list) { list = new TQPtrList<IInput>; m_dependencies->insert(dep, list); @@ -201,7 +201,7 @@ void DoxygenConfigWidget::addDependency(TQDict<TQObject> *switches, void DoxygenConfigWidget::toggle(const TQString &name, bool state) { - TQPtrList<IInput> *inputs = m_dependencies->find(name); + TQPtrList<IInput> *inputs = m_dependencies->tqfind(name); Q_ASSERT(inputs!=0); IInput *input = inputs->first(); while (input) { diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h index 4dd68178..54584f07 100644 --- a/parts/doxygen/doxygenconfigwidget.h +++ b/parts/doxygen/doxygenconfigwidget.h @@ -21,12 +21,13 @@ class IInput; -class DoxygenConfigWidget : public QTabWidget +class DoxygenConfigWidget : public TQTabWidget { Q_OBJECT + TQ_OBJECT public: - DoxygenConfigWidget( const TQString &fileName, TQWidget *parent=0, const char *name=0 ); + DoxygenConfigWidget( const TQString &fileName, TQWidget *tqparent=0, const char *name=0 ); ~DoxygenConfigWidget(); public slots: @@ -37,7 +38,7 @@ private slots: void changed(); private: - TQSize sizeHint() const; + TQSize tqsizeHint() const; void loadFile(); void saveFile(); void init(); diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 833f4938..29265ceb 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -51,8 +51,8 @@ typedef KDevGenericFactory<DoxygenPart> DoxygenFactory; static const KDevPluginInfo data("kdevdoxygen"); K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) -DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) - : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) +DoxygenPart::DoxygenPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevPlugin(&data, tqparent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) { setInstance(DoxygenFactory::instance()); setXMLFile("kdevdoxygen.rc"); @@ -172,7 +172,7 @@ void DoxygenPart::adjustDoxyfile() patterns->addValue("*.tlh"); patterns->addValue("*.diff"); patterns->addValue("*.patch"); - patterns->addValue("*.moc"); + patterns->addValue("*.tqmoc"); patterns->addValue("*.xpm"); patterns->addValue("*.dox"); } @@ -448,7 +448,7 @@ void DoxygenPart::slotRunPreview( ) if (poDir != 0) *poDir->valueRef() = dirVal; - KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").arg(file.name())); + KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").tqarg(file.name())); return; } @@ -485,7 +485,7 @@ void DoxygenPart::slotActivePartChanged( KParts::Part * part ) if (doc != 0) m_file = doc->url().path(); else - m_file = TQString::null; + m_file = TQString(); // <- m_activeEditor = dynamic_cast<KTextEditor::EditInterface*>(part); m_cursor = part ? dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()) : 0; diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h index 7756a791..a77545c9 100644 --- a/parts/doxygen/doxygenpart.h +++ b/parts/doxygen/doxygenpart.h @@ -40,9 +40,10 @@ namespace KTextEditor{ class DoxygenPart : public KDevPlugin { Q_OBJECT + TQ_OBJECT public: - DoxygenPart( TQObject *parent, const char *name, const TQStringList & ); + DoxygenPart( TQObject *tqparent, const char *name, const TQStringList & ); ~DoxygenPart(); private slots: diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp index e316d69e..bf4af7ea 100644 --- a/parts/doxygen/input.cpp +++ b/parts/doxygen/input.cpp @@ -110,16 +110,16 @@ static const char* const update_xpm_data[] = const char **update_xpm = (const char **)update_xpm_data; -InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag) - : TQWidget(parent), state(flag), key(k) +InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * tqparent, bool &flag) + : TQWidget(tqparent), state(flag), key(k) { - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); cb = new TQCheckBox(text,this); init(); - layout->addWidget(cb); - layout->addStretch(1); + tqlayout->addWidget(cb); + tqlayout->addStretch(1); connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool))); } @@ -151,19 +151,19 @@ void InputBool::setEnabled(bool b) } -InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal) - : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) +InputInt::InputInt(const TQString &label, TQWidget *tqparent, int &val, int minVal, int maxVal) + : TQWidget(tqparent), m_val(val), m_minVal(minVal), m_maxVal(maxVal) { - TQHBoxLayout *layout = new TQHBoxLayout(this, 5); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5); sp = new TQSpinBox(minVal, maxVal, 1, this); lab = new TQLabel(sp, label+":", this); init(); - layout->addWidget(lab); - layout->addWidget(sp); - layout->addStretch(1); + tqlayout->addWidget(lab); + tqlayout->addWidget(sp); + tqlayout->addStretch(1); connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); } @@ -175,8 +175,8 @@ InputInt::~InputInt() void InputInt::init() { - m_val = QMAX(m_minVal, m_val); - m_val = QMIN(m_maxVal, m_val); + m_val = TQMAX(m_minVal, m_val); + m_val = TQMIN(m_maxVal, m_val); sp->setValue(m_val); } @@ -197,31 +197,31 @@ void InputInt::setEnabled(bool state) InputString::InputString(const TQString & label, - TQWidget *parent, TQCString &s, StringMode m) - : TQWidget(parent), str(s), sm(m), m_values(0), m_index(0) + TQWidget *tqparent, TQCString &s, StringMode m) + : TQWidget(tqparent), str(s), sm(m), m_values(0), m_index(0) { le = 0; br = 0; com = 0; if (m == StringFixed) { - TQHBoxLayout *layout = new TQHBoxLayout(this, 5); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5); com = new TQComboBox(this); lab = new TQLabel(com,label+":", this); - layout->addWidget(lab); - layout->addWidget(com); - layout->addStretch(1); + tqlayout->addWidget(lab); + tqlayout->addWidget(com); + tqlayout->addStretch(1); } else { - TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5); + TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5); le = new KLineEdit(this); lab = new TQLabel(le,label+":", this); - layout->addWidget(lab, 0, 0); + tqlayout->addWidget(lab, 0, 0); le->setText(s); - layout->addWidget(le, 0, 1); + tqlayout->addWidget(le, 0, 1); if (m == StringFile || m == StringDir) { br = new TQPushButton(this); br->setPixmap(SmallIcon(m==StringFile? "document" : "folder")); TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder")); - layout->addWidget(br, 0, 2); + tqlayout->addWidget(br, 0, 2); } } @@ -245,7 +245,7 @@ InputString::~InputString() void InputString::init() { if (sm == StringFixed) { - int *itemIndex = m_values->find(str); + int *itemIndex = m_values->tqfind(str); if (itemIndex) com->setCurrentItem(*itemIndex); else @@ -324,32 +324,32 @@ void InputString::browse() InputStrList::InputStrList(const TQString & label, - TQWidget *parent, TQStrList &sl, ListMode lm) - : TQWidget(parent), strList(sl) + TQWidget *tqparent, TQStrList &sl, ListMode lm) + : TQWidget(tqparent), strList(sl) { - TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5); + TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5); - TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */ - TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5); + TQWidget *dw = new TQWidget(this); /* dummy widget used for tqlayouting */ + TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5); le = new KLineEdit(dw); lab = new TQLabel(le,label+":", this ); - layout->addWidget(lab, 0, 0); - boxlayout->addWidget(le, 1); + tqlayout->addWidget(lab, 0, 0); + boxtqlayout->addWidget(le, 1); add = new TQPushButton(dw); add->setPixmap(TQPixmap( add_xpm )); TQToolTip::add(add, i18n("Add item")); - boxlayout->addWidget(add); + boxtqlayout->addWidget(add); del = new TQPushButton(dw); del->setPixmap(TQPixmap( del_xpm )); TQToolTip::add(del, i18n("Delete selected item")); - boxlayout->addWidget(del); + boxtqlayout->addWidget(del); upd = new TQPushButton(dw); upd->setPixmap(TQPixmap( update_xpm )); TQToolTip::add(upd, i18n("Update selected item")); - boxlayout->addWidget(upd); + boxtqlayout->addWidget(upd); lb = new TQListBox(this); lb->setMinimumSize(400, 100); @@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label, brFile = new TQPushButton(dw); brFile->setPixmap(SmallIcon("document")); TQToolTip::add(brFile, i18n("Browse to a file")); - boxlayout->addWidget(brFile); + boxtqlayout->addWidget(brFile); } if (lm & ListDir) { brDir = new TQPushButton(dw); brDir->setPixmap(SmallIcon("folder")); TQToolTip::add(brDir, i18n("Browse to a folder")); - boxlayout->addWidget(brDir); + boxtqlayout->addWidget(brDir); } } - layout->addWidget(dw, 0, 1); - layout->addWidget(lb, 1, 1); + tqlayout->addWidget(dw, 0, 1); + tqlayout->addWidget(lb, 1, 1); connect( le, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(addString()) ); diff --git a/parts/doxygen/input.h b/parts/doxygen/input.h index b046f39c..ac73ce20 100644 --- a/parts/doxygen/input.h +++ b/parts/doxygen/input.h @@ -36,14 +36,15 @@ class IInput class InputBool : public TQWidget, public IInput { Q_OBJECT + TQ_OBJECT public: - InputBool(const TQCString &key, const TQString &text, TQWidget *parent, bool &flag); + InputBool(const TQCString &key, const TQString &text, TQWidget *tqparent, bool &flag); ~InputBool(); void init(); virtual void setEnabled(bool b); - virtual TQObject *qobject() { return this; } + virtual TQObject *qobject() { return TQT_TQOBJECT(this); } virtual bool getState() const { return state; } signals: @@ -63,15 +64,16 @@ private: class InputInt : public TQWidget, public IInput { Q_OBJECT + TQ_OBJECT public: - InputInt(const TQString &text, TQWidget *parent, + InputInt(const TQString &text, TQWidget *tqparent, int &val, int minVal, int maxVal); ~InputInt(); void init(); virtual void setEnabled(bool); - TQObject *qobject() { return this; } + TQObject *qobject() { return TQT_TQOBJECT(this); } signals: void changed(); @@ -91,6 +93,7 @@ private: class InputString : public TQWidget, public IInput { Q_OBJECT + TQ_OBJECT public: enum StringMode { StringFree=0, @@ -99,14 +102,14 @@ public: StringFixed=3 }; - InputString(const TQString &text, TQWidget *parent, + InputString(const TQString &text, TQWidget *tqparent, TQCString &s, StringMode m=StringFree); ~InputString(); void init(); void addValue(const char *s); void setEnabled(bool); - TQObject *qobject() { return this; } + TQObject *qobject() { return TQT_TQOBJECT(this); } signals: void changed(); @@ -131,6 +134,7 @@ private: class InputStrList : public TQWidget, public IInput { Q_OBJECT + TQ_OBJECT public: enum ListMode { ListString=0, @@ -139,13 +143,13 @@ public: ListFileDir=ListFile|ListDir }; - InputStrList(const TQString &text, TQWidget *parent, + InputStrList(const TQString &text, TQWidget *tqparent, TQStrList &sl, ListMode v=ListString); ~InputStrList(); void init(); void setEnabled(bool); - TQObject *qobject() { return this; } + TQObject *qobject() { return TQT_TQOBJECT(this); } signals: void changed(); diff --git a/parts/doxygen/messages.cpp b/parts/doxygen/messages.cpp index 8819b109..ee56cb34 100644 --- a/parts/doxygen/messages.cpp +++ b/parts/doxygen/messages.cpp @@ -90,7 +90,7 @@ TQString message(const TQCString &key) // configuration options related to warning and progress messages //--------------------------------------------------------------------------- addMessage("Messages", i18n("Messages")); - addMessage("QUIET", i18n("Suppress output")); + addMessage("TQUIET", i18n("Suppress output")); addMessage("WARNINGS", i18n("Show warnings")); addMessage("WARN_IF_UNDOCUMENTED", i18n("Warn about undocumented entities")); addMessage("WARN_IF_DOC_ERROR", i18n("Warn if error in documents")); @@ -289,7 +289,7 @@ TQString message(const TQCString &key) initialized = true; } - if (!sMessages.contains(key)) + if (!sMessages.tqcontains(key)) { kdDebug() << "Unhandled message: " << key << endl; |