summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
m---------cmake0
-rw-r--r--klinkstatus/src/klinkstatus.lsm14
-rw-r--r--kommander/editor/metadatabase.cpp6
-rw-r--r--kommander/editor/metadatabase.h2
-rw-r--r--kommander/editor/preferences.ui8
-rw-r--r--kommander/editor/propertyeditor.cpp18
-rw-r--r--kommander/editor/resource.cpp4
-rw-r--r--kommander/editor/widgetfactory.cpp4
-rw-r--r--kommander/factory/domtool.cpp2
-rw-r--r--kommander/factory/kommanderfactory.cpp2
-rw-r--r--quanta/data/toolbars/kde-docbook/kde-docbook-admonitions.toolbar2
-rw-r--r--quanta/data/toolbars/kde-docbook/kde-docbook-images.toolbar2
-rw-r--r--quanta/data/toolbars/kde-docbook/kde-docbook-list.toolbar2
-rw-r--r--quanta/data/toolbars/kde-docbook/kde-docbook-standard.toolbar2
-rw-r--r--quanta/data/toolbars/kde-docbook/kde-docbook-tables.toolbar2
-rw-r--r--quanta/quanta.lsm15
-rw-r--r--quanta/scripts/checkxml.kmdr4
-rw-r--r--quanta/scripts/tablewizard.kmdr6
-rw-r--r--tdewebdev.lsm14
20 files changed, 35 insertions, 78 deletions
diff --git a/.gitmodules b/.gitmodules
index 4fce771..bdec8fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "admin"]
path = admin
- url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
+ url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
- url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+ url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/cmake b/cmake
-Subproject 0a407527790db5dbf573ffba5dbac45048489c0
+Subproject 8668335711fa13cec276552d75bfbb4285c7edb
diff --git a/klinkstatus/src/klinkstatus.lsm b/klinkstatus/src/klinkstatus.lsm
deleted file mode 100644
index e7e8cd9..0000000
--- a/klinkstatus/src/klinkstatus.lsm
+++ /dev/null
@@ -1,14 +0,0 @@
-Begin4
-Title: KLinkStatus
-Version: R14.1.0
-Entered-date: 2010-05-10
-Description: A web link checker for the Trinity Desktop Environment
-Keywords: TDE Qt
-Author: Paulo Moura Guedes <pmg@netcabo.pt>
-Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site: http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site: http://www.kde.org/
-Platforms: Linux and other Unices running TDE
-Copying-policy: GPL
-End
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index 23e9761..c84e115 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -48,7 +48,7 @@ class MetaDataBaseRecord
public:
TQObject *object;
TQStringList changedProperties;
- TQMap<TQString,TQVariant> fakeProperties;
+ TQStringVariantMap fakeProperties;
TQMap<TQString, TQString> propertyComments;
int spacing, margin;
TQValueList<MetaDataBase::Connection> connections;
@@ -237,14 +237,14 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
o, o->name(), o->className() );
return TQVariant();
}
- TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property );
+ TQStringVariantMap::Iterator it = r->fakeProperties.find( property );
if ( it != r->fakeProperties.end() )
return r->fakeProperties[property];
return WidgetFactory::defaultValue( o, property );
}
-TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o )
+TQStringVariantMap* MetaDataBase::fakeProperties( TQObject* o )
{
setupDataBase();
MetaDataBaseRecord *r = db->find( (void*)o );
diff --git a/kommander/editor/metadatabase.h b/kommander/editor/metadatabase.h
index 11254f0..cb73130 100644
--- a/kommander/editor/metadatabase.h
+++ b/kommander/editor/metadatabase.h
@@ -143,7 +143,7 @@ public:
static void setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value );
static TQVariant fakeProperty( TQObject * o, const TQString &property );
- static TQMap<TQString,TQVariant>* fakeProperties( TQObject* o );
+ static TQStringVariantMap* fakeProperties( TQObject* o );
static void setSpacing( TQObject *o, int spacing );
static int spacing( TQObject *o );
diff --git a/kommander/editor/preferences.ui b/kommander/editor/preferences.ui
index 2cb673e..0f65495 100644
--- a/kommander/editor/preferences.ui
+++ b/kommander/editor/preferences.ui
@@ -38,7 +38,7 @@
<bool>true</bool>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;b&gt;Preferences&lt;/b&gt;&lt;p&gt;Change the preferences of Qt Designer. There is always one tab with general preferences. There may be additional tabs, depending on which plugins are installed.&lt;/p&gt;</string>
+ <string>&lt;b&gt;Preferences&lt;/b&gt;&lt;p&gt;Change the preferences of TQt Designer. There is always one tab with general preferences. There may be additional tabs, depending on which plugins are installed.&lt;/p&gt;</string>
</property>
<vbox>
<property name="name">
@@ -324,7 +324,7 @@
</size>
</property>
<property name="whatsThis" stdset="0">
- <string>A splash screen is displayed when starting Qt Designer if this option is checked.</string>
+ <string>A splash screen is displayed when starting TQt Designer if this option is checked.</string>
</property>
</spacer>
<widget class="TQGroupBox" row="2" column="0">
@@ -358,7 +358,7 @@
<string>Restore last workspace</string>
</property>
<property name="whatsThis" stdset="0">
- <string>The current workspace settings will be restored the next time you start Qt Designer if this option is checked.</string>
+ <string>The current workspace settings will be restored the next time you start TQt Designer if this option is checked.</string>
</property>
</widget>
<widget class="TQCheckBox">
@@ -375,7 +375,7 @@
<string>Show Splashscreen</string>
</property>
<property name="whatsThis" stdset="0">
- <string>A splash screen is displayed when starting Qt Designer if this option is checked.</string>
+ <string>A splash screen is displayed when starting TQt Designer if this option is checked.</string>
</property>
</widget>
<widget class="TQCheckBox">
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index f105a4e..40b4caf 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -1085,7 +1085,7 @@ PropertyBoolItem::~PropertyBoolItem()
void PropertyBoolItem::toggle()
{
bool b = value().toBool();
- setValue( TQVariant( !b, 0 ) );
+ setValue( TQVariant( !b ) );
setValue();
}
@@ -1139,8 +1139,8 @@ void PropertyBoolItem::setValue()
if ( !comb )
return;
setText( 1, combo()->currentText() );
- bool b = combo()->currentItem() == 0 ? (bool)false : (bool)true;
- PropertyItem::setValue( TQVariant( b, 0 ) );
+ bool b = combo()->currentItem() == 0 ? false : true;
+ PropertyItem::setValue( TQVariant( b ) );
notifyValueChange();
}
@@ -1790,13 +1790,13 @@ void PropertyFontItem::initChildren()
} else if ( item->name() == i18n("Point Size" ) )
item->setValue( val.toFont().pointSize() );
else if ( item->name() == i18n("Bold" ) )
- item->setValue( TQVariant( val.toFont().bold(), 0 ) );
+ item->setValue( TQVariant( val.toFont().bold() ) );
else if ( item->name() == i18n("Italic" ) )
- item->setValue( TQVariant( val.toFont().italic(), 0 ) );
+ item->setValue( TQVariant( val.toFont().italic() ) );
else if ( item->name() == i18n("Underline" ) )
- item->setValue( TQVariant( val.toFont().underline(), 0 ) );
+ item->setValue( TQVariant( val.toFont().underline() ) );
else if ( item->name() == i18n("Strikeout" ) )
- item->setValue( TQVariant( val.toFont().strikeOut(), 0 ) );
+ item->setValue( TQVariant( val.toFont().strikeOut() ) );
}
}
@@ -3081,9 +3081,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
} else if ( i->name() == "wordwrap" ) {
int align = editor->widget()->property( "alignment" ).toInt();
if ( align & WordBreak )
- i->setValue( TQVariant( true, 0 ) );
+ i->setValue( TQVariant( true ) );
else
- i->setValue( TQVariant( false, 0 ) );
+ i->setValue( TQVariant( false) );
} else if ( i->name() == "layoutSpacing" ) {
( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
} else if ( i->name() == "layoutMargin" ) {
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index d9d3fa7..e08d25c 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -1044,8 +1044,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
}
if ( w->isWidgetType() && MetaDataBase::fakeProperties( w ) ) {
- TQMap<TQString, TQVariant>* fakeProperties = MetaDataBase::fakeProperties( w );
- for ( TQMap<TQString, TQVariant>::Iterator fake = fakeProperties->begin();
+ TQStringVariantMap* fakeProperties = MetaDataBase::fakeProperties( w );
+ for ( TQStringVariantMap::Iterator fake = fakeProperties->begin();
fake != fakeProperties->end(); ++fake ) {
if ( MetaDataBase::isPropertyChanged( w, fake.key() ) ) {
if ( w->inherits( "CustomWidget" ) ) {
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 15f9ad1..5908574 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -1679,13 +1679,13 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
{
if ( propName == "wordwrap" ) {
int v = defaultValue( w, "alignment" ).toInt();
- return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
+ return TQVariant( ( v & WordBreak ) == WordBreak );
} else if ( propName == "toolTip" || propName == "whatsThis" ) {
return TQVariant( TQString::fromLatin1( "" ) );
} else if ( w->inherits( "CustomWidget" ) ) {
return TQVariant();
} else if ( propName == "frameworkCode" ) {
- return TQVariant( true, 0 );
+ return TQVariant( true );
} else if ( propName == "layoutMargin" ) {
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
return TQVariant( 0 );
diff --git a/kommander/factory/domtool.cpp b/kommander/factory/domtool.cpp
index 40190ff..56a98a6 100644
--- a/kommander/factory/domtool.cpp
+++ b/kommander/factory/domtool.cpp
@@ -177,7 +177,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def
v = TQVariant( e.firstChild().toText().data().toDouble() );
} else if ( e.tagName() == "bool" ) {
TQString t = e.firstChild().toText().data();
- v = TQVariant( t == "true" || t == "1", 0 );
+ v = TQVariant( t == "true" || t == "1" );
} else if ( e.tagName() == "pixmap" ) {
v = TQVariant( e.firstChild().toText().data() );
} else if ( e.tagName() == "iconset" ) {
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index eee18d4..8154943 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -788,7 +788,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
if ( prop == "buddy" ) {
buddies.insert( obj->name(), v.toCString() );
} else if ( prop == "frameworkCode" ) {
- if ( !DomTool::elementToVariant( e, TQVariant( true, 0 ) ).toBool() ) {
+ if ( !DomTool::elementToVariant( e, TQVariant( true ) ).toBool() ) {
noDatabaseWidgets << obj->name();
}
} else if ( prop == "buttonGroupId" ) {
diff --git a/quanta/data/toolbars/kde-docbook/kde-docbook-admonitions.toolbar b/quanta/data/toolbars/kde-docbook/kde-docbook-admonitions.toolbar
index 83ad67b..8eb2478 100644
--- a/quanta/data/toolbars/kde-docbook/kde-docbook-admonitions.toolbar
+++ b/quanta/data/toolbars/kde-docbook/kde-docbook-admonitions.toolbar
@@ -1,7 +1,7 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="quanta" version="2">
<ToolBar tabname="Admonitions" noMerge="1" name="admonitions" >
- <text>KDE DocBook Admonitions</text>
+ <text>TDE DocBook Admonitions</text>
<Action name="DBtag_warning" />
<Action name="DBtag_caution" />
<Separator name="separator_3" />
diff --git a/quanta/data/toolbars/kde-docbook/kde-docbook-images.toolbar b/quanta/data/toolbars/kde-docbook/kde-docbook-images.toolbar
index 1f6253b..f440a2b 100644
--- a/quanta/data/toolbars/kde-docbook/kde-docbook-images.toolbar
+++ b/quanta/data/toolbars/kde-docbook/kde-docbook-images.toolbar
@@ -1,7 +1,7 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="quanta" version="2">
<ToolBar tabname="Images" noMerge="1" name="images" >
- <text>KDE DocBook Images</text>
+ <text>TDE DocBook Images</text>
<Action name="image_wizard" />
<Separator name="separator_4" />
<Action name="DBtag_screenshot" />
diff --git a/quanta/data/toolbars/kde-docbook/kde-docbook-list.toolbar b/quanta/data/toolbars/kde-docbook/kde-docbook-list.toolbar
index 30fe1f0..b580aea 100644
--- a/quanta/data/toolbars/kde-docbook/kde-docbook-list.toolbar
+++ b/quanta/data/toolbars/kde-docbook/kde-docbook-list.toolbar
@@ -1,7 +1,7 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="quanta" version="2">
<ToolBar tabname="Lists" noMerge="1" name="lists" >
- <text>KDE DocBook Lists</text>
+ <text>TDE DocBook Lists</text>
<Action name="list_wizard" />
<Separator name="separator_4" />
<Action name="DBtag_orderedlist" />
diff --git a/quanta/data/toolbars/kde-docbook/kde-docbook-standard.toolbar b/quanta/data/toolbars/kde-docbook/kde-docbook-standard.toolbar
index ac77966..047c2da 100644
--- a/quanta/data/toolbars/kde-docbook/kde-docbook-standard.toolbar
+++ b/quanta/data/toolbars/kde-docbook/kde-docbook-standard.toolbar
@@ -1,7 +1,7 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="quanta" version="2">
<ToolBar tabname="Standard" noMerge="1" name="standard" >
- <text>KDE DocBook Standard</text>
+ <text>TDE DocBook Standard</text>
<Action name="DBtag_chapter" />
<Action name="DBtag_sect1" />
<Action name="DBtag_sect2" />
diff --git a/quanta/data/toolbars/kde-docbook/kde-docbook-tables.toolbar b/quanta/data/toolbars/kde-docbook/kde-docbook-tables.toolbar
index 290fa88..7a30850 100644
--- a/quanta/data/toolbars/kde-docbook/kde-docbook-tables.toolbar
+++ b/quanta/data/toolbars/kde-docbook/kde-docbook-tables.toolbar
@@ -1,7 +1,7 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="quanta" version="2">
<ToolBar tabname="Tables" noMerge="1" name="tables" >
- <text>KDE DocBook Tables</text>
+ <text>TDE DocBook Tables</text>
<Action name="table_wizard" />
<Separator name="separator_3" />
<Action name="DBtag_table" />
diff --git a/quanta/quanta.lsm b/quanta/quanta.lsm
deleted file mode 100644
index bc4d320..0000000
--- a/quanta/quanta.lsm
+++ /dev/null
@@ -1,15 +0,0 @@
-Begin4
-Title: Quanta Plus
-Version: R14.1.0
-Entered-date: 2010-05-10
-Description: Markup and script language editor for the Trinity Desktop Environment
-Keywords: HTML, JS, PHP, Embeded Preview, TDE, Quanta
-Author: Eric Laffoon <sequitur@kde.org> and Andras Mantia <amantia@kde.org>
- Originally by Dmitry Poplavsky <dima@kde.org> and Alexander Yakovlev <yshurik@kde.org>
-Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site: http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site: http://www.kde.org/
-Platforms: Linux and other Unices running TDE
-Copying-policy: GPL
-End
diff --git a/quanta/scripts/checkxml.kmdr b/quanta/scripts/checkxml.kmdr
index c6e1f98..c20778a 100644
--- a/quanta/scripts/checkxml.kmdr
+++ b/quanta/scripts/checkxml.kmdr
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>Form3</class>
-<comment>Quanta+ KDE XML Validator is a Kommander front-end for checkXML.</comment>
+<comment>Quanta+ TDE XML Validator is a Kommander front-end for checkXML.</comment>
<author>Chris Hornbaker</author>
<widget class="Dialog">
<property name="name">
@@ -15,7 +15,7 @@
</rect>
</property>
<property name="caption">
- <string>Quanta+ KDE XML Validator</string>
+ <string>Quanta+ TDE XML Validator</string>
</property>
<property name="associations" stdset="0">
<stringlist>
diff --git a/quanta/scripts/tablewizard.kmdr b/quanta/scripts/tablewizard.kmdr
index ec00277..205a8b4 100644
--- a/quanta/scripts/tablewizard.kmdr
+++ b/quanta/scripts/tablewizard.kmdr
@@ -265,7 +265,7 @@ done;
<string>Table title:</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Enter here the title of the table. The title of the table will appear in the table of contents as well, under the "List of Tables", if you are using the KDE DocBook tools.</string>
+ <string>Enter here the title of the table. The title of the table will appear in the table of contents as well, under the "List of Tables", if you are using the TDE DocBook tools.</string>
</property>
</widget>
<widget class="SpinBoxInt" row="0" column="2">
@@ -305,7 +305,7 @@ done
</stringlist>
</property>
<property name="whatsThis" stdset="0">
- <string>Enter here the title of the table. The title of the table will appear in the table of contents as well, under the "List of Tables", if you are using the KDE DocBook tools.</string>
+ <string>Enter here the title of the table. The title of the table will appear in the table of contents as well, under the "List of Tables", if you are using the TDE DocBook tools.</string>
</property>
</widget>
</grid>
@@ -403,7 +403,7 @@ echo '&lt;/informaltable&gt;'</string>
<string>&lt;qt&gt;
Select the table type:
&lt;ul&gt;
-&lt;li&gt;&lt;b&gt;informaltable:&lt;/b&gt; the most used table type in KDE docs. A informaltable does not contain title, table head or entry in the table of contents.&lt;/li&gt;
+&lt;li&gt;&lt;b&gt;informaltable:&lt;/b&gt; the most used table type in TDE docs. A informaltable does not contain title, table head or entry in the table of contents.&lt;/li&gt;
&lt;li&gt;&lt;b&gt;table:&lt;/b&gt; a complete and formal table type, including title, table head and entry in the table of contents.&lt;/li&gt;
&lt;/ul&gt;
&lt;/qt&gt;</string>
diff --git a/tdewebdev.lsm b/tdewebdev.lsm
deleted file mode 100644
index cc1a272..0000000
--- a/tdewebdev.lsm
+++ /dev/null
@@ -1,14 +0,0 @@
-Begin4
-Title: tdewebdev
-Version: R14.1.0
-Entered-date: 2010-05-10
-Description: Web Development Applications for the Trinity Desktop Environment
-Keywords: TDE X11 desktop Qt
-Author: http://www.kde.org/
-Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site: http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site: http://www.kde.org/
-Platforms: Linux and other Unices running TDE
-Copying-policy: GPL
-End