François Andriot
9 years ago
parent
17e804faf6
commit
47b9cb5f61
@ -1,141 +0,0 @@
|
||||
# Default version for this component
|
||||
%define kdecomp knutclient
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?tde_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
%define tde_appdir %{tde_datadir}/applications
|
||||
|
||||
%define tde_tdeappdir %{tde_appdir}/kde
|
||||
%define tde_tdedocdir %{tde_docdir}/tde
|
||||
%define tde_tdeincludedir %{tde_includedir}/tde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
|
||||
Name: trinity-%{kdecomp}
|
||||
Summary: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
|
||||
Version: 0.9.5
|
||||
Release: 3%{?dist}%{?_variant}
|
||||
|
||||
License: GPLv2+
|
||||
Group: Applications/Utilities
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.knut.noveradsl.cz/knutclient/
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{kdecomp}-3.5.13.1.tar.gz
|
||||
|
||||
|
||||
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
|
||||
%description
|
||||
KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
|
||||
http://www.networkupstools.org/) framework on Linux and other systems. This
|
||||
information, presented in a nice visual format, can be invaluable on
|
||||
stations using an UPS.
|
||||
|
||||
|
||||
%if 0%{?suse_version} || 0%{?pclinuxos}
|
||||
%debug_package
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{kdecomp}-3.5.13.1
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i admin/acinclude.m4.in \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt3.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
%configure \
|
||||
--prefix=%{tde_prefix} \
|
||||
--exec-prefix=%{tde_prefix} \
|
||||
--bindir=%{tde_bindir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--mandir=%{tde_mandir} \
|
||||
--includedir=%{tde_tdeincludedir} \
|
||||
--disable-rpath \
|
||||
--with-extra-includes=%{tde_includedir}/tqt \
|
||||
--enable-closure
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
%find_lang %{kdecomp}
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
for f in hicolor locolor; do
|
||||
touch --no-create %{tde_datadir}/icons/${f} || :
|
||||
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
|
||||
done
|
||||
|
||||
%postun
|
||||
for f in hicolor locolor; do
|
||||
touch --no-create %{tde_datadir}/icons/${f} || :
|
||||
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
|
||||
done
|
||||
|
||||
|
||||
%files -f %{kdecomp}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README TODO
|
||||
%{tde_bindir}/knutclient
|
||||
%{tde_datadir}/applnk/Utilities/knutclient.desktop
|
||||
%{tde_datadir}/apps/knutclient/knutclientui.rc
|
||||
%{tde_datadir}/apps/knutclient
|
||||
%{tde_tdedocdir}/HTML/cs/knutclient
|
||||
%{tde_tdedocdir}/HTML/en/knutclient
|
||||
%{tde_datadir}/icons/hicolor/*/apps/*.png
|
||||
%{tde_datadir}/icons/locolor/*/apps/*.png
|
||||
|
||||
%changelog
|
||||
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-3
|
||||
- Initial release for TDE 3.5.13.1
|
||||
|
||||
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
|
||||
- Rebuild for Fedora 17
|
||||
|
||||
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
|
||||
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
|
||||
|
||||
@ -1,133 +0,0 @@
|
||||
# Default version for this component
|
||||
%define kdecomp knutclient
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?tde_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
%define tde_appdir %{tde_datadir}/applications
|
||||
|
||||
%define tde_tdeappdir %{tde_appdir}/kde
|
||||
%define tde_tdedocdir %{tde_docdir}/kde
|
||||
%define tde_tdeincludedir %{tde_includedir}/kde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
|
||||
Name: trinity-%{kdecomp}
|
||||
Summary: A KDE GUI that displays UPS statistics from NUT's upsd [Trinity]
|
||||
Version: 0.9.5
|
||||
Release: 2%{?dist}%{?_variant}
|
||||
|
||||
License: GPLv2+
|
||||
Group: Applications/Utilities
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.knut.noveradsl.cz/knutclient/
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{kdecomp}-3.5.13.tar.gz
|
||||
|
||||
|
||||
BuildRequires: tqtinterface-devel
|
||||
BuildRequires: trinity-tdelibs-devel
|
||||
BuildRequires: trinity-tdebase-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
|
||||
%description
|
||||
KNutClient monitors UPS statistics through the NUT (Network UPS Tools,
|
||||
http://www.networkupstools.org/) framework on Linux and other systems. This
|
||||
information, presented in a nice visual format, can be invaluable on
|
||||
stations using an UPS.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n applications/%{kdecomp}
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i admin/acinclude.m4.in \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
%configure \
|
||||
--prefix=%{tde_prefix} \
|
||||
--exec-prefix=%{tde_prefix} \
|
||||
--bindir=%{tde_bindir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--mandir=%{tde_mandir} \
|
||||
--includedir=%{tde_tdeincludedir} \
|
||||
--disable-rpath \
|
||||
--with-extra-includes=%{tde_includedir}/tqt \
|
||||
--enable-closure
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
%find_lang %{kdecomp}
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
for f in hicolor locolor; do
|
||||
touch --no-create %{tde_datadir}/icons/${f} || :
|
||||
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
|
||||
done
|
||||
|
||||
%postun
|
||||
for f in hicolor locolor; do
|
||||
touch --no-create %{tde_datadir}/icons/${f} || :
|
||||
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
|
||||
done
|
||||
|
||||
|
||||
%files -f %{kdecomp}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README TODO
|
||||
%{tde_bindir}/knutclient
|
||||
%{tde_datadir}/applnk/Utilities/knutclient.desktop
|
||||
%{tde_datadir}/apps/knutclient/knutclientui.rc
|
||||
%{tde_datadir}/apps/knutclient
|
||||
%{tde_tdedocdir}/HTML/cs/knutclient
|
||||
%{tde_tdedocdir}/HTML/en/knutclient
|
||||
%{tde_datadir}/icons/hicolor/*/apps/*.png
|
||||
%{tde_datadir}/icons/locolor/*/apps/*.png
|
||||
|
||||
%Changelog
|
||||
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
|
||||
- Rebuild for Fedora 17
|
||||
|
||||
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
|
||||
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,27 +0,0 @@
|
||||
--- kexi/kexidb/drivers/sqlite/sqlitecursor.cpp 2006/10/26 19:25:03 599352
|
||||
+++ kexi/kexidb/drivers/sqlite/sqlitecursor.cpp 2007/10/01 19:29:39 719720
|
||||
@@ -324,19 +324,21 @@
|
||||
}
|
||||
|
||||
//debug
|
||||
-/*
|
||||
- if (m_result == FetchOK && d->curr_coldata) {
|
||||
+/* if (((int)m_result == (int)FetchOK) && d->curr_coldata) {
|
||||
for (uint i=0;i<m_fieldCount;i++) {
|
||||
KexiDBDrvDbg<<"col."<< i<<": "<< d->curr_colname[i]<<" "<< d->curr_colname[m_fieldCount+i]
|
||||
<< " = " << (d->curr_coldata[i] ? TQString::fromLocal8Bit(d->curr_coldata[i]) : "(NULL)") <<endl;
|
||||
}
|
||||
-// KexiDBDrvDbg << "SQLiteCursor::drv_getNextRecord(): "<<m_fieldCount<<" col(s) fetched"<<endl;
|
||||
+ KexiDBDrvDbg << "SQLiteCursor::drv_getNextRecord(): "<<m_fieldCount<<" col(s) fetched"<<endl;
|
||||
}*/
|
||||
}
|
||||
|
||||
void SQLiteCursor::drv_appendCurrentRecordToBuffer()
|
||||
{
|
||||
// KexiDBDrvDbg << "SQLiteCursor::drv_appendCurrentRecordToBuffer():" <<endl;
|
||||
+ if (!d->curr_coldata)
|
||||
+ return;
|
||||
+
|
||||
if (!d->cols_pointers_mem_size)
|
||||
d->cols_pointers_mem_size = m_fieldCount * sizeof(char*);
|
||||
const char **record = (const char**)malloc(d->cols_pointers_mem_size);
|
||||
@ -1,22 +0,0 @@
|
||||
--- kexi/migration/pqxx/pqxxmigrate.cpp 2006/12/17 21:08:15 614463
|
||||
+++ kexi/migration/pqxx/pqxxmigrate.cpp 2008/04/30 09:54:43 802697
|
||||
@@ -538,10 +538,18 @@
|
||||
int index = 0;
|
||||
for ( i = R.begin(); i != end; ++i, index++) {
|
||||
if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::BLOB || fieldsExpanded.at(index)->field->type()==KexiDB::Field::LongText)
|
||||
+ {
|
||||
vals.append( KexiDB::pgsqlByteaToByteArray((*i).c_str(), (*i).size()) );
|
||||
- else
|
||||
+ }
|
||||
+ else if (fieldsExpanded.at(index)->field->type()==KexiDB::Field::Boolean )
|
||||
+ {
|
||||
+ vals.append(QString((*i).c_str()).lower() == "t" ? QVariant(true, 1) : QVariant(false, 1));
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
vals.append( KexiDB::cstringToVariant((*i).c_str(),
|
||||
fieldsExpanded.at(index)->field, (*i).size()) );
|
||||
+ }
|
||||
}
|
||||
if (!destConn->insertRecord(*dstTable, vals))
|
||||
return false;
|
||||
@ -1,23 +0,0 @@
|
||||
--- kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2007/10/25 14:56:36 729302
|
||||
+++ kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2008/04/30 09:54:43 802697
|
||||
@@ -236,12 +236,20 @@
|
||||
{
|
||||
return (*m_res)[at()][pos].as(double());
|
||||
}
|
||||
+ else if (f->type() == Field::Boolean )
|
||||
+ {
|
||||
+ return QString((*m_res)[at()][pos].c_str()).lower() == "t" ? QVariant(true, 1) : QVariant(false, 1);
|
||||
+ }
|
||||
else if (f->typeGroup() == Field::BLOBGroup)
|
||||
{
|
||||
// pqxx::result::field r = (*m_res)[at()][pos];
|
||||
// kdDebug() << r.name() << ", " << r.c_str() << ", " << r.type() << ", " << r.size() << endl;
|
||||
return ::pgsqlByteaToByteArray((*m_res)[at()][pos]);
|
||||
}
|
||||
+ else
|
||||
+ {
|
||||
+ return pgsqlCStrToVariant((*m_res)[at()][pos]);
|
||||
+ }
|
||||
}
|
||||
else // We probably have a raw type query so use pqxx to determin the column type
|
||||
{
|
||||
@ -1,21 +0,0 @@
|
||||
Index: kexi/kexidb/expression.cpp
|
||||
===================================================================
|
||||
--- kexi/kexidb/expression.cpp (revision 742153)
|
||||
+++ kexi/kexidb/expression.cpp (working copy)
|
||||
@@ -400,14 +400,10 @@
|
||||
if (ltInt && rtInt)
|
||||
return KexiDB::maximumForIntegerTypes(lt, rt);
|
||||
|
||||
- if (Field::isFPNumericType(lt) && rtInt)
|
||||
+ if (Field::isFPNumericType(lt) && (rtInt || lt==rt))
|
||||
return lt;
|
||||
- if (Field::isFPNumericType(rt) && ltInt)
|
||||
+ if (Field::isFPNumericType(rt) && (ltInt || lt==rt))
|
||||
return rt;
|
||||
- if ((lt==Field::Double || lt==Field::Float) && rtInt)
|
||||
- return lt;
|
||||
- if ((rt==Field::Double || rt==Field::Float) && ltInt)
|
||||
- return rt;
|
||||
|
||||
return Field::Boolean;
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
Index: kexi/kexiutils/utils.cpp
|
||||
===================================================================
|
||||
--- kexi/kexiutils/utils.cpp (revision 716273)
|
||||
+++ kexi/kexiutils/utils.cpp (working copy)
|
||||
@@ -57,7 +57,7 @@
|
||||
TQApplication::restoreOverrideCursor();
|
||||
}
|
||||
void DelayedCursorHandler::show() {
|
||||
- TQApplication::setOverrideCursor( KCursor::waitCursor() );
|
||||
+ TQApplication::setOverrideCursor( KCursor::waitCursor(), true/*replace*/ );
|
||||
}
|
||||
|
||||
DelayedCursorHandler _delayedCursorHandler;
|
||||
@@ -89,7 +89,8 @@
|
||||
|
||||
WaitCursorRemover::~WaitCursorRemover()
|
||||
{
|
||||
- _delayedCursorHandler.start(true);
|
||||
+ if (m_reactivateCursor)
|
||||
+ _delayedCursorHandler.start(true);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
@ -1,16 +0,0 @@
|
||||
Index: kexi/migration/mysql/mysqlmigrate.cpp
|
||||
===================================================================
|
||||
--- kexi/migration/mysql/mysqlmigrate.cpp (revision 714726)
|
||||
+++ kexi/migration/mysql/mysqlmigrate.cpp (working copy)
|
||||
@@ -420,9 +420,9 @@
|
||||
if(mysqlType.contains("blob", false) != 0) {
|
||||
// Doesn't matter how big it is, it's binary
|
||||
kexiType = KexiDB::Field::BLOB;
|
||||
- } else if(mysqlType.contains("text", false) != 0) {
|
||||
+/* } else if(mysqlType.contains("text", false) != 0) {
|
||||
// All the TEXT types are too big for Kexi text.
|
||||
- kexiType = KexiDB::Field::BLOB;
|
||||
+ kexiType = KexiDB::Field::BLOB;*/
|
||||
} else if(fld->length < 200) {
|
||||
kexiType = KexiDB::Field::Text;
|
||||
} else {
|
||||
@ -1,258 +0,0 @@
|
||||
Index: kexi/plugins/forms/kexidataprovider.cpp
|
||||
===================================================================
|
||||
--- kexi/plugins/forms/kexidataprovider.cpp (revision 688747)
|
||||
+++ kexi/plugins/forms/kexidataprovider.cpp (revision 688748)
|
||||
@@ -153,7 +153,7 @@
|
||||
count = it_dup.data();
|
||||
tmpDuplicatedItems.insert( it.current()->columnInfo()->field, ++count );
|
||||
}
|
||||
- m_duplicatedItems = new TQPtrDict<char>(101);
|
||||
+ m_duplicatedItems = new TQPtrDict<char>(1009);
|
||||
for (it_dup = tmpDuplicatedItems.begin(); it_dup!=tmpDuplicatedItems.end(); ++it_dup) {
|
||||
if (it_dup.data() > 1) {
|
||||
m_duplicatedItems->insert( it_dup.key(), (char*)1 );
|
||||
@@ -260,7 +260,7 @@
|
||||
// m_fieldNumbersForDataItems = newFieldNumbersForDataItems;
|
||||
|
||||
//update data sources set (some of them may be removed)
|
||||
- TQDict<char> tmpUsedDataSources(1013);
|
||||
+ TQDict<char> tmpUsedDataSources(1009);
|
||||
|
||||
if (query)
|
||||
query->debug();
|
||||
Index: kexi/plugins/tables/kexitabledesignerview.cpp
|
||||
===================================================================
|
||||
--- kexi/plugins/tables/kexitabledesignerview.cpp (revision 688747)
|
||||
+++ kexi/plugins/tables/kexitabledesignerview.cpp (revision 688748)
|
||||
@@ -1262,7 +1262,7 @@
|
||||
KoProperty::Set *b = 0;
|
||||
bool no_fields = true;
|
||||
int i;
|
||||
- TQDict<char> names(101, false);
|
||||
+ TQDict<char> names(1009, false);
|
||||
char dummy;
|
||||
for (i=0;i<(int)d->sets->size();i++) {
|
||||
b = d->sets->at(i);
|
||||
Index: kexi/plugins/queries/kexiquerydesignerguieditor.cpp
|
||||
===================================================================
|
||||
--- kexi/plugins/queries/kexiquerydesignerguieditor.cpp (revision 688747)
|
||||
+++ kexi/plugins/queries/kexiquerydesignerguieditor.cpp (revision 688748)
|
||||
@@ -77,7 +77,7 @@
|
||||
{
|
||||
public:
|
||||
Private()
|
||||
- : fieldColumnIdentifiers(101, false/*case insens.*/)
|
||||
+ : fieldColumnIdentifiers(1009, false/*case insens.*/)
|
||||
{
|
||||
droppedNewItem = 0;
|
||||
slotTableAdded_enabled = true;
|
||||
@@ -809,7 +809,7 @@
|
||||
//2. Collect information about criterias
|
||||
// --this must be top level chain of AND's
|
||||
// --this will also show joins as: [table1.]field1 = [table2.]field2
|
||||
- TQDict<KexiDB::BaseExpr> criterias(101, false);
|
||||
+ TQDict<KexiDB::BaseExpr> criterias(1009, false);
|
||||
KexiDB::BaseExpr* e = query->whereExpression();
|
||||
KexiDB::BaseExpr* eItem = 0;
|
||||
while (e) {
|
||||
@@ -877,7 +877,7 @@
|
||||
//3. show fields (including * and table.*)
|
||||
uint row_num = 0;
|
||||
KexiDB::Field *field;
|
||||
- TQPtrDict<char> usedCriterias(101); // <-- used criterias will be saved here
|
||||
+ TQPtrDict<char> usedCriterias(1009); // <-- used criterias will be saved here
|
||||
// so in step 4. we will be able to add
|
||||
// remaining invisible columns with criterias
|
||||
for (KexiDB::Field::ListIterator it(*query->fields());
|
||||
@@ -1270,7 +1270,7 @@
|
||||
const TQCString expStr
|
||||
= i18n("short for 'expression' word (only latin letters, please)", "expr").latin1();
|
||||
//TODO: optimization: cache it?
|
||||
- TQAsciiDict<char> aliases(101);
|
||||
+ TQAsciiDict<char> aliases(1009);
|
||||
for (int r = 0; r<(int)d->sets->size(); r++) {
|
||||
KoProperty::Set *set = d->sets->at(r);
|
||||
if (set) {
|
||||
Index: kexi/widget/tableview/kexidataawarepropertyset.cpp
|
||||
===================================================================
|
||||
--- kexi/widget/tableview/kexidataawarepropertyset.cpp (revision 688747)
|
||||
+++ kexi/widget/tableview/kexidataawarepropertyset.cpp (revision 688748)
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <koproperty/property.h>
|
||||
#include <kexiviewbase.h>
|
||||
|
||||
-#define MAX_FIELDS 101 //nice prime number (default prop. set vector size)
|
||||
+#define MAX_FIELDS 1009 //nice prime number (default prop. set vector size)
|
||||
|
||||
KexiDataAwarePropertySet::KexiDataAwarePropertySet(KexiViewBase *view,
|
||||
KexiDataAwareObjectInterface* dataObject)
|
||||
Index: kexi/widget/utils/kexisharedactionclient.cpp
|
||||
===================================================================
|
||||
--- kexi/widget/utils/kexisharedactionclient.cpp (revision 688747)
|
||||
+++ kexi/widget/utils/kexisharedactionclient.cpp (revision 688748)
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <kaction.h>
|
||||
|
||||
KexiSharedActionClient::KexiSharedActionClient()
|
||||
- : m_sharedActions(101, false)
|
||||
+ : m_sharedActions(1009, false)
|
||||
{
|
||||
}
|
||||
|
||||
Index: kexi/main/keximainwindowimpl.cpp
|
||||
===================================================================
|
||||
--- kexi/main/keximainwindowimpl.cpp (revision 688747)
|
||||
+++ kexi/main/keximainwindowimpl.cpp (revision 688748)
|
||||
@@ -4203,8 +4203,10 @@
|
||||
data = new KexiProjectData(*d->prj->data()); // a copy
|
||||
drv = d->prj->dbConnection()->driver();
|
||||
const tristate res = closeProject();
|
||||
- if (~res || !res)
|
||||
+ if (~res || !res) {
|
||||
+ delete data;
|
||||
return;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (!drv->adminTools().vacuum(*data->connectionData(), data->databaseName())) {
|
||||
@@ -4212,10 +4214,9 @@
|
||||
showErrorMessage( &drv->adminTools() );
|
||||
}
|
||||
|
||||
- if (data && projectWasOpened) {
|
||||
+ if (projectWasOpened)
|
||||
openProject(*data);
|
||||
- delete data;
|
||||
- }
|
||||
+ delete data;
|
||||
}
|
||||
|
||||
tristate KexiMainWindowImpl::showProjectMigrationWizard(
|
||||
Index: kexi/core/kexidbconnectionset.cpp
|
||||
===================================================================
|
||||
--- kexi/core/kexidbconnectionset.cpp (revision 688747)
|
||||
+++ kexi/core/kexidbconnectionset.cpp (revision 688748)
|
||||
@@ -30,7 +30,7 @@
|
||||
{
|
||||
public:
|
||||
KexiDBConnectionSetPrivate()
|
||||
- : dataForFilenames(101)
|
||||
+ : dataForFilenames(1009)
|
||||
{
|
||||
list.setAutoDelete(true);
|
||||
maxid=-1;
|
||||
Index: kexi/migration/keximigrate.cpp
|
||||
===================================================================
|
||||
--- kexi/migration/keximigrate.cpp (revision 688747)
|
||||
+++ kexi/migration/keximigrate.cpp (revision 688748)
|
||||
@@ -491,7 +491,6 @@
|
||||
// Prompt the user to choose a field type
|
||||
KexiDB::Field::Type KexiMigrate::userType(const TQString& fname)
|
||||
{
|
||||
- KInputDialog *dlg;
|
||||
TQStringList types;
|
||||
TQString res;
|
||||
|
||||
@@ -509,7 +508,7 @@
|
||||
types << "Long Text";
|
||||
types << "Binary Large Object";
|
||||
|
||||
- res = dlg->getItem( i18n("Field Type"),
|
||||
+ res = KInputDialog::getItem( i18n("Field Type"),
|
||||
i18n("The data type for %1 could not be determined. "
|
||||
"Please select one of the following data "
|
||||
"types").tqarg(fname),
|
||||
Index: kexi/kexidb/connection.cpp
|
||||
===================================================================
|
||||
--- kexi/kexidb/connection.cpp (revision 688747)
|
||||
+++ kexi/kexidb/connection.cpp (revision 688748)
|
||||
@@ -83,10 +83,10 @@
|
||||
ConnectionPrivate(Connection* const conn, ConnectionData &conn_data)
|
||||
: conn(conn)
|
||||
, conn_data(&conn_data)
|
||||
- , tableSchemaChangeListeners(101)
|
||||
+ , tableSchemaChangeListeners(1009)
|
||||
, m_parser(0)
|
||||
- , tables_byname(101, false)
|
||||
- , queries_byname(101, false)
|
||||
+ , tables_byname(1009, false)
|
||||
+ , queries_byname(1009, false)
|
||||
, kexiDBSystemTables(101)
|
||||
, dont_remove_transactions(false)
|
||||
, skip_databaseExists_check_in_useDatabase(false)
|
||||
@@ -104,8 +104,8 @@
|
||||
queries_byname.setAutoDelete(false);//queries is owner, not me
|
||||
|
||||
//reasonable sizes: TODO
|
||||
- tables.resize(101);
|
||||
- queries.resize(101);
|
||||
+ tables.resize(1009);
|
||||
+ queries.resize(1009);
|
||||
}
|
||||
~ConnectionPrivate()
|
||||
{
|
||||
Index: kexi/kexidb/fieldvalidator.cpp
|
||||
===================================================================
|
||||
--- kexi/kexidb/fieldvalidator.cpp (revision 688747)
|
||||
+++ kexi/kexidb/fieldvalidator.cpp (revision 688748)
|
||||
@@ -36,7 +36,7 @@
|
||||
if (field.isIntegerType()) {
|
||||
TQValidator *validator = 0;
|
||||
const bool u = field.isUnsigned();
|
||||
- int bottom, top;
|
||||
+ int bottom = 0, top = 0;
|
||||
if (t==Field::Byte) {
|
||||
bottom = u ? 0 : -0x80;
|
||||
top = u ? 0xff : 0x7f;
|
||||
Index: kexi/kexidb/alter.cpp
|
||||
===================================================================
|
||||
--- kexi/kexidb/alter.cpp (revision 688747)
|
||||
+++ kexi/kexidb/alter.cpp (revision 688748)
|
||||
@@ -223,7 +223,7 @@
|
||||
static AlterTableHandler::ActionDict* createActionDict(
|
||||
AlterTableHandler::ActionDictDict &fieldActions, int forFieldUID )
|
||||
{
|
||||
- AlterTableHandler::ActionDict* dict = new AlterTableHandler::ActionDict(101, false);
|
||||
+ AlterTableHandler::ActionDict* dict = new AlterTableHandler::ActionDict(1009, false);
|
||||
dict->setAutoDelete(true);
|
||||
fieldActions.insert( forFieldUID, dict );
|
||||
return dict;
|
||||
Index: kexi/kexidb/queryschema.cpp
|
||||
===================================================================
|
||||
--- kexi/kexidb/queryschema.cpp (revision 688747)
|
||||
+++ kexi/kexidb/queryschema.cpp (revision 688748)
|
||||
@@ -1439,7 +1439,7 @@
|
||||
}
|
||||
|
||||
//remove duplicates for lookup fields
|
||||
- TQDict<uint> lookup_dict(101); //used to fight duplicates and to update QueryColumnInfo::indexForVisibleLookupValue()
|
||||
+ TQDict<uint> lookup_dict(1009); //used to fight duplicates and to update QueryColumnInfo::indexForVisibleLookupValue()
|
||||
// (a mapping from table.name string to uint* lookupFieldIndex
|
||||
lookup_dict.setAutoDelete(true);
|
||||
i=0;
|
||||
Index: kexi/kexidb/fieldlist.cpp
|
||||
===================================================================
|
||||
--- kexi/kexidb/fieldlist.cpp (revision 688747)
|
||||
+++ kexi/kexidb/fieldlist.cpp (revision 688748)
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
FieldList::FieldList(bool owner)
|
||||
//reasonable sizes: TODO
|
||||
- : m_fields_by_name(101, false)
|
||||
+ : m_fields_by_name(1009, false)
|
||||
{
|
||||
m_fields.setAutoDelete( owner );
|
||||
m_fields_by_name.setAutoDelete( false );
|
||||
Index: kexi/formeditor/widgetlibrary.cpp
|
||||
===================================================================
|
||||
--- kexi/formeditor/widgetlibrary.cpp (revision 688747)
|
||||
+++ kexi/formeditor/widgetlibrary.cpp (revision 688748)
|
||||
@@ -55,7 +55,7 @@
|
||||
{
|
||||
public:
|
||||
WidgetLibraryPrivate()
|
||||
- : widgets(101)
|
||||
+ : widgets(1009)
|
||||
// , alternateWidgets(101)
|
||||
, services(101, false)
|
||||
, supportedFactoryGroups(17, false)
|
||||
@ -1,129 +0,0 @@
|
||||
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
|
||||
index 5bce37b..eea8000 100644
|
||||
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
|
||||
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
|
||||
@@ -182,6 +182,7 @@ namespace {
|
||||
|
||||
image -> addAnnotation(annotation);
|
||||
}
|
||||
+#if 0
|
||||
for(int i = 0; i < src->generic_profiles; i++)
|
||||
{
|
||||
TQByteArray rawdata;
|
||||
@@ -193,6 +194,7 @@ namespace {
|
||||
|
||||
image -> addAnnotation(annotation);
|
||||
}
|
||||
+#endif
|
||||
|
||||
const ImageAttribute* imgAttr = GetImageAttribute(src, NULL);
|
||||
while(imgAttr)
|
||||
@@ -480,7 +482,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
|
||||
TQ_UINT8 opacity = OPACITY_OPAQUE;
|
||||
const ImageAttribute * attr = GetImageAttribute(image, "[layer-opacity]");
|
||||
if (attr != 0) {
|
||||
- opacity = TQ_UINT8_MAX - Downscale(TQString(attr->value).toInt());
|
||||
+ opacity = TQ_UINT8_MAX - ScaleQuantumToChar(TQString(attr->value).toInt());
|
||||
}
|
||||
|
||||
KisPaintLayerSP layer = 0;
|
||||
@@ -534,17 +536,17 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
|
||||
while (!hiter.isDone())
|
||||
{
|
||||
TQ_UINT8 *ptr= hiter.rawData();
|
||||
- *(ptr++) = Downscale(pp->red); // cyan
|
||||
- *(ptr++) = Downscale(pp->green); // magenta
|
||||
- *(ptr++) = Downscale(pp->blue); // yellow
|
||||
- *(ptr++) = Downscale(indexes[x]); // Black
|
||||
+ *(ptr++) = ScaleQuantumToChar(pp->red); // cyan
|
||||
+ *(ptr++) = ScaleQuantumToChar(pp->green); // magenta
|
||||
+ *(ptr++) = ScaleQuantumToChar(pp->blue); // yellow
|
||||
+ *(ptr++) = ScaleQuantumToChar(indexes[x]); // Black
|
||||
// XXX: Warning! This ifdef messes up the paren matching big-time!
|
||||
#ifdef HAVE_MAGICK6
|
||||
if (image->matte != MagickFalse) {
|
||||
#else
|
||||
if (image->matte == true) {
|
||||
#endif
|
||||
- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
|
||||
+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
|
||||
}
|
||||
else {
|
||||
*(ptr++) = OPACITY_OPAQUE;
|
||||
@@ -578,10 +580,10 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
|
||||
{
|
||||
TQ_UINT8 *ptr= hiter.rawData();
|
||||
// XXX: not colorstrategy and bitdepth independent
|
||||
- *(ptr++) = Downscale(pp->blue);
|
||||
- *(ptr++) = Downscale(pp->green);
|
||||
- *(ptr++) = Downscale(pp->red);
|
||||
- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
|
||||
+ *(ptr++) = ScaleQuantumToChar(pp->blue);
|
||||
+ *(ptr++) = ScaleQuantumToChar(pp->green);
|
||||
+ *(ptr++) = ScaleQuantumToChar(pp->red);
|
||||
+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
|
||||
|
||||
pp++;
|
||||
++hiter;
|
||||
@@ -608,8 +610,8 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
|
||||
{
|
||||
TQ_UINT8 *ptr= hiter.rawData();
|
||||
// XXX: not colorstrategy and bitdepth independent
|
||||
- *(ptr++) = Downscale(pp->blue);
|
||||
- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
|
||||
+ *(ptr++) = ScaleQuantumToChar(pp->blue);
|
||||
+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
|
||||
|
||||
pp++;
|
||||
++hiter;
|
||||
@@ -812,13 +814,12 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
|
||||
while (!it.isDone()) {
|
||||
|
||||
TQ_UINT8 * d = it.rawData();
|
||||
- pp -> red = Upscale(d[PIXEL_CYAN]);
|
||||
- pp -> green = Upscale(d[PIXEL_MAGENTA]);
|
||||
- pp -> blue = Upscale(d[PIXEL_YELLOW]);
|
||||
+ pp -> red = ScaleCharToQuantum(d[PIXEL_CYAN]);
|
||||
+ pp -> green = ScaleCharToQuantum(d[PIXEL_MAGENTA]);
|
||||
+ pp -> blue = ScaleCharToQuantum(d[PIXEL_YELLOW]);
|
||||
if (alpha)
|
||||
- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]);
|
||||
-
|
||||
- indexes[x]= Upscale(d[PIXEL_BLACK]);
|
||||
+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]);
|
||||
+ indexes[x]= ScaleCharToQuantum(d[PIXEL_BLACK]);
|
||||
|
||||
x++;
|
||||
pp++;
|
||||
@@ -848,11 +849,11 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
|
||||
while (!it.isDone()) {
|
||||
|
||||
TQ_UINT8 * d = it.rawData();
|
||||
- pp -> red = Upscale(d[PIXEL_RED]);
|
||||
- pp -> green = Upscale(d[PIXEL_GREEN]);
|
||||
- pp -> blue = Upscale(d[PIXEL_BLUE]);
|
||||
+ pp -> red = ScaleCharToQuantum(d[PIXEL_RED]);
|
||||
+ pp -> green = ScaleCharToQuantum(d[PIXEL_GREEN]);
|
||||
+ pp -> blue = ScaleCharToQuantum(d[PIXEL_BLUE]);
|
||||
if (alpha)
|
||||
- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_ALPHA]);
|
||||
+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_ALPHA]);
|
||||
|
||||
pp++;
|
||||
++it;
|
||||
@@ -879,11 +880,11 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
|
||||
else {
|
||||
while (!it.isDone()) {
|
||||
TQ_UINT8 * d = it.rawData();
|
||||
- pp -> red = Upscale(d[PIXEL_GRAY]);
|
||||
- pp -> green = Upscale(d[PIXEL_GRAY]);
|
||||
- pp -> blue = Upscale(d[PIXEL_GRAY]);
|
||||
+ pp -> red = ScaleCharToQuantum(d[PIXEL_GRAY]);
|
||||
+ pp -> green = ScaleCharToQuantum(d[PIXEL_GRAY]);
|
||||
+ pp -> blue = ScaleCharToQuantum(d[PIXEL_GRAY]);
|
||||
if (alpha)
|
||||
- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]);
|
||||
+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]);
|
||||
|
||||
pp++;
|
||||
++it;
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -1,19 +0,0 @@
|
||||
--- koffice/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h.ORI 2012-04-26 20:22:29.322777779 +0200
|
||||
+++ koffice/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h 2012-04-26 20:23:21.216311169 +0200
|
||||
@@ -137,12 +137,12 @@
|
||||
}
|
||||
initiales = initiales.upper();
|
||||
// set/get general
|
||||
- addFunction("set" + initiales, &Iterator::setPixel);
|
||||
- addFunction("get" + initiales, &Iterator::getPixel);
|
||||
+ this->addFunction("set" + initiales, &Iterator::setPixel);
|
||||
+ this->addFunction("get" + initiales, &Iterator::getPixel);
|
||||
kdDebug(41011) << ( "get" + initiales ) << endl;
|
||||
// Various colorSpace
|
||||
- addFunction("invertColor", &Iterator::invertColor);
|
||||
- addFunction("darken", &Iterator::darken);
|
||||
+ this->addFunction("invertColor", &Iterator::invertColor);
|
||||
+ this->addFunction("darken", &Iterator::darken);
|
||||
}
|
||||
|
||||
~Iterator()
|
||||
@ -1,11 +0,0 @@
|
||||
--- koffice/chalk/configure.in.in.ORI 2012-08-05 22:30:11.362533703 +0200
|
||||
+++ koffice/chalk/configure.in.in 2012-08-05 22:30:31.456987824 +0200
|
||||
@@ -48,7 +48,7 @@
|
||||
fi
|
||||
|
||||
|
||||
-ac_link='$LIBTOOL_SHELL --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5'
|
||||
+ac_link='$LIBTOOL_SHELL --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries -ltqt conftest.$ac_ext -llcms 1>&5'
|
||||
|
||||
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -1,48 +0,0 @@
|
||||
--- koffice/filters/chalk/png/kis_png_converter.cc 2011-06-27 13:54:18.000000000 -0500
|
||||
+++ koffice/filters/chalk/png/kis_png_converter.cc.new 2011-11-07 15:38:47.918508855 -0600
|
||||
@@ -785,7 +785,7 @@
|
||||
|
||||
void KisPNGConverter::progress(png_structp png_ptr, png_uint_32 row_number, int pass)
|
||||
{
|
||||
- if(png_ptr == NULL || row_number > PNG_MAX_UINT || pass > 7) return;
|
||||
+ if(png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;
|
||||
// setProgress(row_number);
|
||||
}
|
||||
|
||||
--- koffice/filters/chalk/png/kis_png_converter.cc.gcc47 2012-04-26 16:38:35.805156927 -0400
|
||||
+++ koffice/filters/chalk/png/kis_png_converter.cc 2012-04-26 16:49:27.179323394 -0400
|
||||
@@ -43,6 +43,8 @@
|
||||
#include <kis_paint_layer.h>
|
||||
#include <kis_group_layer.h>
|
||||
|
||||
+#include <zlib.h>
|
||||
+
|
||||
namespace {
|
||||
|
||||
const TQ_UINT8 PIXEL_BLUE = 0;
|
||||
@@ -222,6 +224,7 @@
|
||||
|
||||
// Read image profile
|
||||
png_charp profile_name, profile_data;
|
||||
+ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
|
||||
int compression_type;
|
||||
png_uint_32 proflen;
|
||||
int number_of_passes = 1;
|
||||
@@ -230,7 +233,7 @@
|
||||
number_of_passes = png_set_interlace_handling(png_ptr);
|
||||
|
||||
KisProfile* profile = 0;
|
||||
- if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &proflen))
|
||||
+ if(png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &proflen))
|
||||
{
|
||||
TQByteArray profile_rawdata;
|
||||
// XXX: Hardcoded for icc type -- is that correct for us?
|
||||
@@ -627,7 +630,7 @@
|
||||
} else { // Profile
|
||||
char* name = new char[(*it)->type().length()+1];
|
||||
strcpy(name, (*it)->type().ascii());
|
||||
- png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (char*)(*it)->annotation().data(), (*it) -> annotation() . size());
|
||||
+ png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE, (unsigned char*)(*it)->annotation().data(), (*it) -> annotation() . size());
|
||||
}
|
||||
++it;
|
||||
}
|
||||
@ -1,118 +0,0 @@
|
||||
diff -urN koffice/configure.in koffice.new/configure.in
|
||||
--- koffice/configure.in 2011-08-21 18:30:53.000000000 -0500
|
||||
+++ koffice.new/configure.in 2011-12-08 17:56:31.000000000 -0600
|
||||
@@ -1539,14 +1539,22 @@
|
||||
# Check for Ruby
|
||||
|
||||
if test "x$compile_kross" = "xyes" ; then
|
||||
- AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)
|
||||
+ AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
|
||||
|
||||
if test -n "$RUBY"; then
|
||||
AC_MSG_CHECKING(for Ruby dirs)
|
||||
RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
|
||||
RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
|
||||
RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
|
||||
- RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
|
||||
+ if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
|
||||
+ # Ruby 1.9
|
||||
+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
|
||||
+ RUBY_VERSION_H=ruby/version.h
|
||||
+ else
|
||||
+ # not Ruby 1.9
|
||||
+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
|
||||
+ RUBY_VERSION_H=version.h
|
||||
+ fi
|
||||
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
|
||||
RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
|
||||
RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
|
||||
@@ -1599,7 +1607,7 @@
|
||||
[
|
||||
AC_TRY_COMPILE([
|
||||
#include <ruby.h>
|
||||
- #include <version.h>
|
||||
+ #include <$RUBY_VERSION_H>
|
||||
],[
|
||||
|
||||
#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
|
||||
diff -urN koffice/lib/kross/configure.in.in koffice.new/lib/kross/configure.in.in
|
||||
--- koffice/lib/kross/configure.in.in 2010-08-11 22:16:27.000000000 -0500
|
||||
+++ koffice.new/lib/kross/configure.in.in 2011-12-08 17:56:28.000000000 -0600
|
||||
@@ -21,14 +21,22 @@
|
||||
# Check for Ruby
|
||||
|
||||
if test "x$compile_kross" = "xyes" ; then
|
||||
- AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18], ruby)
|
||||
+ AC_CHECK_PROGS([RUBY], [ruby ruby1.8 ruby18 ruby1.9 ruby19], ruby)
|
||||
|
||||
if test -n "$RUBY"; then
|
||||
AC_MSG_CHECKING(for Ruby dirs)
|
||||
RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
|
||||
RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
|
||||
RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
|
||||
- RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
|
||||
+ if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
|
||||
+ # Ruby 1.9
|
||||
+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'`
|
||||
+ RUBY_VERSION_H=ruby/version.h
|
||||
+ else
|
||||
+ # not Ruby 1.9
|
||||
+ RUBY_INCLUDEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyincludedir"@:>@)'`
|
||||
+ RUBY_VERSION_H=version.h
|
||||
+ fi
|
||||
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
|
||||
RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
|
||||
RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"ENABLE_SHARED"@:>@)'`
|
||||
@@ -81,7 +89,7 @@
|
||||
[
|
||||
AC_TRY_COMPILE([
|
||||
#include <ruby.h>
|
||||
- #include <version.h>
|
||||
+ #include <$RUBY_VERSION_H>
|
||||
],[
|
||||
|
||||
#if(RUBY_VERSION_MAJOR==1 && RUBY_VERSION_MINOR == 8 && RUBY_VERSION_TEENY <= 1)
|
||||
diff -urN koffice/lib/kross/ruby/rubyextension.cpp koffice.new/lib/kross/ruby/rubyextension.cpp
|
||||
--- koffice/lib/kross/ruby/rubyextension.cpp 2011-08-17 20:25:04.000000000 -0500
|
||||
+++ koffice.new/lib/kross/ruby/rubyextension.cpp 2011-12-08 21:18:42.000000000 -0600
|
||||
@@ -18,7 +18,7 @@
|
||||
***************************************************************************/
|
||||
#include "rubyextension.h"
|
||||
|
||||
-#include <st.h>
|
||||
+#include <ruby/st.h>
|
||||
|
||||
#include <tqmap.h>
|
||||
#include <tqstring.h>
|
||||
@@ -211,7 +211,7 @@
|
||||
case T_ARRAY:
|
||||
{
|
||||
TQValueList<Kross::Api::Object::Ptr> l;
|
||||
- for(int i = 0; i < RARRAY(value)->len; i++)
|
||||
+ for(int i = 0; i < RARRAY_LEN(value); i++)
|
||||
{
|
||||
Kross::Api::Object::Ptr o = toObject( rb_ary_entry( value , i ) );
|
||||
if(o) l.append(o);
|
||||
diff -urN koffice/lib/kross/ruby/rubyscript.cpp koffice.new/lib/kross/ruby/rubyscript.cpp
|
||||
--- koffice/lib/kross/ruby/rubyscript.cpp 2011-06-25 13:42:29.000000000 -0500
|
||||
+++ koffice.new/lib/kross/ruby/rubyscript.cpp 2011-12-08 21:45:36.000000000 -0600
|
||||
@@ -21,8 +21,8 @@
|
||||
|
||||
#include <ruby.h>
|
||||
#include <env.h>
|
||||
-#include <rubysig.h>
|
||||
-#include <node.h>
|
||||
+#include <ruby/backward/rubysig.h>
|
||||
+#include <ruby/node.h>
|
||||
|
||||
#include <main/scriptcontainer.h>
|
||||
|
||||
@@ -70,6 +70,8 @@
|
||||
krossdebug("RubyScript::compile()");
|
||||
#endif
|
||||
int critical;
|
||||
+ int ruby_nerrs;
|
||||
+ int ruby_in_eval;
|
||||
|
||||
ruby_nerrs = 0;
|
||||
ruby_errinfo = Qnil;
|
||||
@ -1,34 +0,0 @@
|
||||
--- koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py.ORI 2011-11-25 00:13:38.356036607 +0100
|
||||
+++ koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py 2011-11-25 00:14:16.794035577 +0100
|
||||
@@ -46,11 +46,11 @@
|
||||
if l%2: return args[-1]
|
||||
utility_builtins['test'] = test
|
||||
|
||||
-def reorder(s, with=None, without=()):
|
||||
- # s, with, and without are sequences treated as sets.
|
||||
- # The result is subtract(intersect(s, with), without),
|
||||
- # unless with is None, in which case it is subtract(s, without).
|
||||
- if with is None: with=s
|
||||
+def reorder(s, swith=None, swithout=()):
|
||||
+ # s, swith, and swithout are sequences treated as sets.
|
||||
+ # The result is subtract(intersect(s, swith), swithout),
|
||||
+ # unless swith is None, in which case it is subtract(s, swithout).
|
||||
+ if swith is None: swith=s
|
||||
d={}
|
||||
tt=type(())
|
||||
for i in s:
|
||||
@@ -61,12 +61,12 @@
|
||||
a=r.append
|
||||
h=d.has_key
|
||||
|
||||
- for i in without:
|
||||
+ for i in swithout:
|
||||
if type(i) is tt and len(i)==2: k, v = i
|
||||
else: k= v = i
|
||||
if h(k): del d[k]
|
||||
|
||||
- for i in with:
|
||||
+ for i in swith:
|
||||
if type(i) is tt and len(i)==2: k, v = i
|
||||
else: k= v = i
|
||||
if h(k):
|
||||
@ -1,61 +0,0 @@
|
||||
--- koffice/lib/store/Makefile.am.ORI 2012-08-05 21:05:16.181010835 +0200
|
||||
+++ koffice/lib/store/Makefile.am 2012-08-05 21:05:25.027837330 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
####### Files
|
||||
|
||||
-libkstore_la_LIBADD = $(LIB_KIO)
|
||||
+libkstore_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
|
||||
libkstore_la_SOURCES = KoStore.cpp KoTarStore.cpp KoDirectoryStore.cpp KoZipStore.cpp KoStoreDrag.cpp KoStoreBase.cpp KoXmlWriter.cpp
|
||||
libkstore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined
|
||||
include_HEADERS = KoStore.h KoStoreDevice.h KoXmlWriter.h
|
||||
--- koffice/lib/kwmf/Makefile.am.ORI 2012-08-05 21:09:16.183303850 +0200
|
||||
+++ koffice/lib/kwmf/Makefile.am 2012-08-05 21:09:35.742920240 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes)
|
||||
libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined
|
||||
# We use kdecore for kdDebug :)
|
||||
-libkwmf_la_LIBADD = $(LIB_KDECORE)
|
||||
+libkwmf_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
|
||||
|
||||
####### Files
|
||||
|
||||
@@ -16,4 +16,4 @@
|
||||
|
||||
libkowmf_la_SOURCES = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc
|
||||
libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0 -no-undefined
|
||||
-libkowmf_la_LIBADD = $(LIB_KDECORE)
|
||||
+libkowmf_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
|
||||
--- koffice/lib/kofficecore/Makefile.am.ORI 2012-08-05 21:12:34.924406087 +0200
|
||||
+++ koffice/lib/kofficecore/Makefile.am 2012-08-05 21:12:47.700155525 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
KDE_CXXFLAGS = $(USE_RTTI) $(WOVERLOADED_VIRTUAL)
|
||||
INCLUDES= $(KSTORE_INCLUDES) $(KWMF_INCLUDES) $(all_includes)
|
||||
libkofficecore_la_LIBADD = $(LIB_KSTORE) $(LIB_KOWMF) $(LIB_KPARTS) \
|
||||
- $(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF)
|
||||
+ $(LIB_KDEPRINT) $(LIB_KABC) $(LIB_KWMF) -lDCOP
|
||||
|
||||
####### Files
|
||||
|
||||
--- koffice/lib/koproperty/Makefile.am.ORI 2012-08-05 21:16:10.320181691 +0200
|
||||
+++ koffice/lib/koproperty/Makefile.am 2012-08-05 21:16:17.135048036 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
lib_LTLIBRARIES = libkoproperty.la
|
||||
|
||||
-libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la
|
||||
+libkoproperty_la_LIBADD = $(LIB_KDEUI) ./editors/libkopropertyeditors.la $(LIB_QT) $(LIB_KDECORE)
|
||||
libkoproperty_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 2:0:0
|
||||
libkoproperty_la_SOURCES = property.cpp customproperty.cpp set.cpp editor.cpp \
|
||||
editoritem.cpp factory.cpp widget.cpp
|
||||
--- koffice/kpresenter/Makefile.am.ORI 2012-08-05 21:41:53.120199863 +0200
|
||||
+++ koffice/kpresenter/Makefile.am 2012-08-05 21:42:03.358832558 +0200
|
||||
@@ -72,7 +72,7 @@
|
||||
if include_ARTS
|
||||
ARTSKDE = -lartskde
|
||||
endif
|
||||
-libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE)
|
||||
+libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KOTEXT) $(LIB_KOPAINTER) $(ARTSKDE) -lsoundserver_idl -lmcop
|
||||
|
||||
## The part
|
||||
kde_module_LTLIBRARIES = libkpresenterpart.la
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,88 +0,0 @@
|
||||
--- trinity-koffice-3.5.13.2/filters/kword/wordperfect/import/WordPerfectCollector.hxx.wpd2 2013-04-08 12:28:49.159409461 +0200
|
||||
+++ trinity-koffice-3.5.13.2/filters/kword/wordperfect/import/WordPerfectCollector.hxx 2013-04-08 12:29:01.170158682 +0200
|
||||
@@ -81,7 +81,7 @@
|
||||
class WordPerfectCollector : public WPXDocumentInterface
|
||||
#else // HAVE_LIBWPD_090
|
||||
class WordPerfectCollector : public WPXHLListenerImpl
|
||||
-#endif HAVE_LIBWPD_090
|
||||
+#endif // HAVE_LIBWPD_090
|
||||
{
|
||||
public:
|
||||
WordPerfectCollector(WPXInputStream *pInput, DocumentHandler *pHandler);
|
||||
@@ -93,12 +93,12 @@
|
||||
virtual void startDocument();
|
||||
virtual void endDocument();
|
||||
virtual void definePageStyle(const WPXPropertyList &propList) {};
|
||||
- virtual void openPageSpan(const WPXPropertyList &propList) {};
|
||||
- virtual void closePageSpan() {};
|
||||
- virtual void openHeader(const WPXPropertyList &propList) {};
|
||||
- virtual void closeHeader() {};
|
||||
- virtual void openFooter(const WPXPropertyList &propList) {};
|
||||
- virtual void closeFooter() {};
|
||||
+ virtual void openPageSpan(const WPXPropertyList &propList);
|
||||
+ virtual void closePageSpan();
|
||||
+ virtual void openHeader(const WPXPropertyList &propList);
|
||||
+ virtual void closeHeader();
|
||||
+ virtual void openFooter(const WPXPropertyList &propList);
|
||||
+ virtual void closeFooter();
|
||||
virtual void defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
|
||||
virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
|
||||
virtual void closeParagraph();
|
||||
@@ -106,36 +106,36 @@
|
||||
virtual void openSpan(const WPXPropertyList &propList);
|
||||
virtual void closeSpan();
|
||||
virtual void defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
|
||||
- virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
|
||||
- virtual void closeSection() {};
|
||||
+ virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
|
||||
+ virtual void closeSection();
|
||||
virtual void insertTab();
|
||||
virtual void insertSpace() {};
|
||||
virtual void insertText(const WPXString &text);
|
||||
virtual void insertLineBreak();
|
||||
virtual void insertField(const WPXString &type, const WPXPropertyList &propList) {};
|
||||
- virtual void defineOrderedListLevel(const WPXPropertyList &propList) {};
|
||||
- virtual void defineUnorderedListLevel(const WPXPropertyList &propList) {};
|
||||
- virtual void openOrderedListLevel(const WPXPropertyList &propList) {};
|
||||
- virtual void openUnorderedListLevel(const WPXPropertyList &propList) {};
|
||||
- virtual void closeOrderedListLevel() {};
|
||||
- virtual void closeUnorderedListLevel() {};
|
||||
- virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) {};
|
||||
- virtual void closeListElement() {};
|
||||
- virtual void openFootnote(const WPXPropertyList &propList) {};
|
||||
- virtual void closeFootnote() {};
|
||||
- virtual void openEndnote(const WPXPropertyList &propList) {};
|
||||
- virtual void closeEndnote() {};
|
||||
+ virtual void defineOrderedListLevel(const WPXPropertyList &propList);
|
||||
+ virtual void defineUnorderedListLevel(const WPXPropertyList &propList);
|
||||
+ virtual void openOrderedListLevel(const WPXPropertyList &propList);
|
||||
+ virtual void openUnorderedListLevel(const WPXPropertyList &propList);
|
||||
+ virtual void closeOrderedListLevel();
|
||||
+ virtual void closeUnorderedListLevel();
|
||||
+ virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
|
||||
+ virtual void closeListElement();
|
||||
+ virtual void openFootnote(const WPXPropertyList &propList);
|
||||
+ virtual void closeFootnote();
|
||||
+ virtual void openEndnote(const WPXPropertyList &propList);
|
||||
+ virtual void closeEndnote();
|
||||
virtual void openComment(const WPXPropertyList &propList) {};
|
||||
virtual void closeComment() {};
|
||||
virtual void openTextBox(const WPXPropertyList &propList) {};
|
||||
virtual void closeTextBox() {};
|
||||
- virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) {};
|
||||
- virtual void openTableRow(const WPXPropertyList &propList) {};
|
||||
- virtual void closeTableRow() {};
|
||||
- virtual void openTableCell(const WPXPropertyList &propList) {};
|
||||
- virtual void closeTableCell() {};
|
||||
- virtual void insertCoveredTableCell(const WPXPropertyList &propList) {};
|
||||
- virtual void closeTable() {};
|
||||
+ virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
|
||||
+ virtual void openTableRow(const WPXPropertyList &propList);
|
||||
+ virtual void closeTableRow();
|
||||
+ virtual void openTableCell(const WPXPropertyList &propList);
|
||||
+ virtual void closeTableCell();
|
||||
+ virtual void insertCoveredTableCell(const WPXPropertyList &propList);
|
||||
+ virtual void closeTable();
|
||||
virtual void openFrame(const WPXPropertyList &propList) {};
|
||||
virtual void closeFrame() {};
|
||||
virtual void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) {};
|
||||
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 2.5 KiB |
@ -1,84 +0,0 @@
|
||||
commit 96f2a488786e370c355778e00c795e776e09d199
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1322168535 -0600
|
||||
|
||||
Fix FTBFS
|
||||
|
||||
diff --git a/konversation/src/alias_preferences.h b/konversation/src/alias_preferences.h
|
||||
index cf70b4f..aeb3062 100644
|
||||
--- a/konversation/src/alias_preferences.h
|
||||
+++ b/konversation/src/alias_preferences.h
|
||||
@@ -13,6 +13,8 @@
|
||||
#ifndef EXALIASPREFERENCES_H
|
||||
#define EXALIASPREFERENCES_H
|
||||
|
||||
+#include <tqlistview.h>
|
||||
+
|
||||
#include "alias_preferencesui.h"
|
||||
#include "konvisettingspage.h"
|
||||
|
||||
diff --git a/konversation/src/autoreplace_preferences.h b/konversation/src/autoreplace_preferences.h
|
||||
index c73da29..9cab1f0 100644
|
||||
--- a/konversation/src/autoreplace_preferences.h
|
||||
+++ b/konversation/src/autoreplace_preferences.h
|
||||
@@ -13,6 +13,8 @@
|
||||
#ifndef AUTOREPLACECONFIG_H
|
||||
#define AUTOREPLACECONFIG_H
|
||||
|
||||
+#include <tqlistview.h>
|
||||
+
|
||||
#include "autoreplace_preferencesui.h"
|
||||
#include "konvisettingspage.h"
|
||||
|
||||
diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg
|
||||
index a2a2582..8cf2b82 100644
|
||||
--- a/konversation/src/config/konversation.kcfg
|
||||
+++ b/konversation/src/config/konversation.kcfg
|
||||
@@ -294,7 +294,7 @@
|
||||
<whatsthis></whatsthis>
|
||||
</entry>
|
||||
<entry key="LogfileReaderGeometry" type="Size" name="LogfileReaderSize">
|
||||
- <default code="true">QSize(400, 200)</default>
|
||||
+ <default code="true">TQSize(400, 200)</default>
|
||||
<label></label>
|
||||
<whatsthis></whatsthis>
|
||||
</entry>
|
||||
diff --git a/konversation/src/highlight_preferences.h b/konversation/src/highlight_preferences.h
|
||||
index 67863a7..89974ca 100644
|
||||
--- a/konversation/src/highlight_preferences.h
|
||||
+++ b/konversation/src/highlight_preferences.h
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "konvisettingspage.h"
|
||||
|
||||
#include <tqobject.h>
|
||||
-
|
||||
+#include <tqlistview.h>
|
||||
|
||||
class Highlight_Config;
|
||||
class Highlight;
|
||||
diff --git a/konversation/src/ignore_preferences.h b/konversation/src/ignore_preferences.h
|
||||
index e910b78..a19ff03 100644
|
||||
--- a/konversation/src/ignore_preferences.h
|
||||
+++ b/konversation/src/ignore_preferences.h
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "konvisettingspage.h"
|
||||
|
||||
#include <tqptrlist.h>
|
||||
-
|
||||
+#include <tqlistview.h>
|
||||
|
||||
class Ignore;
|
||||
class Ignore_Config : public Ignore_ConfigUI, public KonviSettingsPage
|
||||
diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h
|
||||
index c8cc0e1..ccf26af 100644
|
||||
--- a/konversation/src/quickbuttons_preferences.h
|
||||
+++ b/konversation/src/quickbuttons_preferences.h
|
||||
@@ -13,6 +13,8 @@
|
||||
#ifndef TQUICKBUTTONSCONFIG_H
|
||||
#define TQUICKBUTTONSCONFIG_H
|
||||
|
||||
+#include <tqlistview.h>
|
||||
+
|
||||
#include "quickbuttons_preferencesui.h"
|
||||
#include "konvisettingspage.h"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,697 +0,0 @@
|
||||
commit c64099e59a4e9ba6bdb8eebecd88e3363aee479b
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1324497946 -0600
|
||||
|
||||
Rename obsolete tq methods to standard names
|
||||
|
||||
diff --git a/konversation/src/alias_preferencesui.ui b/konversation/src/alias_preferencesui.ui
|
||||
index 3783955..10d926a 100644
|
||||
--- a/konversation/src/alias_preferencesui.ui
|
||||
+++ b/konversation/src/alias_preferencesui.ui
|
||||
@@ -21,7 +21,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget" row="1" column="0">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout7</cstring>
|
||||
+ <cstring>layout7</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -114,7 +114,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout8</cstring>
|
||||
+ <cstring>layout8</cstring>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/autoreplace_preferencesui.ui b/konversation/src/autoreplace_preferencesui.ui
|
||||
index 769ba9b..494427f 100644
|
||||
--- a/konversation/src/autoreplace_preferencesui.ui
|
||||
+++ b/konversation/src/autoreplace_preferencesui.ui
|
||||
@@ -22,7 +22,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout6</cstring>
|
||||
+ <cstring>layout6</cstring>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
@@ -137,7 +137,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="1" column="0">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout16</cstring>
|
||||
+ <cstring>layout16</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/channeloptionsui.ui b/konversation/src/channeloptionsui.ui
|
||||
index 33bb6ff..529207d 100644
|
||||
--- a/konversation/src/channeloptionsui.ui
|
||||
+++ b/konversation/src/channeloptionsui.ui
|
||||
@@ -215,7 +215,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout11</cstring>
|
||||
+ <cstring>layout11</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -289,7 +289,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout2</cstring>
|
||||
+ <cstring>layout2</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/colorsappearance_preferences.ui b/konversation/src/colorsappearance_preferences.ui
|
||||
index 909e5b3..b0e9c1e 100644
|
||||
--- a/konversation/src/colorsappearance_preferences.ui
|
||||
+++ b/konversation/src/colorsappearance_preferences.ui
|
||||
@@ -726,7 +726,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="12">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout18</cstring>
|
||||
+ <cstring>layout18</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/dccrecipientdialog.cpp b/konversation/src/dccrecipientdialog.cpp
|
||||
index 6be72d2..bb5d334 100644
|
||||
--- a/konversation/src/dccrecipientdialog.cpp
|
||||
+++ b/konversation/src/dccrecipientdialog.cpp
|
||||
@@ -30,7 +30,7 @@ DccRecipientDialog::DccRecipientDialog(TQWidget* parent, const TQStringList &lis
|
||||
// Create the top level widget
|
||||
TQWidget* page=new TQWidget(this);
|
||||
setMainWidget(page);
|
||||
- // Add the tqlayout to the widget
|
||||
+ // Add the layout to the widget
|
||||
TQVBoxLayout* dialogLayout=new TQVBoxLayout(page);
|
||||
dialogLayout->setSpacing(spacingHint());
|
||||
// Add the nickname list widget
|
||||
diff --git a/konversation/src/dcctransferdetailedinfopanelui.ui b/konversation/src/dcctransferdetailedinfopanelui.ui
|
||||
index 967b1ae..ea04cf8 100644
|
||||
--- a/konversation/src/dcctransferdetailedinfopanelui.ui
|
||||
+++ b/konversation/src/dcctransferdetailedinfopanelui.ui
|
||||
@@ -26,7 +26,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout7</cstring>
|
||||
+ <cstring>layout7</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -115,7 +115,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="6" column="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout6</cstring>
|
||||
+ <cstring>layout6</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
@@ -162,7 +162,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout26</cstring>
|
||||
+ <cstring>layout26</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
@@ -170,7 +170,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout24</cstring>
|
||||
+ <cstring>layout24</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -344,7 +344,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout25</cstring>
|
||||
+ <cstring>layout25</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/editnotifydialog.cpp b/konversation/src/editnotifydialog.cpp
|
||||
index 312d69c..8874463 100644
|
||||
--- a/konversation/src/editnotifydialog.cpp
|
||||
+++ b/konversation/src/editnotifydialog.cpp
|
||||
@@ -37,8 +37,8 @@ KDialogBase::Ok,true)
|
||||
TQWidget* page=new TQWidget(this);
|
||||
setMainWidget(page);
|
||||
|
||||
- TQHBoxLayout* tqlayout = new TQHBoxLayout(page);
|
||||
- tqlayout->setSpacing(spacingHint());
|
||||
+ TQHBoxLayout* layout = new TQHBoxLayout(page);
|
||||
+ layout->setSpacing(spacingHint());
|
||||
|
||||
TQLabel* networkNameLabel=new TQLabel(i18n("&Network name:"),page);
|
||||
TQString networkNameWT = i18n(
|
||||
@@ -80,10 +80,10 @@ KDialogBase::Ok,true)
|
||||
if(*it == network) m_networkNameCombo->setCurrentItem(m_networkNameCombo->count()-1);
|
||||
}
|
||||
|
||||
- tqlayout->addWidget(networkNameLabel);
|
||||
- tqlayout->addWidget(m_networkNameCombo);
|
||||
- tqlayout->addWidget(nicknameLabel);
|
||||
- tqlayout->addWidget(m_nicknameInput);
|
||||
+ layout->addWidget(networkNameLabel);
|
||||
+ layout->addWidget(m_networkNameCombo);
|
||||
+ layout->addWidget(nicknameLabel);
|
||||
+ layout->addWidget(m_nicknameInput);
|
||||
|
||||
setButtonOK(KGuiItem(i18n("&OK"),"button_ok",i18n("Change notify information")));
|
||||
setButtonCancel(KGuiItem(i18n("&Cancel"),"button_cancel",i18n("Discards all changes made")));
|
||||
diff --git a/konversation/src/highlight_preferencesui.ui b/konversation/src/highlight_preferencesui.ui
|
||||
index 3b42a4d..df28e7e 100644
|
||||
--- a/konversation/src/highlight_preferencesui.ui
|
||||
+++ b/konversation/src/highlight_preferencesui.ui
|
||||
@@ -93,7 +93,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="4" rowspan="5" colspan="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout13</cstring>
|
||||
+ <cstring>layout13</cstring>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/identitydialog.cpp b/konversation/src/identitydialog.cpp
|
||||
index 0f9e672..cfa592a 100644
|
||||
--- a/konversation/src/identitydialog.cpp
|
||||
+++ b/konversation/src/identitydialog.cpp
|
||||
@@ -90,7 +90,7 @@ namespace Konversation
|
||||
|
||||
TQGroupBox* nicknameGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Nickname"), generalWidget);
|
||||
nicknameGBox->setMargin(marginHint());
|
||||
- TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->tqlayout(), 1, 2, spacingHint());
|
||||
+ TQGridLayout* nicknameLayout = new TQGridLayout(nicknameGBox->layout(), 1, 2, spacingHint());
|
||||
|
||||
m_nicknameLBox = new TQListBox(nicknameGBox);
|
||||
TQWhatsThis::add(m_nicknameLBox, i18n("This is your list of nicknames. A nickname is the name that other users will know you by. You may use any name you desire. The first character must be a letter.\n\nSince nicknames must be unique across an entire IRC network, your desired name may be rejected by the server because someone else is already using that nickname. Enter alternate nicknames for yourself. If your first choice is rejected by the server, Konversation will try the alternate nicknames."));
|
||||
@@ -126,7 +126,7 @@ namespace Konversation
|
||||
|
||||
TQGroupBox* autoIdentifyGBox = new TQGroupBox(0, Qt::Horizontal, i18n("Auto Identify"), generalWidget);
|
||||
autoIdentifyGBox->setMargin(marginHint());
|
||||
- TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->tqlayout(), 1, 2, spacingHint());
|
||||
+ TQGridLayout* autoIdentifyLayout = new TQGridLayout(autoIdentifyGBox->layout(), 1, 2, spacingHint());
|
||||
|
||||
TQLabel* botLabel=new TQLabel(i18n("Ser&vice:"), autoIdentifyGBox);
|
||||
TQWhatsThis::add(botLabel,i18n("Service name can be <b><i>nickserv</i></b> or a network dependant name like <b><i>nickserv@services.dal.net</i></b>"));
|
||||
@@ -167,7 +167,7 @@ namespace Konversation
|
||||
m_automaticAwayGBox->setCheckable(true);
|
||||
m_automaticAwayGBox->setColumnLayout(0, Qt::Horizontal);
|
||||
m_automaticAwayGBox->setMargin(marginHint());
|
||||
- TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->tqlayout(), 1, 2, spacingHint());
|
||||
+ TQGridLayout* automaticAwayLayout = new TQGridLayout(m_automaticAwayGBox->layout(), 1, 2, spacingHint());
|
||||
|
||||
TQWhatsThis::add(m_automaticAwayGBox, i18n("If you check this box, Konversation will automatically set all connections using this Identity away when the screensaver starts or after a period of user inactivity configured below."));
|
||||
|
||||
@@ -198,7 +198,7 @@ namespace Konversation
|
||||
m_awayMessageGBox->setCheckable(true);
|
||||
m_awayMessageGBox->setColumnLayout(0, Qt::Horizontal);
|
||||
m_awayMessageGBox->setMargin(marginHint());
|
||||
- TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->tqlayout(), 1, 2, spacingHint());
|
||||
+ TQGridLayout* messagesLayout = new TQGridLayout(m_awayMessageGBox->layout(), 1, 2, spacingHint());
|
||||
|
||||
TQWhatsThis::add(m_awayMessageGBox, i18n("If you check this box, Konversation will automatically send the Away message to all channels joined with this Identity. <b>%s</b> is replaced with <b>msg</b>. Whenever you perform an <b>/away</b> command, the Return message will be displayed in all channels joined with this Identity."));
|
||||
|
||||
diff --git a/konversation/src/ignore_preferencesui.ui b/konversation/src/ignore_preferencesui.ui
|
||||
index 88aa423..501fa89 100644
|
||||
--- a/konversation/src/ignore_preferencesui.ui
|
||||
+++ b/konversation/src/ignore_preferencesui.ui
|
||||
@@ -145,7 +145,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="2" rowspan="3" colspan="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout20</cstring>
|
||||
+ <cstring>layout20</cstring>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/irccharsets.cpp b/konversation/src/irccharsets.cpp
|
||||
index 0849cfc..692820c 100644
|
||||
--- a/konversation/src/irccharsets.cpp
|
||||
+++ b/konversation/src/irccharsets.cpp
|
||||
@@ -130,7 +130,7 @@ namespace Konversation
|
||||
|
||||
// setup m_shortNameAliases
|
||||
// use only [a-z0-9] for keys!
|
||||
- m_shortNameAliases["tqunicode"] = "utf8";
|
||||
+ m_shortNameAliases["unicode"] = "utf8";
|
||||
m_shortNameAliases["latin1"] = "iso-8859-1";
|
||||
|
||||
// setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames
|
||||
diff --git a/konversation/src/ircinput.cpp b/konversation/src/ircinput.cpp
|
||||
index e76b032..7766351 100644
|
||||
--- a/konversation/src/ircinput.cpp
|
||||
+++ b/konversation/src/ircinput.cpp
|
||||
@@ -371,7 +371,7 @@ void IRCInput::paste(bool useSelection)
|
||||
|
||||
void IRCInput::paste()
|
||||
{
|
||||
- TQClipboard *cb = KApplication::kApplication()->tqclipboard();
|
||||
+ TQClipboard *cb = KApplication::kApplication()->clipboard();
|
||||
setFocus();
|
||||
|
||||
// Copy text from the clipboard (paste)
|
||||
diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp
|
||||
index 94a10b5..b2711ff 100644
|
||||
--- a/konversation/src/ircview.cpp
|
||||
+++ b/konversation/src/ircview.cpp
|
||||
@@ -645,7 +645,7 @@ TQString IRCView::createNickLine(const TQString& nick, bool encapsulateNick, boo
|
||||
|
||||
for (uint index = 0; index < nick.length(); index++)
|
||||
{
|
||||
- nickvalue += nick[index].tqunicode();
|
||||
+ nickvalue += nick[index].unicode();
|
||||
}
|
||||
|
||||
nickColor = Preferences::nickColor((nickvalue % 8)).name();
|
||||
@@ -1344,7 +1344,7 @@ bool IRCView::contextMenu(TQContextMenuEvent* ce)
|
||||
break;
|
||||
case CopyUrl:
|
||||
{
|
||||
- TQClipboard *cb = KApplication::kApplication()->tqclipboard();
|
||||
+ TQClipboard *cb = KApplication::kApplication()->clipboard();
|
||||
cb->setText(m_urlToCopy,TQClipboard::Selection);
|
||||
cb->setText(m_urlToCopy,TQClipboard::Clipboard);
|
||||
break;
|
||||
@@ -1621,8 +1621,8 @@ TQPopupMenu* IRCView::getPopup() const
|
||||
}
|
||||
|
||||
// for more information about these RTFM
|
||||
-// http://www.tqunicode.org/reports/tr9/
|
||||
-// http://www.w3.org/TR/tqunicode-xml/
|
||||
+// http://www.unicode.org/reports/tr9/
|
||||
+// http://www.w3.org/TR/unicode-xml/
|
||||
TQChar IRCView::LRM = (ushort)0x200e; // Right-to-Left Mark
|
||||
TQChar IRCView::RLM = (ushort)0x200f; // Left-to-Right Mark
|
||||
TQChar IRCView::LRE = (ushort)0x202a; // Left-to-Right Embedding
|
||||
diff --git a/konversation/src/konversationapplication.h b/konversation/src/konversationapplication.h
|
||||
index 4795659..8651b19 100644
|
||||
--- a/konversation/src/konversationapplication.h
|
||||
+++ b/konversation/src/konversationapplication.h
|
||||
@@ -89,7 +89,7 @@ class KonversationApplication : public KUniqueApplication
|
||||
static KonversationApplication* instance();
|
||||
|
||||
/** For dcop and addressbook, a user can be specified as user@irc.server.net
|
||||
- * or user\@servergroup or using the tqunicode separator symbol 0xE120 instead
|
||||
+ * or user\@servergroup or using the unicode separator symbol 0xE120 instead
|
||||
* of the "@". This function takes a string like the above examples, and
|
||||
* modifies ircnick and serverOrGroup to contain the split up string. If
|
||||
* the string doesn't have an @ or 0xE120, ircnick is set to the
|
||||
diff --git a/konversation/src/linkaddressbook/addressbook_base.cpp b/konversation/src/linkaddressbook/addressbook_base.cpp
|
||||
index 48f6973..935dcd0 100644
|
||||
--- a/konversation/src/linkaddressbook/addressbook_base.cpp
|
||||
+++ b/konversation/src/linkaddressbook/addressbook_base.cpp
|
||||
@@ -194,7 +194,7 @@ namespace Konversation
|
||||
lnick_servergroup = lnick + TQChar(0xE120) + servergroup.lower();
|
||||
|
||||
//We should now have lnick = ircnick, and versions with servername and servergroup -
|
||||
- // like johnflux, johnflux@freenode, or johnflux@irc.kde.org except with the tqunicode
|
||||
+ // like johnflux, johnflux@freenode, or johnflux@irc.kde.org except with the unicode
|
||||
// separator char 0xe120 instead of the @
|
||||
|
||||
kdDebug() << "nick" << ircnick<< endl;
|
||||
diff --git a/konversation/src/linkaddressbook/linkaddressbookui_base.ui b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
|
||||
index e67d306..1fa3c3e 100644
|
||||
--- a/konversation/src/linkaddressbook/linkaddressbookui_base.ui
|
||||
+++ b/konversation/src/linkaddressbook/linkaddressbookui_base.ui
|
||||
@@ -125,7 +125,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout1</cstring>
|
||||
+ <cstring>layout1</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/multilineedit.cpp b/konversation/src/multilineedit.cpp
|
||||
index 3999bbc..b4af548 100644
|
||||
--- a/konversation/src/multilineedit.cpp
|
||||
+++ b/konversation/src/multilineedit.cpp
|
||||
@@ -28,7 +28,7 @@ KGuiItem(i18n("Add &Quotation Indicators")))
|
||||
// Create the top level widget
|
||||
TQWidget* page=new TQWidget(this);
|
||||
setMainWidget(page);
|
||||
- // Add the tqlayout to the widget
|
||||
+ // Add the layout to the widget
|
||||
TQVBoxLayout* dialogLayout=new TQVBoxLayout(page);
|
||||
dialogLayout->setSpacing(spacingHint());
|
||||
// add the text editor
|
||||
diff --git a/konversation/src/nick.cpp b/konversation/src/nick.cpp
|
||||
index 640003a..2f44e4d 100644
|
||||
--- a/konversation/src/nick.cpp
|
||||
+++ b/konversation/src/nick.cpp
|
||||
@@ -238,7 +238,7 @@ void Nick::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int wid
|
||||
|
||||
if(nickInfo->isAway())
|
||||
{
|
||||
- cg2.setColor(TQColorGroup::Text, kapp->tqpalette(listView()).disabled().text());
|
||||
+ cg2.setColor(TQColorGroup::Text, kapp->palette(listView()).disabled().text());
|
||||
}
|
||||
|
||||
KListViewItem::paintCell(p,cg2,column,width,align);
|
||||
diff --git a/konversation/src/nickinfo.cpp b/konversation/src/nickinfo.cpp
|
||||
index 17765ca..efc218e 100644
|
||||
--- a/konversation/src/nickinfo.cpp
|
||||
+++ b/konversation/src/nickinfo.cpp
|
||||
@@ -85,7 +85,7 @@ uint NickInfo::getNickColor()
|
||||
|
||||
for (uint index = 0; index < m_nickname.length(); index++)
|
||||
{
|
||||
- nickvalue += m_nickname[index].tqunicode();
|
||||
+ nickvalue += m_nickname[index].unicode();
|
||||
}
|
||||
|
||||
m_nickColor = (nickvalue % 8) + 1;
|
||||
diff --git a/konversation/src/queuetunerbase.ui b/konversation/src/queuetunerbase.ui
|
||||
index 6bb1c7a..2a974e0 100644
|
||||
--- a/konversation/src/queuetunerbase.ui
|
||||
+++ b/konversation/src/queuetunerbase.ui
|
||||
@@ -32,7 +32,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout92</cstring>
|
||||
+ <cstring>layout92</cstring>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
@@ -132,7 +132,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout164</cstring>
|
||||
+ <cstring>layout164</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
@@ -185,7 +185,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="0">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout242</cstring>
|
||||
+ <cstring>layout242</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -239,7 +239,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout236_2_2</cstring>
|
||||
+ <cstring>layout236_2_2</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -314,7 +314,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout163</cstring>
|
||||
+ <cstring>layout163</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
@@ -367,7 +367,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout236_2</cstring>
|
||||
+ <cstring>layout236_2</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -415,7 +415,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="0">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout240</cstring>
|
||||
+ <cstring>layout240</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -496,7 +496,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout161</cstring>
|
||||
+ <cstring>layout161</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
@@ -552,7 +552,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="0">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout237</cstring>
|
||||
+ <cstring>layout237</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -606,7 +606,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout236</cstring>
|
||||
+ <cstring>layout236</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -681,7 +681,7 @@
|
||||
</property>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout88</cstring>
|
||||
+ <cstring>layout88</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/quickbuttons_preferencesui.ui b/konversation/src/quickbuttons_preferencesui.ui
|
||||
index 4e22b30..c0fd88f 100644
|
||||
--- a/konversation/src/quickbuttons_preferencesui.ui
|
||||
+++ b/konversation/src/quickbuttons_preferencesui.ui
|
||||
@@ -63,7 +63,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="1" column="0">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout3</cstring>
|
||||
+ <cstring>layout3</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
@@ -161,7 +161,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="1" rowspan="3" colspan="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout1</cstring>
|
||||
+ <cstring>layout1</cstring>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/quickconnectdialog.cpp b/konversation/src/quickconnectdialog.cpp
|
||||
index 671b17a..0d86fcc 100644
|
||||
--- a/konversation/src/quickconnectdialog.cpp
|
||||
+++ b/konversation/src/quickconnectdialog.cpp
|
||||
@@ -31,9 +31,9 @@ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
|
||||
TQWidget* page = new TQWidget(this);
|
||||
setMainWidget(page);
|
||||
|
||||
- TQGridLayout* tqlayout = new TQGridLayout(page, 2, 4);
|
||||
- tqlayout->setSpacing(spacingHint());
|
||||
- tqlayout->setColStretch(1, 10);
|
||||
+ TQGridLayout* layout = new TQGridLayout(page, 2, 4);
|
||||
+ layout->setSpacing(spacingHint());
|
||||
+ layout->setColStretch(1, 10);
|
||||
|
||||
TQLabel* hostNameLabel = new TQLabel(i18n("&Server host:"), page);
|
||||
TQString hostNameWT = i18n("Enter the host of the network here.");
|
||||
@@ -66,17 +66,17 @@ KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
|
||||
sslCheckBox = new TQCheckBox(page, "sslCheckBox");
|
||||
sslCheckBox->setText(i18n("&Use SSL"));
|
||||
|
||||
- tqlayout->addWidget(hostNameLabel, 0, 0);
|
||||
- tqlayout->addWidget(hostNameInput, 0, 1);
|
||||
- tqlayout->addWidget(portLabel, 0, 2);
|
||||
- tqlayout->addWidget(portInput, 0, 3);
|
||||
+ layout->addWidget(hostNameLabel, 0, 0);
|
||||
+ layout->addWidget(hostNameInput, 0, 1);
|
||||
+ layout->addWidget(portLabel, 0, 2);
|
||||
+ layout->addWidget(portInput, 0, 3);
|
||||
|
||||
- tqlayout->addWidget(nickLabel, 1, 0);
|
||||
- tqlayout->addWidget(nickInput, 1, 1);
|
||||
- tqlayout->addWidget(passwordLabel, 1, 2);
|
||||
- tqlayout->addWidget(passwordInput, 1, 3);
|
||||
+ layout->addWidget(nickLabel, 1, 0);
|
||||
+ layout->addWidget(nickInput, 1, 1);
|
||||
+ layout->addWidget(passwordLabel, 1, 2);
|
||||
+ layout->addWidget(passwordInput, 1, 3);
|
||||
|
||||
- tqlayout->addWidget(sslCheckBox, 2, 0);
|
||||
+ layout->addWidget(sslCheckBox, 2, 0);
|
||||
|
||||
hostNameInput->setFocus();
|
||||
|
||||
diff --git a/konversation/src/serverlistdialog.cpp b/konversation/src/serverlistdialog.cpp
|
||||
index 38ad8f4..cd37cd1 100644
|
||||
--- a/konversation/src/serverlistdialog.cpp
|
||||
+++ b/konversation/src/serverlistdialog.cpp
|
||||
@@ -133,14 +133,14 @@ namespace Konversation
|
||||
showAtStartup->setChecked(Preferences::showServerList());
|
||||
connect(showAtStartup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowAtStartup(bool)));
|
||||
|
||||
- TQGridLayout* tqlayout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint());
|
||||
-
|
||||
- tqlayout->addMultiCellWidget(m_serverList, 0, 3, 0, 0);
|
||||
- tqlayout->addWidget(m_addButton, 0, 1);
|
||||
- tqlayout->addWidget(m_editButton, 1, 1);
|
||||
- tqlayout->addWidget(m_delButton, 2, 1);
|
||||
- tqlayout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1);
|
||||
- tqlayout->setRowStretch(3, 10);
|
||||
+ TQGridLayout* layout = new TQGridLayout(mainWidget, 5, 2, 0, spacingHint());
|
||||
+
|
||||
+ layout->addMultiCellWidget(m_serverList, 0, 3, 0, 0);
|
||||
+ layout->addWidget(m_addButton, 0, 1);
|
||||
+ layout->addWidget(m_editButton, 1, 1);
|
||||
+ layout->addWidget(m_delButton, 2, 1);
|
||||
+ layout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1);
|
||||
+ layout->setRowStretch(3, 10);
|
||||
|
||||
m_serverList->setFocus();
|
||||
|
||||
diff --git a/konversation/src/tabs_preferencesui.ui b/konversation/src/tabs_preferencesui.ui
|
||||
index 73b914c..a039acb 100644
|
||||
--- a/konversation/src/tabs_preferencesui.ui
|
||||
+++ b/konversation/src/tabs_preferencesui.ui
|
||||
@@ -39,7 +39,7 @@ the Free Software Foundation; either version 2 of the License, or
|
||||
</property>
|
||||
<widget class="TQLayoutWidget">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout2</cstring>
|
||||
+ <cstring>layout2</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/theme_preferencesui.ui b/konversation/src/theme_preferencesui.ui
|
||||
index 90c3a2b..f804677 100644
|
||||
--- a/konversation/src/theme_preferencesui.ui
|
||||
+++ b/konversation/src/theme_preferencesui.ui
|
||||
@@ -29,7 +29,7 @@
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout17</cstring>
|
||||
+ <cstring>layout17</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
diff --git a/konversation/src/topiclabel.cpp b/konversation/src/topiclabel.cpp
|
||||
index c618026..5b03382 100644
|
||||
--- a/konversation/src/topiclabel.cpp
|
||||
+++ b/konversation/src/topiclabel.cpp
|
||||
@@ -199,7 +199,7 @@ namespace Konversation
|
||||
break;
|
||||
case CopyUrl:
|
||||
{
|
||||
- TQClipboard *cb = KApplication::kApplication()->tqclipboard();
|
||||
+ TQClipboard *cb = KApplication::kApplication()->clipboard();
|
||||
cb->setText(m_urlToCopy,TQClipboard::Selection);
|
||||
cb->setText(m_urlToCopy,TQClipboard::Clipboard);
|
||||
break;
|
||||
diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp
|
||||
index 76ff9e5..0fe0732 100644
|
||||
--- a/konversation/src/urlcatcher.cpp
|
||||
+++ b/konversation/src/urlcatcher.cpp
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
|
||||
{
|
||||
- tqlayout()->setAutoAdd(false);
|
||||
+ layout()->setAutoAdd(false);
|
||||
setName(i18n("URL Catcher"));
|
||||
setType(ChatWindow::UrlCatcher);
|
||||
|
||||
@@ -96,9 +96,9 @@ UrlCatcher::UrlCatcher(TQWidget* parent) : ChatWindow(parent)
|
||||
saveListButton->setEnabled(false);
|
||||
clearListButton->setEnabled(false);
|
||||
|
||||
- tqlayout()->add(searchWidget);
|
||||
- tqlayout()->add(urlListView);
|
||||
- tqlayout()->add(buttonBox);
|
||||
+ layout()->add(searchWidget);
|
||||
+ layout()->add(urlListView);
|
||||
+ layout()->add(buttonBox);
|
||||
|
||||
urlSelected();
|
||||
}
|
||||
@@ -167,7 +167,7 @@ void UrlCatcher::copyUrlClicked()
|
||||
TQListViewItem* item=urlListView->selectedItem();
|
||||
if(item)
|
||||
{
|
||||
- TQClipboard *cb=KApplication::kApplication()->tqclipboard();
|
||||
+ TQClipboard *cb=KApplication::kApplication()->clipboard();
|
||||
cb->setText(item->text(1),TQClipboard::Selection);
|
||||
cb->setText(item->text(1),TQClipboard::Clipboard);
|
||||
}
|
||||
diff --git a/konversation/src/viewcontainer.cpp b/konversation/src/viewcontainer.cpp
|
||||
index 7b92a86..cbb0ba6 100644
|
||||
--- a/konversation/src/viewcontainer.cpp
|
||||
+++ b/konversation/src/viewcontainer.cpp
|
||||
@@ -1058,12 +1058,12 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
|
||||
Channel *channel = static_cast<Channel*>(view);
|
||||
|
||||
if (!channel->joined())
|
||||
- textColor = KonversationApplication::instance()->tqpalette(m_viewTree).disabled().text();
|
||||
+ textColor = KonversationApplication::instance()->palette(m_viewTree).disabled().text();
|
||||
}
|
||||
else if (view->getType() == ChatWindow::Query)
|
||||
{
|
||||
if (!view->getServer()->isConnected())
|
||||
- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
|
||||
+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
|
||||
}
|
||||
|
||||
m_viewTree->setViewColor(view, textColor);
|
||||
@@ -1100,12 +1100,12 @@ void ViewContainer::unsetViewNotification(ChatWindow* view)
|
||||
Channel *channel = static_cast<Channel*>(view);
|
||||
|
||||
if (!channel->joined())
|
||||
- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
|
||||
+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
|
||||
}
|
||||
else if (view->getType() == ChatWindow::Query)
|
||||
{
|
||||
if (!view->getServer()->isConnected())
|
||||
- textColor = KonversationApplication::instance()->tqpalette(m_tabWidget).disabled().text();
|
||||
+ textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text();
|
||||
}
|
||||
|
||||
m_tabWidget->setTabColor(view, textColor);
|
||||
diff --git a/konversation/src/watchednicknames_preferencesui.ui b/konversation/src/watchednicknames_preferencesui.ui
|
||||
index 6f9860b..9df9782 100644
|
||||
--- a/konversation/src/watchednicknames_preferencesui.ui
|
||||
+++ b/konversation/src/watchednicknames_preferencesui.ui
|
||||
@@ -273,7 +273,7 @@ When the nickname watcher is turned on, you will be notified when the nicknames
|
||||
</widget>
|
||||
<widget class="TQLayoutWidget" row="0" column="4" rowspan="2" colspan="1">
|
||||
<property name="name">
|
||||
- <cstring>tqlayout3</cstring>
|
||||
+ <cstring>layout3</cstring>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
@ -1,36 +0,0 @@
|
||||
commit 440010aa593e209ce5993a73b1b7cb0a843a2716
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1327529820 -0600
|
||||
|
||||
Fix linear alphabet string errors
|
||||
|
||||
diff --git a/konversation/src/blowfish/b64stuff.cpp b/konversation/src/blowfish/b64stuff.cpp
|
||||
index 79d5e64..72f0776 100644
|
||||
--- a/konversation/src/blowfish/b64stuff.cpp
|
||||
+++ b/konversation/src/blowfish/b64stuff.cpp
|
||||
@@ -36,10 +36,10 @@
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
-//static char b64table[64] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
|
||||
+//static char b64table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
// "abcdefghijklmnopqrstuvwxyz"
|
||||
// "0123456789+/";
|
||||
-static char b64table[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
+static char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
|
||||
/* Accepts a binary buffer with an associated size.
|
||||
* Returns a base64-encoded, NULL-terminated string.
|
||||
diff --git a/konversation/src/blowfish/oldblowfish.cpp b/konversation/src/blowfish/oldblowfish.cpp
|
||||
index 3eab870..1f274db 100644
|
||||
--- a/konversation/src/blowfish/oldblowfish.cpp
|
||||
+++ b/konversation/src/blowfish/oldblowfish.cpp
|
||||
@@ -271,7 +271,7 @@ void oldCBlowFish::Decode (BYTE * pInput, BYTE * pOutput, DWORD lSize)
|
||||
#define SALT2 0x23f6b095
|
||||
|
||||
// Convert 64-bit encrypted passphrase to text for userfile
|
||||
-char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
|
||||
+char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||
|
||||
int base64dec(char c)
|
||||
{
|
||||
@ -1,200 +0,0 @@
|
||||
commit ca3d6cef5d40d2c9faf1f0279f40b135a444d206
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1334302097 -0500
|
||||
|
||||
Fix inadvertent "TQ" changes.
|
||||
|
||||
diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp
|
||||
index c28c844..5534ac8 100644
|
||||
--- a/konversation/src/config/preferences.cpp
|
||||
+++ b/konversation/src/config/preferences.cpp
|
||||
@@ -105,7 +105,7 @@ const TQStringList Preferences::defaultQuickButtonList()
|
||||
<< "Kick,/KICK %u%n"
|
||||
<< "Ban,/BAN %u%n"
|
||||
<< "Part,/PART %c Leaving...%n"
|
||||
- << "Quit,/TQUIT Leaving...%n";
|
||||
+ << "Quit,/QUIT Leaving...%n";
|
||||
}
|
||||
|
||||
const TQStringList Preferences::quickButtonList()
|
||||
diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h
|
||||
index af7bc97..f4b03a9 100644
|
||||
--- a/konversation/src/dcctransfer.h
|
||||
+++ b/konversation/src/dcctransfer.h
|
||||
@@ -92,9 +92,9 @@ class DccTransfer : public TQObject
|
||||
|
||||
// common settings for DccTransferRecv / DccTransferSend
|
||||
|
||||
- // RETQUIRED
|
||||
+ // REQUIRED
|
||||
void setConnectionId( int connectionId );
|
||||
- // RETQUIRED
|
||||
+ // REQUIRED
|
||||
void setPartnerNick( const TQString& nick );
|
||||
|
||||
signals:
|
||||
diff --git a/konversation/src/dcctransferrecv.h b/konversation/src/dcctransferrecv.h
|
||||
index aed4624..92f4201 100644
|
||||
--- a/konversation/src/dcctransferrecv.h
|
||||
+++ b/konversation/src/dcctransferrecv.h
|
||||
@@ -50,11 +50,11 @@ class DccTransferRecv : public DccTransfer
|
||||
DccTransferRecv(TQObject* parent);
|
||||
virtual ~DccTransferRecv();
|
||||
|
||||
- // RETQUIRED
|
||||
+ // REQUIRED
|
||||
void setPartnerIp( const TQString& ip );
|
||||
- // RETQUIRED
|
||||
+ // REQUIRED
|
||||
void setPartnerPort( const TQString& port );
|
||||
- // RETQUIRED
|
||||
+ // REQUIRED
|
||||
void setFileSize( unsigned long fileSize );
|
||||
// OPTIONAL, if not specified, "unnamed_file"
|
||||
// TODO: "$sendername-$receiveddate" is better
|
||||
diff --git a/konversation/src/dcctransfersend.h b/konversation/src/dcctransfersend.h
|
||||
index 1a3e4ea..e4f50f0 100644
|
||||
--- a/konversation/src/dcctransfersend.h
|
||||
+++ b/konversation/src/dcctransfersend.h
|
||||
@@ -39,11 +39,11 @@ class DccTransferSend : public DccTransfer
|
||||
DccTransferSend(TQObject* parent);
|
||||
virtual ~DccTransferSend();
|
||||
|
||||
- // RETQUIRED
|
||||
+ // REQUIRED
|
||||
void setFileURL( const KURL& url );
|
||||
// OPTIONAL
|
||||
void setFileName( const TQString& fileName );
|
||||
- // RETQUIED
|
||||
+ // REQUIRED
|
||||
// FIXME: this setting should be an optional one or be removed: make DccTransferSend itself read the configuration
|
||||
void setOwnIp( const TQString& ownIp );
|
||||
// OPTIONAL
|
||||
diff --git a/konversation/src/ircqueue.h b/konversation/src/ircqueue.h
|
||||
index b1473d6..ec5d7d2 100644
|
||||
--- a/konversation/src/ircqueue.h
|
||||
+++ b/konversation/src/ircqueue.h
|
||||
@@ -10,8 +10,8 @@
|
||||
*/
|
||||
|
||||
|
||||
-#ifndef IRCTQUEUE_H
|
||||
-#define IRCTQUEUE_H
|
||||
+#ifndef IRCQUEUE_H
|
||||
+#define IRCQUEUE_H
|
||||
|
||||
class Server;
|
||||
|
||||
diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp
|
||||
index 9ec34f6..f691a6d 100644
|
||||
--- a/konversation/src/outputfilter.cpp
|
||||
+++ b/konversation/src/outputfilter.cpp
|
||||
@@ -1429,7 +1429,7 @@ namespace Konversation
|
||||
|
||||
if(parameter.isEmpty())
|
||||
{
|
||||
- result = usage(i18n("Usage: %1TQUOTE command list").arg(commandChar));
|
||||
+ result = usage(i18n("Usage: %1QUOTE command list").arg(commandChar));
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/konversation/src/query.h b/konversation/src/query.h
|
||||
index 513377e..c390ca7 100644
|
||||
--- a/konversation/src/query.h
|
||||
+++ b/konversation/src/query.h
|
||||
@@ -10,8 +10,8 @@
|
||||
Copyright (C) 2005-2008 Eike Hein <hein@kde.org>
|
||||
*/
|
||||
|
||||
-#ifndef TQUERY_H
|
||||
-#define TQUERY_H
|
||||
+#ifndef QUERY_H
|
||||
+#define QUERY_H
|
||||
|
||||
#include "chatwindow.h"
|
||||
#include "nickinfo.h"
|
||||
diff --git a/konversation/src/queuetuner.h b/konversation/src/queuetuner.h
|
||||
index c918171..be8fc55 100644
|
||||
--- a/konversation/src/queuetuner.h
|
||||
+++ b/konversation/src/queuetuner.h
|
||||
@@ -10,8 +10,8 @@
|
||||
*/
|
||||
|
||||
|
||||
-#ifndef TQUEUETUNER_H
|
||||
-#define TQUEUETUNER_H
|
||||
+#ifndef QUEUETUNER_H
|
||||
+#define QUEUETUNER_H
|
||||
|
||||
#include "queuetunerbase.h"
|
||||
|
||||
diff --git a/konversation/src/quickbutton.h b/konversation/src/quickbutton.h
|
||||
index 7bf9cf5..bb850ad 100644
|
||||
--- a/konversation/src/quickbutton.h
|
||||
+++ b/konversation/src/quickbutton.h
|
||||
@@ -11,8 +11,8 @@
|
||||
email: eisfuchs@tigress.com
|
||||
*/
|
||||
|
||||
-#ifndef TQUICKBUTTON_H
|
||||
-#define TQUICKBUTTON_H
|
||||
+#ifndef QUICKBUTTON_H
|
||||
+#define QUICKBUTTON_H
|
||||
|
||||
#include <tqpushbutton.h>
|
||||
|
||||
diff --git a/konversation/src/quickbuttons_preferences.h b/konversation/src/quickbuttons_preferences.h
|
||||
index ab04a55..8e2293c 100644
|
||||
--- a/konversation/src/quickbuttons_preferences.h
|
||||
+++ b/konversation/src/quickbuttons_preferences.h
|
||||
@@ -10,8 +10,8 @@
|
||||
Copyright (C) 2006 John Tapsell <johnflux@gmail.com>
|
||||
*/
|
||||
|
||||
-#ifndef TQUICKBUTTONSCONFIG_H
|
||||
-#define TQUICKBUTTONSCONFIG_H
|
||||
+#ifndef QUICKBUTTONSCONFIG_H
|
||||
+#define QUICKBUTTONSCONFIG_H
|
||||
|
||||
#include <tqlistview.h>
|
||||
|
||||
diff --git a/konversation/src/quickconnectdialog.h b/konversation/src/quickconnectdialog.h
|
||||
index b41922d..3ba2ba8 100644
|
||||
--- a/konversation/src/quickconnectdialog.h
|
||||
+++ b/konversation/src/quickconnectdialog.h
|
||||
@@ -12,8 +12,8 @@
|
||||
email: mail@tuxipuxi.de
|
||||
*/
|
||||
|
||||
-#ifndef TQUICKCONNECTDIALOG_H
|
||||
-#define TQUICKCONNECTDIALOG_H
|
||||
+#ifndef QUICKCONNECTDIALOG_H
|
||||
+#define QUICKCONNECTDIALOG_H
|
||||
|
||||
#include "common.h"
|
||||
|
||||
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
|
||||
index f04e75f..4c1cc6f 100644
|
||||
--- a/konversation/src/server.cpp
|
||||
+++ b/konversation/src/server.cpp
|
||||
@@ -692,9 +692,9 @@ void Server::gotOwnResolvedHostByWelcome(KResolverResults res)
|
||||
|
||||
void Server::quitServer()
|
||||
{
|
||||
- // Make clear this is deliberate even if the TQUIT never actually goes through the queue
|
||||
+ // Make clear this is deliberate even if the QUIT never actually goes through the queue
|
||||
// (i.e. this is not redundant with _send_internal()'s updateConnectionState() call for
|
||||
- // a TQUIT).
|
||||
+ // a QUIT).
|
||||
updateConnectionState(Konversation::SSDeliberatelyDisconnected);
|
||||
|
||||
TQString command(Preferences::commandChar()+"QUIT");
|
||||
@@ -1050,7 +1050,7 @@ int Server::getPreLength(const TQString& command, const TQString& dest)
|
||||
}
|
||||
|
||||
//Commands greater than 1 have localizeable text: 0 1 2 3 4 5 6
|
||||
-static TQStringList outcmds=TQStringList::split(TQChar(' '),"WHO TQUIT PRIVMSG NOTICE KICK PART TOPIC");
|
||||
+static TQStringList outcmds=TQStringList::split(TQChar(' '),"WHO QUIT PRIVMSG NOTICE KICK PART TOPIC");
|
||||
|
||||
int Server::_send_internal(TQString outputLine)
|
||||
{
|
||||
@ -1,153 +0,0 @@
|
||||
# Default version for this component
|
||||
%define kdecomp kopete-otr
|
||||
|
||||
# Required for Mageia 2: removes the ldflag '--no-undefined'
|
||||
%define _disable_ld_no_undefined 1
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?tde_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
%define tde_appdir %{tde_datadir}/applications
|
||||
|
||||
%define tde_tdeappdir %{tde_appdir}/kde
|
||||
%define tde_tdedocdir %{tde_docdir}/tde
|
||||
%define tde_tdeincludedir %{tde_includedir}/tde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
|
||||
Name: trinity-%{kdecomp}
|
||||
Summary: Off-The-Record encryption for Kopete [Trinity]
|
||||
Version: 0.7
|
||||
Release: 3%{?dist}%{?_variant}
|
||||
|
||||
License: GPLv2+
|
||||
Group: Applications/Utilities
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{kdecomp}-3.5.13.1.tar.gz
|
||||
|
||||
|
||||
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
|
||||
BuildRequires: trinity-tdebase-devel >= 3.5.13.1
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
# Kopete is provided by kdenetwork
|
||||
BuildRequires: trinity-tdenetwork-devel
|
||||
Requires: trinity-tdenetwork
|
||||
BuildRequires: libotr-devel
|
||||
|
||||
%description
|
||||
This plugin enables Off-The-Record encryption for the KDE instant
|
||||
messenger Kopete. Using this plugin you can encrypt chatsessions to other
|
||||
users with IM-Cients supporting the OTR encryption method.
|
||||
|
||||
|
||||
%if 0%{?suse_version} || 0%{?pclinuxos}
|
||||
%debug_package
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{kdecomp}-3.5.13.1
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i admin/acinclude.m4.in \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt3.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
%configure \
|
||||
--prefix=%{tde_prefix} \
|
||||
--exec-prefix=%{tde_prefix} \
|
||||
--bindir=%{tde_bindir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--mandir=%{tde_mandir} \
|
||||
--includedir=%{tde_tdeincludedir} \
|
||||
--disable-rpath \
|
||||
--with-extra-includes=%{tde_includedir}/tqt \
|
||||
--enable-closure
|
||||
|
||||
%__make %{_smp_mflags}
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
# Unwanted files
|
||||
%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
|
||||
|
||||
%find_lang kopete_otr
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
touch --no-create %{tde_datadir}/icons/crystalsvg || :
|
||||
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%postun
|
||||
touch --no-create %{tde_datadir}/icons/crystalsvg || :
|
||||
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
|
||||
/sbin/ldconfig || :
|
||||
|
||||
|
||||
%files -f kopete_otr.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING README TODO
|
||||
%{tde_libdir}/libkotr.la
|
||||
%{tde_libdir}/libkotr.so.0
|
||||
%{tde_libdir}/libkotr.so.0.0.0
|
||||
%{tde_tdelibdir}/kcm_kopete_otr.la
|
||||
%{tde_tdelibdir}/kcm_kopete_otr.so
|
||||
%{tde_tdelibdir}/kopete_otr.la
|
||||
%{tde_tdelibdir}/kopete_otr.so
|
||||
%{tde_datadir}/apps/kopete_otr
|
||||
%{tde_datadir}/config.kcfg/kopete_otr.kcfg
|
||||
%{tde_tdedocdir}/HTML/en/kopete_otr/
|
||||
%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
|
||||
%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop
|
||||
%{tde_datadir}/services/kopete_otr.desktop
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
|
||||
- Initial release for TDE 3.5.13.1
|
||||
|
||||
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
|
||||
- Rebuild for Fedora 17
|
||||
|
||||
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
|
||||
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
|
||||
|
||||
@ -1,145 +0,0 @@
|
||||
# Default version for this component
|
||||
%define kdecomp kopete-otr
|
||||
|
||||
# Required for Mageia 2: removes the ldflag '--no-undefined'
|
||||
%define _disable_ld_no_undefined 1
|
||||
|
||||
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||
%if "%{?tde_prefix}" != "/usr"
|
||||
%define _variant .opt
|
||||
%endif
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
%define tde_bindir %{tde_prefix}/bin
|
||||
%define tde_datadir %{tde_prefix}/share
|
||||
%define tde_docdir %{tde_datadir}/doc
|
||||
%define tde_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
%define tde_mandir %{tde_datadir}/man
|
||||
%define tde_appdir %{tde_datadir}/applications
|
||||
|
||||
%define tde_tdeappdir %{tde_appdir}/kde
|
||||
%define tde_tdedocdir %{tde_docdir}/kde
|
||||
%define tde_tdeincludedir %{tde_includedir}/kde
|
||||
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||
|
||||
%define _docdir %{tde_docdir}
|
||||
|
||||
|
||||
Name: trinity-%{kdecomp}
|
||||
Summary: Off-The-Record encryption for Kopete [Trinity]
|
||||
Version: 0.7
|
||||
Release: 2%{?dist}%{?_variant}
|
||||
|
||||
License: GPLv2+
|
||||
Group: Applications/Utilities
|
||||
|
||||
Vendor: Trinity Project
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
URL: http://www.trinitydesktop.org/
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: %{kdecomp}-3.5.13.tar.gz
|
||||
|
||||
|
||||
BuildRequires: tqtinterface-devel
|
||||
BuildRequires: trinity-tdelibs-devel
|
||||
BuildRequires: trinity-tdebase-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
# Kopete is provided by kdenetwork
|
||||
BuildRequires: trinity-tdenetwork-devel
|
||||
Requires: trinity-tdenetwork
|
||||
BuildRequires: libotr-devel
|
||||
|
||||
%description
|
||||
This plugin enables Off-The-Record encryption for the KDE instant
|
||||
messenger Kopete. Using this plugin you can encrypt chatsessions to other
|
||||
users with IM-Cients supporting the OTR encryption method.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n applications/%{kdecomp}
|
||||
|
||||
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||
%__sed -i admin/acinclude.m4.in \
|
||||
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||
|
||||
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||
%__make -f "admin/Makefile.common"
|
||||
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt.sh
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
|
||||
|
||||
%configure \
|
||||
--prefix=%{tde_prefix} \
|
||||
--exec-prefix=%{tde_prefix} \
|
||||
--bindir=%{tde_bindir} \
|
||||
--datadir=%{tde_datadir} \
|
||||
--libdir=%{tde_libdir} \
|
||||
--mandir=%{tde_mandir} \
|
||||
--includedir=%{tde_tdeincludedir} \
|
||||
--disable-rpath \
|
||||
--with-extra-includes=%{tde_includedir}/tqt \
|
||||
--enable-closure
|
||||
|
||||
%__make %{_smp_mflags}
|
||||
|
||||
%install
|
||||
export PATH="%{tde_bindir}:${PATH}"
|
||||
%__rm -rf %{buildroot}
|
||||
%__make install DESTDIR=%{buildroot}
|
||||
|
||||
# Unwanted files
|
||||
%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so
|
||||
|
||||
%find_lang kopete_otr
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
touch --no-create %{tde_datadir}/icons/crystalsvg || :
|
||||
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%postun
|
||||
touch --no-create %{tde_datadir}/icons/crystalsvg || :
|
||||
gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
|
||||
/sbin/ldconfig || :
|
||||
|
||||
|
||||
%files -f kopete_otr.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING README TODO
|
||||
%{tde_libdir}/libkotr.la
|
||||
%{tde_libdir}/libkotr.so.0
|
||||
%{tde_libdir}/libkotr.so.0.0.0
|
||||
%{tde_tdelibdir}/kcm_kopete_otr.la
|
||||
%{tde_tdelibdir}/kcm_kopete_otr.so
|
||||
%{tde_tdelibdir}/kopete_otr.la
|
||||
%{tde_tdelibdir}/kopete_otr.so
|
||||
%{tde_datadir}/apps/kopete_otr
|
||||
%{tde_datadir}/config.kcfg/kopete_otr.kcfg
|
||||
%{tde_tdedocdir}/HTML/en/kopete_otr/
|
||||
%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png
|
||||
%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop
|
||||
%{tde_datadir}/services/kopete_otr.desktop
|
||||
|
||||
|
||||
%Changelog
|
||||
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
|
||||
- Rebuild for Fedora 17
|
||||
|
||||
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
|
||||
- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
|
||||
|
||||
Loading…
Reference in new issue