summaryrefslogtreecommitdiffstats
path: root/interfaces/ktexteditor
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-16 02:40:35 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-16 02:40:35 +0000
commitbab40890696ec68c337dc290880423a0602b83c7 (patch)
tree6ba03f720b1fa88235ba339e7aedb4455430357e /interfaces/ktexteditor
parentf7e71d47719ab6094cf4a9fafffa5ea351973522 (diff)
downloadtdelibs-bab40890696ec68c337dc290880423a0602b83c7.tar.gz
tdelibs-bab40890696ec68c337dc290880423a0602b83c7.zip
Finished remaining porting to new TQt API
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'interfaces/ktexteditor')
-rw-r--r--interfaces/ktexteditor/document.h1
-rw-r--r--interfaces/ktexteditor/editor.h1
-rw-r--r--interfaces/ktexteditor/editorchooser.cpp4
-rw-r--r--interfaces/ktexteditor/editorchooser_ui.ui6
-rw-r--r--interfaces/ktexteditor/templateinterface.cpp6
5 files changed, 10 insertions, 8 deletions
diff --git a/interfaces/ktexteditor/document.h b/interfaces/ktexteditor/document.h
index 624c344b9..da6a6dd77 100644
--- a/interfaces/ktexteditor/document.h
+++ b/interfaces/ktexteditor/document.h
@@ -33,6 +33,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor
friend class PrivateDocument;
Q_OBJECT
+ TQ_OBJECT
public:
Document ( TQObject *parent = 0, const char *name = 0 );
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h
index fa4761432..2530257eb 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/ktexteditor/editor.h
@@ -41,6 +41,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
friend class PrivateEditor;
Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp
index 60aef8d10..fa4677aaf 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/ktexteditor/editorchooser.cpp
@@ -57,7 +57,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
{
if ((*it)->desktopEntryName().contains(editor))
{
- d->chooser->editorCombo->insertItem(i18n("System Default (%1)").arg((*it)->name()));
+ d->chooser->editorCombo->insertItem(TQString(i18n("System Default (%1)").arg((*it)->name())));
break;
}
}
@@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
else
{
- int idx=d->elements.findIndex(editor);
+ int idx=d->elements.tqfindIndex(editor);
idx=idx+1;
d->chooser->editorCombo->setCurrentItem(idx);
}
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui
index 831d8d37a..816a1d194 100644
--- a/interfaces/ktexteditor/editorchooser_ui.ui
+++ b/interfaces/ktexteditor/editorchooser_ui.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EditorChooser_UI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>EditorChooser</cstring>
</property>
@@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -44,7 +44,7 @@
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="TQComboBox">
<property name="name">
<cstring>editorCombo</cstring>
</property>
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index b19b1d10a..10576fe15 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/ktexteditor/templateinterface.cpp
@@ -75,8 +75,8 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
KABC::StdAddressBook *addrBook = 0;
KABC::Addressee userAddress;
TQDateTime datetime = TQDateTime::tqcurrentDateTime();
- TQDate date = datetime.date();
- TQTime time = datetime.time();
+ TQDate date = TQT_TQDATE_OBJECT(datetime.date());
+ TQTime time = TQT_TQTIME_OBJECT(datetime.time());
TQMap<TQString,TQString>::Iterator it;
for ( it = map.begin(); it != map.end(); ++it )
@@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
}
}
TQString placeholder = rx.cap( 1 );
- if ( ! enhancedInitValues.contains( placeholder ) )
+ if ( ! enhancedInitValues.tqcontains( placeholder ) )
enhancedInitValues[ placeholder ] = "";
pos += rx.matchedLength();