summaryrefslogtreecommitdiffstats
path: root/libk3b
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b')
-rw-r--r--libk3b/cddb/k3bcddb.cpp2
-rw-r--r--libk3b/cddb/k3bcddbhttpquery.cpp12
-rw-r--r--libk3b/cddb/k3bcddbhttpquery.h6
-rw-r--r--libk3b/cddb/k3bcddblocalquery.h4
-rw-r--r--libk3b/cddb/k3bcddbpquery.cpp16
-rw-r--r--libk3b/cddb/k3bcddbpquery.h6
-rw-r--r--libk3b/cddb/k3bcddbquery.h6
-rw-r--r--libk3b/projects/videocd/cdi/icdia.htm4
-rw-r--r--libk3b/tools/k3bcutcombobox.cpp2
-rw-r--r--libk3b/tools/k3bcutcombobox.h2
-rw-r--r--libk3b/videodvd/k3bvideodvdaudiostream.h6
11 files changed, 33 insertions, 33 deletions
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index 78767c2..f89f9d2 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -241,7 +241,7 @@ TQString K3bCddb::errorString() const
return i18n("Error while connecting to host.");
case K3bCddbQuery::WORKING:
return i18n("Working...");
- case K3bCddbQuery::TQUERY_ERROR:
+ case K3bCddbQuery::QUERY_ERROR:
case K3bCddbQuery::READ_ERROR:
case K3bCddbQuery::FAILURE:
default:
diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp
index b554910..65eb915 100644
--- a/libk3b/cddb/k3bcddbhttpquery.cpp
+++ b/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -46,7 +46,7 @@ K3bCddbHttpQuery::~K3bCddbHttpQuery()
void K3bCddbHttpQuery::doQuery()
{
setError( WORKING );
- m_state = TQUERY;
+ m_state = QUERY;
performCommand( queryString() );
}
@@ -122,7 +122,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
switch( m_state ) {
- case TQUERY:
+ case QUERY:
if( getCode( line ) == 200 ) {
// parse exact match and send a read command
K3bCddbResultHeader header;
@@ -137,7 +137,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
emit infoMessage( i18n("Found multiple exact matches") );
- m_state = TQUERY_DATA;
+ m_state = QUERY_DATA;
}
else if( getCode( line ) == 211 ) {
@@ -145,7 +145,7 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
emit infoMessage( i18n("Found inexact matches") );
- m_state = TQUERY_DATA;
+ m_state = QUERY_DATA;
}
else if( getCode( line ) == 202 ) {
@@ -160,14 +160,14 @@ void K3bCddbHttpQuery::slotResult( KIO::Job* job )
else {
kdDebug() << "(K3bCddbHttpQuery) Error while querying: " << line << endl;
emit infoMessage( i18n("Error while querying") );
- setError(TQUERY_ERROR);
+ setError(QUERY_ERROR);
m_state = FINISHED;
emitQueryFinished();
return;
}
break;
- case TQUERY_DATA:
+ case QUERY_DATA:
if( line.startsWith( "." ) ) {
// finished query
// go on reading
diff --git a/libk3b/cddb/k3bcddbhttpquery.h b/libk3b/cddb/k3bcddbhttpquery.h
index 4f70e58..63774e3 100644
--- a/libk3b/cddb/k3bcddbhttpquery.h
+++ b/libk3b/cddb/k3bcddbhttpquery.h
@@ -14,8 +14,8 @@
*/
-#ifndef K3BCDDB_HTTP_TQUERY_H
-#define K3BCDDB_HTTP_TQUERY_H
+#ifndef K3BCDDB_HTTP_QUERY_H
+#define K3BCDDB_HTTP_QUERY_H
#include "k3bcddbquery.h"
#include "k3bcddbresult.h"
@@ -48,7 +48,7 @@ class K3bCddbHttpQuery : public K3bCddbQuery
private:
void performCommand( const TQString& );
- enum State { TQUERY, TQUERY_DATA, READ, READ_DATA, FINISHED };
+ enum State { QUERY, QUERY_DATA, READ, READ_DATA, FINISHED };
int m_state;
TQString m_server;
diff --git a/libk3b/cddb/k3bcddblocalquery.h b/libk3b/cddb/k3bcddblocalquery.h
index e3d22fe..8f67824 100644
--- a/libk3b/cddb/k3bcddblocalquery.h
+++ b/libk3b/cddb/k3bcddblocalquery.h
@@ -15,8 +15,8 @@
-#ifndef K3BCDDB_LOCAL_TQUERY_H
-#define K3BCDDB_LOCAL_TQUERY_H
+#ifndef K3BCDDB_LOCAL_QUERY_H
+#define K3BCDDB_LOCAL_QUERY_H
#include "k3bcddbquery.h"
#include "k3bcddbresult.h"
diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp
index 0cde7f0..3961109 100644
--- a/libk3b/cddb/k3bcddbpquery.cpp
+++ b/libk3b/cddb/k3bcddbpquery.cpp
@@ -95,7 +95,7 @@ void K3bCddbpQuery::slotConnectionClosed()
void K3bCddbpQuery::cddbpQuit()
{
- m_state = TQUIT;
+ m_state = QUIT;
m_stream << "quit" << endl << flush;
}
@@ -146,13 +146,13 @@ void K3bCddbpQuery::slotReadyRead()
}
// just ignore the reply since it's not important for the functionality
- m_state = TQUERY;
+ m_state = QUERY;
m_stream << queryString() << endl << flush;
break;
}
- case TQUERY:
+ case QUERY:
if( getCode( line ) == 200 ) {
// parse exact match and send a read command
K3bCddbResultHeader header;
@@ -169,7 +169,7 @@ void K3bCddbpQuery::slotReadyRead()
emit infoMessage( i18n("Found multiple exact matches") );
- m_state = TQUERY_DATA;
+ m_state = QUERY_DATA;
}
else if( getCode( line ) == 211 ) {
@@ -177,7 +177,7 @@ void K3bCddbpQuery::slotReadyRead()
emit infoMessage( i18n("Found inexact matches") );
- m_state = TQUERY_DATA;
+ m_state = QUERY_DATA;
}
else if( getCode( line ) == 202 ) {
@@ -190,12 +190,12 @@ void K3bCddbpQuery::slotReadyRead()
else {
kdDebug() << "(K3bCddbpQuery) Error while querying: " << line << endl;
emit infoMessage( i18n("Error while querying") );
- setError( TQUERY_ERROR );
+ setError( QUERY_ERROR );
cddbpQuit();
}
break;
- case TQUERY_DATA:
+ case QUERY_DATA:
if( line.startsWith( "." ) ) {
// finished query
// go on reading
@@ -246,7 +246,7 @@ void K3bCddbpQuery::slotReadyRead()
}
break;
- case TQUIT:
+ case QUIT:
// no parsing needed
break;
}
diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h
index 87a0a49..b8d2174 100644
--- a/libk3b/cddb/k3bcddbpquery.h
+++ b/libk3b/cddb/k3bcddbpquery.h
@@ -13,8 +13,8 @@
*/
-#ifndef K3BCDDBP_TQUERY_H
-#define K3BCDDBP_TQUERY_H
+#ifndef K3BCDDBP_QUERY_H
+#define K3BCDDBP_QUERY_H
#include "k3bcddbquery.h"
#include "k3bcddbresult.h"
@@ -48,7 +48,7 @@ class K3bCddbpQuery : public K3bCddbQuery
private:
void cddbpQuit();
- enum State { GREETING, HANDSHAKE, PROTO, TQUERY, TQUERY_DATA, READ, READ_DATA, TQUIT };
+ enum State { GREETING, HANDSHAKE, PROTO, QUERY, QUERY_DATA, READ, READ_DATA, QUIT };
int m_state;
TQString m_server;
diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h
index 962bc5c..c2680cb 100644
--- a/libk3b/cddb/k3bcddbquery.h
+++ b/libk3b/cddb/k3bcddbquery.h
@@ -14,8 +14,8 @@
*/
-#ifndef K3BCDDB_TQUERY_H
-#define K3BCDDB_TQUERY_H
+#ifndef K3BCDDB_QUERY_H
+#define K3BCDDB_QUERY_H
#include <tqobject.h>
#include <tqstring.h>
@@ -57,7 +57,7 @@ class LIBK3B_EXPORT K3bCddbQuery : public TQObject
CANCELED,
NO_ENTRY_FOUND,
CONNECTION_ERROR,
- TQUERY_ERROR,
+ QUERY_ERROR,
READ_ERROR,
FAILURE,
WORKING };
diff --git a/libk3b/projects/videocd/cdi/icdia.htm b/libk3b/projects/videocd/cdi/icdia.htm
index 53f9121..cd6c47b 100644
--- a/libk3b/projects/videocd/cdi/icdia.htm
+++ b/libk3b/projects/videocd/cdi/icdia.htm
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
-<META HTTP-ETQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<META HTTP-ETQUIV="Refresh" CONTENT="0; URL=http://www.icdia.org/">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<META HTTP-EQUIV="Refresh" CONTENT="0; URL=http://www.icdia.org/">
<TITLE>The New International CD-i Association</TITLE>
</HEAD>
<BODY>
diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp
index a92ae6a..6ed6d7a 100644
--- a/libk3b/tools/k3bcutcombobox.cpp
+++ b/libk3b/tools/k3bcutcombobox.cpp
@@ -214,7 +214,7 @@ void K3bCutComboBox::cutText()
w -= ( pixmap(i)->width() + 4 );
TQString text;
- if( d->method == STQUEEZE )
+ if( d->method == SQUEEZE )
text = K3b::squeezeTextToWidth( fontMetrics(), d->originalItems[i], w );
else
text = K3b::cutToWidth( fontMetrics(), d->originalItems[i], w );
diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h
index 87941ef..bfa7509 100644
--- a/libk3b/tools/k3bcutcombobox.h
+++ b/libk3b/tools/k3bcutcombobox.h
@@ -44,7 +44,7 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox
enum Method {
CUT,
- STQUEEZE
+ SQUEEZE
};
/**
diff --git a/libk3b/videodvd/k3bvideodvdaudiostream.h b/libk3b/videodvd/k3bvideodvdaudiostream.h
index b5719f9..87d8831 100644
--- a/libk3b/videodvd/k3bvideodvdaudiostream.h
+++ b/libk3b/videodvd/k3bvideodvdaudiostream.h
@@ -37,9 +37,9 @@ namespace K3bVideoDVD
};
enum AudioQuantization {
- AUDIO_TQUANTIZATION_16BIT = 0,
- AUDIO_TQUANTIZATION_20BIT = 1,
- AUDIO_TQUANTIZATION_24BIT = 2
+ AUDIO_QUANTIZATION_16BIT = 0,
+ AUDIO_QUANTIZATION_20BIT = 1,
+ AUDIO_QUANTIZATION_24BIT = 2
};
enum AudioSampleFrequency {
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 02:33:31 +0000