Reset submodule main/applications/office/kbookreader/admin to latest HEAD

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "admin"]
+	path = admin
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

acinclude.m4

@@ -417,7 +417,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
 if test "$1" = "default"; then
 
   if test -z "$kde_htmldir"; then
-    kde_htmldir='\${datadir}/doc/HTML'
+    kde_htmldir='\${datadir}/doc/tde/HTML'
   fi
   if test -z "$kde_appsdir"; then
     kde_appsdir='\${datadir}/applnk'

admin

@@ -0,0 +1 @@
+Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

bookreader.kdevelop

@@ -67,7 +67,7 @@
         <f77flags/>
       </optimized>
       <debug>
-        <configargs>--enable-debug=full --prefix=/home/nau/.kde</configargs>
+        <configargs>--enable-debug=full --prefix=/home/nau/.trinity</configargs>
         <builddir>debug</builddir>
         <ccompiler>kdevgccoptions</ccompiler>
         <cxxcompiler>kdevgppoptions</cxxcompiler>

src/bookmark.h

@@ -33,7 +33,7 @@ class Bookmark
 {
 public:
 	Bookmark(int page, const TQString& name = TQString(), 
-		TQDateTime dateTime = TQDateTime::tqcurrentDateTime());
+		TQDateTime dateTime = TQDateTime::currentDateTime());
 	~Bookmark();
 
 	void setPage(unsigned int page) { m_page = page; }

src/bookmarksdlg.cpp

@@ -45,7 +45,7 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent,
 	setSizeGripEnabled(TRUE);
 	BookmarksDlgLayout = new TQVBoxLayout( this, 11, 6, "BookmarksDlgLayout");
 
-	tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
+	layout3 = new TQHBoxLayout( 0, 0, 6, "layout3");
 
 	bookmarksTable = new TQTable(3, 2, this, "bookmarksList" );
 	bookmarksTable->horizontalHeader()->setLabel(0, "Title");
@@ -53,19 +53,19 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent,
 // 	bookmarksTable->setLeftMargin(0);
 	bookmarksTable->setColumnStretchable(0, true);
 	bookmarksTable->setSelectionMode(TQTable::SingleRow);
-	tqlayout3->addWidget( bookmarksTable );
+	layout3->addWidget( bookmarksTable );
 
-	tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
+	layout2 = new TQVBoxLayout( 0, 0, 6, "layout2");
 
 	addButton = new TQPushButton( this, "addButton" );
-	tqlayout2->addWidget( addButton );
+	layout2->addWidget( addButton );
 
 	deleteButton = new TQPushButton( this, "deleteButton" );
-	tqlayout2->addWidget( deleteButton );
+	layout2->addWidget( deleteButton );
 	Horizontal_Spacing2_2 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-	tqlayout2->addItem( Horizontal_Spacing2_2 );
-	tqlayout3->addLayout( tqlayout2 );
-	BookmarksDlgLayout->addLayout( tqlayout3 );
+	layout2->addItem( Horizontal_Spacing2_2 );
+	layout3->addLayout( layout2 );
+	BookmarksDlgLayout->addLayout( layout3 );
 
 	Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1");
 
@@ -85,7 +85,7 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent,
 	Layout1->addWidget( buttonCancel );
 	BookmarksDlgLayout->addLayout( Layout1 );
 	languageChange();
-	resize( TQSize(400, 267).expandedTo(tqminimumSizeHint()) );
+	resize( TQSize(400, 267).expandedTo(minimumSizeHint()) );
 	clearWState( WState_Polished );
 
 	updateBookmarks();

src/bookmarksdlg.h

@@ -53,8 +53,8 @@ public:
 
 protected:
 	TQVBoxLayout* BookmarksDlgLayout;
-	TQHBoxLayout* tqlayout3;
-	TQVBoxLayout* tqlayout2;
+	TQHBoxLayout* layout3;
+	TQVBoxLayout* layout2;
 	TQSpacerItem* Horizontal_Spacing2_2;
 	TQHBoxLayout* Layout1;
 	TQSpacerItem* Horizontal_Spacing2;

src/bookreader.cpp

@@ -304,7 +304,7 @@ void BookReader::optionsPreferences()
 	
 	TQString curEncoding(encodings[Settings::defaultEncoding()]);
 	if (curEncoding.isEmpty())
-		curEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+		curEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
 	
 	general->kcfg_DefaultEncoding->clear();
 	general->kcfg_DefaultEncoding->insertStringList(encodings);
@@ -405,7 +405,7 @@ void BookReader::loadLastUrl()
 void BookReader::loaded(int loaded)
 {
 	//m_loaded = loaded;
-	m_splash->message(tqtr("Loading: %1 - %2%").tqarg(lastURL.fileName()).tqarg(loaded));
+	m_splash->message(tqtr("Loading: %1 - %2%").arg(lastURL.fileName()).arg(loaded));
 }
 
 void BookReader::gotoFirstPage()

src/bookwidget.cpp

@@ -296,7 +296,7 @@ void BookWidget::resizeEvent(TQResizeEvent * e)
 	TQWidget::resizeEvent(e);
 }
 
-TQSize BookWidget::tqminimumSizeHint() const
+TQSize BookWidget::minimumSizeHint() const
 {
 	return TQSize(400, 300);
 }
@@ -429,7 +429,7 @@ void BookWidget::saveBookmarks( )
 	for (Bookmarks::size_type i = 0; i < m_bookmarks.size(); ++i)
 	{
 		const Bookmark & bm = m_bookmarks[i];
-		config.setGroup(tqtr("Bookmark %1").tqarg(i));
+		config.setGroup(tqtr("Bookmark %1").arg(i));
 		config.writeEntry("page", bm.page());
 		config.writeEntry("name", bm.name());
 		config.writeEntry("dateTime", bm.dateTime());

src/bookwidget.h

@@ -59,7 +59,7 @@ public:
 	void prevPage();
 	void firstPage();
 	void lastPage();
-	TQSize tqminimumSizeHint () const;
+	TQSize minimumSizeHint () const;
 	void setupPageSize();
 	void setEncoding(int);
 	void setEncoding(const TQString & a_encoding);

src/settingsdlg.ui

@@ -41,7 +41,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -67,7 +67,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -93,7 +93,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -138,7 +138,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>