summaryrefslogtreecommitdiffstats
path: root/parts/astyle
diff options
context:
space:
mode:
Diffstat (limited to 'parts/astyle')
-rw-r--r--parts/astyle/astyle_part.cpp28
-rw-r--r--parts/astyle/astyle_part.h2
-rw-r--r--parts/astyle/astyle_widget.cpp68
-rw-r--r--parts/astyle/astyle_widget.h2
-rw-r--r--parts/astyle/astyleconfig.ui4
5 files changed, 52 insertions, 52 deletions
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index f5b5e2e7..df911cc1 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -33,7 +33,7 @@
#include "astyle_widget.h"
#include "astyle_adaptor.h"
-static const KDevPluginInfo data("kdevastyle");
+static const KDevPluginInfo pluginData("kdevastyle");
namespace {
const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm";
@@ -41,22 +41,22 @@ namespace {
typedef KDevGenericFactory<AStylePart> AStyleFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( pluginData ) )
AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
- : KDevSourceFormatter(&data, parent, name ? name : "AStylePart")
+ : KDevSourceFormatter(&pluginData, parent, name ? name : "AStylePart")
{
setInstance(AStyleFactory::instance());
setXMLFile("kdevpart_astyle.rc");
- formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle");
+ formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQ_SLOT(beautifySource()), actionCollection(), "edit_astyle");
formatTextAction->setEnabled(false);
formatTextAction->setToolTip(i18n("Reformat source"));
formatTextAction->setWhatsThis(i18n("<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</b> library. "
"Also available in <b>New Class</b> and <b>Subclassing</b> wizards."));
- formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle");
+ formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQ_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle");
formatFileAction->setEnabled(false);
formatFileAction->setToolTip(i18n("Format files"));
formatFileAction->setWhatsThis(i18n("<b>Fomat files</b><p>Formatting functionality using <b>astyle</b> library. "
@@ -68,11 +68,11 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
m_configProxy->createProjectConfigPage(i18n("Formatting"), PROJECTDOC_OPTIONS, info()->icon());
- connect(m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQT_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int)));
+ connect(m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase* ,TQWidget*,unsigned int)), this, TQ_SLOT(insertConfigWidget(const KDialogBase*,TQWidget*,unsigned int)));
- connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(activePartChanged(KParts::Part*)));
+ connect(partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), this, TQ_SLOT(activePartChanged(KParts::Part*)));
- connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+ connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
loadGlobal();
//use the globals first, project level will override later..
@@ -88,7 +88,7 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &)
void AStylePart::loadGlobal()
{
// kdDebug(9009) << "Load global"<<endl;
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("AStyle");
TQString options = config->readEntry("Options","BlockBreak=0,BlockBreakAll=0,BlockIfElse=0,Brackets=Break,BracketsCloseHeaders=0,FStyle=UserDefined,Fill=Tabs,FillCount=4,FillEmptyLines=0,FillForce=0,IndentBlocks=0,IndentBrackets=0,IndentCases=0,IndentClasses=1,IndentLabels=1,IndentNamespaces=1,IndentPreprocessors=0,IndentSwitches=1,KeepBlocks=1,KeepStatements=1,MaxStatement=40,MinConditional=-1,PadOperators=0,PadParenthesesIn=1,PadParenthesesOut=1,PadParenthesesUn=1,");
m_globalExtensions=TQStringList::split(",",config->readEntry("Extensions",defaultFormatExtensions));
@@ -123,7 +123,7 @@ void AStylePart::saveGlobal()
// kdDebug(9009) << "project before: " <<iter.key() << "="<< iter.data() << endl;
// }
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("AStyle");
config->writeEntry("Options",options);
config->writeEntry("Extensions",m_globalExtensions.join(","));
@@ -249,13 +249,13 @@ void AStylePart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsi
case GLOBALDOC_OPTIONS:
{
AStyleWidget *w = new AStyleWidget(this, true, page, "astyle config widget");
- connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
+ connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
break;
}
case PROJECTDOC_OPTIONS:
{
AStyleWidget *w = new AStyleWidget(this, false, page, "astyle config widget");
- connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
+ connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
break;
}
}
@@ -399,7 +399,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context)
if (context->hasType( Context::EditorContext ))
{
popup->insertSeparator();
- int id = popup->insertItem( i18n("Format selection"), this, TQT_SLOT(beautifySource()) );
+ int id = popup->insertItem( i18n("Format selection"), this, TQ_SLOT(beautifySource()) );
popup->TQMenuData::setWhatsThis(id, i18n("<b>Format</b><p>Formats the current selection, if possible"));
}
else if ( context->hasType( Context::FileContext )){
@@ -407,7 +407,7 @@ void AStylePart::contextMenu(TQPopupMenu *popup, const Context *context)
m_urls = ctx->urls();
popup->insertSeparator();
- int id = popup->insertItem( i18n("Format files"), this, TQT_SLOT(formatFiles()) );
+ int id = popup->insertItem( i18n("Format files"), this, TQ_SLOT(formatFiles()) );
popup->TQMenuData::setWhatsThis(id, i18n("<b>Format files</b><p>Formats selected files if possible"));
}
diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h
index f5a79485..05f94bb7 100644
--- a/parts/astyle/astyle_part.h
+++ b/parts/astyle/astyle_part.h
@@ -22,7 +22,7 @@ class ConfigWidgetProxy;
class AStylePart : public KDevSourceFormatter
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp
index 6959fe7b..67cf8d5c 100644
--- a/parts/astyle/astyle_widget.cpp
+++ b/parts/astyle/astyle_widget.cpp
@@ -17,40 +17,40 @@ AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, con
: AStyleConfig(parent, name), m_part(part), isGlobalWidget(global)
{
// which style changed - disable the other pages.
- connect(StyleGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged()));
- connect(ConfigTabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(styleChanged()) );
-
- connect(FillingGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged()));
- connect(Fill_ForceTabs, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Fill_TabCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged()));
- connect(Fill_SpaceCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged()));
-
- connect(BracketGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(styleChanged()));
- connect(Brackets_CloseHeaders, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
-
- connect(Indent_Switches, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Indent_Cases, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Indent_Classes, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Indent_Brackets, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Indent_Namespaces, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Indent_Labels, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Indent_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Indent_Preprocessors, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
-
- connect(Continue_MaxStatement, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged()));
- connect(Continue_MinConditional, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(styleChanged()));
-
- connect(Block_Break, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Block_BreakAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Block_IfElse, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
-
- connect(Pad_ParenthesesIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Pad_ParenthesesOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Pad_ParenthesesUn, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Pad_Operators, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
-
- connect(Keep_Statements, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
- connect(Keep_Blocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleChanged()));
+ connect(StyleGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged()));
+ connect(ConfigTabs, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(styleChanged()) );
+
+ connect(FillingGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged()));
+ connect(Fill_ForceTabs, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Fill_TabCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged()));
+ connect(Fill_SpaceCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged()));
+
+ connect(BracketGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(styleChanged()));
+ connect(Brackets_CloseHeaders, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+
+ connect(Indent_Switches, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Indent_Cases, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Indent_Classes, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Indent_Brackets, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Indent_Namespaces, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Indent_Labels, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Indent_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Indent_Preprocessors, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+
+ connect(Continue_MaxStatement, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged()));
+ connect(Continue_MinConditional, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(styleChanged()));
+
+ connect(Block_Break, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Block_BreakAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Block_IfElse, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+
+ connect(Pad_ParenthesesIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Pad_ParenthesesOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Pad_ParenthesesUn, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Pad_Operators, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+
+ connect(Keep_Statements, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
+ connect(Keep_Blocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleChanged()));
TQStringVariantMap option;
diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h
index 91963e54..5ebb70b0 100644
--- a/parts/astyle/astyle_widget.h
+++ b/parts/astyle/astyle_widget.h
@@ -9,7 +9,7 @@ class KDevPart;
class AStyleWidget : public AStyleConfig
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui
index 73cf691a..28a3432e 100644
--- a/parts/astyle/astyleconfig.ui
+++ b/parts/astyle/astyleconfig.ui
@@ -1324,9 +1324,9 @@ multiple single-statement lines.</string>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>allFiles()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 17:55:20 +0000