summaryrefslogtreecommitdiffstats
path: root/kivio
diff options
context:
space:
mode:
Diffstat (limited to 'kivio')
-rw-r--r--kivio/kiviopart/kivio_doc.cpp12
-rw-r--r--kivio/kiviopart/kivio_doc.h4
-rw-r--r--kivio/kiviopart/kivio_factory.cpp4
-rw-r--r--kivio/kiviopart/kivio_factory.h2
-rw-r--r--kivio/kiviopart/kivio_page.cpp8
-rw-r--r--kivio/kiviopart/kivio_view.cpp2
-rw-r--r--kivio/kiviopart/ui/aligndialog.ui18
-rw-r--r--kivio/kiviopart/ui/export_page_dialog_base.ui4
-rw-r--r--kivio/kiviopart/ui/kivio_birdeye_panel_base.ui6
-rw-r--r--kivio/kiviopart/ui/kivio_layer_panel_base.ui6
-rw-r--r--kivio/kiviopart/ui/kivio_protection_panel_base.ui2
-rw-r--r--kivio/kiviopart/ui/kiviooptionsdialog.cpp14
-rw-r--r--kivio/kiviopart/ui/kiviostencilsetwidget.ui4
-rw-r--r--kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui4
14 files changed, 45 insertions, 45 deletions
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index cf0327ab..f30b256e 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -99,8 +99,8 @@
TQPtrList<KivioDoc>* KivioDoc::s_docs = 0;
int KivioDoc::s_docId = 0;
-KivioDoc::KivioDoc( TQWidget *tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-: KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+: KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
{
dcop = 0;
if (!s_docs)
@@ -172,7 +172,7 @@ TQPtrList<KivioDoc>& KivioDoc::documents()
return *s_docs;
}
-bool KivioDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool KivioDoc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
{
KivioPage *t = createPage();
m_pMap->addPage( t );
@@ -196,7 +196,7 @@ bool KivioDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
}
ret = KoTemplateChooseDia::choose( KivioFactory::global(), f,
- dlgtype, "kivio_template", tqparentWidget );
+ dlgtype, "kivio_template", parentWidget );
if( ret == KoTemplateChooseDia::File ) {
KURL url(f);
@@ -305,9 +305,9 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter)
KoGenStyles styles;
KoGenStyle pageLayout = Kivio::Config::defaultPageLayout().saveOasis();
- TQString tqlayoutName = styles.lookup(pageLayout, "PL");
+ TQString layoutName = styles.lookup(pageLayout, "PL");
KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
- masterPage.addAttribute("style:page-tqlayout-name", tqlayoutName);
+ masterPage.addAttribute("style:page-tqlayout-name", layoutName);
styles.lookup(masterPage, "Standard", false);
if(!store->open("content.xml")) {
diff --git a/kivio/kiviopart/kivio_doc.h b/kivio/kiviopart/kivio_doc.h
index 441e8376..496a5fa8 100644
--- a/kivio/kiviopart/kivio_doc.h
+++ b/kivio/kiviopart/kivio_doc.h
@@ -68,7 +68,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
TQ_OBJECT
friend class KivioPage;
public:
- KivioDoc( TQWidget *tqparentWidget = 0, const char* widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+ KivioDoc( TQWidget *parentWidget = 0, const char* widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
~KivioDoc();
virtual DCOPObject* dcopObject();
@@ -79,7 +79,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
virtual bool loadXML( TQIODevice *, const TQDomDocument& doc );
virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* );
- virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+ virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
virtual TQCString mimeType() const { return MIME_TYPE; }
diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp
index 39a367ab..9badd432 100644
--- a/kivio/kiviopart/kivio_factory.cpp
+++ b/kivio/kiviopart/kivio_factory.cpp
@@ -43,11 +43,11 @@ KivioFactory::~KivioFactory()
s_global = 0L;
}
-KParts::Part* KivioFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
{
bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
- KivioDoc *doc = new KivioDoc( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+ KivioDoc *doc = new KivioDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
if ( !bWantKoDocument )
doc->setReadWrite( false );
diff --git a/kivio/kiviopart/kivio_factory.h b/kivio/kiviopart/kivio_factory.h
index 1883be87..4fe5ed1a 100644
--- a/kivio/kiviopart/kivio_factory.h
+++ b/kivio/kiviopart/kivio_factory.h
@@ -31,7 +31,7 @@ public:
KivioFactory( TQObject* tqparent = 0, const char* name = 0 );
~KivioFactory();
- virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+ virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
static KInstance* global();
static KAboutData* aboutData();
diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index 4a8fd51b..6e799f93 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -154,8 +154,8 @@ TQDomElement KivioPage::save( TQDomDocument& doc )
page.setAttribute( "hide", (int)m_bPageHide );
// Create a child element for the page tqlayout
- TQDomElement tqlayoutE = saveLayout( doc );
- page.appendChild( tqlayoutE );
+ TQDomElement layoutE = saveLayout( doc );
+ page.appendChild( layoutE );
// Save guides
TQDomElement guidesElement = doc.createElement("GuidesLayout");
@@ -191,10 +191,10 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle
docWriter->addAttribute("draw:master-page-name", "Standard");
} else {
KoGenStyle pageLayout = m_pPageLayout.saveOasis();
- TQString tqlayoutName = styles->lookup(pageLayout, "PL");
+ TQString layoutName = styles->lookup(pageLayout, "PL");
KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
- masterPage.addAttribute("style:page-tqlayout-name", tqlayoutName);
+ masterPage.addAttribute("style:page-tqlayout-name", layoutName);
TQString masterName = styles->lookup(masterPage, "MP");
docWriter->addAttribute("draw:master-page-name", masterName);
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 7d050b86..d38690d9 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -257,7 +257,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
TQWidget::setFocusPolicy( TQ_StrongFocus );
setFocusProxy( m_pCanvas );
- connect( TQT_TQOBJECT(this), TQT_SIGNAL( tqinvalidated() ), m_pCanvas, TQT_SLOT( update() ) );
+ connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) );
connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( tqrepaint( const TQRegion&, bool ) ) );
setInstance(KivioFactory::global());
diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui
index 80041d21..27f8c3b3 100644
--- a/kivio/kiviopart/ui/aligndialog.ui
+++ b/kivio/kiviopart/ui/aligndialog.ui
@@ -28,7 +28,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
<widget class="TQWidget">
<property name="name">
@@ -48,7 +48,7 @@
<property name="title">
<string>Horizontal</string>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
<grid>
<property name="name">
@@ -224,7 +224,7 @@
<property name="title">
<string>Vertical</string>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
<grid>
<property name="name">
@@ -347,9 +347,9 @@
<property name="title">
<string></string>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
- <property name="tqlayoutSpacing" stdset="0">
+ <property name="layoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -389,7 +389,7 @@
<property name="title">
<string>Vertical</string>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
<grid>
<property name="name">
@@ -485,7 +485,7 @@
<property name="title">
<string>Horizontal</string>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
<grid>
<property name="name">
@@ -627,6 +627,6 @@
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
- <tqlayoutdefaults spacing="6" margin="11"/>
- <tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kivio/kiviopart/ui/export_page_dialog_base.ui b/kivio/kiviopart/ui/export_page_dialog_base.ui
index 0935d1bf..bc993ed8 100644
--- a/kivio/kiviopart/ui/export_page_dialog_base.ui
+++ b/kivio/kiviopart/ui/export_page_dialog_base.ui
@@ -170,6 +170,6 @@ Places a blank border around the edges of the image. This can be used if for one
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
index 5ede3845..8b2cf4c0 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
@@ -20,9 +20,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
- <property name="tqlayoutSpacing" stdset="0">
+ <property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@@ -104,5 +104,5 @@
<slot>zoomPlus()</slot>
</Q_SLOTS>
<pixmapfunction>BarIcon</pixmapfunction>
-<tqlayoutdefaults spacing="2" margin="0"/>
+<layoutdefaults spacing="2" margin="0"/>
</UI>
diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
index f6e73ae8..0438d261 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
@@ -12,9 +12,9 @@
<height>268</height>
</rect>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
- <property name="tqlayoutSpacing" stdset="0">
+ <property name="layoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -92,7 +92,7 @@
<slot access="protected">itemClicked(TQListViewItem*,const QPoint&amp;,int)</slot>
<slot access="protected">updateButtons(TQListViewItem*)</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktoolbar.h</includehint>
</includehints>
diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
index 19bd2a6e..55fe9888 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
@@ -124,5 +124,5 @@
<tabstop>m_checkYPosition</tabstop>
<tabstop>m_checkDeletion</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="2" margin="0"/>
+<layoutdefaults spacing="2" margin="0"/>
</UI>
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index f6950f13..136b7deb 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -111,14 +111,14 @@ void KivioOptionsDialog::initPage()
m_unitCombo->insertStringList(KoUnit::listOfUnitName());
m_unitCombo->setCurrentItem(unit);
unitLbl->setBuddy(m_unitCombo);
- TQLabel* tqlayoutLbl = new TQLabel(i18n("Default tqlayout:"), page);
+ TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page);
m_layoutTxtLbl = new TQLabel(page);
m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy(
TQSizePolicy::Minimum, TQSizePolicy::Fixed));
setLayoutText(m_layout);
- KPushButton* tqlayoutBtn = new KPushButton(i18n("Change..."), page);
- tqlayoutBtn->tqsetSizePolicy(TQSizePolicy(
+ KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page);
+ layoutBtn->tqsetSizePolicy(TQSizePolicy(
TQSizePolicy::Fixed, TQSizePolicy::Fixed));
TQLabel* fontLbl = new TQLabel(i18n("Default font:"), page);
m_fontTxtLbl = new TQLabel(page);
@@ -127,7 +127,7 @@ void KivioOptionsDialog::initPage()
TQSizePolicy::Minimum, TQSizePolicy::Fixed));
setFontText(m_font);
KPushButton* fontBtn = new KPushButton(i18n("Change..."), page);
- tqlayoutBtn->tqsetSizePolicy(TQSizePolicy(
+ layoutBtn->tqsetSizePolicy(TQSizePolicy(
TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page);
m_marginsChBox->setChecked(view->isShowPageMargins());
@@ -138,9 +138,9 @@ void KivioOptionsDialog::initPage()
gl->setSpacing(KDialog::spacingHint());
gl->addWidget(unitLbl, 0, 0);
gl->addMultiCellWidget(m_unitCombo, 0, 0, 1, 2);
- gl->addWidget(tqlayoutLbl, 1, 0);
+ gl->addWidget(layoutLbl, 1, 0);
gl->addWidget(m_layoutTxtLbl, 1, 1);
- gl->addWidget(tqlayoutBtn, 1, 2);
+ gl->addWidget(layoutBtn, 1, 2);
gl->addWidget(fontLbl, 2, 0);
gl->addWidget(m_fontTxtLbl, 2, 1);
gl->addWidget(fontBtn, 2, 2);
@@ -148,7 +148,7 @@ void KivioOptionsDialog::initPage()
gl->addMultiCellWidget(m_rulersChBox, 4, 4, 0, 2);
gl->addMultiCell(new TQSpacerItem(0, 0), 5, 5, 0, 2);
- connect(tqlayoutBtn, TQT_SIGNAL(clicked()), TQT_SLOT(pageLayoutDlg()));
+ connect(layoutBtn, TQT_SIGNAL(clicked()), TQT_SLOT(pageLayoutDlg()));
connect(fontBtn, TQT_SIGNAL(clicked()), TQT_SLOT(fontDlg()));
connect(m_unitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(unitChanged(int)));
}
diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
index 63467798..48de8cc4 100644
--- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui
+++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
@@ -157,8 +157,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
index 1042746f..cfa2f317 100644
--- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
+++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
@@ -243,8 +243,8 @@ You should have received a copy of the GNU General Public License along with thi
<tabstop>m_fontSizeCombo</tabstop>
<tabstop>m_textColorButton</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-20 08:37:51 +0000